From 3bdd686d50ae8c999924ac64101a5dbe4e271c71 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 04 七月 2025 17:27:19 +0800
Subject: [PATCH] 优化日志信息，删除冗余的工具类代码
---
wms/LocationHelper.cs | 119 -----
core/Monitor.cs | 26
/dev/null | 141 ------
api/ErpController.cs | 7
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/ae79d810-1f3d-43c5-9dc6-b3aebb5cf931.vsidx | 0
util/LogHelper.cs | 6
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f7a50a7a-1b25-4250-b1c5-b473ed7bc264.vsidx | 0
api/ApiModel.cs | 10
core/WCSCore.cs | 12
HH.WCS.Mobox3.DSZSH.csproj | 2
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/32a96041-8c39-4fb6-a3b7-5622cb274494.vsidx | 0
wms/WCSHelper.cs | 144 +-----
api/AgvController.cs | 4
api/ApiHelper.cs | 747 +++++++++++------------------------
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c0bdc83d-37b9-402c-9d38-5f67c7e45fb1.vsidx | 0
api/MoboxController.cs | 27
api/WMSController.cs | 6
models/TN_Task_Action.cs | 2
18 files changed, 319 insertions(+), 934 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/138ad012-fc4b-4ce6-afd4-7057b1c2cecf.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/138ad012-fc4b-4ce6-afd4-7057b1c2cecf.vsidx
deleted file mode 100644
index 992c63d..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/138ad012-fc4b-4ce6-afd4-7057b1c2cecf.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/32a96041-8c39-4fb6-a3b7-5622cb274494.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/32a96041-8c39-4fb6-a3b7-5622cb274494.vsidx
new file mode 100644
index 0000000..a1b0d46
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/32a96041-8c39-4fb6-a3b7-5622cb274494.vsidx
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
deleted file mode 100644
index 9f369ae..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/7a460209-dbc4-48fb-b898-02f23d93e759.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/ae79d810-1f3d-43c5-9dc6-b3aebb5cf931.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/ae79d810-1f3d-43c5-9dc6-b3aebb5cf931.vsidx
new file mode 100644
index 0000000..30b52bf
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/ae79d810-1f3d-43c5-9dc6-b3aebb5cf931.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c0bdc83d-37b9-402c-9d38-5f67c7e45fb1.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c0bdc83d-37b9-402c-9d38-5f67c7e45fb1.vsidx
new file mode 100644
index 0000000..531541b
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c0bdc83d-37b9-402c-9d38-5f67c7e45fb1.vsidx
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
deleted file mode 100644
index a176a11..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e75c296c-c8ea-460c-b254-e5337f896e37.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f7a50a7a-1b25-4250-b1c5-b473ed7bc264.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f7a50a7a-1b25-4250-b1c5-b473ed7bc264.vsidx
new file mode 100644
index 0000000..07d5eab
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f7a50a7a-1b25-4250-b1c5-b473ed7bc264.vsidx
Binary files differ
diff --git a/HH.WCS.Mobox3.DSZSH.csproj b/HH.WCS.Mobox3.DSZSH.csproj
index 2445f1b..35781fe 100644
--- a/HH.WCS.Mobox3.DSZSH.csproj
+++ b/HH.WCS.Mobox3.DSZSH.csproj
@@ -244,7 +244,6 @@
<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" />
@@ -271,7 +270,6 @@
<Compile Include="api\WMSController.cs" />
<Compile Include="dispatch\HostToAGV.cs" />
<Compile Include="util\LogHelper.cs" />
- <Compile Include="wms\ContainerHelper.cs" />
<Compile Include="wms\LocationHelper.cs" />
<Compile Include="wms\SYSHelper.cs" />
<Compile Include="Program.cs" />
diff --git a/api/AgvController.cs b/api/AgvController.cs
index 77cced6..1a6e3f4 100644
--- a/api/AgvController.cs
+++ b/api/AgvController.cs
@@ -29,7 +29,7 @@
[HttpPost]
[Route("AGVCallbackState")]
public ReturnResult AGVCallbackState(AgvTaskState model){
- LogHelper.Info("NDC HostToAGV 浠诲姟鐘舵�鍥炴姤锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
+ LogHelper.InfoHostToAGV("NDC浠诲姟鐘舵�鍥炴姤", model);
return WCSCore.OperateAgvTaskStatus(model);
}
@@ -41,7 +41,7 @@
[HttpPost]
[Route("SafetyInteraction")]
public ReturnResult SafetyInteraction(SafetyInteractionInfo model) {
- LogHelper.Info("AGV涓庝骇绾胯繘琛屽畨鍏ㄤ氦浜掞細" + JsonConvert.SerializeObject(model), "HosttoagvTask");
+ LogHelper.InfoHostToAGV("AGV涓庝骇绾胯繘琛屽畨鍏ㄤ氦浜�, model);
return WCSCore.SafetyInteraction(model);
}
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 3675e5e..42ff9c1 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -18,12 +18,7 @@
/// <summary>
/// 婊＄涓嬬嚎鍏ュ簱
/// </summary>
- /// <remarks>
- /// 浜哄伐锛氫骇绾�=>婊＄鎿嶄綔鍖�br/>
- /// PDA锛氳皟鐢ㄦ帴鍙ｏ紝鍛煎彨AGV<br/>
- /// AGV锛氭弧绠辨搷浣滃尯==鎼繍==>璐ф灦鍖猴紙涓嶆寚瀹氱粓鐐硅揣鍖猴級
- /// </remarks>
- /// <param name="model">鍖呭惈锛氱墿鏂欎俊鎭�璧风偣璐т綅</param>
+ /// <param name="model"></param>
/// <returns></returns>
public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
var db = new SqlHelper<object>().GetInstance();
@@ -36,107 +31,98 @@
return NewSimpleResult(400, preLog + $"鐗╂枡鏁伴噺'{model.Num}'涓嶅悎娉曪紒瑕佹眰锛氱墿鏂欐暟閲忥紴0");
}
- // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹�+ // 妫�煡璐у搧瀹瑰櫒琛細鏄惁宸茬粡瀛樺湪璐存爣鏈轰紶閫掔殑寰呭叆搴撶墿鏂欎俊鎭�+ // TODO锛氭暟閲忋�瑙勬牸鏄惁涔熷弬涓庢瘮瀵癸紵
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) {
- return NewSimpleResult(1, preLog + $"娌℃湁鍦ㄨ揣鍝佹槑缁嗚〃涓壘鍒癧鐗╂枡缂栫爜='{model.ItemCode}',鎵规鍙�'{model.BatchNo}']鐨勭墿鏂欙紒璇锋鏌ワ細PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭槸鍚︿竴鑷达紒瑕佹眰锛氱墿鏂欑姸鎬�'寰呮'锛�);
+ return NewSimpleResult(1, preLog + $"娌℃湁鍦╗璐у搧鏄庣粏琛╙涓壘鍒癧鐗╂枡缂栫爜='{model.ItemCode}',鎵规鍙�'{model.BatchNo}']鐨勭墿鏂欙紒璇锋鏌ワ細PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭槸鍚︿竴鑷达紒瑕佹眰锛氱墿鏂欑姸鎬�'寰呮'");
}
- var startLoc = LocationHelper.Query(db, 0, 0, taskInfo.StartAreas, model.StartLoc).First();
+ // 鏌ヨ璧风偣璐т綅锛氭暟閲�0
+ var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
if (startLoc == null) {
- return NewSimpleResult(2, LogBuilder.StartLocNotFound(0, 0, taskInfo.StartAreas, model.StartLoc, preLog));
+ return NewSimpleResult(2, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛佽姹傦細閿佺姸鎬�'鏃�锛屽綋鍓嶅鍣ㄦ暟閲�0锛屾墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(taskInfo.StartAreas)}");
}
- startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�
+ // 缁戝畾璐т綅瀹瑰櫒锛岃捣鐐硅揣浣嶅綋鍓嶆暟閲�1
+ var locCntrRel = new TN_Loc_Container { S_LOC_CODE = startLoc.S_CODE, S_CNTR_CODE = cgDetail.S_CNTR_CODE, S_CNTR_TYPE = cntrType,};
+ 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 = cntrType,
- };
-
+ // 鏌ヨ缁堢偣璐т綅
// Order锛氭寜璐т綅灞傛暟锛屼粠灏忓埌澶ф帓鍒�- var endLoc = LocationHelper.Query(db, 0, 0, taskInfo.EndAreas).OrderBy(l => new { l.N_LAYER }).First();
+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER }).First();
if (endLoc == null) {
- return NewSimpleResult(3, LogBuilder.EndLocNotFound(0, 0, taskInfo.EndAreas, pre: preLog));
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛屽綋鍓嶅鍣ㄦ暟閲�0锛屾墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(taskInfo.EndAreas)}");
}
- LocationHelper.LockStartLoc(ref startLoc);
- LocationHelper.LockEndLoc(ref endLoc);
-
- var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙�- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
+ // 璧风偣缁堢偣涓婇攣锛屽垱寤轰换鍔�+ WCSHelper.LockStartLoc(ref startLoc);
+ WCSHelper.LockEndLoc(ref endLoc);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500, preLog + $"鎻掑叆[璐т綅瀹瑰櫒缁戝畾琛╙澶辫触锛� + JsonConvert.SerializeObject(locCntrRel));
+ 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();
- return NewSimpleResult(500, preLog + $"鏇存柊璧风偣璐т綅'{startLoc.S_CODE}'閿佺姸鎬佸け璐ワ紒");
+ 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();
- return NewSimpleResult(500, preLog + $"鏇存柊缁堢偣璐т綅'{endLoc.S_CODE}'閿佺姸鎬佸け璐ワ紒");
+ return NewSimpleResult(500, preLog + $"鏇存柊[缁堢偣璐т綅閿佺姸鎬乚澶辫触锛佺粓鐐�'{endLoc.S_CODE}'锛岄攣鐘舵�=>'鍏ュ簱閿�");
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{taskInfo.TaskName}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}");
+ return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
tran.CommitTran();
- return NewSimpleResult(0, LogBuilder.CreateTaskSuccess(task, preLog));
+ return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
}
catch (Exception ex) {
- LogHelper.InfoEx(ex);
- return NewSimpleResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}", false);
+ return NewSimpleResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
}
/// <summary>
/// 绌烘墭鍏ュ簱
/// </summary>
- /// <remarks>
- /// 浜哄伐灏嗙┖鎵樼洏閫氳繃鎺ラ┏浣嶅叆搴擄紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
- /// 鐢变簬绌烘墭鐩樹竴鑸槸鍑哄簱鍗歌揣鍚庤幏寰楋紝鑰屽嚭搴撴椂娌℃湁鎵嬪姩鍗歌揣鐨勯�杈戯紝鎵�互闇�鍦ㄥ叆搴撶殑鏃跺�鍐嶅垹闄ゆ棫缁戝畾淇℃伅
- /// </remarks>
- /// <param name="model">鍖呭惈锛氳捣鐐硅揣浣嶃�瀹瑰櫒鍙枫�瀹瑰櫒绫诲瀷銆佺粓鐐硅揣鍖�/param>
+ /// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
var taskInfo = ETask.K绌烘墭鍏ュ簱.Info();
- const string pre = "API锛氱┖鎵樺叆搴擄細";
+ const string preLog = "API锛氱┖鎵樺叆搴擄細";
const string cntrType = "鎵樼洏";
try {
- var startLoc = LocationHelper.Query(db, 0, 0, taskInfo.StartAreas, model.StartLoc).First();
+ // 鏌ヨ璧风偣璐т綅锛氭暟閲�0
+ var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
if (startLoc == null) {
- return NewSimpleResult(1, LogBuilder.StartLocNotFound(0, 0, taskInfo.StartAreas, model.StartLoc, pre));
+ return NewSimpleResult(1, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛佽姹傦細閿佺姸鎬�'鏃�锛涘綋鍓嶅鍣ㄦ暟閲�0锛涙墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(taskInfo.StartAreas)}");
}
- // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+ // 鏌ヨ瀹瑰櫒琛細瀹瑰櫒绫诲瀷瀛楁
var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
if (cntr == null) {
- return NewSimpleResult(2, pre + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�);
+ return NewSimpleResult(2, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�);
}
if (cntr.S_TYPE != cntrType) {
- return NewSimpleResult(3, pre + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�);
+ return NewSimpleResult(3, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�);
}
- // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�- // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
+ // 绌虹鍏ュ簱鏃讹紝濡傛灉瀛樺湪鏃х殑缁戝畾鏁版嵁锛屽垹闄� 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();
-
TN_Location locOld = null;
- if (locCntrRelOld != null) { // 濡傛灉闇�瑙ｇ粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
+ if (locCntrRelOld != null) {
locOld = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
if (locOld != null) {
locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
@@ -144,106 +130,98 @@
}
}
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾锛�+ // 缁戝畾璐т綅瀹瑰櫒锛岃捣鐐硅揣浣嶅綋鍓嶆暟閲�1
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; // 缁戝畾鍚�+ startLoc.N_CURRENT_NUM = 1;
-
- // 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();
+ // 鏌ヨ缁堢偣璐т綅
+ // Order锛氬眰鏁颁粠浣庡埌楂樸�琛屻�鍒�+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => 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) {
- return NewSimpleResult(4, pre + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛�1)鏈笂閿�(2)鏁伴噺=0;(3)璐у尯灞炰簬['{string.Join("','", taskInfo.EndAreas)}'];");
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛涘綋鍓嶅鍣ㄦ暟閲�0锛涙墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(taskInfo.EndAreas)}");
}
- LocationHelper.LockStartLoc(ref startLoc);
- LocationHelper.LockEndLoc(ref endLoc);
- var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙�- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
+ // 璧风偣缁堢偣涓婇攣锛屽垱寤轰换鍔�+ WCSHelper.LockStartLoc(ref startLoc);
+ WCSHelper.LockEndLoc(ref endLoc);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);
using (var tran = db.Ado.UseTran()) {
if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500, pre + $"鍒犻櫎[鏃х墿鏂欎俊鎭痌澶辫触锛� + JsonConvert.SerializeObject(cgDetailOld));
+ return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃х墿鏂欎俊鎭痌澶辫触锛佹暟鎹細{JsonConvert.SerializeObject(cgDetailOld)}");
}
if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500, pre + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触锛� + JsonConvert.SerializeObject(locCntrRelOld));
+ return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触锛佹暟鎹細{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));
+ return NewSimpleResult(500, preLog + $"鏇存柊[鏃ц揣浣峾褰撳墠瀹瑰櫒鏁伴噺]澶辫触锛佽揣浣�'{locOld.S_CODE}'锛屾暟閲�>{locOld.N_CURRENT_NUM}");
}
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500, pre + $"鎻掑叆[璐т綅瀹瑰櫒鍏崇郴]澶辫触锛� + JsonConvert.SerializeObject(locCntrRel));
+ 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();
- return NewSimpleResult(500, pre + $"鏇存柊璧风偣璐т綅'{startLoc.S_CODE}'閿佺姸鎬佸け璐ワ紒");
+ 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();
- return NewSimpleResult(500, pre + $"鏇存柊缁堢偣璐т綅'{endLoc.S_CODE}'閿佺姸鎬佸け璐ワ紒");
+ return NewSimpleResult(500, preLog + $"鏇存柊[缁堢偣璐т綅閿佺姸鎬乚澶辫触锛佺粓鐐�'{endLoc.S_CODE}'锛岄攣鐘舵�=>'鍏ュ簱閿�");
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500, pre + $"鐢熸垚浠诲姟'{taskInfo.TaskName}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}");
+ return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
tran.CommitTran();
- return NewSimpleResult(0, pre + $"鐢熸垚浠诲姟'{taskInfo.TaskName}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}");
+ return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
}
catch (Exception ex) {
- LogHelper.InfoEx(ex);
- return NewSimpleResult(-1, pre + $"鍙戠敓浜嗗紓甯革細{ex.Message}", false);
+ return NewSimpleResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
}
/// <summary>
/// 绌虹鍏ュ簱
/// </summary>
- /// <remarks>
- /// 浜哄伐锛氱┖绠�=鎼繍==>鍏ュ簱鎺ラ┏浣嶏紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
- /// 鐢变簬绌虹涓�埇鏄嚭搴撳嵏璐у悗鑾峰緱锛岃�鍑哄簱鏃舵病鏈夋墜鍔ㄥ嵏璐х殑閫昏緫锛屾墍浠ラ渶瑕佸湪鍏ュ簱鐨勬椂鍊欏啀鍒犻櫎鏃х粦瀹氫俊鎭�- /// </remarks>
/// <returns></returns>
public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
var taskInfo = ETask.K绌虹鍏ュ簱.Info();
- const string pre = "API锛氱┖绠卞叆搴擄細";
+ const string preLog = "API锛氱┖绠卞叆搴擄細";
const string cntrType = "濂借繍绠�;
try {
- 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();
+ // 鏌ヨ璧风偣璐т綅锛氭暟閲�0
+ var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
if (startLoc == null) {
- return NewSimpleResult(1, pre + $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛佽姹傦細(1)鏈笂閿�(2)鏁伴噺=0;(3)璐у尯灞炰簬['{string.Join("','", taskInfo.StartAreas)}'];");
+ return NewSimpleResult(1, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛佽姹傦細閿佺姸鎬�'鏃�锛涘綋鍓嶅鍣ㄦ暟閲�0锛涙墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(taskInfo.StartAreas)}");
}
- // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+ // 鏌ヨ瀹瑰櫒琛細瀹瑰櫒绫诲瀷瀛楁
var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
if (cntr == null) {
- return NewSimpleResult(2, pre + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�);
+ return NewSimpleResult(2, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�);
}
if (cntr.S_TYPE != cntrType) {
- return NewSimpleResult(3, pre + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�);
+ return NewSimpleResult(3, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�);
}
- // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�- // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
+ // 绌虹鍏ュ簱鏃讹紝濡傛灉瀛樺湪鏃х殑缁戝畾鏁版嵁锛屽垹闄� 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();
-
TN_Location locOld = null;
- if (locCntrRelOld != null) { // 濡傛灉闇�瑙ｇ粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
+ if (locCntrRelOld != null) {
locOld = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
if (locOld != null) {
locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
@@ -251,100 +229,85 @@
}
}
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾锛�+ // 缁戝畾璐т綅瀹瑰櫒锛岃捣鐐硅揣浣嶅綋鍓嶆暟閲�1
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; // 缁戝畾鍚�+ startLoc.N_CURRENT_NUM = 1;
-
- // 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();
+ // 鏌ヨ缁堢偣璐т綅
+ // Order锛氬眰鏁颁粠浣庡埌楂樸�琛屻�鍒�+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => 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) {
- return NewSimpleResult(4, pre + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛�1)鏈笂閿�(2)鏁伴噺=0;(3)璐у尯灞炰簬['{string.Join("','", taskInfo.EndAreas)}'];");
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛涘綋鍓嶅鍣ㄦ暟閲�0锛涙墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(taskInfo.EndAreas)}");
}
- LocationHelper.LockStartLoc(ref startLoc);
- LocationHelper.LockEndLoc(ref endLoc);
- var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙�- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
+ WCSHelper.LockStartLoc(ref startLoc);
+ WCSHelper.LockEndLoc(ref endLoc);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);
using (var tran = db.Ado.UseTran()) {
if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500, pre + $"鍒犻櫎[鏃х墿鏂欎俊鎭痌澶辫触锛� + JsonConvert.SerializeObject(cgDetailOld));
+ return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃х墿鏂欎俊鎭痌澶辫触锛佹暟鎹細{JsonConvert.SerializeObject(cgDetailOld)}");
}
if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500, pre + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触锛� + JsonConvert.SerializeObject(locCntrRelOld));
+ return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触锛� + 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));
+ return NewSimpleResult(500, preLog + $"鏇存柊[鏃ц揣浣峾瀹瑰櫒鏁伴噺]澶辫触锛� + JsonConvert.SerializeObject(locOld));
}
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500, pre + $"鎻掑叆[璐т綅瀹瑰櫒鍏崇郴]澶辫触锛� + JsonConvert.SerializeObject(locCntrRel));
+ 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();
- return NewSimpleResult(500, pre + $"鏇存柊璧风偣璐т綅'{startLoc.S_CODE}'閿佺姸鎬佸け璐ワ紒");
+ 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();
- return NewSimpleResult(500, pre + $"鏇存柊缁堢偣璐т綅'{endLoc.S_CODE}'閿佺姸鎬佸け璐ワ紒");
+ return NewSimpleResult(500, preLog + $"鏇存柊[缁堢偣璐т綅閿佺姸鎬乚澶辫触锛佺粓鐐�'{endLoc.S_CODE}'锛岄攣鐘舵�=>'鍏ュ簱閿�");
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500, pre + $"鐢熸垚浠诲姟'{taskInfo.TaskName}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}");
+ return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
tran.CommitTran();
- return NewSimpleResult(0, pre + $"鐢熸垚浠诲姟'{taskInfo.TaskName}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}");
+ return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
}
catch (Exception ex) {
- LogHelper.InfoEx(ex);
- return NewSimpleResult(-1, pre + $"鍙戠敓浜嗗紓甯革細{ex.Message}", false);
+ return NewSimpleResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
}
/// <summary>
/// 绌烘墭涓婄嚎鍑哄簱
/// </summary>
- /// <remarks>
- /// 浜哄伐鏍规嵁褰撳墠鐢熶骇鐗╂枡鎵�渶鐨勫鍣ㄧ被鍨嬶紝鍛煎彨AGV浠庣┖瀹瑰櫒璐ф灦涓彨涓�釜绗﹀悎瑕佹眰鐨勬墭鐩�- /// </remarks>
- /// <param name="model">鍖呭惈锛氬鍣ㄥ彿銆佺墿鏂欑紪鐮�/param>
+ /// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo 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 preLog = "API锛氱┖鎵樹笂绾垮嚭搴擄細";
const string cntrType = "鎵樼洏";
try {
- var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == model.CntId)
- .First();
-
+ // 鏌ヨ瀹瑰櫒琛細瀹瑰櫒绫诲瀷瀛楁
+ var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntId).First();
if (cntr == null) {
- info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
- LogHelper.Info(info);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(1, $"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�);
}
- if (cntr.S_TYPE != cntrType) { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
- info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�{cntrType}'锛�;
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ if (cntr.S_TYPE != cntrType) {
+ return NewSimpleResult(2, preLog + $"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�{cntrType}'锛�);
}
var needUpdateContainer = false;
@@ -353,94 +316,57 @@
// 寰呭畾锛氬悗闈㈠彲鑳戒細鏇存敼娴佺▼锛屾垨鑰呯敤鍏朵粬淇℃伅锛堝鐗╂枡绫诲瀷/瑙勬牸锛変綔涓哄鍣ㄧ殑瑙勬牸
needUpdateContainer = true;
- info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓�瑙勬牸锛堢墿鏂欑紪鐮侊級涓虹┖锛屽皢鐗╂枡缂栫爜'{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�;
- LogHelper.Info(info);
-
cntr.S_SPEC = model.ItemCode;
+ LogHelper.Info($"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓璠瑙勬牸(鐗╂枡缂栫爜)]涓虹┖锛屽皢鐗╂枡缂栫爜'{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�);
}
else if (cntr.S_SPEC != model.ItemCode) {
- info = $"瀹瑰櫒'{model.CntId}'宸茬粡涓庣墿鏂欑被鍨�{cntr.S_SPEC}'缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂�{model.ItemCode}'";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(3, $"瀹瑰櫒'{model.CntId}'宸茬粡涓庣墿鏂欑被鍨�{cntr.S_SPEC}'缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂�{model.ItemCode}'锛�);
}
- var startLoc = db.Queryable<TN_Location>()
- .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- .Where((l, c) => c.S_CNTR_CODE == model.CntId)
- .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 == 1)
- .First();
-
+ var startLoc = 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").Where((l, c) => taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == cntrType).First();
if (startLoc == null) {
- info = $"鎵句笉鍒伴�鐢ㄤ簬{model.ItemCode}鐗╂枡銆佷笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛涘綋鍓嶅鍣ㄦ暟閲�1锛涙墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(taskInfo.StartAreas)}锛岀粦瀹氬鍣ㄧ紪鐮�'{model.CntId}'锛岀粦瀹氬鍣ㄧ被鍨�'{cntrType}'");
}
- 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)
- .First();
-
+ // 鏌ヨ缁堢偣璐т綅
+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- info = $"鎵句笉鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(5, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛涘綋鍓嶅鍣ㄦ暟閲�0锛涙墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(taskInfo.EndAreas)}");
}
- var cntId = model.CntId;
-
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ WCSHelper.LockStartLoc(ref startLoc);
+ WCSHelper.LockEndLoc(ref endLoc);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, model.CntId, taskInfo.TaskName);
cntr.S_SOURCE = task.S_CODE; // 鐢ㄤ换鍔″彿浣滀负瀹瑰櫒鏇存柊鐨勪緷鎹� cntr.T_MODIFY = DateTime.Now;
using (var tran = db.Ado.UseTran()) {
- if (needUpdateContainer) {
- if (db.Updateable<TN_Container>(cntr)
- .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鏇存柊琛ㄥ鍣ㄨ〃澶辫触锛� + JsonConvert.SerializeObject(cntr);
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
+ if (needUpdateContainer && db.Updateable<TN_Container>(cntr).UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
+ return NewSimpleResult(500, preLog + $"鏇存柊[瀹瑰櫒琛╙澶辫触锛佹暟鎹細{JsonConvert.SerializeObject(cntr)}");
}
- 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);
- 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) {
+ 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 + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(-1, info);
+ return NewSimpleResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
}
@@ -451,12 +377,8 @@
/// <returns></returns>
public static SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo 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 preLog = "API锛氱┖绠变笂绾垮嚭搴擄細";
const string cntrType = "濂借繍绠�;
try {
@@ -465,90 +387,49 @@
.First();
if (cntr == null) {
- info = $"瀹瑰櫒'{model.CntId}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
- LogHelper.Info(info);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(1, preLog + $"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�);
}
if (cntr.S_TYPE != cntrType) {
- info = $"瀹瑰櫒'{model.CntId}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓殑绫诲瀷={cntr.S_TYPE}锛屼笉鏄�{cntrType}'锛�;
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(2, preLog + $"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷='{cntr.S_TYPE}'锛屼笉鏄�{cntrType}'锛�);
}
- var startLoc = db.Queryable<TN_Location>()
- .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- .Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == "濂借繍绠�)
- .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 == 1)
- .First();
-
+ var startLoc = 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").Where((l, c) => taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == cntrType).First();
if (startLoc == null) {
- info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.CntId}鐨勭┖濂借繍绠辩殑銆愯捣鐐硅揣浣嶃�锛屾垨涓嶆弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=1";
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(2, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛屽綋鍓嶅鍣ㄦ暟閲�1锛屾墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(taskInfo.EndAreas)}锛岀粦瀹氬鍣ㄧ紪鐮�'{model.CntId}'锛岀粦瀹氬鍣ㄧ被鍨�'{cntrType}'");
}
- 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)
- .First();
-
+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛屽綋鍓嶅鍣ㄦ暟閲�0锛屾墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(taskInfo.EndAreas)}");
}
- var cntId = model.CntId;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ WCSHelper.LockStartLoc(ref startLoc);
+ WCSHelper.LockEndLoc(ref endLoc);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, model.CntId, taskInfo.TaskName);
using (var tran = db.Ado.UseTran()) {
- 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);
- 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) {
+ 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 + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(-1, info);
+ return NewSimpleResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
}
@@ -559,12 +440,10 @@
/// <returns></returns>
public static SimpleResult QualifiedBack(QualifiedBackInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var preLog = "API锛氭娊妫�悎鏍煎洖搴�;
var taskInfo = Settings.GetTaskInfo(ETask.C鎶芥鍚堟牸鍥炲簱);
var taskName = taskInfo.TaskName;
- var startAreas = taskInfo.StartAreas;
- var endAreas = taskInfo.EndAreas;
try {
var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -572,9 +451,9 @@
.First();
if (cgDetail == null) {
- info = "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡锛� + JsonConvert.SerializeObject(model);
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ preLog = "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡锛� + JsonConvert.SerializeObject(model);
+ LogHelper.Info(preLog);
+ return NewSimpleResult(2, preLog);
}
var locCntrRel = db.Queryable<TN_Loc_Container>()
@@ -582,44 +461,29 @@
.First();
if (locCntrRel == null) {
- info = $"瀹瑰櫒{model.CntrCode}鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ preLog = $"瀹瑰櫒{model.CntrCode}鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
+ LogHelper.Info(preLog);
+ return NewSimpleResult(3, preLog);
}
- var startLoc = db.Queryable<TN_Location>()
+ var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+
.Where(l => l.N_CURRENT_NUM == 1)
- .Where(l => startAreas.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
- info = $"娌℃湁鎵惧埌瀹瑰櫒{model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ preLog = $"娌℃湁鎵惧埌瀹瑰櫒{model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
+ LogHelper.Info(preLog);
+ return NewSimpleResult(4, preLog);
}
- TN_Location endLoc = null;
- if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
- endAreas = taskInfo.EndAreas_Pallet;
- 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).First();
- }
- else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�) {
- endAreas = taskInfo.EndAreas_Goodpack;
- 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).First();
- }
- else {
- return NewSimpleResult(-1, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
- }
-
+ var endAreas = locCntrRel.S_CNTR_CODE == "鎵樼洏" ? taskInfo.EndAreas_Pallet : taskInfo.EndAreas_Goodpack;
+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => endAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- info = $"娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝鎴栦笉婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲忎负 0";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛屽綋鍓嶅鍣ㄦ暟閲�0锛屾墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(endAreas)}");
}
cgDetail.N_ITEM_STATE = 0;
@@ -629,48 +493,38 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ WCSHelper.LockStartLoc(ref startLoc);
+ WCSHelper.LockEndLoc(ref endLoc);
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'鍚堟牸'澶辫触";
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ preLog = $"鐢熸垚'{taskInfo.TaskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'鍚堟牸'澶辫触";
+ LogHelper.Info(preLog);
+ return NewSimpleResult(500, preLog);
}
- 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);
- 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) {
+ 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 + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(-1, info);
+ return NewSimpleResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
}
@@ -681,124 +535,71 @@
/// <returns></returns>
public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var info = "";
-
- const ETask eTask = ETask.C鎶芥涓嶅悎鏍肩Щ搴�
- var taskName = Settings.GetTaskInfo(eTask).TaskName;
- var startAreas = Settings.GetTaskInfo(eTask).StartAreas;
- var endAreas = Settings.GetTaskInfo(eTask).EndAreas;
+ var taskInfo = ETask.C鎶芥涓嶅悎鏍肩Щ搴�Info();
+ const string preLog = "API锛氭娊妫�笉鍚堟牸绉诲簱锛�;
try {
- if (!startAreas.Contains(model.EndArea)) {
- info = $"缁堢偣搴撳尯'{model.EndArea}'涓嶆弧瓒虫潯浠讹紒闇�锛氳揣鍖哄睘浜嶽{string.Join(", ", startAreas)}]";
- LogHelper.Info(info);
- return NewSimpleResult(1, info);
+ if (!taskInfo.StartAreas.Contains(model.EndArea)) {
+ return NewSimpleResult(1, $"缁堢偣搴撳尯'{model.EndArea}'涓嶆弧瓒虫潯浠讹紒闇�锛氳揣鍖�{JsonConvert.SerializeObject(model.EndArea)}");
}
var cgDetail = db.Queryable<TN_CG_Detail>()
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode)
- .First();
-
+ .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode).First();
if (cgDetail == null) {
- info = $"娌℃湁鍦ㄧ墿鏂欐槑缁嗚〃涓紝鎵惧埌鐗╂枡缂栫爜={model.ItemCode}銆佸鍣ㄧ紪鐮�{model.CntrCode}鐨勭墿鏂�;
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(2, $"娌℃湁鍦╗鐗╂枡鏄庣粏琛╙涓壘鍒扮墿鏂欙紒瑕佹眰锛氱墿鏂欑紪鐮�'{model.ItemCode}'锛屽鍣ㄧ紪鐮�'{model.CntrCode}'");
}
- var locCntrRel = db.Queryable<TN_Loc_Container>()
- .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
- .First();
-
+ var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE).First();
if (locCntrRel == null) {
- info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(3, $"鍦╗璐т綅瀹瑰櫒鍏崇郴琛╙涓病鏈夋壘鍒板鍣�{model.CntrCode}'锛�);
}
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
- .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 == 1)
- .First();
-
+ // 鏌ヨ璧风偣璐т綅锛氭暟閲�1
+ var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y").Where(l => l.S_CODE == locCntrRel.S_LOC_CODE && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).First();
if (startLoc == null) {
- info = $"璧风偣璐т綅' {locCntrRel.S_LOC_CODE} '涓嶆弧瓒虫潯浠讹紒闇�锛氳揣鍖哄睘浜嶽 {string.Join(", ", startAreas)} ]";
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(1, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{locCntrRel.S_LOC_CODE}'锛佽姹傦細閿佺姸鎬�'鏃�锛涘綋鍓嶅鍣ㄦ暟閲�1锛涙墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(taskInfo.StartAreas)}");
}
- var endLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_AREA_CODE == model.EndArea)
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 0)
- .First();
-
+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.S_AREA_CODE == model.EndArea && l.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- info = $"鍦ㄧ粓鐐硅揣鍖�{model.EndArea}'涓紝娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛屽綋鍓嶅鍣ㄦ暟閲�0锛屾墍鍦ㄥ簱鍖�'{model.EndArea}'");
}
cgDetail.N_ITEM_STATE = 2;
cgDetail.S_ITEM_STATE = "涓嶅悎鏍�;
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ WCSHelper.LockStartLoc(ref startLoc);
+ WCSHelper.LockEndLoc(ref endLoc);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);
using (var tran = db.Ado.UseTran()) {
- if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
- new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
+ if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'涓嶅悎鏍�澶辫触";
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, preLog + $"鏇存柊[璐у搧鏄庣粏琛╙澶辫触锛佺墿鏂欏彿='{cgDetail}'锛岀墿鏂欑姸鎬�>'{cgDetail.S_ITEM_STATE}'");
}
- 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);
- 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) {
+ 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 + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(-1, info);
+ return NewSimpleResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
}
@@ -811,123 +612,77 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskInfo = Settings.GetTaskInfo(ETask.W灏炬枡鍥炲簱);
- var taskName = taskInfo.TaskName;
- var startAreas = taskInfo.StartAreas;
- List<string> endAreas = null;
+ var taskInfo = ETask.W灏炬枡鍥炲簱.Info();
+ const string preLog = "API锛氬熬鏂欏洖搴�;
try {
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == model.StartLoc)
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 1)
- .First();
-
+ var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.S_CODE == model.StartLoc && l.N_CURRENT_NUM == 1).First();
if (startLoc == null) {
- info = $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�鏈夎揣鐗�;
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(2, $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛佽姹傦細閿佺姸鎬�'鏃�锛涘綋鍓嶅鍣ㄦ暟閲�1");
}
- var locCntrRel = db.Queryable<TN_Loc_Container>()
- .Where(c => c.S_LOC_CODE == model.StartLoc)
- .First();
-
+ var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_LOC_CODE == model.StartLoc).First();
if (locCntrRel == null) {
info = $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}鎵�粦瀹氱殑瀹瑰櫒";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
- TN_Location endLoc = null;
- if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
- endAreas = taskInfo.EndAreas_Pallet;
- 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)
- .First();
- }
- else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�){
- endAreas = taskInfo.EndAreas_Goodpack;
- 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)
- .First();
- }
-
+ var endAreas = locCntrRel.S_CNTR_CODE == "鎵樼洏" ? taskInfo.EndAreas_Pallet : taskInfo.EndAreas_Goodpack;
+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => endAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒瑕佹眰锛氶攣鐘舵�='鏃�锛屽綋鍓嶅鍣ㄦ暟閲�0锛屾墍鍦ㄥ簱鍖�{JsonConvert.SerializeObject(endAreas)}");
}
var cntId = locCntrRel.S_CNTR_CODE;
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ WCSHelper.LockStartLoc(ref startLoc);
+ WCSHelper.LockEndLoc(ref endLoc);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
using (var tran = db.Ado.UseTran()) {
- 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.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
+ return NewSimpleResult(500, preLog + $"鎻掑叆[瀹瑰櫒璐т綅缁戝畾琛╙澶辫触锛佹暟鎹細{JsonConvert.SerializeObject(locCntrRel)}");
}
- 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>(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}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.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();
+ 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 + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(0, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛锛佷换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={task.S_CNTR_CODE}锛岃捣鐐�{task.S_START_LOC}锛岀粓鐐�{task.S_END_LOC}");
}
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(-1, info);
+ return NewSimpleResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
}
/// <summary>
/// 鎴愬搧鑳跺嚭搴�PDA) 寰呭畾锛屾殏鏃朵笉闇�姝ゅ姛鑳� /// </summary>
- /// <remarks>
- /// WMS鎻愪緵鍑哄簱鐨勭墿鏂欑被鍨嬩笌鏁伴噺锛岃皟鐢ㄦ帴鍙ｇ敱WCS鐢熸垚鍏蜂綋鐨勫嚭搴撲换鍔★紝鐒跺悗WCS鍚庡彴杞澶勭悊
- /// </remarks>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskInfo = Settings.GetTaskInfo(ETask.C鎴愬搧鑳跺嚭搴�;
- var taskName = taskInfo.TaskName;
+ var taskInfo = ETask.C鎴愬搧鑳跺嚭搴�Info();
+ const string preLog = "API锛氭垚鍝佽兌鍑哄簱锛�;
try {
var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
@@ -984,9 +739,7 @@
return NewSimpleResult(0, info);
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
}
@@ -1149,28 +902,21 @@
/// <returns></returns>
public static MesResult CgInfoSync(CgInfoSyncInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ const string preLog = "API锛氬崥瀹炰笅鍙戠墿鏂欎俊鎭細";
+ const string cntrType = "濂借繍绠�;
try {
if (string.IsNullOrEmpty(model.ItemCode)) {
- info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氱墿鏂欑紪鐮侊紙itemCode锛変笉鑳戒负绌�;
- LogHelper.Info(info);
- return NewMesResult(400, info);
+ return NewMesResult(400, preLog + $"鐗╂枡缂栫爜'{model.ItemCode}'涓嶈兘涓虹┖锛�);
}
if (string.IsNullOrEmpty(model.CntrCode)) {
- info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氬鍣ㄧ紪鐮侊紙CntrCode锛変笉鑳戒负绌�;
- LogHelper.Info(info);
- return NewMesResult(400, info);
+ return NewMesResult(400, preLog + $"瀹瑰櫒缂栫爜'{model.CntrCode}'涓嶈兘涓虹┖锛�);
}
if (string.IsNullOrEmpty(model.BatchNo)) {
- info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氭壒娆″彿锛圔atchNo锛変笉鑳戒负绌�;
- LogHelper.Info(info);
- return NewMesResult(400, info);
+ return NewMesResult(400, preLog + $"鎵规鍙�{model.BatchNo}'涓嶈兘涓虹┖锛�);
}
if (model.ItemNum <= 0) {
- info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氳揣鍝佹暟閲忥紙ItemNum锛夊簲璇ュぇ浜�0";
- LogHelper.Info(info);
- return NewMesResult(400, info);
+ return NewMesResult(400, preLog + $"鐗╂枡鏁伴噺'{model.ItemNum}'涓嶅悎娉曪紒瑕佹眰锛氱墿鏂欐暟閲忥紴0");
}
// TEMP 鐩墠娴佺▼锛氬鍗氬疄涓嬪彂鐨勪俊鎭篃杩涜妫�煡锛屾湭鎵惧埌灏辨姤閿欙紝鍚庨潰鏈夐渶姹傚啀鏇存敼
@@ -1179,14 +925,10 @@
.First();
if (cntr == null) {
- info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
- LogHelper.Info(info);
- return NewMesResult(1, info);
+ return NewMesResult(1, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�);
}
- if (cntr.S_TYPE != "濂借繍绠�) {
- info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌褰撳墠瀹瑰櫒绫诲瀷'濂借繍绠�涓嶅悓锛�;
- LogHelper.Info(info);
- return NewMesResult(2, info);
+ if (cntr.S_TYPE != cntrType) {
+ return NewMesResult(2, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌褰撳墠瀹瑰櫒绫诲瀷'{cntrType}'涓嶅悓锛�);
}
// 灏嗕笅鍙戠殑淇℃伅鍏堝瓨鍌ㄥ埌CG琛ㄤ腑锛堟鏃舵墭鐩樻病鏈変笌浜х嚎澶勭殑璐т綅缁戝畾锛�@@ -1213,44 +955,30 @@
// return NewMesResult(2, info);
//}
- using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
- return NewMesResult(500, info);
- }
-
- tran.CommitTran();
+ if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
+ return NewMesResult(500, preLog + $"鎻掑叆[鐗╂枡鏄庣粏琛╙澶辫触锛佹暟鎹細{JsonConvert.SerializeObject(detail)}");
}
- info = "鎻掑叆鐗╂枡淇℃伅鎴愬姛";
- return NewMesResult(0, info);
+ return NewMesResult(500, preLog + $"鎻掑叆[鐗╂枡鏄庣粏琛╙鎴愬姛锛佹暟鎹細{JsonConvert.SerializeObject(detail)}");
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewMesResult(-1, info);
+ return NewMesResult(-1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
}
public static ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
var db = new SqlHelper<object>().GetInstance();
var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
- var info = "";
+ const string preLog = "API锛欵RP涓嬪彂鍑哄簱璁″垝鍗曪細";
try {
- // 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
if (model.pzjs <= 0) {
- info = $"鐗╂枡鏁伴噺(pzjs){model.pzjs}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
- LogHelper.Info(info);
- return NewErpResult(400, info);
+ return NewErpResult(400, preLog + $"鐗╂枡鏁伴噺(pzjs)'{model.pzjs}'涓嶅悎娉曪紒瑕佹眰锛氱墿鏂欐暟閲忥紴0");
}
var outboundPlan = db.Queryable<TN_Outbound_Plan>()
.Where(p => p.JHDH == model.jhdh).First();
if (outboundPlan != null) {
- info = $"璁″垝鍗曞彿{model.jhdh}宸插湪鏁版嵁搴撲腑瀛樺湪";
- LogHelper.Info(info);
- return NewErpResult(1, info);
+ return NewErpResult(1, preLog + $"璁″垝鍗曞彿'{model.jhdh}'宸插湪[鍑哄簱璁″垝鍗昡涓瓨鍦紒");
}
outboundPlan = new TN_Outbound_Plan {
@@ -1323,9 +1051,7 @@
var cgDetail = db.Queryable<TN_CG_Detail>()
.Where(d => d.S_ITEM_CODE == model.cpdm && d.N_ITEM_NUM >= model.pzjs).First();
if (cgDetail == null ) {
- info = $"娌℃湁鍚堥�鐨勭墿鏂欏彲浠ユ弧瓒筹細鐗╂枡缂栫爜={model.cpdm}锛岀墿鏂欐暟閲�={model.pzjs}";
- LogHelper.Info(info);
- return NewErpResult(2, info);
+ return NewErpResult(2, preLog + $"鍦╗璐у搧鏄庣粏琛╙涓病鏈夋壘鍒板悎閫傜殑鐗╂枡锛佽姹傦細鐗╂枡缂栫爜='{model.cpdm}'锛岀墿鏂欐暟閲�={model.pzjs}");
}
var order = new TN_Outbound_Order {
@@ -1370,36 +1096,25 @@
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
- LogHelper.Info(info);
- return NewErpResult(500, info);
+ return NewErpResult(500, preLog + $"鐢熸垚[鍑哄簱鍗昡澶辫触锛佹暟鎹細{JsonConvert.SerializeObject(order)}");
}
if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
- LogHelper.Info(info);
- return NewErpResult(500, info);
+ return NewErpResult(500, preLog + $"鐢熸垚[鍑哄簱鍗曟槑缁哴澶辫触锛佹暟鎹細{JsonConvert.SerializeObject(detailList)}");
}
if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = "鐢熸垚鍑哄簱鍗曡鍒掕褰曡〃澶辫触";
- LogHelper.Info(info);
- return NewErpResult(500, info);
+ return NewErpResult(500, preLog + $"鐢熸垚[鍑哄簱鍗曡鍒掕褰曡〃]澶辫触锛佹暟鎹細{JsonConvert.SerializeObject(outboundPlan)}");
}
tran.CommitTran();
+ return NewErpResult(0, preLog + $"鐢熸垚[鍑哄簱鍗昡鎴愬姛锛佸嚭搴撳崟锛歿JsonConvert.SerializeObject(order)}\n鍑哄簱鍗曟槑缁嗭細{JsonConvert.SerializeObject(detail)}");
}
-
- info = $"鐢熸垚鍑哄簱鍗曟垚鍔燂細" + JsonConvert.SerializeObject(order) + "\n鍑哄簱鍗曟槑缁嗭細" +JsonConvert.SerializeObject(detail);
- LogHelper.Info(info);
- return NewErpResult(0, info);
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewErpResult(1, info);
+ return NewErpResult(1, preLog + $"鍙戠敓浜嗗紓甯革細{ex.Message}\n{ex.StackTrace}");
}
}
}
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index a6b444e..45ab71c 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -152,7 +152,7 @@
public class OtherModel {
/// <summary>
- /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)鏁版嵁绫�+ /// 婊＄涓嬬嚎鍏ュ簱
/// </summary>
public class GoodpackOfflineInfo {
/// <summary>
@@ -411,9 +411,10 @@
/// </summary>
/// <param name="code"></param>
/// <param name="message"></param>
- /// <param name="printLog"></param>
+ /// <param name="log"></param>
/// <returns></returns>
- public static MesResult NewMesResult(int code, string message = "", bool printLog = true) {
+ public static MesResult NewMesResult(int code, string message = "", bool log = true) {
+ if (log) { LogHelper.Info(message); }
return new MesResult {
Result = code,
Success = code == 0, // 浠呭綋code=0鏃讹紝success=true
@@ -431,7 +432,8 @@
public string Message { get; set; }
}
- public static ErpResult NewErpResult(int code, string message) {
+ public static ErpResult NewErpResult(int code, string message, bool log = true) {
+ if (log) { LogHelper.Info(message); }
return new ErpResult { Code = code, Message = message };
}
diff --git a/api/ErpController.cs b/api/ErpController.cs
index 2a887d0..78b7ae5 100644
--- a/api/ErpController.cs
+++ b/api/ErpController.cs
@@ -10,18 +10,15 @@
/// </summary>
[RoutePrefix("api")]
public class ErpController : ApiController {
-
/// <summary>
- /// ERP涓嬪彂鍑哄簱浠诲姟
+ /// ERP涓嬪彂鍑哄簱璁″垝鍗� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("ErpSendOutboundPlan")]
public ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
- var apiName = "ERP涓嬪彂鍑哄簱璁″垝鍗�;
- LogHelper.InfoApi(apiName, model);
-
+ LogHelper.InfoApi("ERP涓嬪彂鍑哄簱璁″垝鍗�, model);
return ApiHelper.ErpSendOutboundPlan(model);
}
}
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 4383de3..2f09344 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -42,7 +42,7 @@
return ApiHelper.EmptyInboundGoodpack(model);
}
else { // PDA鍓嶇涓嬫媺閫夊崟闄愬埗锛屾晠鐞嗚涓婁笉浼氳繘鍏ヨ繖涓祦绋�- return NewSimpleResult(-1, $"瀹瑰櫒绫诲瀷 '{model.CntrType}' 涓嶅悎娉曪細搴斾负 '绌烘墭鐩� 鎴�'绌哄ソ杩愮'");
+ return NewSimpleResult(-1, $"瀹瑰櫒绫诲瀷'{model.CntrType}'涓嶅悎娉曪紒瑕佹眰锛氱被鍨�['绌烘墭鐩�,'绌哄ソ杩愮']");
}
}
@@ -59,65 +59,60 @@
}
/// <summary>
- /// 濂借繍绠�绌虹涓婄嚎(PDA)
+ /// 绌虹涓婄嚎
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("empty-online-goodpack")]
public SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
- var apiName = "濂借繍绠�绌虹涓婄嚎(PDA)";
- LogHelper.InfoApi(apiName, model);
+ LogHelper.InfoApi("绌虹涓婄嚎", model);
return ApiHelper.EmptyOnlineGoodpack(model);
}
/// <summary>
- /// 鍚堟牸鍥炲簱(PDA)
+ /// 鍚堟牸鍥炲簱
/// </summary>
/// <returns></returns>
[HttpPost]
[Route("qualified-back")]
public SimpleResult QualifiedBack(QualifiedBackInfo model) {
- var apiName = "鍚堟牸鍥炲簱(PDA)";
- LogHelper.InfoApi(apiName, model);
+ LogHelper.InfoApi("鍚堟牸鍥炲簱", model);
return ApiHelper.QualifiedBack(model);
}
/// <summary>
- /// 涓嶅悎鏍肩Щ搴�PDA)
+ /// 涓嶅悎鏍肩Щ搴� /// </summary>
/// <returns></returns>
[HttpPost]
[Route("unqualified-shift")]
public SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
- var apiName = "涓嶅悎鏍肩Щ搴�PDA)";
- LogHelper.InfoApi(apiName, model);
+ LogHelper.InfoApi("涓嶅悎鏍肩Щ搴�, model);
return ApiHelper.UnqualifiedShift(model);
}
/// <summary>
- /// 浣欐枡灏剧鍥炲簱(PDA)
+ /// 浣欐枡灏剧鍥炲簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("rest-back")]
public SimpleResult RestBack(RestBackInfo model) {
- var apiName = "浣欐枡灏剧鍥炲簱(PDA)";
- LogHelper.InfoApi(apiName, model);
+ LogHelper.InfoApi("浣欐枡灏剧鍥炲簱", model);
return ApiHelper.RestBack(model);
}
/// <summary>
- /// 鎴愬搧鑳跺嚭搴�PDA)
+ /// 鎴愬搧鑳跺嚭搴� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("finished-outbound")]
public SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
- var apiName = "鎴愬搧鑳跺嚭搴�PDA)";
- LogHelper.InfoApi(apiName, model);
+ LogHelper.InfoApi("鎴愬搧鑳跺嚭搴�, model);
if (model.ForcedOut) {
return ApiHelper.FinishedOutboundForce(model);
diff --git a/api/WMSController.cs b/api/WMSController.cs
index ef806ad..dc50059 100644
--- a/api/WMSController.cs
+++ b/api/WMSController.cs
@@ -12,15 +12,13 @@
[RoutePrefix("api")]
public class WMSController : ApiController {
/// <summary>
- /// 鍗氬疄鐗╂枡淇℃伅涓嬪彂鍚屾(MES)
+ /// 鍗氬疄涓嬪彂鐗╂枡淇℃伅
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- //[Route("WMS/CgInfoSync")]
public MesResult CgInfoSync(CgInfoSyncInfo model) {
- var apiName = "鍗氬疄鐗╂枡淇℃伅涓嬪彂鍚屾(MES)";
- LogHelper.InfoApi(apiName, model);
+ LogHelper.InfoApi("鍗氬疄涓嬪彂鐗╂枡淇℃伅", model);
return ApiHelper.CgInfoSync(model);
}
}
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 0a93748..93892f7 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -163,11 +163,15 @@
var cntId = detail.S_CNTR_CODE;
- var erp_no = string.IsNullOrEmpty(detail.S_BS_NO) ? "" : detail.S_BS_NO;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO, erp_no);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ task.S_OP_CODE = detail.S_OO_NO;
+ if (string.IsNullOrEmpty(detail.S_BS_NO)) {
+ task.S_BS_NO = detail.S_BS_NO;
+ task.S_BS_TYPE = "ERP";
+ }
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ WCSHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ WCSHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Outbound_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
@@ -302,10 +306,11 @@
detail.N_B_STATE = 2;
var cntId = detail.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ task.S_OP_CODE = detail.S_OO_NO;
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ WCSHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ WCSHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_SpotCheck_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
@@ -432,10 +437,11 @@
detail.N_B_STATE = 2;
var cntId = detail.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ task.S_OP_CODE = detail.S_OO_NO;
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ WCSHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ WCSHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_RelocationList_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index ab8fbe7..b6b994e 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -578,8 +578,8 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ WCSHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ WCSHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (locCntrRelOld != null) {
@@ -638,11 +638,15 @@
}
}
catch (Exception ex) {
- LogHelper.InfoEx(ex);
- return new Result<bool>(false, ex.Message);
+ return NewResult(false, ex.Message);
}
}
+ private static Result<bool> NewResult(bool res, string msg, bool log = true) {
+ if (log) { LogHelper.Info(msg); }
+ return new Result<bool>(res, msg);
+ }
+
}
public class ProductCompletedMessage {
diff --git a/models/TN_Task_Action.cs b/models/TN_Task_Action.cs
index de1c194..3c9e830 100644
--- a/models/TN_Task_Action.cs
+++ b/models/TN_Task_Action.cs
@@ -12,7 +12,7 @@
/// </summary>
public string S_EQ_TYPE { get; set; }
public string S_DATA { get; set; }
-
+
public string S_TASK_CODE { get; set; }
public string S_EQ_CODE { get; set; }
diff --git a/util/LogBuilder.cs b/util/LogBuilder.cs
deleted file mode 100644
index 79cfbcf..0000000
--- a/util/LogBuilder.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-锘縰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/LogHelper.cs b/util/LogHelper.cs
index 4d2f3d4..94fd38f 100644
--- a/util/LogHelper.cs
+++ b/util/LogHelper.cs
@@ -77,7 +77,11 @@
public static void InfoApi(string apiName, object model) {
Info($"瑙﹀彂API锛歿apiName} " + JsonConvert.SerializeObject(model), "API");
- }
+ }
+
+ public static void InfoHostToAGV(string taskName, object model) {
+ Info($"AGV浠诲姟锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
+ }
#endregion
}
diff --git a/wms/ContainerHelper.cs b/wms/ContainerHelper.cs
deleted file mode 100644
index 9023239..0000000
--- a/wms/ContainerHelper.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-
-using HH.WCS.Mobox3.DSZSH.models;
-using HH.WCS.Mobox3.DSZSH.util;
-
-using Newtonsoft.Json;
-
-namespace HH.WCS.Mobox3.DSZSH.wms {
- /// <summary>
- /// 瀹瑰櫒甯姪绫伙紙鍖呭惈瀹瑰櫒-璐у搧鍏崇郴鐨勫鐞嗭級
- /// </summary>
- internal class ContainerHelper
- {
- /// <summary>
- /// 瀹瑰櫒缁戝畾璐у搧
- /// </summary>
- /// <param name="cnt"></param>
- /// <param name="cGs"></param>
- /// <returns></returns>
- public static string BindingCG(string cnt, List<string> cGs)
- {
- var db = new SqlHelper<object>().GetInstance();
- var logs = $"瀹瑰櫒锛歿cnt}锛岃揣鍝侊細{JsonConvert.SerializeObject(cGs)}";
- try
- {
- var cntCgList = db.Queryable<TN_CG_Detail>().Where(a => cGs.Contains(a.S_ITEM_CODE) && a.S_CNTR_CODE == cnt).ToList();
-
- if (cntCgList.Count > 0)
- {
- cGs = cGs.Except(cntCgList.Select(a => a.S_CNTR_CODE).ToList()).ToList();
- }
-
- var bindCntCgList = new List<TN_CG_Detail>();
- foreach (var item in cGs)
- {
- bindCntCgList.Add(new TN_CG_Detail() { S_CNTR_CODE = cnt, S_ITEM_CODE = item });
- }
-
- var log = JsonConvert.SerializeObject(bindCntCgList);
- if (db.Insertable<TN_CG_Detail>(bindCntCgList).ExecuteCommand() > 0)
- {
- LogHelper.Info($"鎻掑叆瀹瑰櫒璐у搧鍏崇郴琛ㄦ垚鍔燂紝{log}");
- }
- else
- {
- LogHelper.Info($"鎻掑叆瀹瑰櫒璐у搧鍏崇郴琛ㄥけ璐ワ紝{log}");
- return "瀹瑰櫒缁戝畾璐у搧澶辫触锛� + logs;
- }
-
- var cntid = db.Queryable<TN_Container>().First(a => a.S_CODE == cnt);
-
- if (cntid != null)
- {
- cntid.T_MODIFY = System.DateTime.Now;
- log = JsonConvert.SerializeObject(cntid);
- if (db.Updateable(cntid).UpdateColumns(it => new { it.T_MODIFY }).ExecuteCommand() > 0)
- {
- LogHelper.Info($"鏇存柊瀹瑰櫒琛ㄦ垚鍔燂紝{log}");
- }
- else
- {
- LogHelper.Info($"鏇存柊瀹瑰櫒琛ㄥけ璐ワ紝{log}");
- return "瀹瑰櫒缁戝畾璐у搧澶辫触锛� + logs;
- }
- }
- else
- {
- LogHelper.Info($"鍦ㄦ暟鎹簱涓湭鎵惧埌璇ュ鍣紝鏃犻渶鏇存柊锛屽鍣細{cnt}");
- }
- return "瀹瑰櫒缁戝畾璐у搧鎴愬姛锛� + logs;
- }
- catch (Exception ex)
- {
- LogHelper.Info($"鍙戠敓浜嗗紓甯革紝璐т綅缁戝畾瀹瑰櫒澶辫触锛�);
- return "瀹瑰櫒缁戝畾璐у搧澶辫触锛� + ex.Message;
- }
- }
-
- /// <summary>
- /// 瀹瑰櫒瑙ｇ粦璐у搧
- /// </summary>
- /// <param name="cnt"></param>
- /// <param name="cGs"></param>
- /// <returns></returns>
- public static string UnBindingCG(string cnt, List<string> cGs)
- {
- var db = new SqlHelper<object>().GetInstance();
- var logs = $"瀹瑰櫒锛歿cnt}锛岃揣鍝侊細{JsonConvert.SerializeObject(cGs)}";
- try
- {
- var cntCgList = db.Queryable<TN_CG_Detail>().Where(a => cGs.Contains(a.S_ITEM_CODE) && a.S_CNTR_CODE == cnt).ToList();
- if (cntCgList.Count == 0)
- {
- LogHelper.Info($"瀹瑰櫒鏃犻渶瑙ｇ粦璐у搧锛屽湪鏁版嵁搴撲腑鏈壘鍒皗JsonConvert.SerializeObject(cGs)}鐩稿叧鐨勫鍣ㄨ揣鍝佸叧绯昏〃淇℃伅");
- return "瀹瑰櫒鏃犻渶瑙ｇ粦璐у搧锛岃В缁戞垚鍔� + logs;
- }
- cGs = cntCgList.Select(a => a.S_ITEM_CODE).ToList();
-
- var log = JsonConvert.SerializeObject(cGs);
- if (db.Deleteable<TN_CG_Detail>().Where(it => cGs.Contains(it.S_ITEM_CODE) && it.S_CNTR_CODE == cnt).ExecuteCommand() > 0)
- {
- LogHelper.Info($"鍒犻櫎瀹瑰櫒璐у搧鍏崇郴琛ㄦ垚鍔燂紝{log}");
- }
- else
- {
- LogHelper.Info($"鍒犻櫎瀹瑰櫒璐у搧鍏崇郴琛ㄥけ璐ワ紝{log}");
- return "瀹瑰櫒缁戝畾璐у搧澶辫触锛� + logs;
- }
-
- var CntId = db.Queryable<TN_Container>().First(a => a.S_CODE == cnt);
- if (CntId != null)
- {
- CntId.T_MODIFY = System.DateTime.Now;
- log = JsonConvert.SerializeObject(CntId);
- if (db.Updateable(CntId).UpdateColumns(it => new { it.T_MODIFY }).ExecuteCommand() > 0)
- {
- LogHelper.Info($"鏇存柊瀹瑰櫒琛ㄦ垚鍔燂紝{log}");
- }
- else
- {
- LogHelper.Info($"鏇存柊瀹瑰櫒琛ㄥけ璐ワ紝{log}");
- return "瀹瑰櫒缁戝畾璐у搧澶辫触锛� + logs;
- }
-
- }
- else
- {
- LogHelper.Info($"鍦ㄦ暟鎹簱涓湭鎵惧埌璇ュ鍣紝鏃犻渶鏇存柊锛屽鍣細{cnt}");
- }
- return "瀹瑰櫒瑙ｇ粦璐у搧鎴愬姛锛� + logs;
- }
- catch (Exception ex)
- {
- LogHelper.Info($"鍙戠敓浜嗗紓甯革紝璐т綅瑙ｇ粦瀹瑰櫒澶辫触锛寋ex.Message}");
- return "瀹瑰櫒瑙ｇ粦璐у搧澶辫触锛� + logs;
- }
- }
- }
-}
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 714a1bc..ad88264 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -127,125 +127,6 @@
}
/// <summary>
- /// 璧风偣鍑哄簱閿侊紙鍙兘瀵规棤閿佽揣浣嶄笂閿侊級
- /// </summary>
- /// <param name="loc"></param>
- /// <param name="lockSource"></param>
- /// <returns></returns>
- public static bool LockStartLoc(ref TN_Location loc, string lockSource = "") {
- if (loc == null) {
- LogHelper.Info($"璧风偣鍑哄簱閿侊細浼犲叆鐨勮揣浣嶅弬鏁颁负null");
- return false;
- }
-
- if (loc.N_LOCK_STATE != 0 || loc.S_LOCK_STATE != "鏃�) {
- LogHelper.Info($"璧风偣鍑哄簱閿侊細璐т綅褰撳墠宸叉湁閿�{loc.N_LOCK_STATE},{loc.S_LOCK_STATE})");
- return false;
- }
-
- if (loc != null && loc.N_LOCK_STATE == 0) {
- loc.N_LOCK_STATE = 2; // 璧风偣鍑哄簱閿�- loc.S_LOCK_STATE = GetLockStateStr(2); // 璧风偣鍑哄簱閿�- loc.S_LOCK_OP = lockSource;
- loc.T_MODIFY = System.DateTime.Now;
- }
-
- return true;
- }
-
- /// <summary>
- /// 缁堢偣鍏ュ簱閿侊紙鍙兘瀵规棤閿佽揣浣嶄笂閿侊級
- /// </summary>
- /// <param name="loc"></param>
- /// <param name="lockSource"></param>
- /// <returns></returns>
- public static bool LockEndLoc(ref TN_Location loc, string lockSource = "") {
- if (loc == null) {
- LogHelper.Info($"缁堢偣鍏ュ簱閿侊細浼犲叆鐨勮揣浣嶅弬鏁颁负null");
- return false;
- }
-
- if (loc.N_LOCK_STATE != 0 || loc.S_LOCK_STATE != "鏃�) {
- LogHelper.Info($"缁堢偣鍏ュ簱閿侊細璐т綅褰撳墠宸叉湁閿�{loc.N_LOCK_STATE},{loc.S_LOCK_STATE})");
- return false;
- }
-
- if (loc != null && loc.N_LOCK_STATE == 0) {
- loc.N_LOCK_STATE = 1; // 缁堢偣鍑哄簱閿�- loc.S_LOCK_STATE = GetLockStateStr(1); // 缁堢偣鍑哄簱閿�- loc.S_LOCK_OP = lockSource;
- loc.T_MODIFY = System.DateTime.Now;
- }
-
- return true;
- }
-
- 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;
- }
-
- /// <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);
- }
-
- return query;
- }
-
- /// <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>
diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index 5d2dde4..06549ea 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -46,118 +46,52 @@
return task;
}
- public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type) {
- TN_Task TN_Task = new TN_Task() {
- S_CODE = GenerateTaskNo(),
- S_START_AREA = startLoc.S_AREA_CODE,
- S_END_AREA = endLoc.S_AREA_CODE,
- S_START_LOC = startLoc.S_CODE,
- S_END_LOC = endLoc.S_CODE,
- S_TYPE = type,
- N_PRIORITY = 3, // 鍒濆浼樺厛绾ч粯璁や负锛�
- N_SCHEDULE_TYPE = 1, // NDC
- N_B_STATE = 0,
- S_CNTR_CODE = cntId,
- };
-
- return TN_Task;
- }
-
- public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, string op_no, string erp_no = "") {
- TN_Task TN_Task = new TN_Task() {
- S_CODE = GenerateTaskNo(),
- S_START_AREA = startLoc.S_AREA_CODE,
- S_END_AREA = endLoc.S_AREA_CODE,
- S_START_LOC = startLoc.S_CODE,
- S_END_LOC = endLoc.S_CODE,
- S_TYPE = type,
- N_PRIORITY = 3, // 鍒濆浼樺厛绾ч粯璁や负锛�
- N_SCHEDULE_TYPE = 1, // NDC
- N_B_STATE = 0,
- S_CNTR_CODE = cntId,
- S_OP_CODE = op_no,
- S_BS_NO = erp_no,
- S_BS_TYPE = erp_no == "" ? "" : "ERP",
- };
-
- return TN_Task;
+ public static string GetAgvSite(string locCode) {
+ var db = new SqlHelper<object>().GetInstance();
+ var loc = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCode).First();
+ return loc == null ? "0" : loc.S_AGV_SITE;
}
/// <summary>
- /// 鍒涘缓鎼�浠诲姟
+ /// 璧风偣鍑哄簱閿侊紙寮哄埗璧嬪�锛屼笉浼氭鏌oc!=null锛岄攣鐘舵�=鏃狅紝闇�浼犲弬鍓嶇‘璁わ級
/// </summary>
- /// <param name="from">璧风偣</param>
- /// <param name="to">缁堢偣</param>
- /// <param name="taskType">浠诲姟绫诲瀷</param>
- /// <param name="pri">浼樺厛绾�/param>
- /// <param name="cntrInfo">瀹瑰櫒缂栫爜</param>
- /// <returns></returns>
- internal static bool CreateTask(string from, string to, string taskType, int pri, string cntrInfo) {
- var fromLoc = LocationHelper.GetLocation(from);
- var endLoc = LocationHelper.GetLocation(to);
+ /// <param name="loc"></param>
+ /// <param name="lockSource"></param>
+ public static void LockStartLoc(ref TN_Location loc, string lockSource = "") {
+ loc.N_LOCK_STATE = 2; // 璧风偣鍑哄簱閿�+ loc.S_LOCK_STATE = TN_Location.GetLockStateStr(2); // 璧风偣鍑哄簱閿�+ loc.S_LOCK_OP = lockSource;
+ loc.T_MODIFY = System.DateTime.Now;
+ }
+
+ /// <summary>
+ /// 缁堢偣鍏ュ簱閿侊紙寮哄埗璧嬪�锛屼笉浼氭鏌oc!=null锛岄攣鐘舵�=鏃狅紝闇�浼犲弬鍓嶇‘璁わ級
+ /// </summary>
+ /// <param name="loc"></param>
+ /// <param name="lockSource"></param>
+ public static void LockEndLoc(ref TN_Location loc, string lockSource = "") {
+ loc.N_LOCK_STATE = 1; // 缁堢偣鍑哄簱閿�+ loc.S_LOCK_STATE = TN_Location.GetLockStateStr(1); // 缁堢偣鍑哄簱閿�+ loc.S_LOCK_OP = lockSource;
+ loc.T_MODIFY = System.DateTime.Now;
+ }
+
+ public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, int pri = 3, int agvType = 1) {
TN_Task TN_Task = new TN_Task() {
S_CODE = GenerateTaskNo(),
- S_START_AREA = fromLoc.S_AREA_CODE,
+ S_START_AREA = startLoc.S_AREA_CODE,
S_END_AREA = endLoc.S_AREA_CODE,
- S_START_LOC = from,
- S_END_LOC = to,
- S_TYPE = taskType,
+ S_START_LOC = startLoc.S_CODE,
+ S_END_LOC = endLoc.S_CODE,
+ S_TYPE = type,
N_PRIORITY = pri,
- N_SCHEDULE_TYPE = 1,
- N_B_STATE = 0,
- S_CNTR_CODE = cntrInfo,
+ N_SCHEDULE_TYPE = agvType,
+ N_B_STATE = 0, // 浠诲姟鍒涘缓鏃讹紝榛樿绛夊緟
+ S_CNTR_CODE = cntId,
};
- var log = JsonConvert.SerializeObject(TN_Task);
- var db = new SqlHelper<TN_Task>().GetInstance();
- var res = db.Insertable(TN_Task).ExecuteCommand() > 0;
- if (res) {
- LogHelper.Info($"鎻掑叆浠诲姟鎴愬姛锛寋log}");
- }
- else {
- LogHelper.Info($"鎻掑叆浠诲姟澶辫触锛寋log}");
- }
- return res;
-
+ return TN_Task;
}
-
- public static bool CreateTask(List<CreateTasks> modes) {
- if (modes != null && modes.Count > 0) {
- List<TN_Task> tN_Tasks = new List<TN_Task>();
-
- foreach (var item in modes) {
-
- var fromLoc = LocationHelper.GetLocation(item.from);
- var endLoc = LocationHelper.GetLocation(item.to);
-
- tN_Tasks.Add(new TN_Task() {
- S_CODE = GenerateTaskNo(),
- S_START_AREA = fromLoc.S_AREA_CODE,
- S_END_AREA = endLoc.S_AREA_CODE,
- S_START_LOC = item.from,
- S_END_LOC = item.to,
- S_TYPE = item.taskType,
- N_PRIORITY = item.pri,
- N_SCHEDULE_TYPE = 1,
- N_B_STATE = 0,
- S_CNTR_CODE = item.cntrInfo,
- });
- }
- var log = JsonConvert.SerializeObject(tN_Tasks);
- var db = new SqlHelper<object>().GetInstance();
- var res = db.Insertable<TN_Task>(tN_Tasks).ExecuteCommand() > 0;
- if (res) {
- LogHelper.Info($"鎻掑叆浠诲姟鎴愬姛锛寋log}");
- }
- else {
- LogHelper.Info($"鎻掑叆浠诲姟澶辫触锛寋log}");
- }
- return res;
- }
-
- return false;
- }
-
internal static bool CheckActionRecordExist(string no, int code) {
var db = new SqlHelper<TN_Task_Action>().GetInstance();
@@ -211,13 +145,5 @@
var db = new SqlHelper<object>().GetInstance();
return db.Queryable<TN_Task>().Where(a => a.N_B_STATE == 0 && (a.S_B_STATE == "绛夊緟" || a.S_B_STATE == "寰呮帹閫�)).ToList();
}
- }
-
- public class CreateTasks {
- public string from { set; get; }
- public string to { set; get; }
- public string taskType { set; get; }
- public int pri { set; get; }
- public string cntrInfo { set; get; }
}
}
--
Gitblit v1.9.1