From 59dc2aa6e3fe7f699c4f2d03b774763142c5698d Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期六, 05 七月 2025 17:31:54 +0800
Subject: [PATCH] 添加货位容器关系表锁、调整货架行号和记录表同步逻辑
---
core/WCSCore.cs | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 63ae73d..383223a 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) {
@@ -245,7 +249,7 @@
// 濡傛灉娌℃湁绗﹀悎鏉′欢鐨勮揣浣嶏紝缃┖锛岀瓑寰匬DA閲嶆柊纭畾
if (endLoc == null) {
- tn_task.S_END_AREA = Settings.Areas[1][0]; // HJQ
+ tn_task.S_END_AREA = Settings.Areas[AreaIndex.H璐ф灦鍖篯[0]; // HJQ
tn_task.S_END_LOC = "0";
// 涓嶉渶瑕佸啀缁橤Z AGV浼犵┖鍊硷紝涓�紑濮嬪氨娌＄粰鍏蜂綋璐т綅锛屽彧缁欎簡Area
@@ -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