From c321182cdcbc7d6489d969810f0610e48ac2b5ed Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期三, 23 七月 2025 17:40:22 +0800
Subject: [PATCH] 双钱-需求变更：增加了两个搬送流程，增加了两个库区，主要是修改对空托上线脱皮机的逻辑
---
process/TaskProcess.cs | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index bfcdf52..b3bc424 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -51,26 +51,21 @@
CacheBitUpdate(mst, false);
WCSHelper.End(mst);//浠诲姟鐘舵�鏀规垚缁撴潫
}
- else
+ else // 娌℃湁寮�鍗歌揣
{
- // 娌℃湁寮�鍗歌揣
+
WCSHelper.Fail(mst);//浠诲姟鐘舵�鏀规垚閿欒
var db = new SqlHelper<object>().GetInstance();
- var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == mst.S_CNTR_CODE);
- if (cginfo!= null)
- {
- db.Deleteable<TN_InventoryM>().Where(it => it.S_ID == cginfo.S_ID || it.RFID == mst.S_CNTR_CODE).ExecuteCommand();
- }
- else
- {
- db.Deleteable<TN_InventoryM>().Where(it => it.RFID == mst.S_CNTR_CODE).ExecuteCommand();
- }
+ db.Deleteable<TN_CG_Detail>().Where(it => it.S_CNTR_CODE == mst.S_CNTR_CODE).ExecuteCommand();
+ db.Deleteable<TN_InventoryM>().Where(it => it.RFID == mst.S_CNTR_CODE).ExecuteCommand();
+ db.Deleteable<TN_Loc_Container>().Where(it => it.S_CNTR_CODE == mst.S_CNTR_CODE).ExecuteCommand();
+ db.Deleteable<TN_Container>().Where(it => it.S_CODE == mst.S_CNTR_CODE).ExecuteCommand();
//蹇呴』鍒犳帀
- LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { locID = mst.S_START_LOC, reqCode = 1 });
}
if (!WCSHelper.CheckActionRecordExist(mst.S_CODE, 4))
{
LocationHelper.UnLockLoc(mst.S_START_LOC);//瑙ｉ攣璧风偣
+ LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { locID = mst.S_START_LOC, reqCode = 1 });
}
LocationHelper.UnLockLoc(mst.S_END_LOC);//瑙ｉ攣缁堢偣
@@ -148,7 +143,7 @@
start = LocationHelper.GetAgvSite(mst.S_START_LOC);
end = LocationHelper.GetAgvSite(mst.S_END_LOC);
- if (mst.S_TYPE == "绌烘墭涓嬬嚎鍫嗗彔")
+ if (mst.S_TYPE.Contains("绌烘墭涓嬬嚎鍫嗗彔"))
{
end = LocationHelper.GetAgvSite(mst.S_END_LOC,true);
}
--
Gitblit v1.9.1