From af3455bc13c0ed48f4e3fa1b1614f601df24f12c Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期五, 09 五月 2025 17:17:22 +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 |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs
index 19ac0a6..f43f5fb 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;
@@ -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