From f8d23dcf8d6501482db1a5180325194232afe96c Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 18 七月 2025 17:30:09 +0800
Subject: [PATCH] 封装部分业务代码，继续优化日志打印流程
---
api/ApiHelper.cs | 1609 ++++++++++++++++++++++++----------------------------------
1 files changed, 671 insertions(+), 938 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 3c352ae..f1adf15 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -1,9 +1,8 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using HH.WCS.Mobox3.DSZSH.core;
using HH.WCS.Mobox3.DSZSH.models;
using HH.WCS.Mobox3.DSZSH.util;
using HH.WCS.Mobox3.DSZSH.wms;
@@ -15,993 +14,644 @@
using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
-using static HH.WCS.Mobox3.DSZSH.Config;
-
namespace HH.WCS.Mobox3.DSZSH.api {
public class ApiHelper {
/// <summary>
- /// 濂借繍绠�婊℃墭涓嬬嚎鍏ュ簱(PDA)
+ /// 婊＄涓嬬嚎鍏ュ簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
- var taskName = TaskName.濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭� var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var taskInfo = ETask.M婊＄涓嬬嚎鍏ュ簱.Info();
+ const string preLog = "API:婊＄涓嬬嚎鍏ュ簱:";
+ const string cntrType = "濂借繍绠�;
+
try {
- // 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
- var cgDetail = db.Queryable<TN_CG_Detail>()
- .Where(d => d.S_ITEM_CODE == model.s_item_code && d.S_BATCH_NO == model.s_batch) // 鎸囧畾锛氱墿鏂欑紪鐮併�鎵规鍙�- .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮") // NOTE 鍐椾綑妫�煡锛氱墿鏂欑姸鎬佸簲璇ヤ负 1寰呮
- .First();
+ if (model.Num <= 0) {
+ return NewSimpleResult(400, preLog + $"鐗╂枡鏁伴噺'{model.Num}'涓嶅悎娉�瑕佹眰:鐗╂枡鏁伴噺锛�");
+ }
+ // 妫�煡璐у搧瀹瑰櫒琛�鏄惁宸茬粡瀛樺湪璐存爣鏈轰紶閫掔殑寰呭叆搴撶墿鏂欎俊鎭�+ // 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) {
- info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
- LogHelper.Info(info);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(1, preLog + $"娌℃湁鍦╗璐у搧鏄庣粏琛╙涓壘鍒癧鐗╂枡缂栫爜='{model.ItemCode}',鎵规鍙�'{model.BatchNo}']鐨勭墿鏂�璇锋鏌�PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭槸鍚︿竴鑷�瑕佹眰:鐗╂枡鐘舵�='寰呮'");
}
- var startLoc = db.Queryable<TN_Location>()
- .Where(a => a.S_CODE == model.s_start_loc) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .First();
-
+ // 鏌ヨ璧风偣璐т綅:鏁伴噺=0
+ var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆 '{model.s_start_loc}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(2, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0,鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)}");
}
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿
- var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = model.s_start_loc,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_CNTR_TYPE = "濂借繍绠�,
- };
+ // 鍜屾弧鎵樹笅绾垮叆搴撶殑閫昏緫涓�嚧,鐢变簬瀹瑰櫒绉诲姩涓嶄細鏇存敼缁戝畾淇℃伅,鎵�互蹇呴』鍒犻櫎鏃ф暟鎹�+ var old = WCSHelper.GetLocCntrCg(cgDetail.S_CNTR_CODE, skipCgDetail: true);
- if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
+ // 缁戝畾璐т綅瀹瑰櫒,璧风偣璐т綅褰撳墠鏁伴噺=1
+ var locCntrRel = WCSHelper.BindLocCntr(ref startLoc, cgDetail.S_CNTR_CODE);
+ locCntrRel.S_CNTR_TYPE = cntrType;
- // TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖�- var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
- .OrderBy(l => l.N_LAYER)
- .OrderBy(l => l.S_AREA_CODE).First();
-
+ // 鏌ヨ缁堢偣璐т綅
+ // Order:鎸夎揣浣嶅眰鏁�浠庡皬鍒板ぇ鎺掑垪
+ 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 }).First();
if (endLoc == null) {
- info = "婊＄鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0,鎵�湪搴撳尯={LogObject(taskInfo.EndAreas)}");
}
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+ // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+ 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_Location>(startLoc).UpdateColumns(it => new {
- it.N_LOCK_STATE,
- it.S_LOCK_STATE,
- it.S_LOCK_OP,
- it.T_MODIFY
- }).ExecuteCommand() <= 0) {
+ // 鍒犻櫎/鏇存柊鏃璐т綅/瀹瑰櫒/鐗╂枡]淇℃伅
+ if (old.LocCntrRel != null && db.Deleteable(old.LocCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触!鏁版嵁:{LogObject(old.LocCntrRel)}");
+ }
+ if (old.Location != null && db.Updateable(old.Location).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewSimpleResult(500, preLog + $"鏇存柊[鏃ц揣浣峾褰撳墠瀹瑰櫒鏁伴噺]澶辫触!璐т綅='{old.Location.S_CODE}',鏁伴噺=>{old.Location.N_CURRENT_NUM}");
}
- 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.Insertable(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, preLog + $"鎻掑叆[瀹瑰櫒璐т綅缁戝畾琛╙澶辫触!鏁版嵁:{LogObject(locCntrRel)}");
}
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
+ // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+ if (db.Updateable(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} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+ }
+ if (db.Updateable(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(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ 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} 鎴愬姛锛屽鍣ㄥ彿 {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.Info(info);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(ex, preLog);
}
}
- ///// <summary>
- ///// 绌烘墭鐩樼粦瀹�PDA)
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //public static SimpleResult EmptyBindPallet(EmptyBindInfo model) {
- // var db = DbHelper.GetDbClient();
-
- // try {
- // var loc = db.Queryable<TN_Location>()
- // .Where(ExprHelper.LocCode(model.LocCode))
- // .Where(ExprHelper.LocBelongsToArea(AreaName.绌烘墭鐩樻帴椹冲尯))
- // .Where(ExprHelper.LocIsFree)
- // .Where(ExprHelper.LocIsEmpty).First();
-
- // if (loc == null) {
- // return BuildSimpleResult(2, $"褰撳墠璐т綅 '{model.LocCode}' 鏃犳硶鍐嶇粦瀹氬鍣�);
- // }
-
- // var locCntrRel = db.Queryable<TN_Loc_Container>()
- // .Where(lc => lc.S_CNTR_CODE == model.LocCode).First();
-
- // if (locCntrRel != null) {
- // return BuildSimpleResult(3, $"褰撳墠瀹瑰櫒 '{model.CntrCode}' 宸茬粡涓�'{locCntrRel.S_LOC_CODE}' 缁戝畾");
- // }
-
- // //loc.N_CURRENT_NUM = model.PalletCount;
-
- // locCntrRel = new TN_Loc_Container {
- // S_LOC_CODE = model.LocCode,
- // S_CNTR_CODE = model.CntrCode
- // };
-
- // using (var tran = db.Ado.UseTran()) {
- // if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0
- // && db.Updateable<TN_Location>(loc).UpdateColumns(it => it.N_CURRENT_NUM).ExecuteCommand() > 0) {
- // tran.CommitTran();
- // return BuildSimpleResult(0, $"缁戝畾瀹瑰櫒 '{model.CntrCode}' 涓庤揣浣�'{model.LocCode}' 鎴愬姛");
- // }
- // else {
- // tran.RollbackTran();
- // return BuildSimpleResult(4, $"缁戝畾瀹瑰櫒 '{model.CntrCode}' 涓庤揣浣�'{model.LocCode}' 澶辫触");
- // }
- // }
- // }
- // catch (Exception ex) {
- // return BuildSimpleEx(ex);
- // }
- //}
-
- ///// <summary>
- ///// 绌虹缁戝畾(PDA)
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //public static SimpleResult EmptyBindGoodpack(EmptyBindInfo model) {
- // var db = DbHelper.GetDbClient();
-
- // try {
- // var loc = db.Queryable<TN_Location>()
- // .Where(ExprHelper.LocCode(model.LocCode))
- // .Where(ExprHelper.LocBelongsToArea(AreaName.绌虹鎺ラ┏鍖�)
- // .Where(ExprHelper.LocIsFree)
- // .Where(ExprHelper.LocIsEmpty).First();
-
- // if (loc == null) {
- // return BuildSimpleResult(2, $"褰撳墠璐т綅 '{model.LocCode}' 鏃犳硶鍐嶇粦瀹氬鍣�);
- // }
-
- // var locCntrRel = db.Queryable<TN_Loc_Container>()
- // .Where(lc => lc.S_CNTR_CODE == model.LocCode).First();
-
- // if (locCntrRel != null) {
- // return BuildSimpleResult(3, $"褰撳墠瀹瑰櫒 '{model.CntrCode}' 宸茬粡涓�'{locCntrRel.S_LOC_CODE}' 缁戝畾");
- // }
-
- // loc.N_CURRENT_NUM = 1; // 绌虹缁戝畾鏃跺鍣ㄦ暟蹇呯劧涓�1
-
- // locCntrRel = new TN_Loc_Container {
- // S_LOC_CODE = model.LocCode,
- // S_CNTR_CODE = model.CntrCode
- // };
-
- // using (var tran = db.Ado.UseTran()) {
- // if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0
- // && db.Updateable<TN_Location>(loc).UpdateColumns(it => it.N_CURRENT_NUM).ExecuteCommand() > 0) {
- // tran.CommitTran();
- // return BuildSimpleResult(0, $"缁戝畾瀹瑰櫒 '{model.CntrCode}' 涓庤揣浣�'{model.LocCode}' 鎴愬姛");
- // }
- // else {
- // tran.RollbackTran();
- // return BuildSimpleResult(4, $"缁戝畾瀹瑰櫒 '{model.CntrCode}' 涓庤揣浣�'{model.LocCode}' 澶辫触");
- // }
- // }
- // }
- // catch (Exception ex) {
- // return BuildSimpleEx(ex);
- // }
- //}
-
/// <summary>
- /// 鎵樼洏-绌烘墭鍏ュ簱(PDA)
+ /// 绌烘墭鍏ュ簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
- var taskName = TaskName.鎵樼洏_绌烘墭鍏ュ簱;
var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var taskInfo = ETask.K绌烘墭鍏ュ簱.Info();
+ const string preLog = "API:绌烘墭鍏ュ簱:";
+ const string cntrType = "鎵樼洏";
+
try {
- var startLoc = db.Queryable<TN_Location>()
- .Where(a => a.S_CODE == model.StartLoc) // 鎸囧畾锛氳捣鐐硅揣浣�- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 1)
- .First();
-
+ // 鏌ヨ璧风偣璐т綅:鏁伴噺=0
+ var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
if (startLoc == null) {
- return NewSimpleResult(2, $"璧风偣浣嶇疆 '{model.StartLoc}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�);
+ return NewSimpleResult(1, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=0;鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)}");
}
- // 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�- var locCntrRel = db.Queryable<TN_Loc_Container>()
- .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
- .First();
-
- if (locCntrRel == null) {
- return NewSimpleResult(3, $"璧风偣浣嶇疆 '{model.StartLoc}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntrCode}'");
+ // 鏌ヨ瀹瑰櫒琛�瀹瑰櫒绫诲瀷瀛楁
+ var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
+ if (cntr == null) {
+ return NewSimpleResult(2, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪,璇峰湪鍓嶅彴椤甸潰涓淮鎶�");
}
+ if (cntr.S_TYPE != cntrType) {
+ return NewSimpleResult(3, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷涓�{cntr.S_TYPE}',涓庤緭鍏ョ殑瀹瑰櫒绫诲瀷'{cntrType}'涓嶅悓!");
+ }
+
+ // 绌虹鍏ュ簱鏃�濡傛灉瀛樺湪鏃х殑缁戝畾鏁版嵁,鍒犻櫎
+ var old = WCSHelper.GetLocCntrCg(model.CntrCode);
- // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
- var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.绌烘墭瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
- .OrderBy(l => l.N_LAYER)
- .OrderBy(l => l.S_AREA_CODE).First();
+ // 缁戝畾璐т綅瀹瑰櫒,璧风偣璐т綅褰撳墠鏁伴噺=1
+ var locCntrRel = WCSHelper.BindLocCntr(ref startLoc, cntr.S_CODE);
+ locCntrRel.S_CNTR_TYPE = cntrType;
+ // 鏌ヨ缁堢偣璐т綅
+ // Order:灞傛暟浠庝綆鍒伴珮,琛�鍒�+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
if (endLoc == null) {
- return NewSimpleResult(4, $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅");
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=0;鎵�湪搴撳尯={LogObject(taskInfo.EndAreas)}");
}
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+ // 璧风偣缁堢偣涓婇攣,鍒涘缓浠诲姟
+ 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_Location>(startLoc).UpdateColumns(it => new {
- it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) {
+ if (old.CgDetail != null && db.Deleteable(old.CgDetail).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
+ return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃х墿鏂欎俊鎭痌澶辫触!鏁版嵁:{LogObject(old.CgDetail)}");
}
- 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 (old.LocCntrRel != null && db.Deleteable(old.LocCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触!鏁版嵁:{LogObject(old.LocCntrRel)}");
}
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
+ if (old.Location != null && db.Updateable(old.Location).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ return NewSimpleResult(500, preLog + $"鏇存柊[鏃ц揣浣峾褰撳墠瀹瑰櫒鏁伴噺]澶辫触!璐т綅='{old.Location.S_CODE}',鏁伴噺=>{old.Location.N_CURRENT_NUM}");
}
+ if (db.Insertable(locCntrRel).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewSimpleResult(500, preLog + $"鎻掑叆[璐т綅瀹瑰櫒缁戝畾琛╙澶辫触!鏁版嵁:{LogObject(locCntrRel)}");
+ }
+
+ // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+ if (db.Updateable(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}',閿佺姸鎬�>'鍑哄簱閿�");
+ }
+ if (db.Updateable(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(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ 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,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {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) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.Info(info);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(ex, preLog);
}
}
/// <summary>
- /// 濂借繍绠�绌虹鍏ュ簱(PDA)
+ /// 绌虹鍏ュ簱
/// </summary>
/// <returns></returns>
public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
- var taskName = TaskName.濂借繍绠盻绌虹鍏ュ簱;
var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var taskInfo = ETask.K绌虹鍏ュ簱.Info();
+ const string preLog = "API:绌虹鍏ュ簱:";
+ const string cntrType = "濂借繍绠�;
+
try {
- var startLoc = db.Queryable<TN_Location>()
- .Where(a => a.S_CODE == model.StartLoc)
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�- .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, $"璧风偣浣嶇疆 '{model.StartLoc}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�);
+ return NewSimpleResult(1, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=0;鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)}");
}
- // 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�- var locCntrRel = db.Queryable<TN_Loc_Container>()
- .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
- .First();
-
- if (locCntrRel == null) {
- return NewSimpleResult(3, $"璧风偣浣嶇疆 '{model.StartLoc}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntrCode}'");
+ // 鏌ヨ瀹瑰櫒琛�瀹瑰櫒绫诲瀷瀛楁
+ var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
+ if (cntr == null) {
+ return NewSimpleResult(1, $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪,璇峰湪鍓嶅彴椤甸潰涓淮鎶�");
+ }
+ if (cntr.S_TYPE != cntrType) {
+ return NewSimpleResult(2, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷鏄�{cntr.S_TYPE},涓嶆槸'{cntrType}'!");
}
- // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
- var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.绌虹瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
- .OrderBy(l => l.N_LAYER)
- .OrderBy(l => l.S_AREA_CODE).First();
+ // 绌虹鍏ュ簱鏃�濡傛灉瀛樺湪鏃х殑缁戝畾鏁版嵁,鍒犻櫎
+ var old = WCSHelper.GetLocCntrCg(model.CntrCode);
+ // 缁戝畾璐т綅瀹瑰櫒,璧风偣璐т綅褰撳墠鏁伴噺=1
+ var locCntrRel = WCSHelper.BindLocCntr(ref startLoc, model.CntrCode);
+ locCntrRel.S_CNTR_TYPE = cntrType;
+
+ // 鏌ヨ缁堢偣璐т綅
+ // 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, $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅");
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=0;鎵�湪搴撳尯={LogObject(taskInfo.EndAreas)}");
}
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+ 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_Location>(startLoc).UpdateColumns(it => new {
- it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() <= 0) {
+ if (old.CgDetail != null && db.Deleteable(old.CgDetail).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
+ return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃х墿鏂欎俊鎭痌澶辫触!鏁版嵁:{LogObject(old.CgDetail)}");
+ }
+ if (old.LocCntrRel != null && db.Deleteable(old.LocCntrRel).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewSimpleResult(500, preLog + $"鍒犻櫎[鏃ц揣浣嶅鍣ㄥ叧绯籡澶辫触!鏁版嵁:{LogObject(old.LocCntrRel)}");
+ }
+ if (old.Location != null && db.Updateable(old.Location).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewSimpleResult(500, preLog + $"鏇存柊[鏃ц揣浣峾褰撳墠瀹瑰櫒鏁伴噺]澶辫触!璐т綅='{old.Location.S_CODE}',鏁伴噺=>{old.Location.N_CURRENT_NUM}");
}
- 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.Insertable(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ return NewSimpleResult(500, preLog + $"鎻掑叆[璐т綅瀹瑰櫒鍏崇郴]澶辫触:" + LogObject(locCntrRel));
}
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
+ // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+ if (db.Updateable(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,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+ }
+ if (db.Updateable(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(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ 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,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {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) {
- return BuildSimpleEx(ex);
+ return NewSimpleResult(ex, preLog);
}
}
/// <summary>
- /// 鎵樼洏-绌烘墭涓婄嚎(PDA)
+ /// 绌烘墭涓婄嚎鍑哄簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
- var taskName = TaskName.鎵樼洏_绌烘墭涓婄嚎;
var db = new SqlHelper<object>().GetInstance();
- var taskInfo = Settings.TaskMap[taskName];
- var info = "";
+ var taskInfo = ETask.K绌烘墭涓婄嚎鍑哄簱.Info();
+ const string preLog = "API:绌烘墭涓婄嚎鍑哄簱:";
+ const string cntrType = "鎵樼洏";
+
try {
- // TODO 绗﹀悎鐗╂枡淇℃伅鐨勮揣浣�- var startLoc = db.Queryable<TN_Location>()
- .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�- .First();
+ // 鏌ヨ瀹瑰櫒琛�瀹瑰櫒绫诲瀷瀛楁
+ var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntId).First();
+ if (cntr == null) {
+ return NewSimpleResult(1, $"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪,璇峰湪鍓嶅彴椤甸潰涓淮鎶�");
+ }
+ if (cntr.S_TYPE != cntrType) {
+ return NewSimpleResult(2, preLog + $"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷鏄�{cntr.S_TYPE},涓嶆槸'{cntrType}'!");
+ }
+ var needUpdateContainer = false;
+ if (string.IsNullOrEmpty(cntr.S_SPEC)) {
+ // TEMP 鐩墠娴佺▼:濡傛灉瀹瑰櫒琛ㄤ腑瑙勬牸 (鐗╂枡缂栫爜) 涓虹┖,鏍规嵁娴佺▼鐨勭墿鏂欎俊鎭啓鍏�+ // 寰呭畾:鍚庨潰鍙兘浼氭洿鏀规祦绋�鎴栬�鐢ㄥ叾浠栦俊鎭�(濡傜墿鏂欑被鍨�瑙勬牸) 浣滀负瀹瑰櫒鐨勮鏍�+
+ needUpdateContainer = true;
+ cntr.S_SPEC = model.ItemCode;
+ LogHelper.Info($"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓璠瑙勬牸(鐗╂枡缂栫爜)]涓虹┖,灏嗙墿鏂欑紪鐮�{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�);
+ }
+ else if (cntr.S_SPEC != model.ItemCode) {
+ 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 => 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) {
- return NewSimpleResult(2, $"娌℃湁鍚堥�鐨勮捣鐐逛綅缃�);
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=1;鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)},缁戝畾瀹瑰櫒缂栫爜='{model.CntId}',缁戝畾瀹瑰櫒绫诲瀷='{cntrType}'");
}
- var locCntrRel = db.Queryable<TN_Loc_Container>().First(
- a => a.S_LOC_CODE == startLoc.S_CODE
- && a.S_CNTR_CODE == model.CntId);
-
- if (locCntrRel == null) {
- return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
- }
-
- var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.鍖呰鍖篯.Contains(a.S_AREA_CODE))
- .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
- .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) {
- return NewSimpleResult(4, $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�);
+ return NewSimpleResult(5, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=0;鎵�湪搴撳尯={LogObject(taskInfo.EndAreas)}");
}
- var cntId = locCntrRel.S_CNTR_CODE;
- 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);
- LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+ cntr.S_SOURCE = task.S_CODE; // 鐢ㄤ换鍔″彿浣滀负瀹瑰櫒鏇存柊鐨勪緷鎹�+ cntr.T_MODIFY = DateTime.Now;
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) {
- tran.RollbackTran();
- return NewSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
+ if (needUpdateContainer && db.Updateable(cntr).UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
+ return NewSimpleResult(500, preLog + $"鏇存柊[瀹瑰櫒琛╙澶辫触!鏁版嵁:{LogObject(cntr)}");
}
- 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(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,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+ }
+ if (db.Updateable(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(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
}
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- return NewSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
-
+ // 鎻愪氦鏁版嵁搴撴洿鏀� tran.CommitTran();
- return NewSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {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) {
- return BuildSimpleEx(ex);
+ return NewSimpleResult(ex, preLog);
}
}
/// <summary>
- /// 濂借繍绠�绌虹涓婄嚎(PDA)
+ /// 绌虹涓婄嚎鍑哄簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
- var taskName = TaskName.濂借繍绠盻绌虹涓婄嚎;
var db = new SqlHelper<object>().GetInstance();
- var taskInfo = Settings.TaskMap[taskName];
- var info = "";
- try {
- // TODO 绗﹀悎鐗╂枡淇℃伅鐨勮揣浣�- var startLoc = db.Queryable<TN_Location>()
- .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 1).First();
+ 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();
+ if (cntr == null) {
+ return NewSimpleResult(1, preLog + $"瀹瑰櫒'{model.CntId}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪,璇峰湪鍓嶅彴椤甸潰涓淮鎶�");
+ }
+ if (cntr.S_TYPE != cntrType) {
+ 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 => 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) {
- return NewSimpleResult(2, $"娌℃湁鍚堥�鐨勮捣鐐逛綅缃�);
+ return NewSimpleResult(2, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=1,鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)},缁戝畾瀹瑰櫒缂栫爜='{model.CntId}',缁戝畾瀹瑰櫒绫诲瀷='{cntrType}'");
}
- var locCntrRel = db.Queryable<TN_Loc_Container>().First(
- a => a.S_LOC_CODE == startLoc.S_CODE
- && a.S_CNTR_CODE == model.CntId);
-
- if (locCntrRel == null) {
- return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
- }
-
- var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.鍖呰鍖篯.Contains(a.S_AREA_CODE))
- .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 0)
- .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) {
- return NewSimpleResult(4, $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�);
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0,鎵�湪搴撳尯={LogObject(taskInfo.EndAreas)}");
}
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�-
+ 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(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,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
+ return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+ }
+ if (db.Updateable(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(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
}
- 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,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
-
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- return NewSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
-
+ // 鎻愪氦鏁版嵁搴撴洿鏀� tran.CommitTran();
- return NewSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {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) {
- return BuildSimpleEx(ex);
+ return NewSimpleResult(ex, preLog);
}
}
/// <summary>
- /// 鍒涘缓鎶芥鍗�- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public static SimpleResult CreateCheckOrder(CreateCheckOrderInfo model) {
- var billName = "鎶芥鍗�;
- var db = new SqlHelper<object>().GetInstance();
- var info = "";
- try {
- var orderNo = GenerateOrderNo("鎶芥鍗曞彿", "CN");
-
- var order = new TN_Check_Order {
- S_NO = orderNo,
- S_ITEM_CODE = model.ItemCode,
- //S_ITEM_NAME = model.ItemName,
- S_BATCH_NO = model.BatchNo,
- N_COUNT = model.Qty,
- S_END_AREA = model.EndArea,
- };
-
- var cgDetailList = SelectCgByTotalQty(model);
- if (cgDetailList.Count == 0) {
- return NewSimpleResult(3, "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ユ娊妫�);
- }
-
- var detailList = new List<TN_Check_Detail>();
- foreach (var cgDetail in cgDetailList) {
- var detail = new TN_Check_Detail {
- S_NO = orderNo,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- S_BATCH_NO = cgDetail.S_BATCH_NO,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_END_AREA = model.EndArea,
- };
-
- detailList.Add(detail);
-
- cgDetail.N_ITEM_STATE = 3;
- cgDetail.S_ITEM_STATE = "鎶介獙涓�;
- }
-
- using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_Check_Order>(order).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚{billName}澶辫触锛� + JsonConvert.SerializeObject(order);
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
- }
-
- if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚{billName}鏄庣粏澶辫触";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
-
- if (db.Updateable<TN_CG_Detail>(cgDetailList).UpdateColumns(it => new {
- it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鏇存柊鐗╂枡鐘舵�澶辫触";
-
- }
-
- tran.CommitTran();
- }
- return NewSimpleResult(0, $"鍒涘缓 鎶芥鍗�鎴愬姛");
- }
- catch (Exception ex) {
- return BuildSimpleEx(ex);
- }
- }
- /// <summary>
- /// 鎶芥-鍚堟牸鍥炲簱(PDA)
+ /// 鎶芥鍚堟牸鍥炲簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult QualifiedBack(QualifiedBackInfo model) {
- var taskName = TaskName.鎶芥_鍚堟牸鍥炲簱;
var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var taskInfo = ETask.C鎶芥鍚堟牸鍥炲簱.Info();
+ const string preLog = "API:鎶芥鍚堟牸鍥炲簱";
+
try {
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) {
- return NewSimpleResult(2, "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡锛� + JsonConvert.SerializeObject(model));
+ return NewSimpleResult(2, preLog + "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡:" + LogObject(model));
}
- 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) {
+ return NewSimpleResult(3, preLog + $"瀹瑰櫒{model.CntrCode}鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪");
+ }
- //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 == cgDetail.S_CNTR_CODE) // 鎸囧畾瀹瑰櫒鍙�- // .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- // .First();
-
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .First();
-
+ var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == locCntrRel.S_LOC_CODE && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).First();
if (startLoc == null) {
- info = "娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�;
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(4, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=1,鎵�湪搴撳尯={LogObject(taskInfo.StartAreas)}");
}
- var endLoc = new TN_Location();
- if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
- endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
- .First();
- }
- else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�) {
- endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.婊＄瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 0)
- .First();
- }
- else {
- return NewSimpleResult(2, $"鎵樼洏绫诲瀷{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" && endAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0,鎵�湪搴撳尯={LogObject(endAreas)}");
}
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);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
- LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+ 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 }).ExecuteCommand() <= 0) {
+ if (db.Updateable(cgDetail).UpdateColumns(it => new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = "淇敼鐗╂枡鐘舵�涓哄悎鏍�澶辫触";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, preLog + $"鏇存柊[鐗╂枡鏄庣粏琛╙澶辫触!鐗╂枡鍙�'{cgDetail.S_ITEM_CODE}',鐗╂枡鐘舵�=>'鍚堟牸'");
}
- 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(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} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+ }
+ if (db.Updateable(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(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
}
- 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} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
-
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
-
+ // 鎻愪氦鏁版嵁搴撴洿鏀� tran.CommitTran();
- return NewSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {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) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.Info(info);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(ex, preLog);
}
}
+
+ /// <summary>
+ /// 鎶芥涓嶅悎鏍肩Щ搴�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
- var taskName = TaskName.鎶芥_涓嶅悎鏍肩Щ搴�
var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var taskInfo = ETask.C鎶芥涓嶅悎鏍肩Щ搴�Info();
+ const string preLog = "API:鎶芥涓嶅悎鏍肩Щ搴�";
+
try {
+ if (!taskInfo.EndAreas.Contains(model.EndArea)) {
+ return NewSimpleResult(1, preLog + $"缁堢偣搴撳尯'{model.EndArea}'涓嶆弧瓒虫潯浠�闇�:璐у尯={LogObject(taskInfo.EndAreas)}");
+ }
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) {
- return NewSimpleResult(2, "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡");
+ return NewSimpleResult(2, preLog + $"娌℃湁鍦╗鐗╂枡鏄庣粏琛╙涓壘鍒扮墿鏂�瑕佹眰:鐗╂枡缂栫爜='{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) {
+ return NewSimpleResult(3, preLog + $"鍦╗璐т綅瀹瑰櫒鍏崇郴琛╙涓病鏈夋壘鍒板鍣�{model.CntrCode}'!");
+ }
- //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 == cgDetail.S_CNTR_CODE) // 鎸囧畾瀹瑰櫒鍙�- // .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- // .First();
-
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .First();
-
+ // 鏌ヨ璧风偣璐т綅:鏁伴噺=1
+ var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == locCntrRel.S_LOC_CODE && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 1).First();
if (startLoc == null) {
- info = "娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�;
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(1, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅'{locCntrRel.S_LOC_CODE}'!瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=1;鎵�湪搴撳尯={LogObject(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" && l.S_AREA_CODE == model.EndArea && l.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
+ 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.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�+ 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(cgDetail).UpdateColumns(it => new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = "淇敼鐗╂枡鐘舵�涓哄悎鏍�澶辫触";
- LogHelper.Info(info);
- return NewSimpleResult(4, 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(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} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, preLog + $"鏇存柊[璧风偣璐т綅閿佺姸鎬乚澶辫触!璧风偣='{startLoc.S_CODE}',閿佺姸鎬�>'鍑哄簱閿�");
+ }
+ if (db.Updateable(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(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewSimpleResult(500, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'澶辫触!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
}
- 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} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
-
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
-
+ // 鎻愪氦鏁版嵁搴撴洿鏀� tran.CommitTran();
- return NewSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {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) {
- return BuildSimpleEx(ex);
- }
- }
-
- public static SimpleResult RestBack(RestBackInfo model) {
- var taskName = TaskName.灏剧鍥炲簱;
- var db = new SqlHelper<object>().GetInstance();
- var info = "";
- try {
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == model.StartLoc)
- .First();
-
- var locCntrRel = db.Queryable<TN_Loc_Container>()
- .Where(c => c.S_LOC_CODE == model.StartLoc)
- .First();
-
- if (locCntrRel == null) {
- return NewSimpleResult(2, $"璧风偣璐т綅 {model.StartLoc}");
- }
-
- var endLoc = db.Queryable<TN_Location, TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- .Where((l, c) => c.S_CNTR_TYPE == locCntrRel.S_CNTR_TYPE)
- .First();
-
- if (endLoc == null) {
- return NewSimpleResult(3, $"涓嶅瓨鍦ㄥ悎閫傜殑缁堢偣璐т綅鍙互鍥炲簱");
- }
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 1); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 2); // 缁堢偣鍏ュ簱閿�-
- 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) {
- tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
-
- 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} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
-
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
-
- tran.CommitTran();
- info = $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
- }
- }
- catch (Exception ex) {
-
- return BuildSimpleEx(ex);
- }
- }
-
- public static List<TN_CG_Detail> SelectCgByTotalQty(CreateCheckOrderInfo model) {
- var db = new SqlHelper<object>().GetInstance();
- var result = new List<TN_CG_Detail>();
- var targetNum = model.Qty;
-
- try {
- var targetCg = db.Queryable<TN_CG_Detail>().Where(a => a.S_ITEM_CODE == model.ItemCode
- && a.N_ITEM_NUM > targetNum).
- OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
- if (targetCg != null) //鍒氬ソ鏈変竴琛屾弧瓒虫潯浠�- {
- result.Add(targetCg);
- return result;
- }
-
- var sortedMaterials = new List<TN_CG_Detail>();
-
- sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
- .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
- .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮")
- .OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
- .OrderBy(d => d.N_ITEM_STATE, OrderByType.Asc).ToList();
-
- if (sortedMaterials.Count == 0) //娌℃湁婊¤冻鏉′欢鐨�- {
- return result;
- }
-
- int countNum = 0;
- foreach (var mat in sortedMaterials) {
- countNum += mat.N_ITEM_NUM;
- result.Add(mat);
- if (countNum >= targetNum) {
- break;
- }
- }
- if (result.Sum(a => a.N_ITEM_NUM) >= targetNum) {
- return result;
- }
- else {
- result.Clear();
- return result;
- }
- }
- catch (Exception ex) {
- throw ex;
+ return NewSimpleResult(ex, preLog);
}
}
/// <summary>
- /// 鎴愬搧鑳跺嚭搴�WMS)
+ /// 灏炬枡鍥炲簱/浣欐枡鍥炲簱
/// </summary>
- /// <remarks>
- /// WMS鎻愪緵鍑哄簱鐨勭墿鏂欑被鍨嬩笌鏁伴噺锛岃皟鐢ㄦ帴鍙ｇ敱WCS鐢熸垚鍏蜂綋鐨勫嚭搴撲换鍔★紝鐒跺悗WCS鍚庡彴杞澶勭悊
- /// </remarks>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public static SimpleResult RestBack(RestBackInfo model) {
+ var db = new SqlHelper<object>().GetInstance();
+ var taskInfo = ETask.W灏炬枡鍥炲簱.Info();
+ const string preLog = "API:灏炬枡鍥炲簱:";
+
+ 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 && l.N_CURRENT_NUM == 1).First();
+ if (startLoc == null) {
+ return NewSimpleResult(2, $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�;褰撳墠瀹瑰櫒鏁伴噺=1");
+ }
+
+ var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_LOC_CODE == model.StartLoc).First();
+ if (locCntrRel == null) {
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}鎵�粦瀹氱殑瀹瑰櫒");
+ }
+
+ 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" && endAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
+ if (endLoc == null) {
+ return NewSimpleResult(3, preLog + $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0,鎵�湪搴撳尯={LogObject(endAreas)}");
+ }
+
+ var cntId = locCntrRel.S_CNTR_CODE;
+
+ 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.Insertable(locCntrRel).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // return NewSimpleResult(500, preLog + $"鎻掑叆[瀹瑰櫒璐т綅缁戝畾琛╙澶辫触!鏁版嵁:{LogObject(locCntrRel)}");
+ //}
+
+ // 鏇存柊[璧风偣/缁堢偣]閿佺姸鎬�鍒涘缓浠诲姟
+ if (db.Updateable(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}',閿佺姸鎬�>'鍑哄簱閿�");
+ }
+ if (db.Updateable(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(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ 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, preLog + $"鐢熸垚浠诲姟'{task.S_TYPE}'鎴愬姛!浠诲姟鍙�{task.S_CODE},瀹瑰櫒鍙�{task.S_CNTR_CODE},璧风偣={task.S_START_LOC},缁堢偣={task.S_END_LOC}");
+ }
+ }
+ catch (Exception ex) {
+ return NewSimpleResult(ex, preLog);
+ }
+ }
+
+ /// <summary>
+ /// 鎴愬搧鑳跺嚭搴�PDA) 寰呭畾,鏆傛椂涓嶉渶瑕佹鍔熻兘
+ /// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
- var info = "";
- try {
- if (string.IsNullOrEmpty(orderNo)) {
- info = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
- }
+ var taskInfo = ETask.C鎴愬搧鑳跺嚭搴�Info();
+ const string preLog = "API:鎴愬搧鑳跺嚭搴�";
- var cgDetailList = SelectCgByTotalQty(model);
+ try {
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
+
+ var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
if (cgDetailList.Count == 0) {
- info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(3, preLog + $"娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�);
}
var order = new TN_Outbound_Order {
@@ -1009,7 +659,6 @@
S_ITEM_CODE = model.ItemCode,
S_BATCH = model.BatchNo,
N_END_NUM = model.Qty,
- //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
S_END_AREA = model.EndArea
};
@@ -1027,27 +676,23 @@
}
using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
+ if (db.Insertable(order).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(2, preLog + "鐢熸垚鍑哄簱鍗曞け璐�" + LogObject(order));
}
- if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
+ if (db.Insertable(detailList).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(4, preLog + "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�" + LogObject(detailList));
}
tran.CommitTran();
}
- return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+ return NewSimpleResult(0, preLog + "鐢熸垚鍑哄簱鍗曟垚鍔�);
}
catch (Exception ex) {
- return BuildSimpleEx(ex);
+ return NewSimpleResult(ex, preLog);
}
}
@@ -1057,83 +702,91 @@
/// <returns></returns>
public static SimpleResult FinishedOutboundForce(FinishedOutboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
- var info = "";
+ var taskInfo = ETask.C鎴愬搧鑳跺嚭搴�Info();
+ const string preLog = "API:鎴愬搧鑳跺嚭搴�";
+
try {
- if (string.IsNullOrEmpty(orderNo)) {
- return NewSimpleResult(2, "鍑哄簱鍗曞彿涓嶈兘涓虹┖");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
+
+ var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
+
+ if (cgDetailList.Count == 0) {
+ return NewSimpleResult(3, preLog + $"娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�);
+ }
+
+ var order = new TN_Outbound_Order {
+ S_NO = orderNo,
+ S_ITEM_CODE = model.ItemCode,
+ S_BATCH = model.BatchNo,
+ N_END_NUM = model.Qty,
+ S_END_AREA = model.EndArea
+ };
+
+ 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 = model.EndArea
+ };
+ detailList.Add(detail);
}
using (var tran = db.Ado.UseTran()) {
-
- var cgDetailList = SelectCgByTotalQty(model);
-
- if (cgDetailList.Count == 0) {
- return NewSimpleResult(3, "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�);
- }
-
- 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,
- S_END_AREA = model.EndArea
- };
-
- if (db.Insertable<TN_Outbound_Detail>(detail).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- return NewSimpleResult(4, "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐ワ細" + JsonConvert.SerializeObject(detail));
- }
- }
-
- var order = new TN_Outbound_Order {
- S_NO = orderNo,
- S_ITEM_CODE = model.ItemCode,
- S_BATCH = model.BatchNo,
- N_END_NUM = model.Qty,
- //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
- S_END_AREA = model.EndArea
- };
-
- if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
+ if (db.Insertable(order).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return NewSimpleResult(5, "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order));
+ return NewSimpleResult(2, preLog + "鐢熸垚鍑哄簱鍗曞け璐�" + LogObject(order));
+ }
+
+ if (db.Insertable(detailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewSimpleResult(4, preLog + "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�" + LogObject(detailList));
}
tran.CommitTran();
}
- return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+ return NewSimpleResult(0, preLog + "鐢熸垚鍑哄簱鍗曟垚鍔�);
}
catch (Exception ex) {
- return BuildSimpleEx(ex);
+ return NewSimpleResult(ex, preLog);
}
}
- public static List<TN_CG_Detail> SelectCgByTotalQty(FinishedOutboundInfo model) {
+ public static List<TN_CG_Detail> SelectCgByTotalQty(int qty, string itemCode, string batchNo, string cntrType = "", bool forcedOut = true) {
var db = new SqlHelper<object>().GetInstance();
var result = new List<TN_CG_Detail>();
- var targetNum = model.Qty;
- var info = "";
+ var targetNum = qty;
try {
- var targetCg = db.Queryable<TN_CG_Detail>().Where(a => a.S_ITEM_CODE == model.ItemCode
- && a.N_ITEM_NUM > targetNum).
- OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
+ var targetCg = db.Queryable<TN_CG_Detail>()
+ .Where(a => a.S_ITEM_CODE == itemCode && a.S_BATCH_NO == batchNo)
+ .Where(a => a.N_ITEM_NUM > targetNum)
+ .OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
if (targetCg != null) //鍒氬ソ鏈変竴琛屾弧瓒虫潯浠� {
result.Add(targetCg);
return result;
}
- // NOTE 鏍规嵁鎬婚噺閫塪etail鏃讹紝鏄惁闇�鑰冭檻璐т綅鐨勯珮浣庯紵
+ // NOTE 鏍规嵁鎬婚噺閫塪etail鏃�鏄惁闇�鑰冭檻璐т綅鐨勯珮浣庯紵
var sortedMaterials = new List<TN_CG_Detail>();
- if (model.ForcedOut) {
+ var cntrTypeList = new List<string>();
+ if (cntrType == "") {
+ cntrTypeList = new List<string> { "鎵樼洏", "濂借繍绠� }; // 涓嶆寚瀹氭墭鐩樼被鍨�浜岃�鍧囧彲
+ }
+ else {
+ cntrTypeList.Add(cntrType);
+ }
+
+ if (forcedOut) {
sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
- .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
+ .Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
+ .Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
.Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "鍚堟牸"
|| d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮")
.OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
@@ -1141,13 +794,12 @@
}
else {
sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
- .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
+ .Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
+ .Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
.Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "鍚堟牸")
.OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
.OrderBy(d => d.N_ITEM_STATE, OrderByType.Asc).ToList();
}
-
if (sortedMaterials.Count == 0) //娌℃湁婊¤冻鏉′欢鐨� {
@@ -1171,160 +823,241 @@
}
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.Info(info);
+ LogHelper.InfoEx(ex);
return result;
}
}
-
- /// <summary>
- /// 绉诲簱-鍒涘缓绉诲簱浠诲姟(WMS)
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public static SimpleResult CreateShiftOrder(CreateShiftOrderInfo model) {
- var billName = "鎶芥鍗�;
- var db = new SqlHelper<object>().GetInstance();
- var info = "";
- try {
- var orderNo = GenerateOrderNo("鎶芥鍗曞彿", "CN");
-
- var order = new TN_Check_Order {
- S_NO = orderNo,
- S_ITEM_CODE = model.ItemCode,
- //S_ITEM_NAME = model.ItemName,
- S_BATCH_NO = model.BatchNo,
- //N_COUNT = model.Qty,
- S_END_AREA = model.EndArea,
- };
-
- var cgDetailList = SelectShiftItem(model);
- if (cgDetailList.Count == 0) {
- return NewSimpleResult(3, "娌℃湁绗﹀悎瑕佹眰鐨勭墿鏂欓渶瑕佺Щ搴�);
- }
-
- var detailList = new List<TN_Check_Detail>();
- foreach (var cgDetail in cgDetailList) {
- var detail = new TN_Check_Detail {
- S_NO = orderNo,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- S_BATCH_NO = cgDetail.S_BATCH_NO,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_END_AREA = model.EndArea,
- };
-
- detailList.Add(detail);
-
- cgDetail.N_ITEM_STATE = 3;
- cgDetail.S_ITEM_STATE = "鎶介獙涓�;
- }
-
- using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_Check_Order>(order).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚{billName}澶辫触锛� + JsonConvert.SerializeObject(order);
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
- }
-
- if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚{billName}鏄庣粏澶辫触";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
-
- if (db.Updateable<TN_CG_Detail>(cgDetailList).UpdateColumns(it => new {
- it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鏇存柊鐗╂枡鐘舵�澶辫触";
-
- }
-
- tran.CommitTran();
- }
- return NewSimpleResult(0, $"鍒涘缓 鎶芥鍗�鎴愬姛");
- }
- catch (Exception ex) {
- return BuildSimpleEx(ex);
- }
- }
-
- public static List<TN_CG_Detail> SelectShiftItem(CreateShiftOrderInfo model) {
- var db = new SqlHelper<object>().GetInstance();
- var result = new List<TN_CG_Detail>();
- var info = "";
- try {
- var targetItemList = db.Queryable<TN_CG_Detail>()
- .Where(a => a.S_ITEM_CODE == model.ItemCode)
- .Where(a => a.S_BATCH_NO == model.BatchNo)
- .Where(a => a.N_ITEM_STATE != 3 && a.S_ITEM_CODE != "鎶芥涓�)
- .OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc)
- .ToList();
-
- return targetItemList;
- }
- catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.Info(info);
- return result;
- }
- }
-
private static string GenerateOrderNo(string snType, string prefix) {
var id = SYSHelper.GetSerialNumber(snType, prefix);
var date = DateTime.Now.ToString("yyMMdd");
- return $"ON{date}{id.ToString().PadLeft(4, '0')}";
+ return $"{prefix}{date}-{id.ToString().PadLeft(4, '0')}";
}
/// <summary>
- /// 鍗氬疄鐗╂枡淇℃伅涓嬪彂鍚屾
+ /// 鍗氬疄鐗╂枡淇℃伅涓嬪彂鍚屾 (鍙拡瀵瑰ソ杩愮)
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public static WmsResult CgInfoSync(CgInfoSyncInfo model) {
+ public static MesResult CgInfoSync(CgInfoSyncInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var random = new Random();
+ const string preLog = "API:鍗氬疄涓嬪彂鐗╂枡淇℃伅:";
+ const string cntrType = "濂借繍绠�;
try {
+ if (string.IsNullOrEmpty(model.ItemCode)) {
+ return NewMesResult(400, preLog + $"鐗╂枡缂栫爜'{model.ItemCode}'涓嶈兘涓虹┖!");
+ }
+ if (string.IsNullOrEmpty(model.CntrCode)) {
+ return NewMesResult(400, preLog + $"瀹瑰櫒缂栫爜'{model.CntrCode}'涓嶈兘涓虹┖!");
+ }
+ if (string.IsNullOrEmpty(model.BatchNo)) {
+ return NewMesResult(400, preLog + $"鎵规鍙�{model.BatchNo}'涓嶈兘涓虹┖!");
+ }
+ if (model.ItemNum <= 0) {
+ return NewMesResult(400, preLog + $"鐗╂枡鏁伴噺'{model.ItemNum}'涓嶅悎娉�瑕佹眰:鐗╂枡鏁伴噺锛�");
+ }
+
+ // TEMP 鐩墠娴佺▼:瀵瑰崥瀹炰笅鍙戠殑淇℃伅涔熻繘琛屾鏌�鏈壘鍒板氨鎶ラ敊,鍚庨潰鏈夐渶姹傚啀鏇存敼
+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█,S_CODE灏辨槸涓婚敭,缁存姢鏃跺繀瀹氬敮涓�+ .First();
+
+ if (cntr == null) {
+ return NewMesResult(1, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪,璇峰湪鍓嶅彴椤甸潰涓淮鎶�");
+ }
+ if (cntr.S_TYPE != cntrType) {
+ return NewMesResult(2, preLog + $"瀹瑰櫒'{model.CntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷涓�{cntr.S_TYPE}',涓庡綋鍓嶅鍣ㄧ被鍨�{cntrType}'涓嶅悓!");
+ }
+
+ // 灏嗕笅鍙戠殑淇℃伅鍏堝瓨鍌ㄥ埌CG琛ㄤ腑 (姝ゆ椂鎵樼洏娌℃湁涓庝骇绾垮鐨勮揣浣嶇粦瀹�
var detail = new TN_CG_Detail {
- S_ITEM_CODE = model.ItemCode,
- S_ITEM_NAME = model.ItemName,
- S_CNTR_CODE = Guid.NewGuid().ToString("D"), // NOTE 瀹瑰櫒鍙凤細鐩墠闅忔満锛堝悗鏈熷彲鑳戒細鎸囧畾锛屾垨鑰匬DA缁戝畾鏃跺啀濉叆锛�- S_BATCH_NO = model.BatchNo,
+ S_ITEM_CODE = model.ItemCode, // NOT NULL
+ S_ITEM_NAME = model.ItemName,
+ S_CNTR_CODE = model.CntrCode, // NOT NULL 鏂欑缂栧彿 (寰呭畾,鐜板湪鏆傛椂璁惧畾涓哄崥瀹炰笅鍙�
+ S_BATCH_NO = model.BatchNo, // NOT NULL
S_STANDARD = model.Standard,
S_NET_WEIGHT = model.NetWeight,
S_QUALITY_GRADE = model.QualityGrade,
- //N_PRODUCT_LINE = random.Next(0, 3), // NOTE 浜х嚎鍙凤細鐩墠闅忔満锛堝悗鏈熷彲鑳戒細鎸囧畾锛屾垨鑰匬DA缁戝畾鏃跺啀濉叆锛� };
- // 璐т綅瀹瑰櫒缁戝畾鐨勯�杈戯紝鍦ㄥソ杩愮涓嬬嚎PDA鐨勬祦绋嬩腑鎿嶄綔
-
- //var locCntrRel = new TN_Loc_Container {
- // //S_LOC_CODE = Settings.Config.ProductionLines[detail.N_PRODUCT_LINE].OffLoc[0], // 濂借繍绠辩殑浣嶇疆鏄搷浣滃尯锛屼笉鏄骇绾�- // S_CNTR_CODE = detail.S_CNTR_CODE,
- // S_CNTR_TYPE = "濂借繍绠�, // 璐存爣鏈哄彧閽堝濂借繍绠�- //};
-
- //using (var tran = db.Ado.UseTran()) {
- // if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0
- // && db.Insertable<TN_Loc_Container>(detail).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // return MesResultBuilder(2, "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail));
- // }
- // tran.CommitTran();
+ // 浜х嚎鍙风殑閫昏緫寰呭畾,鐜板湪璁惧畾涓哄崥瀹炰笅鍙戜骇绾垮彿,鐪嬪悗缁渶姹傚彉鏇�+ // 濂借繍绠辫捣鐐逛负浜х嚎璐т綅,浜哄伐灏嗗ソ杩愮浠庝骇绾夸笂鍙栦笅,鎼繍鍒版弧濂借繍绠辨搷浣滃尯
+ //var startLocCode = "";
+ //if (model.ProdLineId.Trim() == "3") {
+ // startLocCode = "";
//}
- if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
- return MesResultBuilder(2, "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail));
+ //if (model.ProdLineId.Trim() != "3" || model.ProdLineId.Trim() != "4") {
+ // info = $"涓嶅悎娉曠殑浜х嚎鍙穥model.ProdLineId}:濂借繍绠变骇绾垮彿蹇呴』涓�3 鎴�4";
+ // LogHelper.Info(info);
+ // return NewMesResult(2, info);
+ //}
+
+ if (db.Insertable(detail).ExecuteCommand() <= 0) {
+ return NewMesResult(500, preLog + $"鎻掑叆[鐗╂枡鏄庣粏琛╙澶辫触!鏁版嵁:{LogObject(detail)}");
}
- return MesResultBuilder(0, "鎻掑叆鐗╂枡淇℃伅鎴愬姛");
+ return NewMesResult(500, preLog + $"鎻掑叆[鐗╂枡鏄庣粏琛╙鎴愬姛!鏁版嵁:{LogObject(detail)}");
}
catch (Exception ex) {
- return MesResultBuilder(1, ex.Message);
+ return NewMesResult(-1, preLog + $"鍙戠敓浜嗗紓甯�{ex.Message}\n\n{ex.StackTrace}\n");
}
}
+
+ public static ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
+ var db = new SqlHelper<object>().GetInstance();
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
+ const string preLog = "API:ERP涓嬪彂鍑哄簱璁″垝鍗�";
+ try {
+ if (model.pzjs <= 0) {
+ return NewErpResult(400, preLog + $"鐗╂枡鏁伴噺(pzjs)'{model.pzjs}'涓嶅悎娉�瑕佹眰:鐗╂枡鏁伴噺锛�");
+ }
+
+ var outboundPlan = db.Queryable<TN_Outbound_Plan>()
+ .Where(p => p.JHDH == model.jhdh).First();
+ if (outboundPlan != null) {
+ return NewErpResult(1, preLog + $"璁″垝鍗曞彿'{model.jhdh}'宸插湪[鍑哄簱璁″垝鍗昡涓瓨鍦�");
+ }
+
+ outboundPlan = new TN_Outbound_Plan {
+ JHDH = model.jhdh, // 璁″垝鍗曞彿 (鍞竴鏍囪瘑)
+ CKZT = model.ckzt, // 鍑哄簱鐘舵� (闇�杩斿洖)
+ JHLB = model.jhlb, // 璁″垝绫诲埆
+ CKDH = model.ckdh, // 鍙傝�鍗曞彿
+ CPH = model.cph, // 杞︾墝鍙�+ YSFS = model.ysfs, // 杩愯緭鏂瑰紡
+ CPZT = model.cpzt, // 浜у搧鐘舵�
+ MDDW = model.mddw, // 涔版柇鍗曚綅
+ CPDM = model.cpdm, // 浜у搧浠ｇ爜
+ CPLB = model.cplb, // 浜у搧绫诲埆
+ CPLBMX = model.cplbmx, // 浜у搧绫诲埆鏄庣粏
+ PP = model.pp, // 鍝佺墝
+ DJ = model.dj, // 绛夌骇 (闇�杩斿洖)
+ GH = model.gh, // 缃愬彿
+ PH = model.ph, // 鎵瑰彿 (闇�杩斿洖)
+ BZLX = model.bzlx, // 鍖呰绫诲瀷
+ PZDH = model.pzdh, // 娲捐鍗曞彿
+ PZD_DW = model.pzd_dw, // 娲捐鍗曞崟浣�+ PZD_DYBH = model.pzd_dybh, // 娲捐鍗曡皟杩愮紪鍙�+ PZJS = model.pzjs, // 娲捐浠舵暟
+ PZSL = model.pzsl, // 娲捐鏁伴噺
+ PZ_RQ = model.pz_rq, // 娲捐鏃ユ湡(yyyy-mm-dd)
+ PZ_CZRQ = model.pz_czrq, // 娲捐鎿嶄綔鏃ユ湡
+ PZ_ZFBJ = model.pz_zfbj, // 娲捐浣滃簾鏍囪
+ 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, // 鎿嶄綔鍛�(闇�杩斿洖)
+ SHR_USERNAME = model.shr_username, // 瀹℃牳浜�+ SHRQ = model.shrq, // 瀹℃牳鏃ユ湡
+ ZFBJ = model.zfbj, // 浣滃簾鏍囪
+ ZFRQ = model.zfrq, // 浣滃簾鏃ユ湡
+ JSDW = model.jsdw, // 缁撶畻鍗曚綅
+ SHDW = model.shdw, // 鏀惰揣鍗曚綅
+ YSDW = model.ysdw, // 杩愯緭鍗曚綅
+ LXR = model.lxr, // 鑱旂郴浜�+ 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 // 璐т綅鐘舵� (闇�杩斿洖)
+ };
+
+ //var cgDetailList = SelectCgByTotalQty(
+ // qty: (int)model.pzsl,
+ // itemCode: model.cpdm,
+ // batchNo: model.ph
+ // );
+
+ //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 ) {
+ return NewErpResult(2, preLog + $"鍦╗璐у搧鏄庣粏琛╙涓病鏈夋壘鍒板悎閫傜殑鐗╂枡!瑕佹眰:鐗╂枡缂栫爜='{model.cpdm}',鐗╂枡鏁伴噺>={model.pzjs}");
+ }
+
+ 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 = 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);
+ //}
+ 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(order).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewErpResult(500, preLog + $"鐢熸垚[鍑哄簱鍗昡澶辫触!鏁版嵁:{LogObject(order)}");
+ }
+
+ if (db.Insertable(detailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewErpResult(500, preLog + $"鐢熸垚[鍑哄簱鍗曟槑缁哴澶辫触!鏁版嵁:{LogObject(detailList)}");
+ }
+
+ if (db.Insertable(outboundPlan).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewErpResult(500, preLog + $"鐢熸垚[鍑哄簱鍗曡鍒掕褰曡〃]澶辫触!鏁版嵁:{LogObject(outboundPlan)}");
+ }
+
+ tran.CommitTran();
+ return NewErpResult(0, preLog + $"鐢熸垚[鍑哄簱鍗昡鎴愬姛!鍑哄簱鍗�{LogObject(order)}\n鍑哄簱鍗曟槑缁�{LogObject(detail)}");
+ }
+ }
+ catch (Exception ex) {
+ return NewErpResult(1, preLog + $"鍙戠敓浜嗗紓甯�{ex.Message}\n\n{ex.StackTrace}\n");
+ }
+ }
+
+ private static string LogObject(object obj) {
+ return JsonConvert.SerializeObject(obj).Replace("\"", "'");
+ }
}
}
--
Gitblit v1.9.1