From 99d001bbf2a0371373e15c97d3c6c7dcf45e97e3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 13 六月 2025 15:44:22 +0800
Subject: [PATCH] 修复空托上线与满托下线联调的逻辑错误
---
api/DebugController.cs | 335 ++++++++++++-------------------------------------------
1 files changed, 76 insertions(+), 259 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 105b0e6..836c7d7 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -166,64 +166,6 @@
//typeof(TN_Container_Item),
};
- //var areaNameList = new List<string>();
- //foreach (var area in Settings.Areas) {
- // areaNameList.AddRange(area.Codes);
- //}
-
- //var locationList = new List<TN_Location>();
- //foreach (var area in areaNameList) {
- // int i = 0;
- // int j = 0;
- // int k = 0;
-
- // if (area == "KXHJQ" || area == "MTHJQ" || area == "MXHJQ") {
- // for (i = 1; i <= 4; i++) {
- // for (j = 1; j <= 5; j++) {
- // for (k = 1; k <= 3; k++) {
- // locationList.Add(new TN_Location() {
- // N_ROW = i,
- // N_COL = j,
- // N_LAYER = k,
- // S_AREA_CODE = area,
- // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}" +
- // $"-{k.ToString().PadLeft(2, '0')}"
- // });
- // }
- // }
- // }
- // continue;
- // }
-
- // if (area == "BZQ") {
- // for (i = 1; i <= 2; i++) {
- // for (j = 1; j <= 2; j++) {
- // locationList.Add(new TN_Location() {
- // N_ROW = i,
- // N_COL = j,
- // S_AREA_CODE = area,
- // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
- // });
- // }
- // }
- // continue;
- // }
-
- // i = 1;
- // for (j = 1; j <= 5; j++) {
- // locationList.Add(new TN_Location() {
- // N_ROW = i,
- // N_COL = j,
- // S_AREA_CODE = area,
- // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
- // });
- // }
-
-
- //}
-
-
-
//using (var tran = db.Ado.UseTran()) {
// //db.CodeFirst.InitTables(entityTypes);
// if (db.Insertable<TN_Location>(locationList).ExecuteCommand() <= 0) {
@@ -245,151 +187,6 @@
}
/// <summary>
- /// DEBUG锛氭彃鍏ヨ揣浣嶃�瀹瑰櫒銆佽揣鍝佷俊鎭�- /// </summary>
- /// <returns></returns>
- [HttpPost]
- [Route("InsertLocCntrCg")]
- public string InsertLocCntrCg(LocCntrCg locCntrCg) {
- var db = new SqlHelper<object>().GetInstance();
-
- try {
-
- using (var tran = db.UseTran()) {
- LogHelper.Info("LogCntrCg锛� + JsonConvert.SerializeObject(locCntrCg));
- if (string.IsNullOrEmpty(locCntrCg.LocCode)) return "";
-
- var loc = db.Queryable<TN_Location>().First(a => a.S_CODE == locCntrCg.LocCode);
- if (loc == null) {
- var newLoc = new TN_Location {
- S_CODE = locCntrCg.LocCode,
- S_AREA_CODE = locCntrCg.LocArea ?? ""
- };
-
- if (db.Insertable<TN_Location>(newLoc).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"鎻掑叆浣嶇疆{locCntrCg.LocCode}澶辫触");
- return "鎻掑叆澶辫触";
- }
-
- loc = newLoc;
- }
-
- if (string.IsNullOrEmpty(locCntrCg.CntrCode)) {
- LogHelper.Info("瀹瑰櫒鍙蜂负绌猴紝涓嶅啀璇诲彇鍚庨潰鐨勬暟鎹�);
- return "";
- }
-
- var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == locCntrCg.LocCode
- && a.S_CNTR_CODE == locCntrCg.CntrCode);
-
- if (locCntrRel == null) {
- var newLocCntrRel = new TN_Loc_Container {
- S_LOC_CODE = locCntrCg.LocCode,
- S_CNTR_CODE = locCntrCg.CntrCode,
- S_CNTR_TYPE = locCntrCg.CntrType ?? ""
- };
-
- loc.N_CURRENT_NUM = 1;
-
- if (db.Insertable<TN_Loc_Container>(newLocCntrRel).ExecuteCommand() <= 0
- && db.Updateable<TN_Location>(loc).UpdateColumns(c => c.N_CURRENT_NUM).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"鎻掑叆浣嶇疆鎵樼洏鍏崇郴{locCntrCg.LocCode}-{locCntrCg.CntrCode}澶辫触");
- return "鎻掑叆澶辫触";
- }
- }
-
- if (string.IsNullOrEmpty(locCntrCg.ItemCode)) {
- LogHelper.Info("鐗╂枡鍙蜂负绌猴紝涓嶅啀璇诲彇鍚庨潰鐨勬暟鎹�);
- return "";
- }
-
- var cgDetail = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == locCntrCg.CntrCode
- && a.S_ITEM_CODE == locCntrCg.ItemCode);
- if (cgDetail == null) {
- var locList = new List<TN_CG_Detail>();
- locList.Add(new TN_CG_Detail { S_CNTR_CODE = locCntrCg.CntrCode, S_ITEM_CODE = locCntrCg.ItemCode, S_BATCH_NO = locCntrCg.BatchNo ?? "" });
- if (db.Insertable<TN_CG_Detail>(locList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"鎻掑叆鎵樼洏鐗╂枡鍏崇郴{locCntrCg.CntrCode}-{locCntrCg}澶辫触");
- return "鎻掑叆澶辫触";
- }
- }
- tran.CommitTran();
- }
-
- return "鎻掑叆鏁版嵁鎴愬姛";
-
- }
- catch (Exception ex) {
- return $"Error reading CSV file: {ex.Message}";
- }
- }
-
- /// <summary>
- /// DEBUG锛氭牴鎹鍣ㄧ墿鏂欎俊鎭〃锛屾彃鍏ュ鍣ㄧ墿鏂欑櫥璁颁俊鎭〃
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- [Route("InsertContainerItemByCgDetail")]
- public string InsertContainerItemByCgDetail(FalseOk _) {
- var db = new SqlHelper<object>().GetInstance();
- try {
- var cgDetailList = db.Queryable<TN_CG_Detail>().ToList();
- var cntrItemList = new List<TN_Container_ItemType>();
- foreach (var cgDetail in cgDetailList) {
- if (db.Queryable<TN_Container_ItemType>().Where(i => i.S_CNTR_CODE == cgDetail.S_CNTR_CODE).Any()) {
- continue;
- }
-
- cntrItemList.Add(new TN_Container_ItemType {
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- });
- }
-
- if (db.Insertable<TN_Container_ItemType>(cntrItemList).ExecuteCommand() <= 0) {
- return "鎻掑叆澶辫触";
- }
-
- return "鎻掑叆鎴愬姛";
- }
- catch (Exception ex) {
-
- LogHelper.InfoEx(ex);
- return ex.Message;
- }
- }
-
- /// <summary>
- /// DEBUG锛氭牴鎹鍣ㄧ墿鏂欎俊鎭〃锛屾彃鍏ュ鍣ㄧ墿鏂欑櫥璁颁俊鎭〃
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- [Route("InsertContainerItem")]
- public string InsertContainerItem(InsertCntrItemInfo cgDetail) {
- var db = new SqlHelper<object>().GetInstance();
- try {
- var cntrItem = new TN_Container_ItemType {
- S_CNTR_CODE = cgDetail.Cntr,
- S_ITEM_CODE = cgDetail.Item,
- };
-
- if (db.Insertable<TN_Container_ItemType>(cntrItem).ExecuteCommand() <= 0) {
- return "鎻掑叆澶辫触";
- }
-
- return "鎻掑叆鎴愬姛";
- }
- catch (Exception ex) {
-
- LogHelper.InfoEx(ex);
- return ex.Message;
- }
- }
-
- /// <summary>
/// DEBUG锛氭ā鎷熻緭閫佺嚎浜х嚎婊℃墭鐩樹笅绾挎祦绋� /// </summary>
/// <param name="model"></param>
@@ -400,68 +197,86 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱;
- var startAreaName = AreaName.B鍖呰鍖�
+ const string taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱;
+ const string startAreaName = AreaName.B鍖呰鍖�
+ const string endAreaName = AreaName.M婊℃墭璐ф灦鍖�
+ const string cntrType = "鎵樼洏";
try {
-
- var itemCode = model.ItemCode;
- var batchNo = model.BatchNo;
+ //var itemCode = model.ItemCode;
+ //var batchNo = model.BatchNo;
var cntrCode = model.CntrCode;
var startLocCode = model.StartLoc;
- var cgDetail = new TN_CG_Detail {
- S_ITEM_CODE = itemCode,
- S_BATCH_NO = batchNo,
- S_CNTR_CODE = cntrCode,
- };
+ //var cgDetail = new TN_CG_Detail {
+ // S_ITEM_CODE = itemCode,
+ // S_BATCH_NO = batchNo,
+ // S_CNTR_CODE = cntrCode,
+ //};
- // BEG 姣忔杞閮芥鏌ュ搴斿鍣ㄦ槸鍚﹀凡鐧昏锛岀櫥璁颁繚鎸佷笉鍙橈紝鏈櫥璁板垯鎻掑叆
- // TODO 鍙兘浼氶噰鐢ㄦ瘡娆′笂绾块兘鏇存柊鐨勯�杈戯紝鍚庨潰鍐嶇湅
- var cntrItemRel = db.Queryable<TN_Container_ItemType>()
- .Where(i => i.S_CNTR_CODE == cntrCode).First();
+ //var needInsertContainer = false;
+ //var needUpdateContainer = false;
+ // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�+ //var cntr = db.Queryable<TN_Container>()
+ // .Where(c => c.S_CODE == cntrCode).First();
+ // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
+ //if (cntr == null) {
+ // needInsertContainer = true;
+ // LogHelper.Info($"杞锛歿taskName}锛氬鍣細{cntrCode}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
- var insertTable = cntrItemRel == null;
+ // cntr = new TN_Container {
+ // S_CODE = cntrCode,
+ // S_TYPE = "鎵樼洏",
+ // S_SPEC = itemCode,
+ // S_SOURCE = taskName,
+ // };
+ //}
+ //else {
+ // // 濡傛灉鎵惧埌璇ュ鍣紝浣嗗鍣ㄧ墿鏂欑被鍨嬩笌涓嬬嚎鐗╂枡涓嶇锛岃褰曞苟鐩存帴瑕嗙洊锛堝緟瀹氾級
+ // if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != itemCode) {
+ // needUpdateContainer = true;
+ // LogHelper.Info($"杞锛歿taskName}锛氬鍣ㄨ〃涓鍣▄cntrCode}瀵瑰簲鐨勭墿鏂欎俊鎭細{cntr.S_SPEC}锛� +
+ // $"涓庢墍闇�鐨勭墿鏂欎俊鎭瘂itemCode}涓嶇锛岀洿鎺ヨ鐩栫粨鏋�);
- if (insertTable) {
- // 鏆傚畾鍦ㄦ弧鎵樹笅绾垮叆搴撶殑鏃跺�锛岀櫥璁版墭鐩樺鍣�鐗╂枡鍙峰叧绯伙紙鍚庨潰鍙兘浼氭敼鎴愮郴缁熺淮鎶わ級
- cntrItemRel = new TN_Container_ItemType {
- S_ITEM_CODE = itemCode,
- S_CNTR_CODE = cntrCode,
- S_CNTR_TYPE = "鎵樼洏",
- };
- }
- // END
+ // cntr.S_SPEC = itemCode;
+ // cntr.S_SOURCE = taskName;
+ // }
+ //}
var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == startLocCode) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 0)
- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => l.S_CODE == startLocCode)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓� .First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆 '{startLocCode}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{startLocCode}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
return info;
}
+ var locCntrRelOld = db.Queryable<TN_Loc_Container>()
+ .Where(c => c.S_CNTR_CODE == cntrCode).First();
+
// 缁戝畾璐т綅鍜屽鍣ㄥ彿
var locCntrRel = new TN_Loc_Container {
S_LOC_CODE = startLocCode,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_CNTR_TYPE = "鎵樼洏",
+ S_CNTR_CODE = cntrCode,
+ S_CNTR_TYPE = cntrType,
};
+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.Contains(a.S_AREA_CODE))
+ .Where(a => Settings.AreaMap[endAreaName].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) // 绛涢�锛氱┖璐т綅
.OrderBy(l => l.N_LAYER)
.First();
if (endLoc == null) {
- info = "绌烘墭鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
+ info = $"鍦ㄧ粓鐐硅揣鍖�{endAreaName}'涓紝娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
LogHelper.Info(info);
return info;
}
@@ -473,31 +288,38 @@
LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鎻掑叆瀹瑰櫒璐у搧淇℃伅琛ㄥけ璐ワ細鐗╂枡缂栫爜{cgDetail.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cgDetail.S_CNTR_CODE}";
- LogHelper.Info(info);
- return info;
- }
-
- // BEG 鎻掑叆鎴栨洿鏂板鍣ㄤ笌鐗╂枡绫诲瀷鐨勭粦瀹氳〃
- if (insertTable) {
- if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
+ if (locCntrRelOld != null) {
+ if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0 &&
+ db.Updateable<TN_Location>().SetColumns(l => l.N_CURRENT_NUM == 0).Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
+ info = $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯昏〃澶辫触锛氳揣浣嶇紪鐮亄locCntrRelOld.S_LOC_CODE}锛屽鍣ㄧ紪鐮亄locCntrRelOld.S_CNTR_CODE}";
LogHelper.Info(info);
return info;
}
}
- //else {
- // if (db.Updateable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
+ //if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // info = $"鎻掑叆瀹瑰櫒璐у搧淇℃伅琛ㄥけ璐ワ細鐗╂枡缂栫爜{cgDetail.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cgDetail.S_CNTR_CODE}";
+ // LogHelper.Info(info);
+ // return info;
+ //}
+
+ //if (needInsertContainer) {
+ // if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ // info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
// tran.RollbackTran();
- // info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
// LogHelper.Info(info);
// return info;
// }
//}
- // END
+ //else if (needUpdateContainer) {
+ // if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ // info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
+ // tran.RollbackTran();
+ // LogHelper.Info(info);
+ // return info;
+ // }
+ //}
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
@@ -506,12 +328,7 @@
return 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) {
+ if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
@@ -553,11 +370,11 @@
public class AddInboundTaskInfo {
/// <summary>
- /// 鐗╂枡缂栫爜
+ /// 鐗╂枡缂栫爜锛堟殏鏃舵病鐢級
/// </summary>
public string ItemCode { get; set; }
/// <summary>
- /// 鎵规鍙�+ /// 鎵规鍙凤紙鏆傛椂娌＄敤锛� /// </summary>
public string BatchNo { get; set; }
/// <summary>
--
Gitblit v1.9.1