From 3a3c5f5711a57439f34e772313fcbb18ba7885bc Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 14 七月 2025 10:31:15 +0800
Subject: [PATCH] 优化

---
 wms/WMSHelper.cs |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/wms/WMSHelper.cs b/wms/WMSHelper.cs
index f22f842..4b1a893 100644
--- a/wms/WMSHelper.cs
+++ b/wms/WMSHelper.cs
@@ -67,7 +67,7 @@
         internal static List<WMSTask> GetWaitingOperationList()
         {
             var db = new SqlHelper<object>().GetInstance();
-            return db.Queryable<WMSTask>().Where(a => a.N_B_STATE == 0 || a.N_B_STATE == 3).ToList();
+            return db.Queryable<WMSTask>().Where(a => a.N_B_STATE == 0 ).ToList();
         }
         internal static PutawayOrder GetPutawayOrder(string no)
         {
@@ -401,6 +401,50 @@
                             S_LOC_CODE = task.S_END_LOC,
                             S_AREA_CODE = task.S_END_AREA,
                             S_CNTR_CODE = task.S_CNTR_CODE,
+                            S_BATCH_NO = item.S_BATCH_NO,
+                            S_SERIAL_NO = item.S_SERIAL_NO,
+                            //D_PRD_DATE = item.D_PRD_DATE,
+                            F_QTY = item.F_QTY
+                        };
+                        db.Insertable(info).ExecuteCommand();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error($"涓婃灦璁板綍娣诲姞寮傚父 寮傚父淇℃伅={ex.Message}", ex);
+            }
+        }
+
+        internal static void addOnShelves(TN_Outbound_Order task,string cntr_code, int action)
+        {
+            var db = new SqlHelper<object>().GetInstance();
+            var s_action = "";
+            if (action == 1)
+            {
+                s_action = "涓婃灦";
+            }
+            else
+            {
+                s_action = "涓嬫灦";
+            }
+            try
+            {
+                var itemlist = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code).ToList();
+                if (itemlist.Count > 0)
+                {
+                    foreach (var item in itemlist)
+                    {
+                        var info = new TN_OnOff_Shelves
+                        {
+                            S_NO = task.S_NO,
+                            N_ACTION = action,
+                            S_ACTION = s_action,
+                            S_ITEM_CODE = item.S_ITEM_CODE,
+                            S_ITEM_NAME = item.S_ITEM_NAME,
+                            S_LOC_CODE = task.S_END_LOC,
+                            S_AREA_CODE = task.S_END_AREA,
+                            S_CNTR_CODE = cntr_code,
                             S_BATCH_NO = item.S_BATCH_NO,
                             S_SERIAL_NO = item.S_SERIAL_NO,
                             //D_PRD_DATE = item.D_PRD_DATE,
@@ -872,9 +916,19 @@
             //淇敼浣滀笟鐘舵� 閲嶆柊鍚姩
             wmsTask.N_B_STATE = 2;
             WMSHelper.UpdateTaskState(wmsTask);
-            WCSHelper.UpdateStorStatus(task.S_CNTR_CODE, 4);
+            //WCSHelper.UpdateStorStatus(task.S_CNTR_CODE, 4);
         }
+        internal static void Fail(WCSTask task)
+        {
+            var db = new SqlHelper<object>().GetInstance();
+            var wmsTask = db.Queryable<WMSTask>().Where(a => a.S_CODE == task.S_OP_CODE).First();
 
+            //淇敼浣滀笟鐘舵� 閲嶆柊鍚姩
+            wmsTask.N_B_STATE = 5;
+            wmsTask.S_B_STATE = "鍙栨秷";
+            WMSHelper.UpdateTaskState(wmsTask);
+           //WCSHelper.UpdateStorStatus(task.S_CNTR_CODE, 4);
+        }
         internal static void EndTn(string S_CNTR_CODE)
         {
             var db = new SqlHelper<object>().GetInstance();
@@ -935,7 +989,7 @@
 
             return result;
         }
-
+    
         internal static WMSTask GetWmsTaskByCntr(string cntr, bool active = true)
         {
             WMSTask result = null;

--
Gitblit v1.9.1