From abf782e4e9d505184652635aa0912781f572f843 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 24 七月 2025 17:26:41 +0800
Subject: [PATCH] 后端实现添加物料绑定货位, 优化货位容器绑定时容器表插入, 多个物料信息记录的功能
---
core/Monitor.cs | 193 +++++++++++++-----------------------------------
1 files changed, 52 insertions(+), 141 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index ec11518..9fbbcb6 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -28,22 +28,54 @@
var needDeleteDataList = new List<TN_Inbound_DataRecord>();
var needUpdateLocCntrRelList = new List<TN_Loc_Container>();
- var needUpdateCgDetailList = new List<TN_CG_Detail>();
+ //var needUpdateCgDetailList = new List<TN_CG_Detail>();
+
+ var needDeleteCgDetailList = new List<TN_CG_Detail>();
+ var needInsertCgDetailList = new List<TN_CG_Detail>();
+ var needUpdateCntrList = new List<TN_Container>();
+
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) {
+ var cgDetailList = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).ToList();
+ if (cgDetailList.Count == 0) {
LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細璐т綅瀹瑰櫒琛ㄤ腑锛屽寘鍚揣浣�{locCntrRel.S_LOC_CODE}, 瀹瑰櫒={locCntrRel.S_CNTR_CODE}锛涗絾瀹瑰櫒瀵瑰簲鐨勭墿鏂欒〃锛屾病鏈夋壘鍒扮墿鏂欙紒");
continue;
}
+
+ cgDetailList.ForEach(d => {
+ if (!needDeleteCgDetailList.Contains(d)) {
+ needDeleteCgDetailList.Add(d);
+ }
+ });
+
+ // 闂瓺S , 鐢╨inq浼樺寲
+ var cntr = needUpdateCntrList.Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).FirstOrDefault();
+ if (cntr != null) {
+
+ }
+
+ // ERP 鏁版嵁 -> CG_Detail
+ var cgDetail = cgDetailList.FirstOrDefault();
+
cgDetail.S_ITEM_CODE = inboundData.S_ITEM_CODE;
+ cgDetail.S_ITEM_SHORT_DESC = inboundData.S_ITEM_SHORT_DESC; // 鐗╂枡鐭弿杩�+ cgDetail.S_IN_QUANTITY = inboundData.S_IN_QUANTITY; // 鍏ュ簱鏁伴噺
+ cgDetail.S_STOCK_QUANTITY = inboundData.S_STOCK_QUANTITY; // 搴撳瓨鏁伴噺
+ cgDetail.S_TOTAL_PRICE = inboundData.S_TOTAL_PRICE; // 搴撳瓨鎬讳环
+ cgDetail.S_STORE_KEEPER = inboundData.S_STORE_KEEPER;
+ cgDetail.S_LINE_CODE = inboundData.S_LINE_CODE;
+ cgDetail.F_QTY = float.Parse(inboundData.S_IN_QUANTITY);
cgDetail.T_MODIFY = DateTime.Now;
+ //cgDetail.S_INVENTORY_MAN = inboundData.S_INVENTORY_MAN; // 搴撳瓨璐ｄ换浜哄鍚�+
locCntrRel.N_LOCK_STATE = 1;
+ cgDetail.N_LOCK_STATE = 1;
+
locCntrRel.T_MODIFY = DateTime.Now;
needUpdateLocCntrRelList.Add(locCntrRel);
- needUpdateCgDetailList.Add(cgDetail);
+ //needUpdateCgDetailList.Add(cgDetailList);
needDeleteDataList.Add(inboundData);
}
}
@@ -59,11 +91,11 @@
return;
}
- if (needUpdateCgDetailList.Count > 0 && db.Updateable<TN_CG_Detail>(needUpdateCgDetailList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細鏍规嵁ERP淇℃伅锛屾洿鏂扮墿鏂欎俊鎭〃澶辫触锛� + JsonConvert.SerializeObject(needUpdateCgDetailList));
- 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();
@@ -91,7 +123,7 @@
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>();
@@ -104,9 +136,18 @@
LogHelper.Info($"杞锛氬嚭搴撲俊鎭悓姝ワ細璐т綅瀹瑰櫒琛ㄤ腑锛屽寘鍚揣浣�{locCntrRel.S_LOC_CODE}, 瀹瑰櫒={locCntrRel.S_CNTR_CODE}锛涗絾瀹瑰櫒瀵瑰簲鐨勭墿鏂欒〃锛屾病鏈夋壘鍒扮墿鏂欙紒");
continue;
}
+ var actualQty = float.Parse(outboundData.S_ACTUAL_QTY);
+ if (actualQty > cgDetail.F_QTY) {
+ LogHelper.Info($"瀹炲彂鏁伴噺瓒呰繃鐗╂枡鏁伴噺! 鐗╂枡缂栫爜={cgDetail.S_ITEM_CODE}, 褰撳墠鏁伴噺={cgDetail.F_QTY}, 瀹炲彂鏁伴噺='{outboundData.S_ACTUAL_QTY}'", "Error");
+ actualQty = 0f;
+ }
+
cgDetail.S_ITEM_CODE = outboundData.S_ITEM_CODE;
+ cgDetail.S_STORE_KEEPER = outboundData.S_STORE_KEEPER;
+ cgDetail.F_QTY = actualQty;
cgDetail.T_MODIFY = DateTime.Now;
locCntrRel.N_LOCK_STATE = 1;
+ cgDetail.N_LOCK_STATE = 1;
locCntrRel.T_MODIFY = DateTime.Now;
needUpdateLocCntrRelList.Add(locCntrRel);
needUpdateCgDetailList.Add(cgDetail);
@@ -147,137 +188,7 @@
}
}
- // 鐩樼偣鍔熻兘锛堟柊锛�----------------------------------------
-
-
-
- // 澶囩敤锛氱洏鐐圭浉鍏冲姛鑳斤紙鎭㈠锛�-----------------------------------
-
- //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