From 730780020e8f9e9641914d843194e54dfb3a0ba7 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 02 十二月 2025 10:37:35 +0800
Subject: [PATCH] 仓库编码、仓库名称的字段统一
---
MES.Service/service/BasicData/SysDepartmentManager.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 4aa6691..6ba27fc 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -152,27 +152,40 @@
//CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
- Factory = "1000",
Remark4 = department.remark4,
Remark5 = department.remark5,
- WorkshopCenterCode = department.FNumber_WORKSHOP,
- WorkshopCenterName = department.FName_WORKSHOP,
- FactoryName = department.factory_name
+
+ //涓嶅瓨鍦紙涓虹┖鎴� null锛夛紝鍒欎娇鐢� existingCustomer 鐨勫師鍊硷紝鍚﹀垯鐢ㄦ柊鍊笺��
+ WorkshopCenterCode = string.IsNullOrEmpty(department.FNumber_WORKSHOP)
+ ? existingCustomer?.WorkshopCenterCode
+ : department.FNumber_WORKSHOP,
+ WorkshopCenterName = string.IsNullOrEmpty(department.FName_WORKSHOP)
+ ? existingCustomer?.WorkshopCenterName
+ : department.FName_WORKSHOP,
+ FactoryName = string.IsNullOrEmpty(department.factory_name)
+ ? existingCustomer?.FactoryName
+ : department.factory_name,
+ Factory = string.IsNullOrEmpty(department.Factory)
+ ? existingCustomer?.Factory
+ : department.Factory,
+
};
// ERP: 0=鏈鐢�, 1=绂佺敤
// MES: A=鏈鐢�, B=绂佺敤
+ //浼犲叆0銆�1鎴栬�匒銆丅鏃堕兘浼氳浆涓篈銆丅锛屽叾浠栨儏鍐典负A
if (string.IsNullOrEmpty(department.FForbidStatus))
{
entity.Depextr4 = "A";
}
else
{
- //鎴戞湡鏈涚殑鍊兼槸A=鍚�,B=鏄�
- //瀹為檯缁欐垜鐨勫�兼槸0鎴�1锛屾垜甯屾湜涓烘垜杞崲浠嶢鍜孊鐨勬柟寮�
- entity.Depextr4 = department.FForbidStatus == "1" ? "B" : "A";
+ // 鍥炰紶B鎴�1鏃跺啓鍏锛屽叾瀹冨啓A
+ entity.Depextr4 = (department.FForbidStatus == "1" || department.FForbidStatus == "B")
+ ? "B"
+ : "A";
}
return entity;
--
Gitblit v1.9.3