From ae6a8a95861a75ee580c75451f57e0504d2c367a Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 09 六月 2025 17:16:49 +0800
Subject: [PATCH] 针对ERP提供的字段，完善部分出库逻辑
---
api/DebugController.cs | 142 ++++++++++++++++-------------------------------
1 files changed, 49 insertions(+), 93 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index f443eef..d377395 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -29,6 +29,14 @@
[HttpPost]
[Route("AGVSeriesReports")]
public ReturnResults AGVSeriesReports(UpdateTaskState model) {
+ //var db = new SqlHelper<object>().GetInstance();
+
+ //var task = db.Queryable<TN_Task>().Where(t => t.S_CODE == model.TaskID).First();
+ //if (task == null) return new ReturnResults();
+ //if (task.S_B_STATE == "瀹屾垚" && task.N_B_STATE == 3 || task.S_B_STATE == "閿欒" && task.N_B_STATE == 4) {
+ // return new ReturnResults();
+ //}
+
var agvTaskState = new AgvTaskState() {
task_no = model.TaskID,
forklift_no = model.ForkliftNo,
@@ -320,68 +328,6 @@
}
/// <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>
@@ -408,22 +354,34 @@
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;
-
- if (insertTable) {
- // 鏆傚畾鍦ㄦ弧鎵樹笅绾垮叆搴撶殑鏃跺�锛岀櫥璁版墭鐩樺鍣�鐗╂枡鍙峰叧绯伙紙鍚庨潰鍙兘浼氭敼鎴愮郴缁熺淮鎶わ級
- cntrItemRel = new TN_Container_ItemType {
- S_ITEM_CODE = itemCode,
- S_CNTR_CODE = cntrCode,
- S_CNTR_TYPE = "鎵樼洏",
+ cntr = new TN_Container {
+ S_CODE = cntrCode,
+ S_TYPE = "鎵樼洏",
+ S_SPEC = itemCode,
+ S_SOURCE = taskName,
};
}
- // END
+ else {
+ // 濡傛灉鎵惧埌璇ュ鍣紝浣嗗鍣ㄧ墿鏂欑被鍨嬩笌涓嬬嚎鐗╂枡涓嶇锛岃褰曞苟鐩存帴瑕嗙洊锛堝緟瀹氾級
+ if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != itemCode) {
+ needUpdateContainer = true;
+ LogHelper.Info($"杞锛歿taskName}锛氬鍣ㄨ〃涓鍣▄cntrCode}瀵瑰簲鐨勭墿鏂欎俊鎭細{cntr.S_SPEC}锛� +
+ $"涓庢墍闇�鐨勭墿鏂欎俊鎭瘂itemCode}涓嶇锛岀洿鎺ヨ鐩栫粨鏋�);
+
+ cntr.S_SPEC = itemCode;
+ cntr.S_SOURCE = taskName;
+ }
+ }
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == startLocCode) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
@@ -446,7 +404,7 @@
};
var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.K绌烘墭瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
+ .Where(a => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.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)
@@ -472,24 +430,22 @@
return info;
}
- // BEG 鎻掑叆鎴栨洿鏂板鍣ㄤ笌鐗╂枡绫诲瀷鐨勭粦瀹氳〃
- if (insertTable) {
- if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
+ 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;
}
}
- //else {
- // if (db.Updateable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
- // 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();
@@ -574,10 +530,10 @@
/// AGV 灏忚溅鍙� /// </summary>
public string ForkliftNo { set; get; }
- /// <summary>
- /// AGV 涓嬩竴涓姸鎬�- /// </summary>
- public int NextState { set; get; }
+ ///// <summary>
+ ///// AGV 涓嬩竴涓姸鎬�+ ///// </summary>
+ //public int NextState { set; get; }
}
public class FalseOk {
--
Gitblit v1.9.1