From 24de88ebbbb3597bb2043840bc685e3d59363967 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 07 七月 2025 16:48:39 +0800
Subject: [PATCH] 优化轮询ERP信息流程、添加AGV接口报文打印、执行中任务强制取消的功能

---
 core/WCSCore.cs |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 8cebf87..ea81f71 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -126,13 +126,13 @@
                     return;
                 }
 
-                //if (db.Updateable<TN_Loc_Container>()
-                //    .SetColumns(d => d.S_IMG_URL == filepath)
-                //    .Where(d => d.S_CNTR_CODE == model.S_CNTR_CODE).ExecuteCommand() <= 0) {
+                if (db.Updateable<TN_Loc_Container>()
+                    .SetColumns(d => d.S_IMG_URL == filepath)
+                    .Where(d => d.S_CNTR_CODE == model.S_CNTR_CODE).ExecuteCommand() <= 0) {
 
-                //    LogHelper.Info($"鍥剧墖URL '{filepath}' 鍐欏叆鏁版嵁搴撳け璐�);
-                //    return;
-                //}
+                    LogHelper.Info($"鍥剧墖URL '{filepath}' 鍐欏叆鏁版嵁搴撳け璐�);
+                    return;
+                }
             }
             catch (Exception ex) {
                 LogHelper.Info($"鍙戠敓浜嗛敊璇細{ex.Message}");
@@ -167,7 +167,9 @@
                     //cgDetail.F_QTY = 0; // 涓嶈缃负绌猴紝渚夸簬娴嬭瘯鏃堕鍏堣缃竴涓甯稿�
                 }
                 else {
-                    var weight = float.Parse(data[0].parameter_varchar200_up);
+                    var weight_str = data[0].parameter_varchar200_up.Split(';')[1].Split('-')[1];
+
+                    var weight = float.Parse(weight_str);
                     cgDetail.F_QTY = weight;
                     tn_task.F_WEIGHT = weight;
 
@@ -203,6 +205,8 @@
                     LogHelper.Info($"缁堢偣璐ф灦鍙�'{tn_task.S_END_LOC}' 鏃犳硶杞垚鏁板瓧");
                     return;
                 }
+
+                //row -= 100; // 118-1
 
                 // 鍙綋涔嬪墠鎸囧畾缁堢偣璐ф灦鍚庯紝鎵嶅皾璇曡绠楃粓鐐硅揣浣�                 if (cgDetail.F_QTY > 2000) {
@@ -329,8 +333,9 @@
                     LogHelper.Info("鏇存柊鐗╂枡閲嶉噺澶辫触锛氭病鏈夋帴鍙楀埌鏉ヨ嚜鍥借嚜AGV鐨勯噸閲忎俊鎭�);
                     return;
                 }
+                var weight_str = data[0].parameter_varchar200_up.Split(';')[1].Split('-')[1];
 
-                var weight = float.Parse(data[0].parameter_varchar200_up);
+                var weight = float.Parse(weight_str);
                 cgDetail.F_QTY = weight;
 
                 if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => it.F_QTY).ExecuteCommand() <= 0) {

--
Gitblit v1.9.1