From 736fb5782d375908a9097780743913193ffde494 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 03 七月 2025 17:28:14 +0800
Subject: [PATCH] 完善部分日志内容，优化查询语句和日志打印代码
---
wms/LocationHelper.cs | 72 ++++++-
/dev/null | 0
util/Settings.cs | 12 +
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/7a460209-dbc4-48fb-b898-02f23d93e759.vsidx | 0
api/ApiHelper.cs | 305 +++++++++------------------------
util/LogBuilder.cs | 99 +++++++++++
api/ApiModel.cs | 4
api/MoboxController.cs | 12
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/138ad012-fc4b-4ce6-afd4-7057b1c2cecf.vsidx | 0
HH.WCS.Mobox3.DSZSH.csproj | 1
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e75c296c-c8ea-460c-b254-e5337f896e37.vsidx | 0
11 files changed, 262 insertions(+), 243 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/02c9955a-b11d-4346-b51b-88bd67310ee5.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/02c9955a-b11d-4346-b51b-88bd67310ee5.vsidx
deleted file mode 100644
index 760d49f..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/02c9955a-b11d-4346-b51b-88bd67310ee5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1fcb0d14-51a5-4d39-abcb-a3412b32d895.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/138ad012-fc4b-4ce6-afd4-7057b1c2cecf.vsidx
similarity index 65%
rename from .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1fcb0d14-51a5-4d39-abcb-a3412b32d895.vsidx
rename to .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/138ad012-fc4b-4ce6-afd4-7057b1c2cecf.vsidx
index 7a3c480..992c63d 100644
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/1fcb0d14-51a5-4d39-abcb-a3412b32d895.vsidx
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/138ad012-fc4b-4ce6-afd4-7057b1c2cecf.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/52b1bf39-572c-4392-9ec9-d2acb98174ba.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/52b1bf39-572c-4392-9ec9-d2acb98174ba.vsidx
deleted file mode 100644
index bc4511b..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/52b1bf39-572c-4392-9ec9-d2acb98174ba.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/7a460209-dbc4-48fb-b898-02f23d93e759.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/7a460209-dbc4-48fb-b898-02f23d93e759.vsidx
new file mode 100644
index 0000000..9f369ae
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/7a460209-dbc4-48fb-b898-02f23d93e759.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/a24f5716-1832-4d56-a0d6-fdd4886a51ea.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/a24f5716-1832-4d56-a0d6-fdd4886a51ea.vsidx
deleted file mode 100644
index e90e839..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/a24f5716-1832-4d56-a0d6-fdd4886a51ea.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e75c296c-c8ea-460c-b254-e5337f896e37.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e75c296c-c8ea-460c-b254-e5337f896e37.vsidx
new file mode 100644
index 0000000..a176a11
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e75c296c-c8ea-460c-b254-e5337f896e37.vsidx
Binary files differ
diff --git a/HH.WCS.Mobox3.DSZSH.csproj b/HH.WCS.Mobox3.DSZSH.csproj
index f0ef227..2445f1b 100644
--- a/HH.WCS.Mobox3.DSZSH.csproj
+++ b/HH.WCS.Mobox3.DSZSH.csproj
@@ -244,6 +244,7 @@
<Compile Include="models\TN_SpotCheck_Detail.cs" />
<Compile Include="models\TN_Spot_Check.cs" />
<Compile Include="process\TaskProcess.cs" />
+ <Compile Include="util\LogBuilder.cs" />
<Compile Include="util\SqlHelper.cs" />
<Compile Include="models\TN_Outbound_Order.cs" />
<Compile Include="models\TN_Outbound_Detail.cs" />
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index a61f780..3675e5e 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -27,106 +27,74 @@
/// <returns></returns>
public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var info = "";
-
- var taskInfo = Settings.GetTaskInfo(ETask.M婊＄涓嬬嚎鍏ュ簱);
- var taskName = taskInfo.TaskName;
- var startAreas = taskInfo.StartAreas;
- var endAreas = taskInfo.EndAreas;
+ var taskInfo = ETask.M婊＄涓嬬嚎鍏ュ簱.Info();
+ const string preLog = "API锛氭弧绠变笅绾垮叆搴擄細";
+ const string cntrType = "濂借繍绠�;
try {
if (model.Num <= 0) {
- info = $"鐗╂枡鏁伴噺'{model.Num}'涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬0";
- LogHelper.Info(info);
- return NewSimpleResult(400, info);
+ return NewSimpleResult(400, preLog + $"鐗╂枡鏁伴噺'{model.Num}'涓嶅悎娉曪紒瑕佹眰锛氱墿鏂欐暟閲忥紴0");
}
- var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮").First(); // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹�-
+ // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹�+ var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮").First();
if (cgDetail == null) {
- info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
- LogHelper.Info(info);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(1, preLog + $"娌℃湁鍦ㄨ揣鍝佹槑缁嗚〃涓壘鍒癧鐗╂枡缂栫爜='{model.ItemCode}',鎵规鍙�'{model.BatchNo}']鐨勭墿鏂欙紒璇锋鏌ワ細PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭槸鍚︿竴鑷达紒瑕佹眰锛氱墿鏂欑姸鎬�'寰呮'锛�);
}
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == model.StartLoc)
- .Where(l => startAreas.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();
-
+ var startLoc = LocationHelper.Query(db, 0, 0, taskInfo.StartAreas, model.StartLoc).First();
if (startLoc == null) {
- info = $"锛氭病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛佽姹傦細鏈笂閿併�鏁伴噺=0銆佽揣鍖哄睘浜嶽{string.Join(", ", startAreas)}]";
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(2, LogBuilder.StartLocNotFound(0, 0, taskInfo.StartAreas, model.StartLoc, preLog));
}
-
startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
var locCntrRel = new TN_Loc_Container {
S_LOC_CODE = startLoc.S_CODE,
S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_CNTR_TYPE = "濂借繍绠�,
+ S_CNTR_TYPE = cntrType,
};
- var endLoc = db.Queryable<TN_Location>()
- .Where(l => startAreas.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)
- .OrderBy(l => new { l.N_LAYER }).First();
-
+ // Order锛氭寜璐т綅灞傛暟锛屼粠灏忓埌澶ф帓鍒�+ var endLoc = LocationHelper.Query(db, 0, 0, taskInfo.EndAreas).OrderBy(l => new { l.N_LAYER }).First();
if (endLoc == null) {
- info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紝闇�婊¤冻锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(3, LogBuilder.EndLocNotFound(0, 0, taskInfo.EndAreas, pre: preLog));
}
LocationHelper.LockStartLoc(ref startLoc);
LocationHelper.LockEndLoc(ref endLoc);
var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙�- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆璐т綅瀹瑰櫒缁戝畾琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(locCntrRel);
tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, preLog + $"鎻掑叆[璐т綅瀹瑰櫒缁戝畾琛╙澶辫触锛� + JsonConvert.SerializeObject(locCntrRel));
}
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);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, preLog + $"鏇存柊璧风偣璐т綅'{startLoc.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();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, preLog + $"鏇存柊缁堢偣璐т綅'{endLoc.S_CODE}'閿佺姸鎬佸け璐ワ紒");
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{taskInfo.TaskName}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}");
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(0, LogBuilder.CreateTaskSuccess(task, preLog));
}
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(-1, info);
+ return NewSimpleResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}", false);
}
}
@@ -141,58 +109,35 @@
/// <returns></returns>
public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var info = "";
-
- var taskInfo = Settings.GetTaskInfo(ETask.K绌烘墭鍏ュ簱);
- var taskName = taskInfo.TaskName;
- var startAreas = taskInfo.StartAreas;
- var endAreas = taskInfo.EndAreas;
- var cntrType = "鎵樼洏";
+ var taskInfo = ETask.K绌烘墭鍏ュ簱.Info();
+ const string pre = "API锛氱┖鎵樺叆搴擄細";
+ const string cntrType = "鎵樼洏";
try {
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == model.StartLoc)
- .Where(l => startAreas.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();
-
+ var startLoc = LocationHelper.Query(db, 0, 0, taskInfo.StartAreas, model.StartLoc).First();
if (startLoc == null) {
- info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛屾垨涓嶅叿澶囪捣鐐瑰彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
- LogHelper.Info(info);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(1, LogBuilder.StartLocNotFound(0, 0, taskInfo.StartAreas, model.StartLoc, pre));
}
- var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
- .First();
-
+ // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+ var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
if (cntr == null) {
- info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(2, pre + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�);
}
- if (cntr.S_TYPE != cntrType) { // 绌烘墭鍏ュ簱
- info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�;
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ if (cntr.S_TYPE != cntrType) {
+ return NewSimpleResult(3, pre + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�);
}
// 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌� // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
- var cgDetailOld = db.Queryable<TN_CG_Detail>()
- .Where(d => d.S_CNTR_CODE == model.CntrCode)
- .First();
+ var cgDetailOld = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == model.CntrCode).First();
// 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝姝ゆ椂瀹瑰櫒浠嶇劧涓庢棫鐨勫嚭搴撹揣浣嶇粦瀹氾紝闇�妫�煡
- var locCntrRelOld = db.Queryable<TN_Loc_Container>()
- .Where(c => c.S_CNTR_CODE == model.CntrCode)
- .First();
+ var locCntrRelOld = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == model.CntrCode).First();
TN_Location locOld = null;
if (locCntrRelOld != null) { // 濡傛灉闇�瑙ｇ粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
- locOld = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
+ locOld = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
if (locOld != null) {
locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
locOld.T_MODIFY = DateTime.Now;
@@ -200,97 +145,69 @@
}
// 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾锛�- var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = startLoc.S_CODE,
- S_CNTR_CODE = cntr.S_CODE,
- S_CNTR_TYPE = cntrType, // 绌烘墭鍏ュ簱
- };
-
+ var locCntrRel = new TN_Loc_Container { S_LOC_CODE = startLoc.S_CODE, S_CNTR_CODE = cntr.S_CODE, S_CNTR_TYPE = cntrType };
startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�
- var endLoc = db.Queryable<TN_Location>()
- .Where(l => startAreas.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)
- .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
- .First();
+ // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
if (endLoc == null) {
- info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(4, pre + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛�1)鏈笂閿�(2)鏁伴噺=0;(3)璐у尯灞炰簬['{string.Join("','", taskInfo.EndAreas)}'];");
}
LocationHelper.LockStartLoc(ref startLoc);
LocationHelper.LockEndLoc(ref endLoc);
var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙�- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
using (var tran = db.Ado.UseTran()) {
if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鍒犻櫎[鏃х墿鏂欎俊鎭痌澶辫触锛� + JsonConvert.SerializeObject(cgDetailOld));
}
if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触锛� + JsonConvert.SerializeObject(locCntrRelOld));
}
if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鏇存柊[鏃ц揣浣峕[瀹瑰櫒鏁伴噺]澶辫触锛� + JsonConvert.SerializeObject(locOld));
}
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鎻掑叆[璐т綅瀹瑰櫒鍏崇郴]澶辫触锛� + JsonConvert.SerializeObject(locCntrRel));
}
- 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) {
+ 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);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鏇存柊璧风偣璐т綅'{startLoc.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) {
+ 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}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鏇存柊缁堢偣璐т綅'{endLoc.S_CODE}'閿佺姸鎬佸け璐ワ紒");
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鐢熸垚浠诲姟'{taskInfo.TaskName}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}");
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(0, pre + $"鐢熸垚浠诲姟'{taskInfo.TaskName}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}");
}
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(-1, info);
+ return NewSimpleResult(-1, pre + $"鍙戠敓浜嗗紓甯革細{ex.Message}", false);
}
}
/// <summary>
- /// 绌虹鍏ュ簱(濂借繍绠�
+ /// 绌虹鍏ュ簱
/// </summary>
/// <remarks>
/// 浜哄伐锛氱┖绠�=鎼繍==>鍏ュ簱鎺ラ┏浣嶏紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
@@ -299,150 +216,100 @@
/// <returns></returns>
public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var info = "";
-
- var taskInfo = Settings.GetTaskInfo(ETask.K绌虹鍏ュ簱);
- var taskName = taskInfo.TaskName;
- var startAreas = taskInfo.StartAreas;
- var endAreas = taskInfo.EndAreas;
+ var taskInfo = ETask.K绌虹鍏ュ簱.Info();
+ const string pre = "API锛氱┖绠卞叆搴擄細";
const string cntrType = "濂借繍绠�;
try {
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == model.StartLoc)
- .Where(l => startAreas.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();
-
+ var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
if (startLoc == null) {
- info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(1, pre + $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛佽姹傦細(1)鏈笂閿�(2)鏁伴噺=0;(3)璐у尯灞炰簬['{string.Join("','", taskInfo.StartAreas)}'];");
}
- var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
- .First();
-
+ // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+ var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
if (cntr == null) {
- info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(2, pre + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�);
}
if (cntr.S_TYPE != cntrType) {
- info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�;
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(3, pre + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�);
}
// 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌� // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
- var cgDetailOld = db.Queryable<TN_CG_Detail>()
- .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
+ var cgDetailOld = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == model.CntrCode).First();
// 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝姝ゆ椂瀹瑰櫒浠嶇劧涓庢棫鐨勫嚭搴撹揣浣嶇粦瀹氾紝闇�妫�煡
- var locCntrRelOld = db.Queryable<TN_Loc_Container>()
- .Where(c => c.S_CNTR_CODE == model.CntrCode).First();
+ var locCntrRelOld = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == model.CntrCode).First();
TN_Location locOld = null;
if (locCntrRelOld != null) { // 濡傛灉闇�瑙ｇ粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
- locOld = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
+ locOld = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
if (locOld != null) {
locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
+ locOld.T_MODIFY = DateTime.Now;
}
}
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿
- var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = startLoc.S_CODE,
- S_CNTR_CODE = cntr.S_CODE,
- S_CNTR_TYPE = cntrType,
- };
-
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾锛�+ var locCntrRel = new TN_Loc_Container { S_LOC_CODE = startLoc.S_CODE, S_CNTR_CODE = cntr.S_CODE, S_CNTR_TYPE = cntrType };
startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�
- var endLoc = db.Queryable<TN_Location>()
- .Where(l => endAreas.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)
- .OrderBy(l => new { l.N_LAYER }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀�- .First();
+ // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
if (endLoc == null) {
- info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(4, pre + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛�1)鏈笂閿�(2)鏁伴噺=0;(3)璐у尯灞炰簬['{string.Join("','", taskInfo.EndAreas)}'];");
}
-
- var cntId = locCntrRel.S_CNTR_CODE;
LocationHelper.LockStartLoc(ref startLoc);
LocationHelper.LockEndLoc(ref endLoc);
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙�+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
using (var tran = db.Ado.UseTran()) {
- // 瀛樺湪鏃с�鐗╂枡鏄庣粏銆戣〃鏃讹紝鍒犻櫎鏃ц〃
if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- // 瀛樺湪鏃с�璐т綅瀹瑰櫒缁戝畾銆戣〃鏃讹紝鍒犻櫎鏃ц〃
- if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鍒犻櫎[鏃х墿鏂欎俊鎭痌澶辫触锛� + JsonConvert.SerializeObject(cgDetailOld));
}
- if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
+ if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触锛� + JsonConvert.SerializeObject(locCntrRelOld));
+ }
+
+ if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewSimpleResult(500, pre + $"鏇存柊[鏃ц揣浣峕[瀹瑰櫒鏁伴噺]澶辫触锛� + JsonConvert.SerializeObject(locOld));
}
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鎻掑叆[璐т綅瀹瑰櫒鍏崇郴]澶辫触锛� + JsonConvert.SerializeObject(locCntrRel));
}
- 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) {
+ 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);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鏇存柊璧风偣璐т綅'{startLoc.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) {
+ 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}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鏇存柊缁堢偣璐т綅'{endLoc.S_CODE}'閿佺姸鎬佸け璐ワ紒");
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, pre + $"鐢熸垚浠诲姟'{taskInfo.TaskName}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}");
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(0, pre + $"鐢熸垚浠诲姟'{taskInfo.TaskName}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}");
}
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(-1, info);
+ return NewSimpleResult(-1, pre + $"鍙戠敓浜嗗紓甯革細{ex.Message}", false);
}
}
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 57560c4..a6b444e 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -22,8 +22,10 @@
/// </summary>
/// <param name="code"></param>
/// <param name="message"></param>
+ /// <param name="log"></param>
/// <returns></returns>
- public static SimpleResult NewSimpleResult(int code, string message) {
+ public static SimpleResult NewSimpleResult(int code, string message, bool log = true) {
+ if (log) { LogHelper.Info(message); }
return new SimpleResult { resultCode = code, resultMsg = message };
}
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 526ff72..4383de3 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -21,9 +21,7 @@
[HttpPost]
[Route("goodpack-offline")]
public SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
- var apiName = "婊＄涓嬬嚎鍏ュ簱";
- LogHelper.InfoApi(apiName, model);
-
+ LogHelper.InfoApi("婊＄涓嬬嚎鍏ュ簱", model);
return ApiHelper.GoodpackOffline(model);
}
@@ -35,8 +33,7 @@
[HttpPost]
[Route("empty-inbound")]
public SimpleResult EmptyInbound(EmptyInboundInfo model) {
- var apiName = "绌烘墭/绌虹鍏ュ簱";
- LogHelper.InfoApi(apiName, model);
+ LogHelper.InfoApi("绌烘墭/绌虹鍏ュ簱", model);
if (model.CntrType == "绌烘墭鐩�) {
return ApiHelper.EmptyInboundPallet(model);
@@ -50,15 +47,14 @@
}
/// <summary>
- /// 鎵樼洏-绌烘墭涓婄嚎(PDA)
+ /// 绌烘墭涓婄嚎
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("empty-online-pallet")]
public SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
- var apiName = "鎵樼洏-绌烘墭涓婄嚎(PDA)";
- LogHelper.InfoApi(apiName, model);
+ LogHelper.InfoApi("绌烘墭涓婄嚎", model);
return ApiHelper.EmptyOnlinePallet(model);
}
diff --git a/util/LogBuilder.cs b/util/LogBuilder.cs
new file mode 100644
index 0000000..79cfbcf
--- /dev/null
+++ b/util/LogBuilder.cs
@@ -0,0 +1,99 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using HH.WCS.Mobox3.DSZSH.models;
+
+using static HH.WCS.Mobox3.DSZSH.Config;
+
+namespace HH.WCS.Mobox3.DSZSH.util {
+ /// <summary>
+ /// 鎵撳嵃鏃ュ織鍐呭鏋勯�鍣�+ /// </summary>
+ public static class LogBuilder {
+ /// <summary>
+ /// 娌℃湁鎵惧埌璧风偣璐т綅
+ /// </summary>
+ /// <remarks>
+ /// <b>lockStated</b> - 閿佺姸鎬侊紝榛樿涓�锛屽皬浜�鏃跺拷鐣�br/>
+ /// <b>curNum</b> - 褰撳墠鏁伴噺锛岄粯璁や负-1锛屽皬浜�鏃跺拷鐣�br/>
+ /// <b>areas</b> - 鎵�湪搴撳尯鍒楄〃锛岄粯璁や负null锛屼负null鎴栦负绌烘椂蹇界暐<br/>
+ /// <b>name</b> - 璐т綅鍚嶇О锛岄粯璁や负null锛屼负null鎴栦负绌烘椂蹇界暐
+ /// </remarks>
+ /// <param name="lockState">閿佺姸鎬侊紝榛樿涓�锛屽皬浜�鏃跺拷鐣�/param>
+ /// <param name="curNum">褰撳墠鏁伴噺锛岄粯璁や负-1锛屽皬浜�鏃跺拷鐣�/param>
+ /// <param name="areas">鎵�湪搴撳尯鍒楄〃锛岄粯璁や负null锛屼负null鎴栦负绌烘椂蹇界暐</param>
+ /// <param name="name">璐т綅鍚嶇О锛岄粯璁や负null锛屼负null鎴栦负绌烘椂蹇界暐</param>
+ /// <param name="pre"></param>
+ /// <returns></returns>
+ public static string StartLocNotFound(int lockState = 0, int curNum = -1, List<string> areas = null, string name = null, string pre = "") {
+ var res = string.Empty;
+ if (string.IsNullOrEmpty(name)) { res = $"娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣嶏紒"; }
+ else { res = $"娌℃湁鎵惧埌璧风偣璐т綅'{name}'锛�; }
+ res += "瑕佹眰锛�;
+ if (lockState >= 0) { res += $"閿佺姸鎬�'{GetLockStateStr(lockState)}'锛�; }
+ if (curNum >= 0) { res += $"褰撳墠瀹瑰櫒鏁伴噺={curNum}锛�; }
+ if (areas != null && areas.Count != 0) { res += $"鎵�湪搴撳尯=['{string.Join("','", areas)}']锛�; }
+
+ return pre + res;
+ }
+
+ /// <summary>
+ /// 娌℃湁鎵惧埌缁堢偣璐т綅
+ /// </summary>
+ /// <remarks>
+ /// <b>lockStated</b> - 閿佺姸鎬侊紝榛樿涓�锛屽皬浜�鏃跺拷鐣�br/>
+ /// <b>curNum</b> - 褰撳墠鏁伴噺锛岄粯璁や负-1锛屽皬浜�鏃跺拷鐣�br/>
+ /// <b>areas</b> - 鎵�湪搴撳尯鍒楄〃锛岄粯璁や负null锛屼负null鎴栦负绌烘椂蹇界暐<br/>
+ /// <b>name</b> - 璐т綅鍚嶇О锛岄粯璁や负null锛屼负null鎴栦负绌烘椂蹇界暐
+ /// </remarks>
+ /// <param name="lockState">閿佺姸鎬侊紝榛樿涓�锛屽皬浜�鏃跺拷鐣�/param>
+ /// <param name="curNum">褰撳墠鏁伴噺锛岄粯璁や负-1锛屽皬浜�鏃跺拷鐣�/param>
+ /// <param name="areas">鎵�湪搴撳尯鍒楄〃锛岄粯璁や负null锛屼负null鎴栦负绌烘椂蹇界暐</param>
+ /// <param name="name">璐т綅鍚嶇О锛岄粯璁や负null锛屼负null鎴栦负绌烘椂蹇界暐</param>
+ /// <param name="pre"></param>
+ /// <returns></returns>
+ public static string EndLocNotFound(int lockState = 0, int curNum = -1, List<string> areas = null, string name = null, string pre = "") {
+ var res = string.Empty;
+ if (string.IsNullOrEmpty(name)) { res = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒"; }
+ else { res = $"娌℃湁鎵惧埌缁堢偣璐т綅'{name}'锛�; }
+ res += "瑕佹眰锛�;
+ if (lockState >= 0) { res += $"閿佺姸鎬�'{GetLockStateStr(lockState)}'锛�; }
+ if (curNum >= 0) { res += $"褰撳墠瀹瑰櫒鏁伴噺={curNum}锛�; }
+ if (areas != null && areas.Count != 0) { res += $"鎵�湪搴撳尯=['{string.Join("','", areas)}']锛�; }
+
+ return pre + res;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="task"></param>
+ /// <param name="pre"></param>
+ /// <returns></returns>
+ public static string CreateTaskSuccess(TN_Task task, string pre = "") {
+ var res = $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛锛� +
+ $"浠诲姟鍙�'{task.S_CODE}'锛屽鍣ㄥ彿='{task.S_CNTR_CODE}'锛岃捣鐐�'{task.S_START_LOC}'锛岀粓鐐�'{task.S_END_LOC}'";
+ return pre + res;
+ }
+
+ public static string CreateTaskFail(TN_Task task, string pre = "") {
+ var res = $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触锛� +
+ $"浠诲姟鍙�{task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}";
+ return pre + res;
+ }
+
+ private static string GetLockStateStr(int lockState) {
+ var str = "";
+ switch (lockState) {
+ case 0: str = "鏃�; break;
+ case 1: str = "鍏ュ簱閿�; break;
+ case 2: str = "鍑哄簱閿�; break;
+ case 3: str = "鍏跺畠閿�; break;
+ }
+ return str;
+ }
+ }
+}
diff --git a/util/Settings.cs b/util/Settings.cs
index 946c47c..1a2f598 100644
--- a/util/Settings.cs
+++ b/util/Settings.cs
@@ -147,5 +147,17 @@
public static string Name(this ETask eTask) {
return Settings.TaskInfos[(int)eTask].TaskName;
}
+
+ public static Config.TaskInfo Info(this ETask eTask) {
+ return Settings.TaskInfos[(int)eTask];
+ }
+
+ public static List<string> StartAreas(this ETask eTask) {
+ return Settings.TaskInfos[(int)(eTask)].StartAreas;
+ }
+
+ public static List<string> EndAreas(this ETask eTask) {
+ return Settings.TaskInfos[((int)eTask)].EndAreas;
+ }
}
}
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 67fcff2..714a1bc 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -145,7 +145,7 @@
if (loc != null && loc.N_LOCK_STATE == 0) {
loc.N_LOCK_STATE = 2; // 璧风偣鍑哄簱閿�- loc.S_LOCK_STATE = TN_Location.GetLockStateStr(2); // 璧风偣鍑哄簱閿�+ loc.S_LOCK_STATE = GetLockStateStr(2); // 璧风偣鍑哄簱閿� loc.S_LOCK_OP = lockSource;
loc.T_MODIFY = System.DateTime.Now;
}
@@ -172,7 +172,7 @@
if (loc != null && loc.N_LOCK_STATE == 0) {
loc.N_LOCK_STATE = 1; // 缁堢偣鍑哄簱閿�- loc.S_LOCK_STATE = TN_Location.GetLockStateStr(1); // 缁堢偣鍑哄簱閿�+ loc.S_LOCK_STATE = GetLockStateStr(1); // 缁堢偣鍑哄簱閿� loc.S_LOCK_OP = lockSource;
loc.T_MODIFY = System.DateTime.Now;
}
@@ -180,22 +180,38 @@
return true;
}
- /// <summary>
- /// 鏋勫缓璐т綅鏌ヨ琛ㄨ揪寮忥細褰撳墠鏁伴噺銆佽揣鍖恒�鍚嶇О
- /// </summary>
- /// <param name="db"></param>
- /// <param name="nCurrentNum"></param>
- /// <param name="areas"></param>
- /// <param name="name"></param>
- /// <returns></returns>
- public static ISugarQueryable<TN_Location> GetLocQuery(SqlSugarClient db, int nCurrentNum = 0, List<string> areas = null, string name = null) {
- var query = db.Queryable<TN_Location>()
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.N_CURRENT_NUM == nCurrentNum);
+ private static string GetLockStateStr(int lockState) {
+ var str = "";
+ switch (lockState) {
+ case 0: str = "鏃�; break;
+ case 1: str = "鍏ュ簱閿�; break;
+ case 2: str = "鍑哄簱閿�; break;
+ case 3: str = "鍏跺畠閿�; break;
+ }
+ return str;
+ }
- if (areas != null && !areas.Any()) {
+ /// <summary>
+ /// 鏋勫缓璐т綅鏌ヨ琛ㄨ揪寮忥細褰撳墠閿佺姸鎬併�鏁伴噺銆佽揣鍖恒�鍚嶇О锛堥粯璁ょ瓫閫夊凡鍚敤璐т綅锛�+ /// </summary>
+ /// <param name="db">璋冪敤鍖哄煙鐨勬暟鎹簱Client</param>
+ /// <param name="lockState">閿佺姸鎬侊紝榛樿涓�锛屽皬浜�鏃朵笉绛涢�</param>
+ /// <param name="curNum">褰撳墠鏁伴噺锛岄粯璁や负-1锛屽皬浜�鏃朵笉绛涢�</param>
+ /// <param name="areas">鎵�湪搴撳尯鍒楄〃锛岄粯璁や负null锛屼负null鎴栦负绌烘椂涓嶇瓫閫�/param>
+ /// <param name="name">璐т綅鍚嶇О锛岄粯璁や负null锛屼负null鎴栦负绌烘椂涓嶇瓫閫�/param>
+ /// <returns></returns>
+ public static ISugarQueryable<TN_Location> Query(SqlSugarClient db, int lockState = 0, int curNum = -1, List<string> areas = null, string name = null) {
+ var query = db.Queryable<TN_Location>().Where(l => l.C_ENABLE == "Y"); // 宸插惎鐢�+
+ if (lockState >= 0) {
+ query = query.Where(l => l.N_LOCK_STATE == lockState && l.S_LOCK_STATE == GetLockStateStr(lockState));
+ }
+ if (curNum >= 0) {
+ query = query.Where(l => l.N_CURRENT_NUM == curNum);
+ }
+ if (areas != null && areas.Count == 0) {
query = query.Where(l => areas.Contains(l.S_AREA_CODE));
}
-
if (!string.IsNullOrEmpty(name)) {
query = query.Where(l => l.S_CODE == name);
}
@@ -204,6 +220,32 @@
}
/// <summary>
+ /// 鏋勫缓璐т綅鏌ヨ鐨勮姹備俊鎭�+ /// </summary>
+ /// <param name="lockState"></param>
+ /// <param name="curNum"></param>
+ /// <param name="areas"></param>
+ /// <returns></returns>
+ public static string Require(int lockState = 0, int curNum = -1, List<string> areas = null) {
+ var res = "璐т綅瑕佹眰锛�;
+ var index = 1;
+ if (lockState >= 0) {
+ res += $"({index})閿佺姸鎬�'{GetLockStateStr(lockState)}';";
+ index++;
+ }
+ if (curNum >= 0) {
+ res += $"({index})褰撳墠瀹瑰櫒鏁伴噺={curNum};";
+ index++;
+ }
+ if (areas != null && areas.Count != 0) {
+ res += $"({index})鎵�湪搴撳尯=['{string.Join("','", areas)}'];";
+ index++;
+ }
+
+ return res;
+ }
+
+ /// <summary>
/// 鍙栬揣瀹岃В閿佽捣鐐癸紝鍗歌揣瀹岃В閿佺粓鐐癸紝鍙楠岄攣鐨勬潵婧愶紝涔熷彲浠ヤ笉鏍￠獙
/// </summary>
/// <param name="loc"></param>
--
Gitblit v1.9.1