From 648f4270f4f56c5ca284dbcfa650de05e46a7052 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期三, 16 七月 2025 17:20:59 +0800
Subject: [PATCH] 11111
---
HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs | 66 +++++++++++++++------------------
1 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs b/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
index 5659dd1..28101f5 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
@@ -43,6 +43,12 @@
Console.WriteLine($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList(),mst.S_TYPE);
+ if (mst.S_TYPE.Contains("婊℃墭涓婄嚎"))
+ {
+ //瑙ｇ粦鐗╂枡
+ new SqlHelper<object>().GetInstance().Deleteable<CntrItemRel>().Where(a => mst.S_CNTR_CODE.Contains(a.S_CNTR_CODE)).ExecuteCommand();
+ new SqlHelper<object>().GetInstance().Updateable<Container>().SetColumns(a => a.N_DETAIL_COUNT == 0).Where(a => mst.S_CNTR_CODE.Contains(a.S_CODE)).ExecuteCommand();
+ }
}
}
@@ -1359,7 +1365,7 @@
else
{
//鏌ヨ鍚庨潰褰撳墠璐т綅鍚庝竴涓�- result = db.Queryable<Location>().Where(b => b.S_AREA_CODE == a.S_AREA_CODE && b.N_ROW == a.N_ROW && b.N_COL > a.N_COL && a.N_CURRENT_NUM < a.N_CAPACITY && b.S_LOCK_STATE == "鏃�).OrderBy(b => b.N_COL).First();
+ result = db.Queryable<Location>().Where(b => b.S_AREA_CODE == a.S_AREA_CODE && b.N_ROW == a.N_ROW && b.N_COL > a.N_COL && b.N_CURRENT_NUM < b.N_CAPACITY && b.S_LOCK_STATE == "鏃�).OrderBy(b => b.N_COL).First();
}
if (result != null)
{
@@ -1471,7 +1477,7 @@
LogHelper.Info($"鍑哄簱绠楁硶04:褰撳墠璐т綅缁戝畾鐨勬墭鐩樼爜涓猴細{cntrInfo.S_CNTR_CODE}");
string endItemCode = "";
var itemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == cntrInfo.S_CNTR_CODE).First();
- if (itemInfo != null && itemInfo.S_ITEM_CODE == itemCode)
+ if (itemInfo != null)
{
endItemCode = itemInfo.S_ITEM_CODE;
}
@@ -1940,24 +1946,7 @@
{
var cir = new LocCntrRel { S_LOC_CODE = loc, S_CNTR_CODE = cntrCode, S_SRC = deviceName };
if (db.Insertable<LocCntrRel>(cir).ExecuteCommand() > 0) LogHelper.Info($"璐т綅瀹瑰櫒琛ㄧ粦瀹氭垚鍔燂紝璐т綅鍙凤細{loc}锛屾墭鐩樺彿锛歿cntrCode}");
- var Con = db.Queryable<Container>().Where(a => a.S_CODE == cntrCode).First();
- if(Con == null)
- {
- int detallCount = 0;
- if (!string.IsNullOrEmpty(itemCode))
- {
- detallCount = 1;
- }
- if(db.Insertable<Container>(new Container
- {
- S_CODE = cntrCode,
- N_TYPE = 1,
- N_DETAIL_COUNT = detallCount
- }).ExecuteCommand() > 0)
- {
- LogHelper.Info($"瀹瑰櫒琛ㄧ粦瀹氭垚鍔燂紝鎵樼洏鍙凤細{cntrCode}");
- }
- }
+
if (!string.IsNullOrEmpty(itemCode))
{
BindCntrItem(cntrCode, itemCode, batchNo, itemlayer, itemName);
@@ -1984,6 +1973,26 @@
try
{
db.BeginTran();
+
+ var Con = db.Queryable<Container>().Where(a => a.S_CODE == trayCode).First();
+ if (Con == null)
+ {
+ int detallCount = 1;
+ if (db.Insertable<Container>(new Container
+ {
+ S_CODE = trayCode,
+ N_TYPE = 1,
+ N_DETAIL_COUNT = detallCount
+ }).ExecuteCommand() > 0)
+ {
+ LogHelper.Info($"瀹瑰櫒琛ㄧ粦瀹氭垚鍔燂紝鎵樼洏鍙凤細{trayCode}");
+ }
+ }
+ else
+ {
+ Con.N_DETAIL_COUNT = 1;
+ db.Updateable(Con).UpdateColumns(a => new { a.N_DETAIL_COUNT }).ExecuteCommand();
+ }
//db.Updateable(cntr).UpdateColumns(it => new { it.S_DEST }).ExecuteCommand();
//1.灏嗗師鏈夊鍣ㄧ墿鏂欎俊鎭垹闄� //db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == cntr.S_CNTR_CODE.Trim()).ExecuteCommand();
@@ -2542,23 +2551,8 @@
var op = WMSHelper.GetWmsTask(TN_Task.S_OP_CODE);
if (op != null)
{
- if (op.N_B_STATE == 0)
- {
//绛夊緟鐩存帴淇敼鐘舵�涓哄彇娑�- op.N_B_STATE = 3;
- }
- else if (op.N_B_STATE == 1)
- {
- if (WCSHelper.CheckActionRecordExist(TN_Task.S_CODE, 4))
- {
- op.N_B_STATE = 2;
- }
- else
- {
- op.N_B_STATE = 3;
- }
- }
-
+ op.N_B_STATE = 2;
WMSHelper.UpdateTaskState(op);
}
NDCApi.CancelOrder(TN_Task.S_CODE.Trim());
--
Gitblit v1.9.1