From 65d64a3359b31dd71ea2a18df8b08d05b1232970 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 12 十二月 2025 14:54:30 +0800
Subject: [PATCH] 数据库添加字段用于区分部门表与工作中心信息
---
MES.Service/service/BasicData/MesWorkshopcentersManager.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/BasicData/MesWorkshopcentersManager.cs b/MES.Service/service/BasicData/MesWorkshopcentersManager.cs
index 86f092f..29cdb31 100644
--- a/MES.Service/service/BasicData/MesWorkshopcentersManager.cs
+++ b/MES.Service/service/BasicData/MesWorkshopcentersManager.cs
@@ -53,7 +53,7 @@
{
var result = db.Updateable<SysDepartment>()
.SetColumns(s => s.Depextr4 == status)
- .Where(s => s.Id == departmentId).ExecuteCommand();
+ .Where(s => s.Id == departmentId && s.TypeByTable==1).ExecuteCommand();
if (result > 0)
return true;
@@ -75,7 +75,7 @@
private bool DeleteDepartment(SqlSugarScope db, decimal departmentId)
{
var deleteById = db.Deleteable<SysDepartment>()
- .Where(s => s.Id == departmentId).ExecuteCommand();
+ .Where(s => s.Id == departmentId && s.TypeByTable==1).ExecuteCommand();
if (deleteById > 0)
return true;
@@ -128,18 +128,19 @@
{
// 鏌ユ壘鏄惁宸插瓨鍦ㄧ浉鍚岀紪鐮佺殑璁板綍銆�
var existingCustomer = Db.Queryable<SysDepartment>()
- .Where(s => s.Departmentcode == department.FDept)
+ .Where(s => s.WorkshopCenterCode == department.FNumber && s.TypeByTable==1)
.First();
var entity = new SysDepartment
{
+ TypeByTable = 1,//鐢ㄤ簬鍖哄垎閮ㄩ棬琛ㄤ笌宸ヤ綔涓績淇℃伅锛�0/1锛�
// 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑ID锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
// 濡傛灉涓嶅瓨鍦紝璁句负0锛孖nsertOrUpdate鏂规硶灏嗙敓鎴愭柊ID
Id = existingCustomer?.Id ?? 0,
Departmentid = existingCustomer?.Departmentid ?? 0,
//Id = Convert.ToDecimal(department.Id),
//Departmentid = Convert.ToDecimal(department.Id),
- Departmentcode = department.FDept,//涓婚敭
+ Departmentcode = department.FDept,//閮ㄩ棬缂栧彿
Depextr4 = department.FForbidStatus,
// 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑CreateDate锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
// 濡傛灉涓嶅瓨鍦紝璁句负褰撳墠鏃堕棿
@@ -150,7 +151,7 @@
//涓嶅瓨鍦紙涓虹┖鎴� null锛夛紝鍒欎娇鐢� existingCustomer 鐨勫師鍊硷紝鍚﹀垯鐢ㄦ柊鍊笺��
WorkshopCenterCode = string.IsNullOrEmpty(department.FNumber)
? existingCustomer?.WorkshopCenterCode
- : department.FNumber,
+ : department.FNumber,////涓婚敭
WorkshopCenterName = string.IsNullOrEmpty(department.FName)
? existingCustomer?.WorkshopCenterName
: department.FName,
--
Gitblit v1.9.3