From 934c57635b05680e9ce3fca53d109a77e8da5b9a Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期二, 16 九月 2025 13:11:07 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK
---
StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs
index 19ac0a6..e935a1f 100644
--- a/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs
@@ -28,7 +28,6 @@
break;
case "2":
- case "4":
if (InsertOrUpdate(db, entity)) return 1;
break;
@@ -49,7 +48,7 @@
.SetColumns(s => s.IsNg == status)
.Where(s => s.DepotId == depotId).ExecuteCommand();
- if (result > 0)
+ // if (result > 0)
return true;
throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
@@ -150,8 +149,13 @@
CreateOrg = Convert.ToDecimal(depots.FCreateOrgId),
UseOrg = Convert.ToDecimal(depots.FUseOrgId),
CreateDate = DateTime.Now,
+ FZYC= depots.FZYC,
+ FGYC= depots.FGYC,
+ FZMC= depots.FZMC,
+ CGYMC= depots.FCGYMC,
Company = "1000",
- Factory = "1000"
+ Factory = "1000",
+ Type=depots.Type,
};
}
@@ -194,7 +198,6 @@
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
case "2":
- case "4":
if (!InsertOrUpdateBatch(db,
depotsGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂颁粨搴�
throw new NotImplementedException("鍚屾澶辫触");
--
Gitblit v1.9.3