From 75cbd4fae2ba1f08dd436b4515472ef93734a7c0 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 11 十二月 2025 14:08:05 +0800
Subject: [PATCH] 物料信息:默认仓库编码转ID、启用禁用状态erp改为Y、N

---
 MES.Service/service/BasicData/MesItemsManager.cs |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 7697f7e..8067452 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -296,7 +296,25 @@
             entity.SubconUnit = "0";
         }
 
-        // ERP: 0=鏈鐢�, 1=绂佺敤
+        //榛樿浠撳簱缂栫爜杞琁D,DepotCode = item.FStockId,
+        var entityDepotCode = Db.Queryable<MesDepots>()
+        .Where(x => x.DepotCode == item.FStockId)
+        .Select(x => x.DepotId.ToString())
+        .First();
+        if (!string.IsNullOrWhiteSpace(entityDepotCode))
+        {
+            entity.DepotCode = entityDepotCode;
+        }
+        else if (!string.IsNullOrWhiteSpace(item.FStockId))
+        {
+            entity.DepotCode = item.FStockId;
+        }
+        else
+        {
+            entity.SubconUnit = "0";
+        }
+
+        // ERP: Y=鏈鐢�, N=绂佺敤
         // MES: A=鏈鐢�, B=绂佺敤
         if (string.IsNullOrEmpty(item.FForbidStatus))
         {
@@ -304,9 +322,9 @@
         }
         else
         {
-            //鎴戞湡鏈涚殑鍊兼槸A=鍚�,B=鏄�
-            //瀹為檯缁欐垜鐨勫�兼槸0鎴�1锛屾垜甯屾湜涓烘垜杞崲浠嶢鍜孊鐨勬柟寮�
-            entity.Fforbidstatus = item.FForbidStatus == "1" ? "B" : "A";
+            //鎴戞湡鏈涚殑鍊兼槸A=鍚敤,B=绂佺敤
+            //瀹為檯缁欐垜鐨勫�兼槸Y鎴朜锛屾垜甯屾湜涓烘垜杞崲浠嶢鍜孊鐨勬柟寮�
+            entity.Fforbidstatus = item.FForbidStatus == "N" ? "B" : "A";
         }
 
         return entity;

--
Gitblit v1.9.3