From d944fda9f2fbf27d83e8fdf880e8fe5267e1f541 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 04 六月 2025 17:24:13 +0800
Subject: [PATCH] 优化空托空箱入库兼容出库容器回库场景，修复货位容器绑定的类型丢失问题
---
core/WCSCore.cs | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index b209191..77251ee 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -133,25 +133,27 @@
var info = "";
try {
- var cgDetail = new TN_CG_Detail();
+ var cgDetail = new TN_CG_Detail(); // 濡傛灉娌℃湁淇℃伅锛岄粯璁ゅ氨鏄┖鍊硷紝鍙互鐩存帴濉叆锛屼笉闇�鍒ゆ柇
- var emptyTask = false;
+ //var emptyTask = false; // 绌烘墭/绌虹浠诲姟
if (task.S_TYPE != TaskName.H濂借繍绠盻绌虹涓婄嚎 && task.S_TYPE != TaskName.H濂借繍绠盻绌虹鍏ュ簱 &&
task.S_TYPE != TaskName.T鎵樼洏_绌烘墭涓婄嚎 && task.S_TYPE != TaskName.T鎵樼洏_绌烘墭鍏ュ簱) {
- // 闈炵┖鎵樹换鍔★紙绌烘墭浠诲姟鏃犳硶鍦–GDetail鏌ュ埌鐗╂枡淇℃伅锛�- emptyTask= true;
+ // 闈炵┖鎵�绌虹浠诲姟锛堢┖鎵�绌虹浠诲姟鏃犳硶鍦–GDetail鏌ュ埌鐗╂枡淇℃伅锛�+ //emptyTask= true;
cgDetail = db.Queryable<TN_CG_Detail>()
.Where(d => d.S_CNTR_CODE == task.S_CNTR_CODE)
.First();
if (cgDetail == null) {
- info = $"浠诲姟{task.S_CODE}瀹屾垚锛岃褰曞嚭鍏ュ簱澶辫触锛氭棤娉曞湪瀹瑰櫒璐у搧鏄庣粏琛ㄤ腑鎵惧埌鎵樼洏{task.S_CNTR_CODE}瀵瑰簲鐨勭墿鏂�;
+ info = $"浠诲姟{task.S_CODE}瀹屾垚锛岃褰曞嚭鍏ュ簱瀛樺湪闂锛氭棤娉曞湪瀹瑰櫒璐у搧鏄庣粏琛ㄤ腑鎵惧埌鎵樼洏{task.S_CNTR_CODE}瀵瑰簲鐨勭墿鏂�;
LogHelper.Info(info);
- return;
+ //return;
+ cgDetail = new TN_CG_Detail() ;
+ cgDetail.S_ITEM_CODE = "寮傚父";
}
}
- var isInbound = false;
+ var isInbound = false; // 鍏ュ簱绫诲瀷鐨勪换鍔★紙鍖呮嫭绉诲簱绫讳换鍔★級
var inboundTasks = new List<string> {
TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱, TaskName.H濂借繍绠盻绌虹鍏ュ簱, TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱, TaskName.T鎵樼洏_绌烘墭鍏ュ簱,
TaskName.C鎶芥_鍚堟牸鍥炲簱, TaskName.C鎶芥_涓嶅悎鏍肩Щ搴� TaskName.Y绉诲簱
@@ -177,6 +179,8 @@
N_QTY = cgDetail.N_ITEM_NUM,
};
+ // 鏁版嵁搴撴搷浣�+
if (db.Insertable<TN_Record_Table>(record).ExecuteCommand() <= 0) {
info = "鎻掑叆鍑哄叆搴撹褰曡〃澶辫触锛� + JsonConvert.SerializeObject(record);
LogHelper.Info(info);
@@ -191,6 +195,11 @@
}
}
+ /// <summary>
+ /// AGV浜х嚎瀹夊叏浜や簰閫昏緫瀹炵幇
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
public static ReturnResult SafetyInteraction(SafetyInteractionInfo model) {
var db = new SqlHelper<object>().GetInstance();
var info = "";
@@ -358,8 +367,6 @@
else {
LogHelper.Info("鏆傛棤浠诲姟");
}
-
-
}
}
}
--
Gitblit v1.9.1