From c09e27ad225db06c1ebff340635654c76acc4d2d Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 12 三月 2025 14:56:23 +0800
Subject: [PATCH] 1.生产退补料优化,日志

---
 service/Warehouse/MesItemBlManager.cs  |    9 ++++++++-
 util/LogUtil.cs                        |    2 +-
 service/Warehouse/MesItemTblManager.cs |    8 +++++++-
 service/Wom/WwGdManager.cs             |    4 ++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index c648107..9b4729b 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -298,7 +298,7 @@
                     PbillNo = query.billNo,
                     ItemId = blDetail.Bld012,
                     DepotId = stockBarcode.DepotsId.ToString(),
-                    ItemDabid = womdab.Guid,
+                    ItemDabid = blDetail.Id,
                     // Unit = blDetail.Bld009,
                     // DepotId = (int)stockBarcode.DepotsId
                 }).IgnoreColumns(true).ExecuteCommand();
@@ -932,6 +932,13 @@
 
             if (executeCommand <= 1) throw new Exception("鏇存柊澶辫触");
 
+
+            // 鍒涘缓 鎻掑叆鏃ュ織
+            var logService = new LogService();
+            var LogMsg = "[PDA]" + query.Type + "銆傛潯鐮併��" + query.barcode + "銆� 鍑哄簱鍗曞彿銆�" + outNo + "銆�";
+            logService.CreateLog(db, query.userName, womdaa.Guid.ToString(), "WOMDAA", LogMsg, womdaa.Daa001);
+
+
             return executeCommand;
         }) > 0;
 
diff --git a/service/Warehouse/MesItemTblManager.cs b/service/Warehouse/MesItemTblManager.cs
index 2e2bcfc..18cd8c6 100644
--- a/service/Warehouse/MesItemTblManager.cs
+++ b/service/Warehouse/MesItemTblManager.cs
@@ -312,7 +312,8 @@
                     LineK3id = c_mes_inv_item_barcodes.LineK3id,
                     ItemId = c_mes_inv_item_barcodes.ItemId,
                     DepotCode = c_mes_depots.DepotCode,
-                    DepotId = c_depot_code.ToString()
+                    DepotId = c_depot_code.ToString(),
+                    itemDabid = C_MES_ITEM_TBL_DETAIL.Tlid.ToString()
                 }).IgnoreColumns(true).ExecuteCommand();
             else
                 // 瀛樺湪鏃舵洿鏂版暟閲�
@@ -554,6 +555,11 @@
                 throw new Exception(
                     $"鍏抽敭鏁版嵁鎻掑叆澶辫触锛岄鏈熻嚦灏憑minimumExpectedOperations}涓搷浣滐紝瀹為檯鎵ц{totalResult}涓搷浣�");
 
+            // 鍒涘缓 鎻掑叆鏃ュ織
+            var logService = new LogService();
+            var LogMsg = "[PDA]鐢熶骇閫�鏂欍�傛潯鐮併��" + query.barcode + "銆� 閫�鏂欏崟鍙枫��" + c_bill_no + "銆�";
+            logService.CreateLog(db, query.userName, tbWOMDAA.Guid.ToString(), "WOMDAA", LogMsg, tbWOMDAA.Daa001);
+
             return totalResult;
         });
 
diff --git a/service/Wom/WwGdManager.cs b/service/Wom/WwGdManager.cs
index f04b3ea..83ad617 100644
--- a/service/Wom/WwGdManager.cs
+++ b/service/Wom/WwGdManager.cs
@@ -696,7 +696,7 @@
 
             // 鍒涘缓 鎻掑叆鏃ュ織
             var logService = new LogService();
-            var LogMsg = "濮斿閫�鏂欍�傛潯鐮併��" + query.barcode + "銆� 閫�鏂欏崟鍙枫��" + c_bill_no + "銆�";
+            var LogMsg = "[PDA]濮斿閫�鏂欍�傛潯鐮併��" + query.barcode + "銆� 閫�鏂欏崟鍙枫��" + c_bill_no + "銆�";
             logService.CreateLog(db, query.userName, wwgd.Id.ToString(), "WW_GD", LogMsg, wwgd.Daa001);
 
             return totalResult;
@@ -1069,7 +1069,7 @@
 
             // 鍒涘缓 鎻掑叆鏃ュ織
             var logService = new LogService();
-            var LogMsg = query.Type + "銆傛潯鐮併��" +query.barcode+"銆� 琛ユ枡鍗曞彿銆�"+ outNo +"銆�";
+            var LogMsg = "[PDA]"+query.Type + "銆傛潯鐮併��" +query.barcode+"銆� 鍑哄簱鍗曞彿銆�"+ outNo +"銆�";
             logService.CreateLog(db,query.userName,wwgd.Id.ToString(), "WW_GD", LogMsg,wwgd.Daa001);
 
             return 1;
diff --git a/util/LogUtil.cs b/util/LogUtil.cs
index 5840796..e91a9bc 100644
--- a/util/LogUtil.cs
+++ b/util/LogUtil.cs
@@ -22,7 +22,7 @@
                 .Select(it => it.Guid) //
                 .First();
 
-            detail = "[PDA]" + detail;
+            //detail = "[PDA]" + detail;
             // 鎵ц瀛樺偍杩囩▼
             db.Ado.ExecuteCommand(
                 "exec prc_log_create @edtUserGuid, @abtGuid, @abtTable, @detail, @orderNo",

--
Gitblit v1.9.3