From b3af9e295ae16623e4f7b07706ac1654f9cb8ccd Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 06 五月 2025 15:11:17 +0800
Subject: [PATCH] 1.拆分领料返回拆分后条码。

---
 service/Wom/WomdaaManager.cs                     |    9 +++++++--
 Dto/service/ProductionPickDto.cs                 |    2 ++
 service/Warehouse/MesInvItemInCDetailsManager.cs |    4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Dto/service/ProductionPickDto.cs b/Dto/service/ProductionPickDto.cs
index f45b57f..935b3a2 100644
--- a/Dto/service/ProductionPickDto.cs
+++ b/Dto/service/ProductionPickDto.cs
@@ -14,6 +14,8 @@
     public string? splitNum { get; set; }
 
     public string? barcode { get; set; }
+    //鎷嗗垎鍚庢潯鐮�
+    public string? cfBarcode { get; set; }
 
     //杩斿洖淇℃伅
     public string? strMsg { get; set; }
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index d7c7063..192c3a8 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -857,8 +857,8 @@
 
             // 鍒涘缓 鎻掑叆鏃ュ織
             var logService = new LogService();
-            var LogMsg = "[PDA]閲囪喘鍏ュ簱銆傛潯鐮併��" + entity.barcode + "銆� 鍏ュ簱鍗曞彿銆�" + cBillNo + "銆�";
-            logService.CreateLog(db, entity.userName, inventory.Guid.ToString(), "WW_GD", LogMsg, inventory.BillNo);
+            var LogMsg = "銆怭DA銆戦噰璐叆搴撱�傛潯鐮併��" + entity.barcode + "銆� 鍏ュ簱鍗曞彿銆�" + cBillNo + "銆�";
+            logService.CreateLog(db, entity.userName, inventory.Guid.ToString(), "MES_INV_ITEM_ARN", LogMsg, inventory.BillNo);
 
             return 1;
         });
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index a58ae4b..2a3909c 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -109,6 +109,7 @@
 
         var _strMsg = "";
         var _intSum = "";
+        var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
         using (var conn = new SqlConnection(DbHelperSQL.strConn))
         {
             using (var cmd = new SqlCommand("[prc_pda_SCLL_CF]", conn))
@@ -119,8 +120,9 @@
                     cmd.CommandType = CommandType.StoredProcedure;
                     SqlParameter[] parameters =
                     {
-                        new("@outMsg", SqlDbType.NVarChar, 300),
+                        new("@outMsg", SqlDbType.NVarChar, 2000),
                         new("@outSum", SqlDbType.NVarChar, 300),
+                        new("@outCfBar", SqlDbType.NVarChar, 300),
                         new("@c_User", query.userName),
                         new("@p_biLL_no", query.daa001),
                         new("@p_item_barcode", query.barcode),
@@ -128,11 +130,13 @@
                     };
                     parameters[0].Direction = ParameterDirection.Output;
                     parameters[1].Direction = ParameterDirection.Output;
+                    parameters[2].Direction = ParameterDirection.Output;
                     foreach (var parameter in parameters)
                         cmd.Parameters.Add(parameter);
                     cmd.ExecuteNonQuery();
                     _strMsg = parameters[0].Value.ToString();
                     _intSum = parameters[1].Value.ToString();
+                    _cfBar = parameters[2].Value.ToString();
 
 
                     var result = Convert.ToInt32(_intSum);
@@ -141,7 +145,8 @@
                     var dto = new ProductionPickDto
                     {
                         daa001 = query.daa001,
-                        barcode = query.barcode
+                        barcode = query.barcode,//鍘熸潯鐮�
+                        cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
                     };
 
                     return dto;

--
Gitblit v1.9.3