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/MesDepotsManager.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index 9fa8176..e6690b7 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -168,22 +168,24 @@
Department = depots.Fdeptid,
Phone = depots.Phone,
Company = "1000",
- Factory = depots.Factory??"1000",
- Remark3 = depots.remark3,
+ Factory = depots.Factory,
+ factory_name = depots.factory_name,
Remark4 = depots.remark4,
Remark5 = depots.remark5,
};
// ERP: 0=鏈鐢�, 1=绂佺敤
// MES: A=鏈鐢�, B=绂佺敤
+ //浼犲叆0銆�1鎴栬�匒銆丅鏃堕兘浼氳浆涓篈銆丅锛屽叾浠栨儏鍐典负A
if (string.IsNullOrEmpty(depots.FForbidStatus))
{
entity.IsNg = "A";
}
else
{
- //鎴戞湡鏈涚殑鍊兼槸A=鍚�,B=鏄�
- //瀹為檯缁欐垜鐨勫�兼槸0鎴�1锛屾垜甯屾湜涓烘垜杞崲浠嶢鍜孊鐨勬柟寮�
- entity.IsNg = depots.FForbidStatus == "1" ? "B" : "A";
+ // 鍥炰紶B鎴�1鏃跺啓鍏锛屽叾瀹冨啓A
+ entity.IsNg = (depots.FForbidStatus == "1" || depots.FForbidStatus == "B")
+ ? "B"
+ : "A";
}
return entity;
--
Gitblit v1.9.3