From ad56deb081831090408f97b1c73e61a2eaed8657 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 24 六月 2025 17:22:48 +0800
Subject: [PATCH] 整合部分Modbus和TCP Socket方式处理设备交互的逻辑
---
api/ApiHelper.cs | 577 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 300 insertions(+), 277 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 753f4d6..2c76ec6 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -19,7 +19,9 @@
/// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)
/// </summary>
/// <remarks>
- /// 娴佺▼锛氫汉宸ュ皢婊＄浠庝骇绾挎惉杩愬埌鎿嶄綔鍖哄悗锛屼娇鐢≒DA璋冪敤鎺ュ彛锛屽懠鍙獳GV灏嗘弧绠辨惉杩愬埌璐ф灦鍖猴紙涓嶆寚瀹氱粓鐐硅揣鍖猴級
+ /// 浜哄伐锛氫骇绾�=>婊＄鎿嶄綔鍖�br/>
+ /// PDA锛氳皟鐢ㄦ帴鍙ｏ紝鍛煎彨AGV<br/>
+ /// AGV锛氭弧绠辨搷浣滃尯==鎼繍==>璐ф灦鍖猴紙涓嶆寚瀹氱粓鐐硅揣鍖猴級
/// </remarks>
/// <param name="model">鍖呭惈锛氱墿鏂欎俊鎭�璧风偣璐т綅</param>
/// <returns></returns>
@@ -27,81 +29,70 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭�- var startAreaName = AreaName.M婊＄鎿嶄綔鍖� // 璧风偣璐у尯
- var endAreaName = AreaName.M婊＄璐ф灦鍖� // 缁堢偣璐у尯
+ const string taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱;
+ const string startAreaName = AreaName.M婊＄鎿嶄綔鍖�
+ const string endAreaName = AreaName.M婊＄璐ф灦鍖�
try {
- // 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
- if (model.Num <= 0 ) {
- info = $"鐗╂枡鏁伴噺{model.Num}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
+ if (model.Num <= 0) {
+ info = $"鐗╂枡鏁伴噺'{model.Num}'涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬0";
LogHelper.Info(info);
return NewSimpleResult(400, info);
}
- // 璐存爣鏈轰細鎻愬墠灏嗙墿鏂欎俊鎭啓鍏G_Detail琛ㄤ腑
- // 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
var cgDetail = db.Queryable<TN_CG_Detail>()
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo) // 鎸囧畾锛氱墿鏂欑紪鐮併�鎵规鍙�- .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮") // 鏂板鐗╂枡锛屾晠鐗╂枡鐘舵�搴旇涓�1寰呮
+ .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo)
+ .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮")
.First(); // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹�
- // 濡傛灉鎵句笉鍒版寚瀹氱殑鐗╂枡锛岃鏄庝俊鎭笉涓�嚧锛屾姤閿� if (cgDetail == null) {
info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
LogHelper.Info(info);
return NewSimpleResult(1, info);
}
-
- // 鏌ヨ璧风偣璐т綅锛屾槸鍚︾鍚堣姹傦紙鍒濇涓嬬嚎瑕佹眰璐т綅鏃犲鍣級
- // 娉細璧风偣璐т綅缁戝畾鍓嶆病鏈夎揣鐗╋紝鏁伴噺涓�0
+
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 == 0) // 璧风偣缁戝畾鍓嶆病鏈夊鍣�- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => l.S_CODE == model.StartLoc)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓� .First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
return NewSimpleResult(2, info);
- }
+ }
- startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚庯紝淇敼璧风偣璐т綅鏁伴噺涓�1
+ 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_LOC_CODE = startLoc.S_CODE,
+ S_CNTR_CODE = cgDetail.S_CNTR_CODE,
S_CNTR_TYPE = "濂借繍绠�,
};
- // NOTE 涓嶉渶瑕佹牎楠宭ocCntrRel鐨勫鍣ㄦ槸鍚﹀瓨鍦紝鍗氬疄涓嬪彂鐗╂枡宸茬粡鍋氳繃鏍￠獙
-
- // TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖�+
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].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) // 绛涢�锛氱┖璐т綅
+ .Where(l => Settings.AreaMap[endAreaName].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 => l.N_LAYER) // 鎸夎揣鏋舵渶浣庢帓搴�- .First();
+ .First();// TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖�
if (endLoc == null) {
- info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
+ info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
return NewSimpleResult(3, info);
- }
+ }
- var cntId = locCntrRel.S_CNTR_CODE;
+ LocationHelper.LockStartLoc(ref startLoc);
+ LocationHelper.LockEndLoc(ref endLoc);
+ var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙� var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�-
- // 鏁版嵁搴撴搷浣滀簨鍔￠儴鍒嗭細閿欒缂栫爜锛�00
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ info = $"鎻掑叆銆愯揣浣嶅鍣ㄧ粦瀹氥�琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(locCntrRel);
tran.RollbackTran();
LogHelper.Info(info);
return NewSimpleResult(500, info);
@@ -131,16 +122,16 @@
LogHelper.Info(info);
return NewSimpleResult(500, info);
}
-
+
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(500, info);
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -165,17 +156,17 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱;
- var startAreaName = AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖�
- var endAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ const string taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱;
+ const string startAreaName = AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖�
+ const string endAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ const string cntrType = "鎵樼洏";
try {
- // 鐜板湪PDA娌℃湁鍗曠嫭鐨勭粦瀹氭祦绋嬶紝缁戝畾鍦ㄥ叆搴撴椂瀹屾垚
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 == 0) // 缁戝畾鍓嶈揣浣嶄负绌�- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => l.S_CODE == model.StartLoc)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0)
.First();
if (startLoc == null) {
@@ -184,20 +175,17 @@
return NewSimpleResult(1, info);
}
- // TEMP 鐩墠娴佺▼锛氬鍣ㄥ繀椤诲厛鍦ㄧ郴缁熶腑缁存姢锛屽惁鍒欐姤閿�- // - 鍚庡彴绋嬪簭涓嶅彲浠ョ敓鎴怌ontainer锛屽繀椤荤敱鍓嶅彴缁存姢
- // - 鍚﹀垯锛屽伐浜洪殢鎰忚緭鍏ヤ竴涓鍣�杈撳叆閿欏鍣ㄥ彿锛岄兘鍙互缁戝畾
var cntr = db.Queryable<TN_Container>()
.Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
.First();
if (cntr == null) {
- info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
- if (cntr.S_TYPE != "鎵樼洏") { // 绌烘墭鍏ュ簱
- info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�鎵樼洏'涓嶅悓锛�;
+ if (cntr.S_TYPE != cntrType) { // 绌烘墭鍏ュ簱
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�;
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
@@ -205,11 +193,13 @@
// 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌� // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
var cgDetailOld = db.Queryable<TN_CG_Detail>()
- .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
+ .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();
+ .Where(c => c.S_CNTR_CODE == model.CntrCode)
+ .First();
TN_Location locOld = null;
if (locCntrRelOld != null) { // 濡傛灉闇�瑙ｇ粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
@@ -225,33 +215,33 @@
var locCntrRel = new TN_Loc_Container {
S_LOC_CODE = startLoc.S_CODE,
S_CNTR_CODE = cntr.S_CODE,
- S_CNTR_TYPE = "鎵樼洏", // 绌烘墭鍏ュ簱
+ S_CNTR_TYPE = cntrType, // 绌烘墭鍏ュ簱
};
- // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => Settings.AreaMap[endAreaName].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 })
+ .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
.First();
if (endLoc == null) {
- info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
+ info = $"鍦ㄣ�{endAreaName}銆戜腑娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻锛氭湭涓婇攣銆佹棤璐х墿";
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
- var cntId = locCntrRel.S_CNTR_CODE;
+ LocationHelper.LockStartLoc(ref startLoc);
+ LocationHelper.LockEndLoc(ref endLoc);
+ var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙� var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (cgDetailOld != null) {
if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
- info = $"鍒犻櫎鏃х墿鏂欎俊鎭け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
+ info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
tran.RollbackTran();
LogHelper.Info(info);
return NewSimpleResult(500, info);
@@ -260,7 +250,7 @@
if (locCntrRelOld != null) {
if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
- info = $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯诲け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
+ info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
tran.RollbackTran();
LogHelper.Info(info);
return NewSimpleResult(500, info);
@@ -269,7 +259,7 @@
if (locOld != null) {
if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
- info = $"鏇存柊鏃ц揣浣嶅鍣ㄦ暟閲忓け璐ワ細" + JsonConvert.SerializeObject(locOld);
+ info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
tran.RollbackTran();
LogHelper.Info(info);
return NewSimpleResult(500, info);
@@ -277,20 +267,21 @@
}
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
tran.RollbackTran();
LogHelper.Info(info);
return NewSimpleResult(500, info);
}
-
+
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
it.S_LOCK_STATE,
it.S_LOCK_OP,
- it.T_MODIFY
+ it.T_MODIFY,
+ it.N_CURRENT_NUM
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
return NewSimpleResult(500, info);
}
@@ -302,28 +293,28 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(500, info);
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(0, info);
}
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
@@ -331,7 +322,7 @@
/// 濂借繍绠�绌虹鍏ュ簱(PDA)
/// </summary>
/// <remarks>
- /// 浜哄伐灏嗙┖绠遍�杩囨帴椹充綅鍏ュ簱锛岄渶瑕佹柊缁戝畾瀹瑰櫒璐т綅<br/>
+ /// 浜哄伐锛氱┖绠�=鎼繍==>鍏ュ簱鎺ラ┏浣嶏紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
/// 鐢变簬绌虹涓�埇鏄嚭搴撳嵏璐у悗鑾峰緱锛岃�鍑哄簱鏃舵病鏈夋墜鍔ㄥ嵏璐х殑閫昏緫锛屾墍浠ラ渶瑕佸湪鍏ュ簱鐨勬椂鍊欏啀鍒犻櫎鏃х粦瀹氫俊鎭� /// </remarks>
/// <returns></returns>
@@ -339,27 +330,25 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
- var startAreaName = AreaName.K绌虹鍏ュ簱鎺ラ┏鍖�
- var endAreaName = AreaName.K绌虹璐ф灦鍖�
+ const string taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
+ const string startAreaName = AreaName.K绌虹鍏ュ簱鎺ラ┏鍖�
+ const string endAreaName = AreaName.K绌虹璐ф灦鍖�
+ const string cntrType = "濂借繍绠�;
try {
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == model.StartLoc)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
- .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓嶈揣浣嶄负绌�- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓� .First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆{model.StartLoc}涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
- // TEMP 鐩墠娴佺▼锛氬鍣ㄥ繀椤诲厛鍦ㄧ郴缁熶腑缁存姢锛屽惁鍒欐姤閿�- // - 鍚庡彴绋嬪簭涓嶅彲浠ョ敓鎴怌ontainer锛屽繀椤荤敱鍓嶅彴缁存姢
- // - 鍚﹀垯锛屽伐浜洪殢鎰忚緭鍏ヤ竴涓鍣�杈撳叆閿欏鍣ㄥ彿锛岄兘鍙互缁戝畾
var cntr = db.Queryable<TN_Container>()
.Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
.First();
@@ -369,8 +358,8 @@
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
- if (cntr.S_TYPE != "濂借繍绠�) { // 绌虹鍏ュ簱
- info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�濂借繍绠�涓嶅悓锛�;
+ if (cntr.S_TYPE != cntrType) {
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�;
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
@@ -397,15 +386,16 @@
var locCntrRel = new TN_Loc_Container {
S_LOC_CODE = startLoc.S_CODE,
S_CNTR_CODE = cntr.S_CODE,
- S_CNTR_TYPE = "濂借繍绠�,
+ S_CNTR_TYPE = cntrType,
};
- // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀�+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
var endLoc = db.Queryable<TN_Location>()
.Where(l => Settings.AreaMap[endAreaName].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 })
+ .OrderBy(l => new { l.N_LAYER }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀� .First();
if (endLoc == null) {
@@ -415,56 +405,58 @@
}
var cntId = locCntrRel.S_CNTR_CODE;
+
+ LocationHelper.LockStartLoc(ref startLoc);
+ LocationHelper.LockEndLoc(ref endLoc);
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�-
using (var tran = db.Ado.UseTran()) {
+ // 瀛樺湪鏃с�鐗╂枡鏄庣粏銆戣〃鏃讹紝鍒犻櫎鏃ц〃
if (cgDetailOld != null) {
if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
- info = $"鍒犻櫎鏃х墿鏂欎俊鎭け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
+ info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
}
-
+ // 瀛樺湪鏃с�璐т綅瀹瑰櫒缁戝畾銆戣〃鏃讹紝鍒犻櫎鏃ц〃
if (locCntrRelOld != null) {
if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
- info = $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯诲け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
+ info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
}
if (locOld != null) {
if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
- info = $"鏇存柊鏃ц揣浣嶅鍣ㄦ暟閲忓け璐ワ細" + JsonConvert.SerializeObject(locOld);
+ info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
}
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
it.S_LOCK_STATE,
it.S_LOCK_OP,
- it.T_MODIFY
+ it.T_MODIFY,
+ it.N_CURRENT_NUM
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -474,20 +466,20 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -495,7 +487,7 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
@@ -511,25 +503,23 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
- var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
- var endAreaName = AreaName.B鍖呰鍖�
+ const string taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
+ const string startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ const string endAreaName = AreaName.B鍖呰鍖�
+ const string cntrType = "鎵樼洏";
try {
- // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣� 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);
}
- // 濡傛灉瀛樺湪瀹瑰櫒鍙凤紝浣嗙被鍨嬩笉鏄墭鐩橈紝鎶ラ敊
- if (cntr.S_TYPE != "鎵樼洏") { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
- info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�鎵樼洏'锛�;
+ if (cntr.S_TYPE != cntrType) { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�{cntrType}'锛�;
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
@@ -540,7 +530,7 @@
// 寰呭畾锛氬悗闈㈠彲鑳戒細鏇存敼娴佺▼锛屾垨鑰呯敤鍏朵粬淇℃伅锛堝鐗╂枡绫诲瀷/瑙勬牸锛変綔涓哄鍣ㄧ殑瑙勬牸
needUpdateContainer = true;
- info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓鏍硷紙鐗╂枡缂栫爜锛変负绌猴紝灏嗙墿鏂欑紪鐮�{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�;
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓�瑙勬牸锛堢墿鏂欑紪鐮侊級涓虹┖锛屽皢鐗╂枡缂栫爜'{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�;
LogHelper.Info(info);
cntr.S_SPEC = model.ItemCode;
@@ -552,36 +542,36 @@
}
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 => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 闄愬畾鍦ㄧ┖鎵樺瓨鏀惧尯涓壘瀹瑰櫒璐т綅
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭病鏈夐攣鐘舵�
- .Where(l => l.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�+ .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
+ .Where((l, c) => c.S_CNTR_CODE == model.CntId)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 1)
.First();
if (startLoc == null) {
- info = $"鍦ㄧ┖鎵樺瓨鏀惧尯涓紝鎵句笉鍒扮鍚坽model.ItemCode}鐗╂枡锛屼笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
+ info = $"鍦�{startAreaName}'涓紝鎵句笉鍒伴�鐢ㄤ簬{model.ItemCode}鐗╂枡銆佷笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
var endLoc = db.Queryable<TN_Location>()
.Where(l => Settings.AreaMap[endAreaName].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) // 绛涢�锛氱┖璐т綅
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0)
.First();
if (endLoc == null) {
- info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+ info = $"鍦�{endAreaName}'涓紝鎵句笉鍒板悎閫傜殑銆愮粓鐐硅揣浣嶃�锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
var cntId = model.CntId;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿� LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
cntr.S_SOURCE = task.S_CODE; // 鐢ㄤ换鍔″彿浣滀负瀹瑰櫒鏇存柊鐨勪緷鎹� cntr.T_MODIFY = DateTime.Now;
@@ -591,9 +581,9 @@
if (db.Updateable<TN_Container>(cntr)
.UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鏇存柊琛�{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鏇存柊琛ㄥ鍣ㄨ〃澶辫触锛� + JsonConvert.SerializeObject(cntr);
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
}
@@ -604,9 +594,9 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -616,20 +606,20 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -650,40 +640,37 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
- var startAreaName = AreaName.K绌虹璐ф灦鍖�
- var endAreaName = AreaName.K绌虹鎿嶄綔鍖�
+ const string taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
+ const string startAreaName = AreaName.K绌虹璐ф灦鍖�
+ const string endAreaName = AreaName.K绌虹鎿嶄綔鍖�
+ const string cntrType = "濂借繍绠�;
try {
- // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣� var cntr = db.Queryable<TN_Container>()
.Where(c => c.S_CODE == model.CntId)
.First();
- // 濡傛灉瀹瑰櫒鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛屾姤閿� if (cntr == null) {
- info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
LogHelper.Info(info);
return NewSimpleResult(1, info);
}
- // 濡傛灉瀛樺湪瀹瑰櫒鍙凤紝浣嗙被鍨嬩笉鏄墭鐩橈紝鎶ラ敊
- if (cntr.S_TYPE != "鎵樼洏") { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
- info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�濂借繍绠�锛�;
+ if (cntr.S_TYPE != cntrType) {
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓殑绫诲瀷={cntr.S_TYPE}锛屼笉鏄�{cntrType}'锛�;
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
- // NOTE 濂借繍绠卞彧闇�鍏虫敞鍦ㄤ笉鍦紝涓嶉渶瑕佸叧蹇冨叾閫傜敤鐗╂枡绫诲瀷
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, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == "濂借繍绠�)
.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 1)
.First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓紝鎵句笉鍒扮紪鐮佷负{model.CntId}鐨勭┖濂借繍绠�;
+ info = $"鍦�{startAreaName}'涓紝鎵句笉鍒板瓨鏀惧鍣ㄧ紪鐮�{model.CntId}鐨勭┖濂借繍绠辩殑銆愯捣鐐硅揣浣嶃�锛屾垨涓嶆弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=1";
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
@@ -695,7 +682,7 @@
.First();
if (endLoc == null) {
- info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+ info = $"鍦�{endAreaName}'涓紝鎵句笉鍒板悎閫傜殑銆愮粓鐐硅揣浣嶃�锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=0";
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
@@ -714,9 +701,9 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -726,20 +713,20 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -747,7 +734,7 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
@@ -761,8 +748,9 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
- var startAreaName = AreaName.C鎶芥鍖�
+ const string taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
+ const string startAreaName = AreaName.C鎶芥鍖�
+ var endAreaName = "";
try {
var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -798,17 +786,19 @@
return NewSimpleResult(4, info);
}
- var endLoc = new TN_Location();
+ TN_Location endLoc = null;
if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
+ endAreaName = AreaName.M婊℃墭璐ф灦鍖�
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[endAreaName].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 == "濂借繍绠�) {
+ endAreaName = AreaName.M婊＄璐ф灦鍖�
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[endAreaName].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();
@@ -818,13 +808,14 @@
}
if (endLoc == null) {
- info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+ info = $"鍦ㄣ�{endAreaName}銆戜腑娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝鎴栦笉婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲忎负 0";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
cgDetail.N_ITEM_STATE = 0;
cgDetail.S_ITEM_STATE = "鍚堟牸";
+ cgDetail.T_MODIFY = DateTime.Now;
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
@@ -834,11 +825,11 @@
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) {
+ new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = "淇敼鐗╂枡鐘舵�涓哄悎鏍�澶辫触";
+ info = $"鐢熸垚'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'鍚堟牸'澶辫触";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -848,9 +839,9 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -859,29 +850,29 @@
it.S_LOCK_OP,
it.T_MODIFY
}).ExecuteCommand() <= 0) {
-
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- return NewSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
+ LogHelper.Info(info);
+ return NewSimpleResult(0, info);
}
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
@@ -894,12 +885,14 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
+ const string taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
+ const string startAreaName = AreaName.C鎶芥鍖�
+ const string endAreaName = AreaName.C鎶芥寮傚父鍖�
try {
- if (!Settings.AreaMap[AreaName.C鎶芥寮傚父鍖篯.Contains(model.EndArea)) {
- info = $"缁堢偣搴撳尯{model.EndArea}涓嶅睘浜巤AreaName.C鎶芥寮傚父鍖簘";
+ if (!Settings.AreaMap[endAreaName].Contains(model.EndArea)) {
+ info = $"杈撳叆鐨勭粓鐐瑰簱鍖�{model.EndArea}'涓嶅睘浜�{endAreaName}'!";
LogHelper.Info(info);
return NewSimpleResult(1, info);
}
@@ -909,8 +902,9 @@
.First();
if (cgDetail == null) {
-
- return NewSimpleResult(2, "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡");
+ info = $"娌℃湁鍦ㄧ墿鏂欐槑缁嗚〃涓紝鎵惧埌鐗╂枡缂栫爜={model.ItemCode}銆佸鍣ㄧ紪鐮�{model.CntrCode}鐨勭墿鏂�;
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
}
var locCntrRel = db.Queryable<TN_Loc_Container>()
@@ -918,22 +912,22 @@
.First();
if (locCntrRel == null) {
- info = $"瀹瑰櫒{model.CntrCode}鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 1)
- .Where(l => Settings.AreaMap[AreaName.C鎶芥鍖篯.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
- info = "寰呮娊妫�墿鏂欏湪鎶芥鍖轰腑娌℃湁鎵惧埌锛�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{locCntrRel.S_LOC_CODE}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(2, info);
}
var endLoc = db.Queryable<TN_Location>()
@@ -943,7 +937,7 @@
.First();
if (endLoc == null) {
- info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+ info = $"鍦ㄧ粓鐐硅揣鍖�{model.EndArea}'涓紝娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
@@ -961,9 +955,9 @@
if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = "淇敼鐗╂枡鐘舵�涓哄悎鏍�澶辫触";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'涓嶅悎鏍�澶辫触";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -973,9 +967,9 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -984,29 +978,29 @@
it.S_LOCK_OP,
it.T_MODIFY
}).ExecuteCommand() <= 0) {
-
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- return NewSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
+ LogHelper.Info(info);
+ return NewSimpleResult(0, info);
}
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
@@ -1019,7 +1013,8 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.W灏剧鍥炲簱;
+ const string taskName = TaskName.W灏剧鍥炲簱;
+ var endAreaName = "";
try {
var startLoc = db.Queryable<TN_Location>()
@@ -1044,25 +1039,23 @@
return NewSimpleResult(3, info);
}
- //var endLoc = new TN_Location();
TN_Location endLoc = null;
if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
+ endAreaName = AreaName.M婊℃墭璐ф灦鍖�
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[endAreaName].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) // 璧风偣缁戝畾鍓嶆病鏈夊鍣�+ .Where(l => l.N_CURRENT_NUM == 0)
.First();
}
- else if (locCntrRel.S_CNTR_TYPE =="濂借繍绠�){
+ else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�){
+ endAreaName = AreaName.M婊＄璐ф灦鍖�
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[endAreaName].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) // 璧风偣缁戝畾鍓嶆病鏈夊鍣�+ .Where(l => l.N_CURRENT_NUM == 0)
.First();
}
- //else {
- // endLoc = null;
- //}
if (endLoc == null) {
info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
@@ -1071,10 +1064,10 @@
}
var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿� LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -1084,9 +1077,9 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -1095,22 +1088,21 @@
it.S_LOCK_OP,
it.T_MODIFY
}).ExecuteCommand() <= 0) {
-
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- info = $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -1118,7 +1110,7 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
@@ -1134,7 +1126,7 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+ const string taskName = TaskName.C鎴愬搧鑳跺嚭搴�
try {
var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
@@ -1205,7 +1197,7 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+ const string taskName = TaskName.C鎴愬搧鑳跺嚭搴�
try {
var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
@@ -1345,7 +1337,7 @@
private static string GenerateOrderNo(string snType, string prefix) {
var id = SYSHelper.GetSerialNumber(snType, prefix);
var date = DateTime.Now.ToString("yyMMdd");
- return $"{prefix}{date}{id.ToString().PadLeft(4, '0')}";
+ return $"{prefix}{date}-{id.ToString().PadLeft(4, '0')}";
}
/// <summary>
@@ -1445,15 +1437,23 @@
var info = "";
try {
// 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
- if (model.pzsl <= 0) {
- info = $"鐗╂枡鏁伴噺(pzsl){model.pzsl}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
+ if (model.pzjs <= 0) {
+ info = $"鐗╂枡鏁伴噺(pzjs){model.pzjs}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
LogHelper.Info(info);
return NewErpResult(400, info);
}
- var outboundPlan = new TN_Outbound_Plan {
+ 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);
+ }
+
+ outboundPlan = new TN_Outbound_Plan {
JHDH = model.jhdh, // 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
- CKZT = model.ckzt, // 鍑哄簱鐘舵�
+ CKZT = model.ckzt, // 鍑哄簱鐘舵�锛堥渶瑕佽繑鍥烇級
JHLB = model.jhlb, // 璁″垝绫诲埆
CKDH = model.ckdh, // 鍙傝�鍗曞彿
CPH = model.cph, // 杞︾墝鍙�@@ -1464,9 +1464,9 @@
CPLB = model.cplb, // 浜у搧绫诲埆
CPLBMX = model.cplbmx, // 浜у搧绫诲埆鏄庣粏
PP = model.pp, // 鍝佺墝
- DJ = model.dj, // 绛夌骇
+ DJ = model.dj, // 绛夌骇锛堥渶瑕佽繑鍥烇級
GH = model.gh, // 缃愬彿
- PH = model.ph, // 鎵瑰彿
+ PH = model.ph, // 鎵瑰彿锛堥渶瑕佽繑鍥烇級
BZLX = model.bzlx, // 鍖呰绫诲瀷
PZDH = model.pzdh, // 娲捐鍗曞彿
PZD_DW = model.pzd_dw, // 娲捐鍗曞崟浣�@@ -1479,15 +1479,15 @@
PZ_ZFRQ = model.pz_zfrq, // 娲捐浣滃簾鏃ユ湡
PZ_BZ = model.pz_bz, // 娲捐澶囨敞
CKDBH = model.ckdbh, // 鍑哄簱鍗曠紪鍙�- SFJS = model.sfjs, // 瀹炲彂浠舵暟
- SFSL = model.sfsl, // 瀹炲彂鏁伴噺
- SFCS = model.sfcs, // 瀹炲彂杞︽暟
- ZCSJ = model.zcsj, // 瑁呰溅鏃堕棿
- JLDW = model.jldw, // 璁￠噺鍗曚綅
- FHRQ = model.fhrq, // 鍙戣揣鏃ユ湡
- CKDM = model.ckdm, // 浠撳簱浠ｇ爜
- FHR = model.fhr, // 鍙戣揣浜�- CZYDM = model.czydm, // 鎿嶄綔鍛�+ SFJS = model.sfjs, // 瀹炲彂浠舵暟锛堥渶瑕佽繑鍥烇級
+ SFSL = model.sfsl, // 瀹炲彂鏁伴噺锛堥渶瑕佽繑鍥烇級
+ SFCS = model.sfcs, // 瀹炲彂杞︽暟锛堥渶瑕佽繑鍥烇級
+ ZCSJ = model.zcsj, // 瑁呰溅鏃堕棿锛堥渶瑕佽繑鍥烇級
+ JLDW = model.jldw, // 璁￠噺鍗曚綅锛堥渶瑕佽繑鍥烇級
+ FHRQ = model.fhrq, // 鍙戣揣鏃ユ湡锛堥渶瑕佽繑鍥烇級
+ CKDM = model.ckdm, // 浠撳簱浠ｇ爜锛堥渶瑕佽繑鍥烇級
+ FHR = model.fhr, // 鍙戣揣浜猴紙闇�杩斿洖锛�+ CZYDM = model.czydm, // 鎿嶄綔鍛橈紙闇�杩斿洖锛� SHR_USERNAME = model.shr_username, // 瀹℃牳浜� SHRQ = model.shrq, // 瀹℃牳鏃ユ湡
ZFBJ = model.zfbj, // 浣滃簾鏍囪
@@ -1496,67 +1496,88 @@
SHDW = model.shdw, // 鏀惰揣鍗曚綅
YSDW = model.ysdw, // 杩愯緭鍗曚綅
LXR = model.lxr, // 鑱旂郴浜�- RY_ZXG = model.ry_zxg, // 瑁呭嵏宸�- RY_CCSJ = model.ry_ccsj, // 鍙夎溅鍙告満
+ RY_ZXG = model.ry_zxg, // 瑁呭嵏宸ワ紙闇�杩斿洖锛�+ RY_CCSJ = model.ry_ccsj, // 鍙夎溅鍙告満锛堥渶瑕佽繑鍥烇級
ERPHX_JHDH = model.erphx_jhdh, // erp浜よ揣鍗曞彿
ERPHX_WLBM = model.erphx_wlbm, // erp鐗╂枡缂栫爜
ERPHX_WLMC = model.erphx_wlmc, // erp鐗╂枡鍚嶇О
ERPHX_CJRQ = model.erphx_cjrq, // erp鍒涘缓鏃ユ湡
- HW = model.hw, // 璐т綅
- HWZT = model.hwzt // 璐т綅鐘舵�
+ HW = model.hw, // 璐т綅锛堥渶瑕佽繑鍥烇級
+ HWZT = model.hwzt // 璐т綅鐘舵�锛堥渶瑕佽繑鍥烇級
};
- var cgDetailList = SelectCgByTotalQty(
- qty: (int)model.pzsl,
- itemCode: model.cpdm,
- batchNo: model.ph
- );
+ //var cgDetailList = SelectCgByTotalQty(
+ // qty: (int)model.pzsl,
+ // itemCode: model.cpdm,
+ // batchNo: model.ph
+ // );
- if (cgDetailList.Count == 0) {
- info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
+ //if (cgDetailList.Count == 0) {
+ // info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
+ // LogHelper.Info(info);
+ // return NewErpResult(3, info);
+ //}
+
+ 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(3, info);
+ return NewErpResult(2, info);
}
var order = new TN_Outbound_Order {
S_NO = orderNo,
+ //S_ITEM_CODE = model.cpdm,
+ //S_BATCH = model.ph,
+ //N_END_NUM = (int)model.pzsl,
S_ITEM_CODE = model.cpdm,
- S_BATCH = model.ph,
- N_END_NUM = (int)model.pzsl,
- //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
- S_END_AREA = model.ysfs == "姹借溅" ? "QCCKQ" : "HCCKQ", // 鏆傛椂鐢ㄨ繍杈撴柟寮忥紙鐏溅/姹借溅锛夋潵鍖哄垎缁堢偣璐у尯
+ S_BATCH = cgDetail.S_BATCH_NO,
+ N_END_NUM = (int)model.pzjs,
+ S_END_AREA = "QCCKQ", // ERP涓嬪彂鍑哄簱浠诲姟涓烘苯杞﹀嚭搴撳尯
S_BS_NO = model.jhdh,
S_BS_TYPE = "ERP",
};
var detailList = new List<TN_Outbound_Detail>();
- foreach (var cgDetail in cgDetailList) {
- var detail = new TN_Outbound_Detail {
- S_OO_NO = orderNo,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- S_BATCH_NO = cgDetail.S_BATCH_NO,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- N_COUNT = cgDetail.N_ITEM_NUM,
- S_END_AREA = order.S_END_AREA, // order涓篸etail鐨勬瘡涓�釜璐т綅璁剧疆缁堢偣鍊�- S_BS_NO = order.S_BS_NO,
- S_BS_TYPE= order.S_BS_TYPE,
- };
- detailList.Add(detail);
- }
+ //foreach (var cgDetail in cgDetailList) {
+ // var detail = new TN_Outbound_Detail {
+ // S_OO_NO = orderNo,
+ // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ // S_BATCH_NO = cgDetail.S_BATCH_NO,
+ // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ // N_COUNT = cgDetail.N_ITEM_NUM,
+ // S_END_AREA = order.S_END_AREA, // order涓篸etail鐨勬瘡涓�釜璐т綅璁剧疆缁堢偣鍊�+ // S_BS_NO = order.S_BS_NO,
+ // S_BS_TYPE= order.S_BS_TYPE,
+ // };
+ // detailList.Add(detail);
+ //}
+ var detail = new TN_Outbound_Detail {
+ S_OO_NO = orderNo,
+ S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ S_BATCH_NO = cgDetail.S_BATCH_NO,
+ S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ N_COUNT = cgDetail.N_ITEM_NUM,
+ S_END_AREA = order.S_END_AREA, // order涓篸etail鐨勬瘡涓�釜璐т綅璁剧疆缁堢偣鍊�+ S_BS_NO = order.S_BS_NO,
+ S_BS_TYPE = order.S_BS_TYPE,
+ };
+ detailList.Add(detail);
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(2, info);
+ return NewErpResult(500, info);
}
if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
LogHelper.Info(info);
- return NewErpResult(4, info);
+ return NewErpResult(500, info);
}
if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
@@ -1569,7 +1590,9 @@
tran.CommitTran();
}
- return NewErpResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+ info = $"鐢熸垚鍑哄簱鍗曟垚鍔燂細" + JsonConvert.SerializeObject(order) + "\n鍑哄簱鍗曟槑缁嗭細" +JsonConvert.SerializeObject(detail);
+ LogHelper.Info(info);
+ return NewErpResult(0, info);
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
--
Gitblit v1.9.1