From 320a80dcc30db68da1081aebefdca956e7e4235d Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期四, 19 六月 2025 13:44:33 +0800
Subject: [PATCH] 1

---
 HH.WCS.QingXiNongfu/process/DeviceProcess.cs |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
index 32b7729..65482f3 100644
--- a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
@@ -178,6 +178,7 @@
                     {
                         if (od.SQL_Total >= v[0])
                         {
+                            LogHelper.Info(plc.deviceName + $"宸茬疮璁′俊鍙烽噺{od.SQL_Total} 寰呴鏂欐暟{od.OutNum}--寮�杞崲锛堜俊鍙烽噺>{(od.SQL_Total - v[0])} 棰嗘枡鏁�{od.OutNum + v[1]}");
                             od.SQL_Total -= v[0];
                             od.OutNum += v[1];
                             WCSHelper.Do(db =>
@@ -299,6 +300,10 @@
                         {
                             db.Insertable(lirl).ExecuteCommand();
                             db.Insertable(lcrl).ExecuteCommand();
+                            db.Insertable(new Container
+                            {
+                                S_CNTR_CODE = lirl.FirstOrDefault().S_CNTR_CODE,
+                            }).ExecuteCommand();
                             db.Updateable(_cl).UpdateColumns(x => new { x.N_CURRENT_NUM }).ExecuteCommand();
                         });
                         goto ballll;
@@ -321,7 +326,7 @@
                     si = "0";
 
                 }
-                else if (data.Contains("11") && (ods.Find(x => x.SQL_PLineNo.Contains("绾哥")) != null||plc.deviceName.Contains("T1")))
+                else if (data.Contains("11"))// && (ods.Find(x => x.SQL_PLineNo.Contains("绾哥")) != null || plc.deviceName.Contains("T1"))
                 {
                     //if (!ods.Any())
                     //    return;
@@ -340,6 +345,8 @@
                             return db.Updateable(_cl).UpdateColumns(x => new { x.N_CURRENT_NUM }).ExecuteCommand() > 0;
                         });
                     }
+                    if (!plc.deviceName.Contains("T1"))
+                        goto ballll;
                     else if (!plc.deviceName.Contains("姘寸嚎鏍囩"))
                     {
                         LogHelper.Info(_cl.S_LOC_CODE + $"璐т綅 鎵捐捣鐐�);
@@ -1809,9 +1816,18 @@
             }
             if (add)
             {
+                LogHelper.Info($@"{plc.deviceName}鏂板埌浣嶄俊鍙枫� 鎵цYWL宸ュ崟淇″彿閲忓鍔�");
                 var ods = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_State == "鎵ц涓� && x.WorkType == 6 && x.SQL_LinkLineNO == plc.deviceName);//.FirstOrDefault();
                 if (ods.Any())
                 {
+                    LogHelper.Info($@"{plc.deviceName}鏂板埌浣嶄俊鍙凤紝鎵惧埌宸ュ崟{JsonConvert.SerializeObject(ods.Select(x => new
+                    {
+                        x.SQL_PLineNo,
+                        x.SQL_LinkLineNO,
+                        x.SQL_Total,
+                        x.OutNum
+                    }))}");
+
                     foreach (var od in ods)
                     {
                         od.SQL_Total += 1;

--
Gitblit v1.9.1