From 2aa6ffae020b4dab66ac30ee4436346aa15ff3cb Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 15 七月 2025 17:26:54 +0800
Subject: [PATCH] 修复绑定解绑可能导致的信息丢失问题
---
api/ApiHelper.cs | 232 +++++++++++++++++++++++++--------------------------------
1 files changed, 102 insertions(+), 130 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 10aca34..1d27797 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -191,6 +191,7 @@
S_CNTR_CODE = cntId,
//S_ITEM_NAME = model.ItemName,
S_LOC_CODE = startLoc.S_CODE, // ADD锛氳ˉ鍏呴拡瀵筆DA鍒嗘嫞
+ N_LOCK_STATE = locCntrRel.N_LOCK_STATE,
};
startLoc.N_CURRENT_NUM = 1;
@@ -926,7 +927,7 @@
foreach (var transaction in model.stockTransactions) {
var recordOld = db.Queryable<TN_Inbound_DataRecord>()
- .Where(r => r.S_LOCATION_CODE == "HJQ-" + transaction.locationCode.Trim()).First();
+ .Where(r => r.S_LOCATION_CODE == transaction.locationCode.Trim()).First();
if (recordOld != null) {
deleteRecordOldList.Add(recordOld);
//errList.Add(recordOld);
@@ -935,7 +936,7 @@
// 鍐欏叆璁板綍琛� var record = new TN_Inbound_DataRecord {
- S_LOCATION_CODE = "HJQ-" + transaction.locationCode.Trim(),
+ S_LOCATION_CODE = transaction.locationCode.Trim(),
S_STOCK_TRANS = transaction.stockTransactionId,
S_ITEM_CODE = transaction.itemCode,
S_ITEM_NAME = transaction.itemName,
@@ -1024,7 +1025,7 @@
var deleteRecordOldList = new List<TN_Outbound_DataRecord>();
foreach (var issue in model.materialIssues) {
var recordOld = db.Queryable<TN_Outbound_DataRecord>()
- .Where(r => r.S_LOCATION_CODE == "HJQ-" + issue.locationCode.Trim()).First();
+ .Where(r => r.S_LOCATION_CODE == issue.locationCode.Trim()).First();
if (recordOld != null) {
deleteRecordOldList.Add(recordOld);
//errList.Add(recordOld);
@@ -1033,7 +1034,7 @@
// 鍐欏叆璁板綍琛� var record = new TN_Outbound_DataRecord {
- S_LOCATION_CODE = "HJQ-" + issue.locationCode.Trim(),
+ S_LOCATION_CODE = issue.locationCode.Trim(),
S_ORDER_NO = issue.withdrawalOrderNo,
S_ITEM_CODE = issue.itemCode,
S_ITEM_NAME = issue.itemName,
@@ -1098,11 +1099,93 @@
}
}
- // 鐩樼偣鍔熻兘锛堟柊锛�+ // 鐩樼偣鍔熻兘锛堟柊锛�-----------------------------------
+ internal static SimpleResult CheckOutboundOnce(CheckOutboundOnceInfo model) {
+ var taskName = TaskName.鐩樼偣鐞嗚揣鍑哄簱;
+ var db = new SqlHelper<object>().GetInstance();
+ try {
+ var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.cntrCode);
+ if (locCntrRel == null) {
+ return BuildSimpleResult(3, $"瀹瑰櫒 {model.cntrCode} 娌℃湁鎵惧埌瀵瑰簲鐨勮揣浣�);
+ }
- // 澶囩敤锛氱洏鐐圭浉鍏冲姛鑳斤紙鎭㈠锛�-----------------------------
+ // 璧风偣浣嶇疆锛氬彇鏀捐揣鍖猴紙鏈夎揣鐗┿�娌℃湁閿併�宸插惎鐢級
+ var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == locCntrRel.S_LOC_CODE && a.N_CURRENT_NUM == 1 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && Settings.Areas[AreaIndex.H璐ф灦鍖篯.Contains(a.S_AREA_CODE));
+ if (startLoc == null) {
+ return BuildSimpleResult(2, $"璧风偣浣嶇疆 {locCntrRel.S_LOC_CODE} 涓嶇鍚堝嚭搴撴潯浠�);
+ }
+
+ // 缁堢偣浣嶇疆锛氳揣鏋讹紙娌℃湁璐х墿锛屾病鏈夐攣锛�+ var endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.endLoc && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y");
+ if (endLoc == null) {
+ return BuildSimpleResult(4, $"缁堢偣浣嶇疆 {model.endLoc} 涓嶅叿澶囨斁璐ф潯浠�);
+ }
+
+ var countOrder = db.Queryable<TN_AG_Count_Order>().Where(o => o.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
+ if (countOrder == null) {
+ return BuildSimpleResult(6, $"娌℃湁鎵惧埌瀵瑰簲瀹瑰櫒{model.cntrCode}鐨勭洏鐐瑰崟鍙�");
+ }
+ countOrder.N_B_STATE = 1;
+
+ var unFinishedCount = db.Queryable<TN_AG_Count_Order>().Where(a => a.S_CP_NO == countOrder.S_CP_NO && a.S_COUNT_NO != countOrder.S_COUNT_NO && a.N_B_STATE == 0).Count();
+
+ var cntID = locCntrRel.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 (unFinishedCount == 0 && db.Updateable<TN_AG_Count_Plan>().SetColumns(a =>a.N_B_STATE == 1).Where(a => a.S_CP_NO == countOrder.S_CP_NO).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildSimpleResult(500,
+ $"鏇存柊鐩樼偣璁″垝鍗曠姸鎬佷负1澶辫触锛佸崟鍙凤細{countOrder.S_CP_NO}");
+ }
+
+ if (db.Updateable<TN_AG_Count_Order>(countOrder).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildSimpleResult(500,
+ $"鏇存柊鐩樼偣鍗曠姸鎬佷负1澶辫触锛�+ JsonConvert.SerializeObject(countOrder));
+ }
+
+ 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();
+ return BuildSimpleResult(500,
+ $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntID} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
+ }
+
+ 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();
+ return BuildSimpleResult(500,
+ $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntID} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ }
+
+ if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildSimpleResult(500,
+ $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntID} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ }
+
+ tran.CommitTran();
+ return BuildSimpleResult(0,
+ $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntID} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ }
+ }
+ catch (Exception ex) {
+ return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
+ }
+ }
/// <summary>
/// 鐩樼偣鐞嗚揣鍑哄簱(WMS)
@@ -1246,127 +1329,6 @@
}
}
- //public static SimpleResult CreateCountPlan(CreateCountPlanInfo model) {
- // var db = new SqlHelper<object>().GetInstance();
- // try {
-
- // var countPlan = new TN_Count_Plan() {
- // S_CP_NO = GenerateNo("鐩樼偣璁″垝", "PDJH"), // CP =銆婸DJH
- // S_TYPE = model.countType,
- // };
-
- // if (model.countType == "璐т綅") {
- // countPlan.S_LOC_CODE = model.targetId;
- // }
- // else if (model.countType == "鐗╂枡") {
- // countPlan.S_ITEM_CODE = model.targetId;
- // }
- // else {
- // return BuildSimpleResult(2, $"鍒涘缓鐩樼偣璁″垝澶辫触锛氫笉鍚堟硶鐨勭洏鐐圭被鍨�'{model.countType}'");
- // }
-
- // if (db.Insertable<TN_Count_Plan>(countPlan).ExecuteCommand() <= 0) {
- // return BuildSimpleResult(2, "鍒涘缓鐩樼偣璁″垝澶辫触");
- // }
-
- // return BuildSimpleResult(0, "鍒涘缓鐩樼偣璁″垝鎴愬姛");
-
- // }
- // catch (Exception ex) {
-
- // return BuildSimpleResult(1, ex.Message);
- // }
- //}
-
- //public static SimpleResult CreateCountOrder(CreateCountOrderInfo model) {
- // var db = new SqlHelper<object>().GetInstance();
- // var info = "";
- // try {
- // var countPlan = db.Queryable<TN_Count_Plan>()
- // .Where(a => a.S_CP_NO == model.planId).First();
-
- // if (countPlan == null) {
- // return BuildSimpleResult(2, $"鐩樼偣璁″垝鍗曞彿 '{model.planId}' 涓嶅瓨鍦�);
- // }
-
- // var countOrder = new TN_Count_Order() {
- // S_CP_NO = model.planId,
- // S_COUNT_NO = GenerateNo("鐩樼偣鍗�, "PDD"), // CN =銆婸DD
- // };
-
- // var countDetailList = new List<TN_Count_CG_Detail>();
- // if (countPlan.S_TYPE == "璐т綅") {
- // var cgDetail = db.Queryable<TN_Location, TN_Loc_Container, TN_CG_Detail>
- // ((l, c, d) => l.S_CODE == c.S_LOC_CODE && c.S_CNTR_CODE == d.S_CNTR_CODE)
- // .Where(l => l.S_CODE == countPlan.S_LOC_CODE)
- // .Select((l, c, d) => d).First();
-
- // if (cgDetail == null) {
- // return BuildSimpleResult(3, $"鏈壘鍒版寚瀹氳揣浣峽countPlan.S_LOC_CODE}涓婄殑鐗╂枡");
- // }
-
- // var countDetail = new TN_Count_CG_Detail {
- // S_COUNT_NO = countOrder.S_COUNT_NO,
- // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- // };
-
- // countDetailList.Add(countDetail);
- // }
- // else if (countPlan.S_TYPE == "鐗╂枡") {
- // var cgDetail = db.Queryable<TN_CG_Detail>()
- // .Where(d => d.S_ITEM_CODE == countPlan.S_ITEM_CODE).First(); // ToList -> First
-
- // if (cgDetail == null) {
- // return BuildSimpleResult(3, $"鏈壘鍒版寚瀹氱殑鐗╂枡{countPlan.S_ITEM_CODE}");
- // }
-
- // //foreach (var cgDetail in cgDetailList) {
- // // var countDetail = new TN_Count_CG_Detail {
- // // S_COUNT_NO = countOrder.S_COUNT_NO,
- // // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- // // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- // // };
-
- // // countDetailList.Add(countDetail);
- // //}
-
- // var countDetail = new TN_Count_CG_Detail {
- // S_COUNT_NO = countOrder.S_COUNT_NO,
- // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- // };
-
- // countDetailList.Add(countDetail);
- // }
- // else {
- // return BuildSimpleResult(3, $"璁″垝鍗�{model.planId}'鐨勭被鍨媨countPlan.S_TYPE}涓嶅悎娉�);
- // }
-
- // using (var tran = db.Ado.UseTran()) {
- // if (db.Insertable<TN_Count_Order>(countOrder).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = "鍒涘缓鐩樼偣鍗曞け璐�;
- // return BuildSimpleResult(2, info);
- // }
-
- // if (db.Insertable<TN_Count_CG_Detail>(countDetailList).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = "鍒涘缓鐩樼偣鍗曟槑缁嗗け璐�;
- // return BuildSimpleResult(3, info);
- // }
-
- // tran.CommitTran();
- // }
-
- // return BuildSimpleResult(0, "鍒涘缓鐩樼偣鍗曟垚鍔�);
- // }
- // catch (Exception ex) {
-
- // return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
- // }
- //}
-
public static SimpleResult CountProduct(CountProductInfo model) {
var db = new SqlHelper<object>().GetInstance();
try {
@@ -1401,16 +1363,26 @@
return BuildSimpleResult(4, $"褰撳墠鐗╂枡鎵�湪瀹瑰櫒{locCntrRel.S_CNTR_CODE}鐗╂枡淇℃伅娌℃湁鐢熸垚瀵瑰簲鐨勭洏鐐瑰樊寮傝〃锛�);
}
+
countDiff.F_QTY = cgDetail.F_QTY;
countDiff.F_ACTUAL_QTY = model.qty;
//countDiff.S_ITEM_CODE = cgDetail.S_ITEM_CODE;
-
+ cgDetail.F_QTY = model.qty;
//if (db.Insertable<TN_Count_Diff>(countDiff).ExecuteCommand() <= 0) {
// return BuildSimpleResult(3, $"鎻掑叆鐩樼偣宸紓琛ㄥけ璐�);
//}
+ using (var tran = db.Ado.UseTran()) {
+ if (db.Updateable<TN_AG_Count_Diff>(countDiff).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildSimpleResult(5, $"鎻掑叆鐩樼偣宸紓琛ㄥけ璐�);
+ }
- if (db.Updateable<TN_AG_Count_Diff>(countDiff).ExecuteCommand() <= 0) {
- return BuildSimpleResult(5, $"鎻掑叆鐩樼偣宸紓琛ㄥけ璐�);
+ if (db.Updateable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildSimpleResult(5, $"鏇存柊鐗╂枡淇℃伅澶辫触");
+ }
+
+ tran.CommitTran();
}
return BuildSimpleResult(0, "鐩樼偣宸紓瀹屾垚");
--
Gitblit v1.9.1