From 52adedb218549cde2bdc60c3b338e360e72d94a6 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期四, 12 六月 2025 17:44:03 +0800
Subject: [PATCH] 双钱-修改库存记录BUG
---
core/Monitor.cs | 7 -------
api/ApiHelper.cs | 8 +++++++-
process/TaskProcess.cs | 7 +++++++
core/WCSCore.cs | 22 +++++++++++++++++++---
4 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index d05b32b..8732fdf 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -248,7 +248,13 @@
LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿� LogHelper.Info($"鐢熸垚{typeName}浠诲姟鎴愬姛锛屽鍣ㄥ彿{locCnt.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}");
- db.Updateable<TN_CG_Detail>().UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
+ if( db.Updateable<TN_CG_Detail>(cG_Detail).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand() <= 0)
+ {
+ result.resultCode = 5;
+ result.resultMsg = $"鏇存柊瀹瑰櫒{locCnt.S_CNTR_CODE}鐨勮揣鍝佹槑缁嗗け璐�;
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
Task task99 = Task.Run(() =>
{
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 7ac23a4..29452fc 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -566,13 +566,6 @@
db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand();
}
- var targetInM_De = db.Queryable<TN_InventoryM>().LeftJoin<TN_Task>((o, i) => o.RFID == i.S_CNTR_CODE).
- Where((o, i) => i.N_B_STATE == 4 || i.S_B_STATE == "閿欒").ToList();//閿欒鐨勪换鍔″垹闄ゅ搴旂殑搴撳瓨淇℃伅
- if (targetInM_De.Count>0)
- {
- db.Deleteable<TN_InventoryM>(targetInM_De).ExecuteCommand();
- }
-
// 鍚屾 TN_DayProDetail
var curDay = System.DateTime.Now.Date;
var targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curDay && a.DOWNLINETIME <= curDay.AddDays(1)).ToList();
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index f1d10c1..fccab2e 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -1,5 +1,6 @@
锘縰sing HH.WCS.Mobox3.DoubleCoin.device;
using HH.WCS.Mobox3.DoubleCoin.dispatch;
+using HH.WCS.Mobox3.DoubleCoin.models;
using HH.WCS.Mobox3.DoubleCoin.process;
using HH.WCS.Mobox3.DoubleCoin.util;
using HH.WCS.Mobox3.DoubleCoin.wms;
@@ -161,11 +162,11 @@
case 7:
Task task10 = Task.Run(() =>
{
- if (TN_Task.S_TYPE == "婊℃墭涓嬬嚎鍏ュ簱")
+ if (TN_Task.S_TYPE == "婊℃墭涓嬬嚎鍏ュ簱" || TN_Task.S_TYPE == "PDA婊℃墭涓嬬嚎鍏ュ簱")
{
TaskProcess.OperateStatus(TN_Task, 7);//寮傚父澶勭悊
}
- else if(TN_Task.S_TYPE == "婊℃墭鍑哄簱涓婄嚎")
+ else
{
WCSHelper.Fail(TN_Task);//浠诲姟鐘舵�鏀规垚閿欒
LocationHelper.UnLockLoc(TN_Task.S_END_LOC);
@@ -173,7 +174,15 @@
{
LocationHelper.UnLockLoc(TN_Task.S_START_LOC);
}
+ var db = new SqlHelper<object>().GetInstance();
+ var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == TN_Task.S_CNTR_CODE);
+ if (cginfo != null)
+ {
+ SpecHelper.DeleteInventoryM(cginfo.S_ID);
+ }
}
+
+
});
break;
@@ -181,7 +190,7 @@
Task task11 = Task.Run(() =>
{
- if (TN_Task.S_TYPE == "婊℃墭涓嬬嚎鍏ュ簱")
+ if (TN_Task.S_TYPE == "婊℃墭涓嬬嚎鍏ュ簱" || TN_Task.S_TYPE == "PDA婊℃墭涓嬬嚎鍏ュ簱")
{
var res = NDCApi.CancelOrder(TN_Task.S_CODE);
if (res != null && (res.err_code ==50002 || res.err_code == 0))
@@ -204,6 +213,13 @@
{
LocationHelper.UnLockLoc(TN_Task.S_START_LOC);
}
+
+ var db = new SqlHelper<object>().GetInstance();
+ var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == TN_Task.S_CNTR_CODE);
+ if (cginfo != null)
+ {
+ SpecHelper.DeleteInventoryM(cginfo.S_ID);
+ }
}
else
{
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index aaa7228..235ffe3 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -54,6 +54,13 @@
//璧风偣瑙ｉ攣
LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { locID = mst.S_START_LOC,reqCode =1});
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)
+ {
+ SpecHelper.DeleteInventoryM(cginfo.S_ID);
+ }
}
LocationHelper.UnLockLoc(mst.S_END_LOC);
}
--
Gitblit v1.9.1