From fc25dda9baf3b5f4df23d35914f3dd343cf492e3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 28 七月 2025 17:30:21 +0800
Subject: [PATCH] 优化WCSHelper / 序列号生成逻辑 , 添加强制任务处理模块
---
api/DebugController.cs | 63 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index d2f7485..b91bb2e 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -16,12 +16,12 @@
using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
-using static HH.WCS.Mobox3.DSZSH.Config;
using static HH.WCS.Mobox3.DSZSH.core.Monitor;
+using static HH.WCS.Mobox3.DSZSH.util.Config;
namespace HH.WCS.Mobox3.DSZSH.api {
/// <summary>
- /// 娴嬭瘯鐢細濡傛灉椤圭洰涓鍜岃澶囧鎺ワ紝鍓嶆湡璁惧鏃犳硶娴嬭瘯锛岀敤鎺ュ彛妯℃嫙
+ /// 娴嬭瘯鐢�濡傛灉椤圭洰涓鍜岃澶囧鎺�鍓嶆湡璁惧鏃犳硶娴嬭瘯,鐢ㄦ帴鍙ｆā鎷� /// </summary>
[RoutePrefix("api")]
public class DebugController : ApiController {
@@ -90,18 +90,18 @@
}
/// <summary>
- /// DEBUG锛氭ā鎷熻緭閫佺嚎浜х嚎婊℃墭鐩樹笅绾挎祦绋�+ /// DEBUG:妯℃嫙杈撻�绾夸骇绾挎弧鎵樼洏涓嬬嚎娴佺▼
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("AddInboundTask")]
public string AddInboundTask(AddInboundTaskInfo model) {
- return WCSCore.CreateInboundTask(model.StartLoc, model.CntrCode).Content;
+ return WCSCore.CreateInboundTask(model.StartLoc, model.CntrCode).Item2;
}
/// <summary>
- /// DEBUG锛氭ā鎷熶汉宸ュ皢鏂欑鎼繍鍒颁骇绾夸笂绾垮彛锛堢洿鎺ヤ慨鏀规暟鎹簱锛�+ /// DEBUG:妯℃嫙浜哄伐灏嗘枡绠辨惉杩愬埌浜х嚎涓婄嚎鍙�(鐩存帴淇敼鏁版嵁搴�
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -111,23 +111,23 @@
var db = new SqlHelper<object>().GetInstance();
try {
- // 鏌ヨ璧风偣璐т綅锛氭暟閲�0
+ // 鏌ヨ璧风偣璐т綅:鏁伴噺=0
var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- .Where((l,c) => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntrCode).First();
+ .Where((l, c) => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntrCode).First();
if (startLoc == null) {
- return $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛佽姹傦細閿佺姸鎬�'鏃�锛屽綋鍓嶅鍣ㄦ暟閲�1";
+ return $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=1";
}
// 鏌ヨ缁堢偣璐т綅
- // Order锛氭寜璐т綅灞傛暟锛屼粠灏忓埌澶ф帓鍒�+ // Order:鎸夎揣浣嶅眰鏁�浠庡皬鍒板ぇ鎺掑垪
var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- return $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛屽綋鍓嶅鍣ㄦ暟閲�0";
+ return $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0";
}
var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == model.CntrCode).First() ;
if (locCntrRel == null) {
- return $"璇ュ鍣ㄤ笉瀛樺湪缁戝畾鐨勮揣浣嶏紒";
+ return $"璇ュ鍣ㄤ笉瀛樺湪缁戝畾鐨勮揣浣�";
}
locCntrRel.S_LOC_CODE = model.StartLoc;
@@ -140,21 +140,20 @@
db.Updateable(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return "鏁版嵁搴撴搷浣滃け璐ワ紒";
+ return "鏁版嵁搴撴搷浣滃け璐�";
}
- tran.CommitTran() ;
+ tran.CommitTran();
return "鏁版嵁搴撴搷浣滄垚鍔�;
}
}
catch (Exception ex) {
-
return ex.Message;
}
}
/// <summary>
- /// DEBUG锛氭ā鎷烢rp涓嬪彂鍑哄簱璁″垝鍗�+ /// DEBUG:妯℃嫙Erp涓嬪彂鍑哄簱璁″垝鍗� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -175,7 +174,7 @@
}
/// <summary>
- /// 锛堝唴閮ㄦ柟娉曡鍕胯皟鐢級妯℃嫙鍙栬揣瀹屾垚鍙嶉Erp鍥炴姤缁撴灉锛堥粯璁や负success锛�+ /// (鍐呴儴鏂规硶璇峰嬁璋冪敤) 妯℃嫙鍙栬揣瀹屾垚鍙嶉Erp鍥炴姤缁撴灉 (榛樿涓簊uccess)
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -196,7 +195,7 @@
}
/// <summary>
- /// 锛堝唴閮ㄦ柟娉曡鍕胯皟鐢級妯℃嫙浠诲姟鍒涘缓瀹屾垚鍙嶉Erp鍥炴姤缁撴灉锛堥粯璁や负success锛�+ /// (鍐呴儴鏂规硶璇峰嬁璋冪敤) 妯℃嫙浠诲姟鍒涘缓瀹屾垚鍙嶉Erp鍥炴姤缁撴灉 (榛樿涓簊uccess)
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -215,6 +214,22 @@
message = "success"
};
}
+
+ [HttpPost]
+ public string TestDb() {
+ var db = new SqlHelper<object>().GetInstance();
+ var startAreas = new List<string> { "HJQ", "CKQ" };
+ //var locationQuery = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && startAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE).Where((l, c) => c.S_CNTR_CODE == "a" && c.S_CNTR_TYPE == "b");
+ //LogHelper.Info(locationQuery.ToSqlString());
+ ////var location = locationQuery.First();
+ //var newLocationQuery = DbQuery.StartLoc(db, "a", startAreas);
+ //LogHelper.Info(newLocationQuery.ToSqlString());
+ //locationQuery = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE).Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && startAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).Where((l, c) => c.S_CNTR_CODE == "a" && c.S_CNTR_TYPE == "b");
+
+ var locationQuery = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: startAreas));
+ LogHelper.Info(locationQuery.ToSqlString());
+ return locationQuery.ToSqlString();
+ }
}
public class GoodpackToProdLineInfo {
@@ -225,15 +240,15 @@
public class TestErpSendOutboundPlanInfo {
/// <summary>
- /// 鍑哄簱璁″垝鍗曞彿锛堣鍒掑崟鍙�jhdh锛�+ /// 鍑哄簱璁″垝鍗曞彿 (璁″垝鍗曞彿 jhdh)
/// </summary>
public string PlanNo { get; set; } = string.Empty;
/// <summary>
- /// 鐗╂枡缂栫爜锛堜骇鍝佷唬鐮�cpdm锛�+ /// 鐗╂枡缂栫爜 (浜у搧浠ｇ爜 cpdm)
/// </summary>
public string ItemCode { get; set; } = string.Empty;
/// <summary>
- /// 鐗╂枡鏁伴噺锛堟淳瑁呬欢鏁�pzjs锛�+ /// 鐗╂枡鏁伴噺 (娲捐浠舵暟 pzjs)
/// </summary>
public float ItemNum { get; set; } = 0;
}
@@ -245,11 +260,11 @@
public class AddInboundTaskInfo {
/// <summary>
- /// 鐗╂枡缂栫爜锛堟殏鏃舵病鐢級
+ /// 鐗╂枡缂栫爜 (鏆傛椂娌＄敤)
/// </summary>
public string ItemCode { get; set; }
/// <summary>
- /// 鎵规鍙凤紙鏆傛椂娌＄敤锛�+ /// 鎵规鍙�(鏆傛椂娌＄敤)
/// </summary>
public string BatchNo { get; set; }
/// <summary>
@@ -263,7 +278,7 @@
}
/// <summary>
- /// 妯℃嫙 AGV 浼犻�淇″彿锛岀敤浜庢洿鏀逛换鍔＄姸鎬�+ /// 妯℃嫙 AGV 浼犻�淇″彿,鐢ㄤ簬鏇存敼浠诲姟鐘舵�
/// </summary>
public class UpdateTaskState {
/// <summary>
@@ -286,7 +301,7 @@
/// </summary>
public string ForkliftNo { get; set; }
/// <summary>
- /// AGV 涓嬩竴鐘舵�锛堜换鍔″洖鎶ュ彿锛�+ /// AGV 涓嬩竴鐘舵� (浠诲姟鍥炴姤鍙�
/// </summary>
public int NextState { set; get; } = 0;
}
--
Gitblit v1.9.1