From 2ca90a404fa1ab94eb6374f50c6ddd47a2b7f0e6 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 31 七月 2025 17:23:57 +0800
Subject: [PATCH] 删除有问题的TCP旧代码, 优化事务处理和ERP数据模型
---
api/ApiHelper.cs | 1436 +++++++++++++++++------------------------------------------
1 files changed, 414 insertions(+), 1,022 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index beda0c6..36225f0 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -1,1064 +1,459 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
using HH.WCS.Mobox3.DSZSH.models;
using HH.WCS.Mobox3.DSZSH.util;
using HH.WCS.Mobox3.DSZSH.wms;
-
using Newtonsoft.Json;
-using Org.BouncyCastle.Asn1.Tsp;
-
using SqlSugar;
-
-using Swashbuckle.Swagger;
-
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.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭� var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var (ok, msg) = (false, string.Empty);
+ var obj = new CreateTaskObj();
+
+ var tInfo = ETask.M婊＄涓嬬嚎鍏ュ簱.Info();
+ const string preLog = "API:婊＄涓嬬嚎鍏ュ簱:";
+ const string cntrType = "濂借繍绠�;
+
try {
- // 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
+ if (model.Num <= 0) {
+ return NewSimpleResult(400, preLog + $"鐗╂枡鏁伴噺'{model.Num}'涓嶅悎娉�瑕佹眰:鐗╂枡鏁伴噺锛�");
+ }
+
+ // 妫�煡璐у搧瀹瑰櫒琛�鏄惁宸茬粡瀛樺湪璐存爣鏈轰紶閫掔殑寰呭叆搴撶墿鏂欎俊鎭�+ // QES:鏁伴噺,瑙勬牸鏄惁涔熷弬涓庢瘮瀵�
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寰呮
- .First();
-
+ .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 + LogMsg.CgDetailNotFound(item: model.ItemCode) + $"鐗╂枡鐘舵�='寰呮';" +
+ $"璇锋鏌�PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭槸鍚︿竴鑷�!");
}
- // 璧风偣璐т綅缁戝畾鍚庯紝鍙互涓嶇珛鍗宠缃甆_CURRENT_NUM涓�
- // 鍥犱负AGV鍙栬揣鍚庡氨浼氭仮澶�锛岃�涓旇揣浣嶄笂閿佸悗涓嶄細琚闂埌
- 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[AreaName.M婊＄鎿嶄綔鍖篯.Contains(l.S_AREA_CODE))
- .First();
-
+ // 鏌ヨ璧风偣璐т綅(缁戝畾鍓�
+ var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(model.StartLoc, tInfo.StartAreas)).First();
if (startLoc == null) {
- info = $"鍦�{AreaName.M婊＄鎿嶄綔鍖簘'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(2, preLog + LogMsg.StartLocUnbindNotFound(model.StartLoc, tInfo.StartAreas));
}
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿
- var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = model.StartLoc,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_CNTR_TYPE = "濂借繍绠�,
- };
+ // 鍜屾弧鎵樹笅绾垮叆搴撶殑閫昏緫涓�嚧,鐢变簬瀹瑰櫒绉诲姩涓嶄細鏇存敼缁戝畾淇℃伅,鎵�互蹇呴』鍒犻櫎鏃ф暟鎹�+ WMSHelper.FindOldCntrInfo(obj, cgDetail.S_CNTR_CODE, skipCgDetail: true);
- // TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖�- var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.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();
+ // 缁戝畾璐т綅瀹瑰櫒
+ var locCntrRel = WMSHelper.BindLocCntr(obj, startLoc, cgDetail.S_CNTR_CODE, cntrType);
+ // 鏌ヨ缁堢偣璐т綅
+ // Order:浼樺厛閫夋嫨浣庡眰璐ф灦
+ var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: tInfo.EndAreas))
+ .OrderBy(l => new { l.N_LAYER }).First();
if (endLoc == null) {
- info = "婊＄鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: tInfo.EndAreas));
}
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�-
- // TODO
- var record = new TN_Record_Table {
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- S_BATCH_NO= cgDetail.S_BATCH_NO,
- S_ITEM_NAME= cgDetail.S_ITEM_NAME,
- S_START_LOC = startLoc.S_CODE,
- S_END_LOC = endLoc.S_CODE,
- S_CNTR_CODE = cntId,
- S_ITEM_SPEC = cgDetail.S_ITEM_SPEC,
- S_NET_WEIGHT= cgDetail.S_NET_WEIGHT,
- S_QUALITY_GRADE= cgDetail.S_QUALITY_GRADE,
- S_STANDARD = cgDetail.S_STANDARD,
- S_TASK_NO = task.S_CODE,
- };
-
- using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(4, 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
- }).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.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}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽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);
- }
+ // 璧风偣缁堢偣涓婇攣,鍒涘缓浠诲姟
+ WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
+ (ok, msg) = DbTran.CreateTask(obj);
+ return NewSimpleResult(ok ? 0 : 500, preLog + msg);
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- 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.T鎵樼洏_绌烘墭鍏ュ簱;
var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var (ok, msg) = (false, string.Empty);
+ var obj = new CreateTaskObj();
+
+ var tInfo = ETask.K绌烘墭鍏ュ簱.Info();
+ const string preLog = "API:绌烘墭鍏ュ簱:";
+ 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[AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖篯.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
- .First();
+ // 鏌ヨ瀹瑰櫒琛�瀹瑰櫒绫诲瀷瀛楁
+ (ok, msg) = WMSHelper.CheckCntrType(model.CntrCode, cntrType, out var cntr);
+ if (!ok) {
+ return NewSimpleResult(1, preLog + msg);
+ }
+ // 鏌ヨ璧风偣璐т綅(缁戝畾鍓�
+ var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(model.StartLoc, tInfo.StartAreas)).First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆{model.StartLoc}涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(2, preLog + LogMsg.StartLocUnbindNotFound(model.StartLoc, tInfo.StartAreas));
}
- // 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�- //var locCntrRel = db.Queryable<TN_Loc_Container>()
- // .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
- // .First();
+ // 绌虹鍏ュ簱鏃�濡傛灉瀛樺湪鏃х殑缁戝畾鏁版嵁,鍒犻櫎
+ WMSHelper.FindOldCntrInfo(obj, model.CntrCode);
- //if (locCntrRel == null) {
- // info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
- // LogHelper.Info(info);
- // return NewSimpleResult(3, info);
- //}
+ // 缁戝畾璐т綅瀹瑰櫒
+ var locCntrRel = WMSHelper.BindLocCntr(obj, startLoc, cntr.S_CODE, cntrType);
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿
- var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = model.StartLoc,
- S_CNTR_CODE = model.CntrCode,
- S_CNTR_TYPE = "鎵樼洏",
- };
-
- // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
- var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.K绌烘墭瀛樻斁鍖篯.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, row=SqlFunc.Desc(l.S_AREA_CODE) })
- .First();
-
+ // 鏌ヨ缁堢偣璐т綅
+ // Order:灞傛暟浠庝綆鍒伴珮,琛�鍒�+ var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: tInfo.EndAreas))
+ .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
if (endLoc == null) {
- info = $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: tInfo.EndAreas));
}
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�-
- using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(4, 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
- }).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.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}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽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);
- }
+ // 璧风偣缁堢偣涓婇攣,鍒涘缓浠诲姟
+ WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
+ (ok, msg) = DbTran.CreateTask(obj);
+ return NewSimpleResult(ok ? 0 : 500, preLog + msg);
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(ex, preLog);
}
}
/// <summary>
- /// 濂借繍绠�绌虹鍏ュ簱(PDA)
+ /// 绌虹鍏ュ簱
/// </summary>
/// <returns></returns>
public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
- var taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var (ok, msg) = (false, string.Empty);
+ var obj = new CreateTaskObj();
+
+ var tInfo = ETask.K绌虹鍏ュ簱.Info();
+ const string preLog = "API:绌虹鍏ュ簱:";
+ const string cntrType = "濂借繍绠�;
+
try {
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == model.StartLoc)
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
- .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓嶈揣浣嶄负绌�- .Where(l => Settings.AreaMap[AreaName.K绌虹鍏ュ簱鎺ラ┏鍖篯.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
- .First();
-
+ // 鏌ヨ璧风偣璐т綅(缁戝畾鍓�
+ var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLocUnbind(model.StartLoc, tInfo.StartAreas)).First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆{model.StartLoc}涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(1, preLog + LogMsg.StartLocUnbindNotFound(model.StartLoc, tInfo.StartAreas));
}
- // 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�- //var locCntrRel = db.Queryable<TN_Loc_Container>()
- // .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
- // .First();
+ // 鏌ヨ瀹瑰櫒琛�瀹瑰櫒绫诲瀷瀛楁
+ (ok, msg) = WMSHelper.CheckCntrType(model.CntrCode, cntrType, out var cntr);
+ if (!ok) {
+ return NewSimpleResult(2, preLog + msg);
+ }
- //if (locCntrRel == null) {
- // info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
- // LogHelper.Info(info);
- // return NewSimpleResult(3, info);
- //}
+ // 绌虹鍏ュ簱鏃�濡傛灉瀛樺湪鏃х殑缁戝畾鏁版嵁,鍒犻櫎
+ WMSHelper.FindOldCntrInfo(obj, model.CntrCode);
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿
- var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = model.StartLoc,
- S_CNTR_CODE = model.CntrCode,
- S_CNTR_TYPE = "濂借繍绠�,
- };
+ var locCntrRel = WMSHelper.BindLocCntr(obj, startLoc, model.CntrCode, cntrType);
- // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀�- var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.K绌虹璐ф灦鍖篯.Contains(l.S_AREA_CODE))
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
- .Where(l => l.N_CURRENT_NUM == 0)
- .OrderBy(l => new { l.N_LAYER })
- .First();
-
+ var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: tInfo.EndAreas))
+ .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
if (endLoc == null) {
- return NewSimpleResult(4, $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅");
+ return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: tInfo.EndAreas));
}
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�-
- using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(4, 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
- }).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.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}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽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);
- }
+ // 璧风偣缁堢偣涓婇攣,鍒涘缓浠诲姟
+ WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
+ (ok, msg) = DbTran.CreateTask(obj);
+ return NewSimpleResult(ok ? 0 : 500, preLog + msg);
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(ex, preLog);
}
}
/// <summary>
- /// 鎵樼洏-绌烘墭涓婄嚎(PDA)
+ /// 绌烘墭涓婄嚎鍑哄簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
- var taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var (ok, msg) = (false, string.Empty);
+ var obj = new CreateTaskObj();
+
+ var tInfo = ETask.K绌烘墭涓婄嚎鍑哄簱.Info();
+ const string preLog = "API:绌烘墭涓婄嚎鍑哄簱:";
+ const string cntrType = "鎵樼洏";
+
try {
- // 鎵剧鍚堢墿鏂欎俊鎭殑璐т綅
- //var startLoc = db.Queryable<TN_Location>()
- // .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 鑱旇〃锛氳揣浣嶅鍣ㄥ叧绯昏〃
- // .LeftJoin<TN_Container_Item>((l, c, i) => c.S_CNTR_CODE == i.S_CNTR_CODE) // 鑱旇〃锛氬鍣ㄤ笌鐗╂枡绫诲瀷缁戝畾琛�- // .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE)) // 闄愬畾鍦ㄧ┖鎵樺瓨鏀惧尯涓壘瀹瑰櫒璐т綅
- // .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭病鏈夐攣鐘舵�
- // .Where(l => l.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�- // .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
- // .Where((l, c, i) => i.S_ITEM_CODE == model.ItemCode) // 纭繚瀹瑰櫒缂栫爜缁戝畾鐨勭墿鏂欑紪鐮佷笌鎵�渶涓�嚧
- // .First();
-
- //if (startLoc == null) {
- // info = $"鍦ㄧ┖鎵樺瓨鏀惧尯涓紝鎵句笉鍒扮鍚坽model.ItemCode}鐗╂枡锛屼笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
- // LogHelper.Info(info);
- // return NewSimpleResult(2, info);
- //}
-
- //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 cntrItemRel = db.Queryable<TN_Container_Item>()
- .Where(i => i.S_CNTR_CODE == model.CntId && i.S_ITEM_CODE == model.ItemCode)
- .First();
-
- if (cntrItemRel == null) {
- info = $"瀹瑰櫒{model.CntId}涓嶇鍚堢墿鏂檣model.ItemCode}锛氭病鏈夊湪瀹瑰櫒鐗╂枡绫诲瀷鐧昏琛ㄤ腑鎵惧埌";
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ // 鏌ヨ瀹瑰櫒琛�瀹瑰櫒绫诲瀷瀛楁
+ (ok, msg) = WMSHelper.CheckCntrType(model.CntId, cntrType, out var cntr);
+ if (!ok) {
+ return NewSimpleResult(1, preLog + msg);
}
- var startLoc = db.Queryable<TN_Location>()
- .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 鑱旇〃锛氳揣浣嶅鍣ㄥ叧绯昏〃
- .Where(l => Settings.AreaMap[AreaName.K绌烘墭瀛樻斁鍖篯.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, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
- .First();
+ // 妫�煡瀹瑰櫒琛�瀹瑰櫒瑙勬牸(鐗╂枡缂栫爜)
+ 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(DbExpr.StartLoc(areas: tInfo.StartAreas))
+ .Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == cntrType).First();
if (startLoc == null) {
- info = $"鍦ㄧ┖鎵樺瓨鏀惧尯涓紝鎵句笉鍒扮鍚坽model.ItemCode}鐗╂枡锛屼笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ return NewSimpleResult(3, preLog + LogMsg.StartLocNotFound(areas: tInfo.StartAreas) +
+ $"缁戝畾瀹瑰櫒缂栫爜='{model.CntId}';缁戝畾瀹瑰櫒绫诲瀷='{cntrType}';");
}
- var endLoc = db.Queryable<TN_Location>()
- //.Where(l => Settings.AreaMap[AreaName.B鍖呰鍖篯.Contains(l.S_AREA_CODE))
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
- .First();
-
+ // 鏌ヨ缁堢偣璐т綅
+ var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: tInfo.EndAreas)).First();
if (endLoc == null) {
- info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(5, preLog + LogMsg.EndLocNotFound(areas: tInfo.EndAreas));
}
- var cntId = model.CntId;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ // 璧风偣缁堢偣涓婇攣,鍒涘缓浠诲姟
+ var task = WMSHelper.CreateTask(obj, startLoc, endLoc, model.CntId, tInfo.TaskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ cntr.S_SOURCE = task.S_CODE; // 鐢ㄤ换鍔″彿浣滀负瀹瑰櫒鏇存柊鐨勪緷鎹�+ cntr.T_MODIFY = DateTime.Now;
+ obj.ContainerToUpdate = needUpdateContainer ? cntr : null; // 濡傛灉闇�鏇存柊[瀹瑰櫒琛╙瑙勬牸,鍐欏叆obj
- 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}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.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}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽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);
- }
+ (ok, msg) = DbTran.CreateTask(obj);
+ return NewSimpleResult(ok ? 0 : 500, preLog + msg);
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(ex, preLog);
}
}
/// <summary>
- /// 濂借繍绠�绌虹涓婄嚎(PDA)
+ /// 绌虹涓婄嚎鍑哄簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
- var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var (ok, msg) = (false, string.Empty);
+ var obj = new CreateTaskObj();
+
+ var tInfo = ETask.K绌虹涓婄嚎鍑哄簱.Info();
+ const string preLog = "API:绌虹涓婄嚎鍑哄簱:";
+ const string cntrType = "濂借繍绠�;
+
try {
- var startLoc = db.Queryable<TN_Location>()
- .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- .Where(l => Settings.AreaMap[AreaName.K绌虹璐ф灦鍖篯.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, c) => c.S_CNTR_CODE == model.CntId)
- .First();
+ // 鏌ヨ瀹瑰櫒琛�瀹瑰櫒绫诲瀷瀛楁
+ (ok, msg) = WMSHelper.CheckCntrType(model.CntId, cntrType, out var cntr);
+ if (!ok) {
+ return NewSimpleResult(3, preLog + msg);
+ }
+ var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
+ .Where(DbExpr.StartLoc(areas: tInfo.StartAreas))
+ .Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == cntrType).First();
if (startLoc == null) {
- info = $"鍦ㄧ┖绠卞瓨鏀惧尯涓紝鎵句笉鍒扮紪鐮佷负{model.CntId}鐨勭┖濂借繍绠�;
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(2, preLog + preLog + LogMsg.StartLocNotFound(areas: tInfo.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(l => Settings.AreaMap[AreaName.B鍖呰鍖篯.Contains(l.S_AREA_CODE))
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 0)
- .First();
-
+ var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: tInfo.EndAreas)).First();
if (endLoc == null) {
- return NewSimpleResult(4, $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�);
+ return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: tInfo.EndAreas));
}
- var cntId = model.CntId;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�-
- 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}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.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}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽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);
- }
+ // 璧风偣缁堢偣涓婇攣,鍒涘缓浠诲姟
+ WMSHelper.CreateTask(obj, startLoc, endLoc, model.CntId, tInfo.TaskName);
+ (ok, msg) = DbTran.CreateTask(obj);
+ return NewSimpleResult(ok ? 0 : 500, preLog + msg);
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(ex, preLog);
}
}
-
/// <summary>
- /// 鎶芥-鍚堟牸鍥炲簱(PDA)
+ /// 鎶芥鍚堟牸鍥炲簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult QualifiedBack(QualifiedBackInfo model) {
- var taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
var db = new SqlHelper<object>().GetInstance();
- var info = "";
+ var (ok, msg) = (false, string.Empty);
+ var obj = new CreateTaskObj();
+
+ var tInfo = 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(1, preLog + LogMsg.CgDetailNotFound(item: model.ItemCode, cntr: 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(2, preLog + LogMsg.LocCntrRelNotFound(cntr: cgDetail.S_CNTR_CODE));
+ }
- //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(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();
-
+ var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLoc(locCntrRel.S_LOC_CODE, tInfo.StartAreas)).First();
if (startLoc == null) {
- info = "娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�;
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(3, preLog + LogMsg.StartLocNotFound(locCntrRel.S_LOC_CODE, tInfo.StartAreas));
}
- var endLoc = new TN_Location();
- if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
- endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.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 == "濂借繍绠�) {
- endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.Contains(l.S_AREA_CODE))
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 0)
- .First();
- }
- else {
- return NewSimpleResult(2, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
- }
-
-
+ var endAreas = locCntrRel.S_CNTR_CODE == "鎵樼洏" ? tInfo.EndAreas_Pallet : tInfo.EndAreas_Goodpack;
+ var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: endAreas)).First();
if (endLoc == null) {
- return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
+ return NewSimpleResult(4, preLog + LogMsg.EndLocNotFound(areas: endAreas));
}
+ //淇敼鐗╂枡鐘舵�涓篬鍚堟牸]
cgDetail.N_ITEM_STATE = 0;
cgDetail.S_ITEM_STATE = "鍚堟牸";
+ cgDetail.T_MODIFY = DateTime.Now;
+ obj.CgDetailToUpdate = cgDetail;
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�-
- 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) {
- tran.RollbackTran();
- info = "淇敼鐗╂枡鐘舵�涓哄悎鏍�澶辫触";
- LogHelper.Info(info);
- return NewSimpleResult(4, 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
- }).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();
- return NewSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
+ // 璧风偣缁堢偣涓婇攣,鍒涘缓浠诲姟
+ WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
+ (ok, msg) = DbTran.CreateTask(obj);
+ return NewSimpleResult(ok ? 0 : 500, preLog + msg);
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
- }
- }
- public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
- var taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
- var db = new SqlHelper<object>().GetInstance();
- var info = "";
- try {
-
- if (!Settings.AreaMap[AreaName.C鎶芥寮傚父鍖篯.Contains(model.EndArea)) {
- info = $"缁堢偣搴撳尯{model.EndArea}涓嶅睘浜巤AreaName.C鎶芥寮傚父鍖簘";
- LogHelper.Info(info);
- return NewSimpleResult(1, info);
- }
-
- var cgDetail = db.Queryable<TN_CG_Detail>()
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode)
- .First();
-
- if (cgDetail == null) {
-
- return NewSimpleResult(2, "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡");
- }
-
- var locCntrRel = db.Queryable<TN_Loc_Container>()
- .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
- .First();
-
- //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(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 = "娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�;
- LogHelper.Info(info);
- return NewSimpleResult(0, info);
- }
-
- 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();
-
- if (endLoc == null) {
- return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
- }
-
- 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, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�-
- 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) {
- tran.RollbackTran();
- info = "淇敼鐗╂枡鐘舵�涓哄悎鏍�澶辫触";
- LogHelper.Info(info);
- return NewSimpleResult(4, 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
- }).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();
- return NewSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
- }
- catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
- }
- }
-
- public static SimpleResult RestBack(RestBackInfo model) {
- var taskName = TaskName.W灏剧鍥炲簱;
- var db = new SqlHelper<object>().GetInstance();
- var info = "";
- try {
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == model.StartLoc)
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 1)
- .First();
-
- var 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 = new TN_Location();
- if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
- endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.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 =="濂借繍绠�){
- endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.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 {
- endLoc = null;
- }
-
- //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)
- // .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) {
- return NewSimpleResult(3, $"涓嶅瓨鍦ㄥ悎閫傜殑缁堢偣璐т綅鍙互鍥炲簱");
- }
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�-
- 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) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(ex, preLog);
}
}
/// <summary>
- /// 鎴愬搧鑳跺嚭搴�WMS)
+ /// 鎶芥涓嶅悎鏍肩Щ搴� /// </summary>
- /// <remarks>
- /// WMS鎻愪緵鍑哄簱鐨勭墿鏂欑被鍨嬩笌鏁伴噺锛岃皟鐢ㄦ帴鍙ｇ敱WCS鐢熸垚鍏蜂綋鐨勫嚭搴撲换鍔★紝鐒跺悗WCS鍚庡彴杞澶勭悊
- /// </remarks>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
+ var db = new SqlHelper<object>().GetInstance();
+ var (ok, msg) = (false, string.Empty);
+ var obj = new CreateTaskObj();
+
+ var tInfo = ETask.C鎶芥涓嶅悎鏍肩Щ搴�Info();
+ const string preLog = "API:鎶芥涓嶅悎鏍肩Щ搴�";
+
+ try {
+ if (!tInfo.EndAreas.Contains(model.EndArea)) {
+ return NewSimpleResult(1, preLog + $"缁堢偣搴撳尯'{model.EndArea}'涓嶆弧瓒虫潯浠�闇�:璐у尯={LogObject(tInfo.EndAreas)}");
+ }
+
+ var cgDetail = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode).First();
+ if (cgDetail == null) {
+ return NewSimpleResult(2, preLog + LogMsg.CgDetailNotFound(item: model.ItemCode, cntr: model.CntrCode));
+ }
+
+ 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 + LogMsg.LocCntrRelNotFound(cntr: cgDetail.S_CNTR_CODE));
+ }
+
+ var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLoc(locCntrRel.S_LOC_CODE, tInfo.StartAreas)).First();
+ if (startLoc == null) {
+ return NewSimpleResult(4, preLog + LogMsg.StartLocNotFound(locCntrRel.S_LOC_CODE, tInfo.StartAreas));
+ }
+
+ var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: new List<string> { model.EndArea })).First();
+ if (endLoc == null) {
+ return NewSimpleResult(5, preLog + LogMsg.EndLocNotFound(areas: new List<string> { model.EndArea }));
+ }
+
+ cgDetail.N_ITEM_STATE = 2;
+ cgDetail.S_ITEM_STATE = "涓嶅悎鏍�;
+ cgDetail.T_MODIFY = DateTime.Now;
+ obj.CgDetailToUpdate = cgDetail;
+
+ // 璧风偣缁堢偣涓婇攣,鍒涘缓浠诲姟
+ WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
+ (ok, msg) = DbTran.CreateTask(obj);
+ return NewSimpleResult(ok ? 0 : 500, preLog + msg);
+ }
+ catch (Exception ex) {
+ return NewSimpleResult(ex, preLog);
+ }
+ }
+
+ /// <summary>
+ /// 灏炬枡鍥炲簱/浣欐枡鍥炲簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public static SimpleResult RestBack(RestBackInfo model) {
+ var db = new SqlHelper<object>().GetInstance();
+ var (ok, msg) = (false, string.Empty);
+ var obj = new CreateTaskObj();
+
+ var tInfo = ETask.W灏炬枡鍥炲簱.Info();
+ const string preLog = "API:灏炬枡鍥炲簱:";
+
+ try {
+ var startLoc = db.Queryable<TN_Location>().Where(DbExpr.StartLoc(model.StartLoc)).First();
+ if (startLoc == null) {
+ return NewSimpleResult(2, LogMsg.StartLocNotFound(model.StartLoc));
+ }
+
+ var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_LOC_CODE == model.StartLoc).First();
+ if (locCntrRel == null) {
+ return NewSimpleResult(3, preLog + LogMsg.LocCntrRelNotFound(loc: model.StartLoc));
+ }
+
+ var endAreas = locCntrRel.S_CNTR_CODE == "鎵樼洏" ? tInfo.EndAreas_Pallet : tInfo.EndAreas_Goodpack;
+ var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: endAreas)).First();
+ if (endLoc == null) {
+ return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: endAreas));
+ }
+
+ // 璧风偣缁堢偣涓婇攣,鍒涘缓浠诲姟
+ WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, tInfo.TaskName);
+ (ok, msg) = DbTran.CreateTask(obj);
+ return NewSimpleResult(ok ? 0 : 500, preLog + msg);
+ }
+ catch (Exception ex) {
+ return NewSimpleResult(ex, preLog);
+ }
+ }
+
+ /// <summary>
+ /// 鐢熸垚鍑哄簱鍗曞彿,绉佹湁
+ /// </summary>
+ /// <param name="snType"></param>
+ /// <param name="prefix"></param>
+ /// <returns></returns>
+ private static string GenerateOrderNo(string snType, string prefix) {
+ //var id = SYSHelper.GetSerialNumberResetByDay(snType, prefix);
+ //var date = DateTime.Now.ToString("yyMMdd");
+ //return $"{prefix}{date}-{id.ToString().PadLeft(4, '0')}";
+ return SYSHelper.GenerateSN(snType, prefix, "yyMMdd");
+ }
+
+ /// <summary>
+ /// 鎴愬搧鑳跺嚭搴�鎼佺疆)
+ /// </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 (ok, msg) = (false, string.Empty);
- var cgDetailList = SelectCgByTotalQty(model);
+ var tInfo = ETask.C鎴愬搧鑳跺嚭搴�Info();
+ const string preLog = "API:鎴愬搧鑳跺嚭搴�";
+
+ 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 {
@@ -1066,7 +461,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
};
@@ -1084,29 +478,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) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(ex, preLog);
}
}
@@ -1116,85 +504,93 @@
/// <returns></returns>
public static SimpleResult FinishedOutboundForce(FinishedOutboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
- var info = "";
+ var (ok, msg) = (false, string.Empty);
+
+ 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(500, preLog + "鐢熸垚鍑哄簱鍗曞け璐�" + LogObject(order));
+ }
+
+ if (db.Insertable(detailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return NewSimpleResult(500, preLog + "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�" + LogObject(detailList));
}
tran.CommitTran();
}
- return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+ return NewSimpleResult(0, preLog + "鐢熸垚鍑哄簱鍗曟垚鍔�);
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ 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)
@@ -1202,13 +598,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) //娌℃湁婊¤冻鏉′欢鐨� {
@@ -1232,84 +627,81 @@
}
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
return result;
}
}
- 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')}";
- }
+
/// <summary>
- /// 鍗氬疄鐗╂枡淇℃伅涓嬪彂鍚屾
+ /// 鍗氬疄鐗╂枡淇℃伅涓嬪彂鍚屾 (鍙拡瀵瑰ソ杩愮)
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static MesResult CgInfoSync(CgInfoSyncInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var random = new Random();
- var info = "";
+ var (ok, msg) = (false, string.Empty);
+
+ 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}'涓嶅悎娉�瑕佹眰:鐗╂枡鏁伴噺锛�");
+ }
+
+ (ok, msg) = WMSHelper.CheckCntrType(model.CntrCode, cntrType, out var cntr);
+ if (!ok) {
+ return NewMesResult(1, preLog + msg);
+ }
+
+ // 灏嗕笅鍙戠殑淇℃伅鍏堝瓨鍌ㄥ埌CG琛ㄤ腑 (姝ゆ椂鎵樼洏娌℃湁涓庝骇绾垮鐨勮揣浣嶇粦瀹�
var detail = new TN_CG_Detail {
- S_ITEM_CODE = model.ItemCode,
- S_ITEM_NAME = model.ItemName,
- S_CNTR_CODE = GenerateOrderNo("瀹瑰櫒鍙�, "CN"), // 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缁戝畾鏃跺啀濉叆锛� };
- //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 = "濂借繍绠�, // 璐存爣鏈哄彧閽堝濂借繍绠�- //};
+ // 浜х嚎鍙风殑閫昏緫寰呭畾,鐜板湪璁惧畾涓哄崥瀹炰笅鍙戜骇绾垮彿,鐪嬪悗缁渶姹傚彉鏇�+ // 濂借繍绠辫捣鐐逛负浜х嚎璐т綅,浜哄伐灏嗗ソ杩愮浠庝骇绾夸笂鍙栦笅,鎼繍鍒版弧濂借繍绠辨搷浣滃尯
+ //var startLocCode = "";
+ //if (model.ProdLineId.Trim() == "3") {
+ // startLocCode = "";
+ //}
- using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
- return NewMesResult(2, info);
- }
+ //if (model.ProdLineId.Trim() != "3" || model.ProdLineId.Trim() != "4") {
+ // info = $"涓嶅悎娉曠殑浜х嚎鍙穥model.ProdLineId}:濂借繍绠变骇绾垮彿蹇呴』涓�3 鎴�4";
+ // LogHelper.Info(info);
+ // return NewMesResult(2, info);
+ //}
- //if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
- // return NewWmsResult(2, info);
- //}
-
- tran.CommitTran();
+ if (db.Insertable(detail).ExecuteCommand() <= 0) {
+ return NewMesResult(500, preLog + $"鎻掑叆[鐗╂枡鏄庣粏琛╙澶辫触!鏁版嵁:{LogObject(detail)}");
}
- info = "鎻掑叆鐗╂枡淇℃伅鎴愬姛";
- return NewMesResult(0, info);
+ return NewMesResult(500, preLog + $"鎻掑叆[鐗╂枡鏄庣粏琛╙鎴愬姛!鏁版嵁:{LogObject(detail)}");
}
catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewMesResult(1, info);
+ return NewMesResult(-1, preLog + $"鍙戠敓浜嗗紓甯�{ex.Message}\n\n{ex.StackTrace}\n");
}
}
- public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
- var db = new SqlHelper<object>().GetInstance();
- var info = "";
- try {
- // TODO
- return NewErpResult(0, info);
- }
- catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewErpResult(1, info);
- }
+ private static string LogObject(object obj) {
+ return JsonConvert.SerializeObject(obj).Replace("\"", "'");
}
}
}
--
Gitblit v1.9.1