From b183905d45e279eca8a845f532fc2d2edd540edb Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 10 七月 2025 17:27:42 +0800
Subject: [PATCH] 重构盘点单表结构，修复部分盘点逻辑
---
core/Monitor.cs | 375 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 250 insertions(+), 125 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 11ed38f..ec11518 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -8,6 +8,7 @@
using System;
using System.Collections.Generic;
+using System.Linq;
namespace HH.WCS.Mobox3.AnGang.core {
/// <summary>
@@ -15,144 +16,268 @@
/// </summary>
public class Monitor
{
- public static void CheckCountOrder() {
- var taskName = TaskName.鐩樼偣鐞嗚揣鍑哄簱;
+ public static void InboundDataSync() {
var db = new SqlHelper<object>().GetInstance();
- var info = "";
-
try {
- var orderList = db.Queryable<TN_Count_Order>()
- .Where(c => c.N_B_STATE == 1)
- .OrderBy(c => c.T_CREATE, SqlSugar.OrderByType.Asc)
- .ToList();
-
- if (orderList.Count == 0) {
- LogHelper.Info("杞--鍑哄簱--鏆傛棤寰呮墽琛岀殑Order");
+ var inboundDataList = db.Queryable<TN_Inbound_DataRecord>().ToList();
+
+ if (inboundDataList.Count == 0 ) {
+ LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細褰撳墠娌℃湁寰呭悓姝ョ殑ERP鐗╂枡淇℃伅");
return;
}
- var detailList = new List<TN_Count_CG_Detail>();
- foreach (var order in orderList) {
- var doingCount = db.Queryable<TN_Count_CG_Detail>()
- .Count(d => d.S_COUNT_NO == order.S_COUNT_NO && d.N_B_STATE >= 2); // 鎵ц涓�- var allCount = db.Queryable<TN_Count_CG_Detail>()
- .Count(d => d.S_COUNT_NO == order.S_COUNT_NO);
- LogHelper.Info($"杞--{taskName}--缁熻{taskName}鍗�{order.S_COUNT_NO}'浠诲姟宸蹭笅鍙戯細{doingCount}/{allCount}");
-
- if (doingCount == allCount) {
- order.N_B_STATE = 2; // 鎵�湁浠诲姟閮藉凡鎵ц
- db.Updateable<TN_Count_Order>(order).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
- continue;
- }
-
- var lastDetail = db.Queryable<TN_Count_CG_Detail>()
- .Where(d => d.S_COUNT_NO == order.S_COUNT_NO && d.N_B_STATE == 2) // TODO 鎴栬�鏀规垚鏌ask
- .First();
- if (lastDetail != null) {
- LogHelper.Info($"杞--{taskName}--{taskName}鍗�{order.S_COUNT_NO}'涓婁竴涓换鍔′粛鍦ㄨ繘琛屼腑锛�
- + JsonConvert.SerializeObject(lastDetail));
- continue;
- }
-
- var outboundDetail = db.Queryable<TN_Count_CG_Detail>()
- .Where(a => a.S_COUNT_NO == order.S_COUNT_NO && a.N_B_STATE == 1) // 宸蹭笅鍙�- .First();
- if (outboundDetail != null) {
- LogHelper.Info($"杞--{taskName}--");
- continue;
- }
-
- detailList.Add(outboundDetail);
- }
-
- if (detailList.Count == 0) {
- return;
- }
-
- var startLocList = new List<TN_Location>();
- var endLocList = new List<TN_Location>();
-
- var taskList = new List<TN_Task>();
-
- foreach (var detail in detailList) {
- var startLoc = db.Queryable<TN_Location>()
- .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- .Where((l, c) => c.S_CNTR_CODE == detail.S_CNTR_CODE)
- .First();
-
- if (startLoc == null) {
- LogHelper.Info($"杞--鍑哄簱锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
- continue;
- }
-
- var endLoc = db.Queryable<TN_Location>()
- .Where(a => a.S_AREA_CODE == "SFQ")
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y")
- .Where(a => a.N_CURRENT_NUM == 0).First();
-
- if (endLoc == null) {
- LogHelper.Info($"杞--鍑哄簱锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛丼_NO涓�'{detail.S_COUNT_NO}'");
- continue;
- }
-
- detail.N_B_STATE = 2;
-
- var cntId = detail.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�-
- using (var tran = db.Ado.UseTran()) {
- if (db.Updateable<TN_Count_CG_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"杞--鍑哄簱--淇敼鏄庣粏琛ㄧ姸鎬佷负瀹屾垚澶辫触锛�);
- }
-
- if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
- it.N_LOCK_STATE,
- it.S_LOCK_STATE,
- it.S_LOCK_OP,
- it.T_MODIFY
- }).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
- LogHelper.Info(info);
+ var needDeleteDataList = new List<TN_Inbound_DataRecord>();
+ var needUpdateLocCntrRelList = new List<TN_Loc_Container>();
+ var needUpdateCgDetailList = new List<TN_CG_Detail>();
+ foreach (var inboundData in inboundDataList) {
+ var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_LOC_CODE == inboundData.S_LOCATION_CODE).First();
+ // 鏆傛椂涓嶈�铏戝鏋滃綋鍓嶅叧绯昏〃锛岄攣鐘舵�涓�锛堝凡缁廍RP瑕嗙洊杩囷級鐨勬儏鍐碉紝榛樿鏈夊氨瑕嗙洊
+ if (locCntrRel != null) {
+ var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
+ if (cgDetail == null) {
+ LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細璐т綅瀹瑰櫒琛ㄤ腑锛屽寘鍚揣浣�{locCntrRel.S_LOC_CODE}, 瀹瑰櫒={locCntrRel.S_CNTR_CODE}锛涗絾瀹瑰櫒瀵瑰簲鐨勭墿鏂欒〃锛屾病鏈夋壘鍒扮墿鏂欙紒");
continue;
}
-
- if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
- it.N_LOCK_STATE,
- it.S_LOCK_STATE,
- it.S_LOCK_OP,
- it.T_MODIFY
- }).ExecuteCommand() <= 0) {
-
- tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
- LogHelper.Info(info);
- continue;
- }
-
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
- LogHelper.Info(info);
- continue;
- }
-
- tran.CommitTran();
- info = $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
- LogHelper.Info(info);
- continue;
+ cgDetail.S_ITEM_CODE = inboundData.S_ITEM_CODE;
+ cgDetail.T_MODIFY = DateTime.Now;
+ locCntrRel.N_LOCK_STATE = 1;
+ locCntrRel.T_MODIFY = DateTime.Now;
+ needUpdateLocCntrRelList.Add(locCntrRel);
+ needUpdateCgDetailList.Add(cgDetail);
+ needDeleteDataList.Add(inboundData);
}
}
+
+ if (needDeleteDataList.Count == 0) {
+ LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細寰呮洿鏂扮殑ERP鐗╂枡淇℃伅锛屾殏鏃犵墿鏂欏彲浠ヨ鐩栵紝鐩墠寰呮洿鏂版暟閲忥細{inboundDataList.Count}");
+ }
+
+ using (var tran = db.Ado.UseTran()) {
+ if (needDeleteDataList.Count > 0 && db.Deleteable<TN_Inbound_DataRecord>(needDeleteDataList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細鍒犻櫎宸叉湁鐗╂枡鐨勫叆搴撲俊鎭〃澶辫触锛� + JsonConvert.SerializeObject(needDeleteDataList));
+ return;
+ }
+
+ if (needUpdateCgDetailList.Count > 0 && db.Updateable<TN_CG_Detail>(needUpdateCgDetailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細鏍规嵁ERP淇℃伅锛屾洿鏂扮墿鏂欎俊鎭〃澶辫触锛� + JsonConvert.SerializeObject(needUpdateCgDetailList));
+ return;
+ }
+
+ if (needUpdateLocCntrRelList.Count > 0 && db.Updateable<TN_Loc_Container>(needUpdateLocCntrRelList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細鏍规嵁ERP淇℃伅锛屾洿鏂拌揣浣嶅鍣ㄥ叧绯昏〃澶辫触锛� + JsonConvert.SerializeObject(needUpdateLocCntrRelList));
+ return;
+ }
+
+ tran.CommitTran();
+ LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細鏍规嵁ERP淇℃伅锛屾洿鏀硅揣浣嶅鍣ㄥ叧绯汇�璐у搧鏄庣粏鎴愬姛锛佸凡鏇存敼璐т綅锛� + JsonConvert.SerializeObject(needUpdateLocCntrRelList.Select(c => c.S_LOC_CODE).ToArray()));
+ }
+
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.Info(info);
+
+ LogHelper.Info($"鍙戠敓浜嗗紓甯革細{ex.Message}");
}
}
+
+ public static void OutboundDataSync() {
+ var db = new SqlHelper<object>().GetInstance();
+ try {
+ var outboundDataList = db.Queryable<TN_Outbound_DataRecord>().ToList();
+
+ if (outboundDataList.Count== 0 ) {
+ LogHelper.Info($"杞锛氬嚭搴撲俊鎭悓姝ワ細褰撳墠娌℃湁寰呭悓姝ョ殑ERP鐗╂枡淇℃伅");
+ return;
+ }
+
+ var needDeleteDataList = new List<TN_Outbound_DataRecord>();
+ var needUpdateLocCntrRelList = new List<TN_Loc_Container>();
+ var needUpdateCgDetailList = new List<TN_CG_Detail>();
+ foreach (var outboundData in outboundDataList) {
+ var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_LOC_CODE == outboundData.S_LOCATION_CODE).First();
+ // 鏆傛椂涓嶈�铏戝鏋滃綋鍓嶅叧绯昏〃锛岄攣鐘舵�涓�锛堝凡缁廍RP瑕嗙洊杩囷級鐨勬儏鍐碉紝榛樿鏈夊氨瑕嗙洊
+ if (locCntrRel != null) {
+ var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
+ if (cgDetail == null) {
+ LogHelper.Info($"杞锛氬嚭搴撲俊鎭悓姝ワ細璐т綅瀹瑰櫒琛ㄤ腑锛屽寘鍚揣浣�{locCntrRel.S_LOC_CODE}, 瀹瑰櫒={locCntrRel.S_CNTR_CODE}锛涗絾瀹瑰櫒瀵瑰簲鐨勭墿鏂欒〃锛屾病鏈夋壘鍒扮墿鏂欙紒");
+ continue;
+ }
+ cgDetail.S_ITEM_CODE = outboundData.S_ITEM_CODE;
+ cgDetail.T_MODIFY = DateTime.Now;
+ locCntrRel.N_LOCK_STATE = 1;
+ locCntrRel.T_MODIFY = DateTime.Now;
+ needUpdateLocCntrRelList.Add(locCntrRel);
+ needUpdateCgDetailList.Add(cgDetail);
+ needDeleteDataList.Add(outboundData);
+ }
+ }
+
+ if (needDeleteDataList.Count == 0) {
+ LogHelper.Info($"杞锛氬嚭搴撲俊鎭悓姝ワ細寰呮洿鏂扮殑ERP鐗╂枡淇℃伅锛屾殏鏃犵墿鏂欏彲浠ヨ鐩栵紝鐩墠寰呮洿鏂版暟閲忥細{outboundDataList.Count}");
+ }
+
+ using (var tran = db.Ado.UseTran()) {
+ if (needDeleteDataList.Count > 0 && db.Deleteable<TN_Outbound_DataRecord>(needDeleteDataList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ LogHelper.Info($"杞锛氬嚭搴撲俊鎭悓姝ワ細鍒犻櫎宸叉湁鐗╂枡鐨勫嚭搴撲俊鎭〃澶辫触锛� + JsonConvert.SerializeObject(needDeleteDataList));
+ return;
+ }
+
+ if (needUpdateCgDetailList.Count > 0 && db.Updateable<TN_CG_Detail>(needUpdateCgDetailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ LogHelper.Info($"杞锛氬嚭搴撲俊鎭悓姝ワ細鏍规嵁ERP淇℃伅锛屾洿鏂扮墿鏂欎俊鎭〃澶辫触锛� + JsonConvert.SerializeObject(needUpdateCgDetailList));
+ return;
+ }
+
+ if (needUpdateLocCntrRelList.Count > 0 && db.Updateable<TN_Loc_Container>(needUpdateLocCntrRelList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ LogHelper.Info($"杞锛氬嚭搴撲俊鎭悓姝ワ細鏍规嵁ERP淇℃伅锛屾洿鏂拌揣浣嶅鍣ㄥ叧绯昏〃澶辫触锛� + JsonConvert.SerializeObject(needUpdateLocCntrRelList));
+ return;
+ }
+
+ tran.CommitTran();
+ LogHelper.Info($"杞锛氬嚭搴撲俊鎭悓姝ワ細鏍规嵁ERP淇℃伅锛屾洿鏀硅揣浣嶅鍣ㄥ叧绯汇�璐у搧鏄庣粏鎴愬姛锛佸凡鏇存敼璐т綅锛� + JsonConvert.SerializeObject(needUpdateLocCntrRelList.Select(c => c.S_LOC_CODE).ToArray()));
+ }
+
+ }
+ catch (Exception ex) {
+ LogHelper.Info($"鍙戠敓浜嗗紓甯革細{ex.Message}");
+ }
+ }
+
+ // 鐩樼偣鍔熻兘锛堟柊锛�----------------------------------------
+
+
+
+ // 澶囩敤锛氱洏鐐圭浉鍏冲姛鑳斤紙鎭㈠锛�-----------------------------------
+
+ //public static void CheckCountOrder() {
+ // var taskName = TaskName.鐩樼偣鐞嗚揣鍑哄簱;
+ // var db = new SqlHelper<object>().GetInstance();
+ // var info = "";
+
+ // try {
+ // var orderList = db.Queryable<TN_Count_Order>()
+ // .Where(c => c.N_B_STATE == 1)
+ // .OrderBy(c => c.T_CREATE, SqlSugar.OrderByType.Asc)
+ // .ToList();
+
+ // if (orderList.Count == 0) {
+ // LogHelper.Info($"杞--{taskName}--鏆傛棤寰呮墽琛岀殑{taskName}鍗�);
+ // return;
+ // }
+
+ // var detailList = new List<TN_Count_CG_Detail>();
+ // foreach (var order in orderList) {
+ // var doingCount = db.Queryable<TN_Count_CG_Detail>()
+ // .Count(d => d.S_COUNT_NO == order.S_COUNT_NO && d.N_B_STATE >= 2); // 鎵ц涓�+ // var allCount = db.Queryable<TN_Count_CG_Detail>()
+ // .Count(d => d.S_COUNT_NO == order.S_COUNT_NO);
+ // LogHelper.Info($"杞--{taskName}--缁熻{taskName}鍗�{order.S_COUNT_NO}'浠诲姟宸蹭笅鍙戯細{doingCount}/{allCount}");
+
+ // if (doingCount == allCount) {
+ // order.N_B_STATE = 2; // 鎵�湁浠诲姟閮藉凡鎵ц
+ // db.Updateable<TN_Count_Order>(order).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
+ // continue;
+ // }
+
+ // var countCgDetailList = db.Queryable<TN_Count_CG_Detail>()
+ // .Where(a => a.S_COUNT_NO == order.S_COUNT_NO && a.N_B_STATE == 1) // 宸蹭笅鍙�+ // .ToList();
+
+ // if (countCgDetailList.Count == 0) {
+ // LogHelper.Info($"杞--{taskName}--{taskName}鍗曟槑缁嗙姸鎬佸紓甯�);
+ // continue;
+ // }
+
+ // detailList.AddRange(countCgDetailList);
+ // }
+
+ // if (detailList.Count == 0) {
+ // return;
+ // }
+
+ // foreach (var detail in detailList) {
+ // var startLoc = db.Queryable<TN_Location>()
+ // .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
+ // .Where((l, c) => c.S_CNTR_CODE == detail.S_CNTR_CODE)
+ // .First();
+
+ // if (startLoc == null) {
+ // LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
+ // continue;
+ // }
+
+ // var endLoc = db.Queryable<TN_Location>()
+ // .Where(a => Settings.Areas[0].Contains(a.S_AREA_CODE))
+ // .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y")
+ // .Where(a => a.N_CURRENT_NUM == 0).First();
+
+ // if (endLoc == null) {
+ // LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛佸崟鍙蜂负 '{detail.S_COUNT_NO}'");
+ // continue;
+ // }
+
+ // detail.N_B_STATE = 2;
+
+ // var cntId = detail.S_CNTR_CODE;
+ // var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+
+ // LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�+ // LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+
+ // using (var tran = db.Ado.UseTran()) {
+ // if (db.Updateable<TN_Count_CG_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // LogHelper.Info($"杞--{taskName}--淇敼鏄庣粏琛ㄧ姸鎬佷负瀹屾垚澶辫触锛�);
+ // }
+
+ // if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
+ // it.N_LOCK_STATE,
+ // it.S_LOCK_STATE,
+ // it.S_LOCK_OP,
+ // it.T_MODIFY
+ // }).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣浣峽endLoc.S_CODE}";
+ // LogHelper.Info(info);
+ // continue;
+ // }
+
+ // if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
+ // it.N_LOCK_STATE,
+ // it.S_LOCK_STATE,
+ // it.S_LOCK_OP,
+ // it.T_MODIFY
+ // }).ExecuteCommand() <= 0) {
+
+ // tran.RollbackTran();
+ // info = $"鐢熸垚'{taskName}'澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ // LogHelper.Info(info);
+ // continue;
+ // }
+
+ // if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ // LogHelper.Info(info);
+ // continue;
+ // }
+
+ // tran.CommitTran();
+ // info = $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ // LogHelper.Info(info);
+ // //continue;
+ // }
+ // }
+ // }
+ // catch (Exception ex) {
+ // info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+ // LogHelper.Info(info);
+ // }
+ //}
}
}
--
Gitblit v1.9.1