From e2303b1125817cb7887e36d5905c8f1661d685a3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 29 五月 2025 17:29:52 +0800
Subject: [PATCH] 完善ERP出库下发任务及来源单号、记录表的字段更新
---
api/ApiHelper.cs | 375 ++++++++++++++++++++--------------------------------
1 files changed, 145 insertions(+), 230 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index beda0c6..fc8de9c 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -19,29 +19,33 @@
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)
+ /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(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 taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭�+ var startAreaName = AreaName.M婊＄鎿嶄綔鍖�
+ var endAreaName = AreaName.M婊＄璐ф灦鍖�
+
try {
// 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
var cgDetail = db.Queryable<TN_CG_Detail>()
.Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo) // 鎸囧畾锛氱墿鏂欑紪鐮併�鎵规鍙� .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮") // 鏂板鐗╂枡锛屾晠鐗╂枡鐘舵�搴旇涓�1寰呮
+ // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹� .First();
if (cgDetail == null) {
info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
LogHelper.Info(info);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(2, info);
}
// 璧风偣璐т綅缁戝畾鍚庯紝鍙互涓嶇珛鍗宠缃甆_CURRENT_NUM涓�
@@ -50,11 +54,11 @@
.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))
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
- info = $"鍦�{AreaName.M婊＄鎿嶄綔鍖簘'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣峽model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
@@ -68,14 +72,14 @@
// TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖� var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
- .OrderBy(l => l.N_LAYER)
+ .OrderBy(l => l.N_LAYER) // 鎸夎揣鏋舵渶浣庢帓搴� .First();
if (endLoc == null) {
- info = "婊＄鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
+ info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
@@ -86,27 +90,12 @@
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);
+ return NewSimpleResult(5, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -118,7 +107,7 @@
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(5, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -130,14 +119,14 @@
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(5, 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);
+ return NewSimpleResult(5, info);
}
tran.CommitTran();
@@ -153,122 +142,26 @@
}
}
- ///// <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 taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱;
+ var startAreaName = AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖�
+ var endAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+
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)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
@@ -276,17 +169,6 @@
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
-
- // 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�- //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) {
- // info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
- // LogHelper.Info(info);
- // return NewSimpleResult(3, info);
- //}
// 缁戝畾璐т綅鍜屽鍣ㄥ彿
var locCntrRel = new TN_Loc_Container {
@@ -297,14 +179,14 @@
// TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.K绌烘墭瀛樻斁鍖篯.Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 0)
- .OrderBy(l => new { l.N_LAYER, row=SqlFunc.Desc(l.S_AREA_CODE) })
+ .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL })
.First();
if (endLoc == null) {
- info = $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅";
+ info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
@@ -372,15 +254,19 @@
/// </summary>
/// <returns></returns>
public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
- var taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ var taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
+ var startAreaName = AreaName.K绌虹鍏ュ簱鎺ラ┏鍖�
+ var endAreaName = AreaName.K绌虹璐ф灦鍖�
+
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)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
@@ -388,17 +274,6 @@
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
-
- // 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�- //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) {
- // info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
- // LogHelper.Info(info);
- // return NewSimpleResult(3, info);
- //}
// 缁戝畾璐т綅鍜屽鍣ㄥ彿
var locCntrRel = new TN_Loc_Container {
@@ -409,14 +284,16 @@
// TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀� var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.K绌虹璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 0)
.OrderBy(l => new { l.N_LAYER })
.First();
if (endLoc == null) {
- return NewSimpleResult(4, $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅");
+ info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
}
var cntId = locCntrRel.S_CNTR_CODE;
@@ -483,51 +360,31 @@
/// <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 taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
+ var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+
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)
+ // 鏌ュ鍣�鐗╂枡绫诲瀷琛�+ var cntrItemRel = db.Queryable<TN_Container_ItemType>()
+ .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "鎵樼洏")
.First();
-
- if (cntrItemRel == null) {
- info = $"瀹瑰櫒{model.CntId}涓嶇鍚堢墿鏂檣model.ItemCode}锛氭病鏈夊湪瀹瑰櫒鐗╂枡绫诲瀷鐧昏琛ㄤ腑鎵惧埌";
+ // 濡傛灉琛ㄤ腑瀛樺湪杩欎釜鎵樼洏淇℃伅锛屼笖鐗╂枡绫诲瀷涓庝笂绾挎墍闇�墿鏂欎笉绗︼紝鎶ラ敊
+ // 濡傛灉涓嶅瓨鍦紝涓嶄綔闄愬埗锛堣浣滅涓�涓婄嚎锛�+ if (cntrItemRel != null && cntrItemRel.S_ITEM_CODE != model.ItemCode) {
+ info = $"瀹瑰櫒{model.CntId}宸茬粡涓庣墿鏂欑被鍨媨cntrItemRel.S_ITEM_CODE}缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂檣model.ItemCode}";
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
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, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 闄愬畾鍦ㄧ┖鎵樺瓨鏀惧尯涓壘瀹瑰櫒璐т綅
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭病鏈夐攣鐘舵�
.Where(l => l.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�- .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
.First();
if (startLoc == null) {
@@ -605,40 +462,37 @@
/// <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 taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
+ var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+
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, c) => c.S_CNTR_CODE == model.CntId)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 1)
- .Where((l, c) => c.S_CNTR_CODE == model.CntId)
.First();
if (startLoc == null) {
- info = $"鍦ㄧ┖绠卞瓨鏀惧尯涓紝鎵句笉鍒扮紪鐮佷负{model.CntId}鐨勭┖濂借繍绠�;
+ info = $"鍦�{startAreaName}'涓紝鎵句笉鍒扮紪鐮佷负{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 endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.B鍖呰鍖篯.Contains(l.S_AREA_CODE))
+ //.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();
if (endLoc == null) {
- return NewSimpleResult(4, $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�);
+ info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
}
var cntId = model.CntId;
@@ -699,9 +553,12 @@
/// <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 taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
+ var startAreaName = AreaName.C鎶芥鍖�
+
try {
var cgDetail = db.Queryable<TN_CG_Detail>()
.Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode)
@@ -715,21 +572,15 @@
.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)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
- info = "娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒板鍣▄model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -753,9 +604,10 @@
return NewSimpleResult(2, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
}
-
if (endLoc == null) {
- return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
+ info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
cgDetail.N_ITEM_STATE = 0;
@@ -951,7 +803,9 @@
.First();
if (locCntrRel == null) {
- return NewSimpleResult(2, $"璧风偣璐т綅 {model.StartLoc}");
+ info = $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�鏈夎揣鐗�;
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
var endLoc = new TN_Location();
@@ -973,14 +827,10 @@
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, $"涓嶅瓨鍦ㄥ悎閫傜殑缁堢偣璐т綅鍙互鍥炲簱");
+ info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
@@ -1178,9 +1028,10 @@
var targetNum = model.Qty;
var info = "";
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 == model.ItemCode && a.S_BATCH_NO == model.BatchNo)
+ .Where(a => a.N_ITEM_NUM > targetNum)
+ .OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
if (targetCg != null) //鍒氬ソ鏈変竴琛屾弧瓒虫潯浠� {
result.Add(targetCg);
@@ -1300,10 +1151,74 @@
public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
var db = new SqlHelper<object>().GetInstance();
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
var info = "";
try {
- // TODO
- return NewErpResult(0, info);
+ if (string.IsNullOrEmpty(orderNo)) {
+ info = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
+ LogHelper.Info(info);
+ return NewErpResult(2, info);
+ }
+
+ var cgDetailList = SelectCgByTotalQty(new FinishedOutboundInfo {
+ BatchNo = model.BatchNo,
+ CntrType= model.CntrType,
+ ItemCode= model.ItemCode,
+ EndArea= model.EndArea,
+ ForcedOut= model.ForcedOut,
+ Qty= model.Qty,
+ Spe = model.Spe
+ });
+
+ if (cgDetailList.Count == 0) {
+ info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
+ LogHelper.Info(info);
+ return NewErpResult(3, info);
+ }
+
+ 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,
+ S_BS_NO = model.ErpNo,
+ 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 = model.EndArea
+ };
+ detailList.Add(detail);
+ }
+
+ using (var tran = db.Ado.UseTran()) {
+ if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
+ LogHelper.Info(info);
+ return NewErpResult(2, info);
+ }
+
+ if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
+ LogHelper.Info(info);
+ return NewErpResult(4, info);
+ }
+
+ tran.CommitTran();
+ }
+
+ return NewErpResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
--
Gitblit v1.9.1