From 79fec1a2ae702629272c2f347b2fb0fbe5186358 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 27 十一月 2025 15:33:11 +0800
Subject: [PATCH] 部门信息
---
MES.Service/service/BasicData/SysDepartmentManager.cs | 104 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 91 insertions(+), 13 deletions(-)
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index ca70322..fa72be1 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -80,26 +80,65 @@
throw new NotImplementedException("鍒犻櫎澶辫触");
}
- // 鎻掑叆鎴栨洿鏂伴儴闂ㄧ殑鏂规硶
- private bool InsertOrUpdateDepartment(SqlSugarScope db,
- SysDepartment entity)
+ /// <summary>
+ /// 鍚屾鐗╂枡淇℃伅new_0/4
+ /// </summary>
+ /// <param name="db"></param>
+ /// <param name="entity"></param>
+ /// <returns></returns>
+ private bool InsertOrUpdateDepartment(SqlSugarScope db, SysDepartment entity)
{
- db.Deleteable<SysDepartment>()
- .Where(s => s.Id == entity.Id).ExecuteCommand();
+ if (entity.Id == 0)
+ {
+ // 鏂板鎯呭喌锛氱敓鎴愭柊ID骞舵彃鍏�
+ var newId = GenerateNewId();
+ entity.Id = newId;
+ entity.Departmentid = newId;
+ return db.Insertable(entity).ExecuteCommand() > 0;
+ }
+ else
+ {
+ // 鏇存柊鎯呭喌锛氬垹闄ゅ悗閲嶆柊鎻掑叆锛屼繚鎸佸師鏈塈D
+ var originalId = entity.Id;
- var insert = db.Insertable(entity).ExecuteCommand();
- return insert > 0;
+ // 鍏堝垹闄ゅ師璁板綍锛堝鏋滃瓨鍦級
+ db.Deleteable<SysDepartment>().Where(s => s.Id == originalId).ExecuteCommand();
+
+ // 閲嶆柊鎻掑叆锛屼繚鎸佸師鏈塈D
+ entity.Id = originalId;
+ entity.Departmentid = originalId;
+ return db.Insertable(entity).ExecuteCommand() > 0;
+ }
}
+
+ // 鎻掑叆鎴栨洿鏂伴儴闂ㄧ殑鏂规硶
+ //private bool InsertOrUpdateDepartment(SqlSugarScope db,SysDepartment entity)
+ //{
+ // db.Deleteable<SysDepartment>()
+ // .Where(s => s.Id == entity.Id).ExecuteCommand();
+
+ // var insert = db.Insertable(entity).ExecuteCommand();
+ // return insert > 0;
+ //}
// 灏� ErpDepartment 瀵硅薄杞崲涓� SysDepartment 瀵硅薄鐨勬柟娉�
private SysDepartment GetSysDepartment(ErpDepartment department)
{
- return new SysDepartment
+ // 鏌ユ壘鏄惁宸插瓨鍦ㄧ浉鍚岀紪鐮佺殑璁板綍銆�
+ var existingCustomer = Db.Queryable<SysDepartment>()
+ .Where(s => s.Departmentcode == department.FNumber)
+ .First();
+
+ var entity = new SysDepartment
{
- Departmentcode = department.FNumber,
+ // 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑ID锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
+ // 濡傛灉涓嶅瓨鍦紝璁句负0锛孖nsertOrUpdate鏂规硶灏嗙敓鎴愭柊ID
+ Id = existingCustomer?.Id ?? 0,
+ Departmentid = existingCustomer?.Departmentid ?? 0,
+ //Id = Convert.ToDecimal(department.Id),
+ //Departmentid = Convert.ToDecimal(department.Id),
+ Departmentcode = department.FNumber,//涓婚敭
Departmentname = department.FName,
- Departmentid = Convert.ToDecimal(department.Id),
- Id = Convert.ToDecimal(department.Id),
Depextr1 = department.FDeptProperty,
Depextr2 = department.FGroup,
Depextr3 = department.FWIPStockID,
@@ -107,11 +146,50 @@
FParentID = department.FParentID,
FSubsidiary = department.FUseOrgId,
Fumbrella = department.FCreateOrgId,
- CreateDate = DateTime.Now,
+ // 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑CreateDate锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
+ // 濡傛灉涓嶅瓨鍦紝璁句负褰撳墠鏃堕棿
+ CreateDate = existingCustomer?.CreateDate ?? DateTime.Now,
+ //CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
- Factory = "1000"
+ Factory = "1000",
+
+ Remark4 = department.remark4,
+ Remark5 = department.remark5
};
+
+ // ERP: 0=鏈鐢�, 1=绂佺敤
+ // MES: A=鏈鐢�, B=绂佺敤
+ if (string.IsNullOrEmpty(department.FForbidStatus))
+ {
+ entity.Depextr4 = "A";
+ }
+ else
+ {
+ //鎴戞湡鏈涚殑鍊兼槸A=鍚�,B=鏄�
+ //瀹為檯缁欐垜鐨勫�兼槸0鎴�1锛屾垜甯屾湜涓烘垜杞崲浠嶢鍜孊鐨勬柟寮�
+ entity.Depextr4 = department.FForbidStatus == "1" ? "B" : "A";
+ }
+
+ return entity;
+ }
+
+ /// <summary>
+ /// 鐢熸垚鏂扮殑ID锛岀‘淇濅笉閲嶅
+ /// </summary>
+ private decimal GenerateNewId()
+ {
+ // 澶勭悊绌鸿〃鐨勬儏鍐碉紝浠�1寮�濮�
+ var maxId = Db.Queryable<SysDepartment>().Max(x => (decimal?)x.Id) ?? 0;
+ var newId = maxId + 1;
+
+ // 鍙岄噸妫�鏌ワ紝纭繚鐢熸垚鐨処D涓嶅瓨鍦�
+ while (Db.Queryable<SysDepartment>().Where(x => x.Id == newId).Any())
+ {
+ newId++;
+ }
+
+ return newId;
}
// SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜閮ㄩ棬璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
--
Gitblit v1.9.3