From d944fda9f2fbf27d83e8fdf880e8fe5267e1f541 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 04 六月 2025 17:24:13 +0800
Subject: [PATCH] 优化空托空箱入库兼容出库容器回库场景，修复货位容器绑定的类型丢失问题
---
api/ApiHelper.cs | 1121 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 585 insertions(+), 536 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 9c71a92..50eb72a 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -1,102 +1,139 @@
锘縰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 SqlSugar;
-using Swashbuckle.Swagger;
+using SqlSugar;
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)
+ /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)
/// </summary>
- /// <param name="model"></param>
+ /// <remarks>
+ /// 娴佺▼锛氫汉宸ュ皢婊＄浠庝骇绾挎惉杩愬埌鎿嶄綔鍖哄悗锛屼娇鐢≒DA璋冪敤鎺ュ彛锛屽懠鍙獳GV灏嗘弧绠辨惉杩愬埌璐ф灦鍖猴紙涓嶆寚瀹氱粓鐐硅揣鍖猴級
+ /// </remarks>
+ /// <param name="model">鍖呭惈锛氱墿鏂欎俊鎭�璧风偣璐т綅</param>
/// <returns></returns>
public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
- var taskName = TaskName.濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭� var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ var taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭�+ var startAreaName = AreaName.M婊＄鎿嶄綔鍖� // 璧风偣璐у尯
+ var endAreaName = AreaName.M婊＄璐ф灦鍖� // 缁堢偣璐у尯
+
try {
+ // 璐存爣鏈轰細鎻愬墠灏嗙墿鏂欎俊鎭啓鍏G_Detail琛ㄤ腑
// 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
var cgDetail = db.Queryable<TN_CG_Detail>()
.Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo) // 鎸囧畾锛氱墿鏂欑紪鐮併�鎵规鍙�- .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮") // NOTE 鍐椾綑妫�煡锛氱墿鏂欑姸鎬佸簲璇ヤ负 1寰呮
- .First();
+ .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮") // 鏂板鐗╂枡锛屾晠鐗╂枡鐘舵�搴旇涓�1寰呮
+ .First(); // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹�
+ // 濡傛灉鎵句笉鍒版寚瀹氱殑鐗╂枡锛岃鏄庝俊鎭笉涓�嚧锛屾姤閿� if (cgDetail == null) {
info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
LogHelper.Info(info);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(2, info);
}
+ // 鏌ヨ璧风偣璐т綅锛屾槸鍚︾鍚堣姹傦紙鍒濇涓嬬嚎瑕佹眰璐т綅鏃犲鍣級
+ // 娉細璧风偣璐т綅缁戝畾鍓嶆病鏈夎揣鐗╋紝鏁伴噺涓�0
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == model.StartLoc) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0) // 璧风偣缁戝畾鍓嶆病鏈夊鍣�+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆 '{model.StartLoc}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣峽model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚庯紝淇敼璧风偣璐т綅鏁伴噺涓�1
+
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛堟弧绠变笅绾垮埌鎿嶄綔鍖猴紝姝ゆ椂灏氭湭缁戝畾锛� var locCntrRel = new TN_Loc_Container {
S_LOC_CODE = model.StartLoc,
S_CNTR_CODE = cgDetail.S_CNTR_CODE,
S_CNTR_TYPE = "濂借繍绠�,
};
- if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ // 姣忎釜鏂版彃鍏ュ鍣ㄧ殑閫昏緫锛岄兘闇�鏌ヨ杩欎釜琛ㄦ槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄤ篃鍔犲叆锛屽鏋滃瓨鍦細鏆備笉鏇存柊缁撴灉锛堝緟瀹氾級
+ // 鏇磋缁嗙殑锛屾槸绌虹鍏ュ簱锛屽拰婊℃枡涓嬬嚎杩欎袱涓祦绋嬬殑瀹瑰櫒鍙兘鏄柊鐨勶紝鍏朵綑瀹瑰櫒涓�畾鏄棫鐨勶紝鏃犻渶鍐嶅垽鏂�+ // 涓ユ牸鏉ヨ锛屽鍣ㄧ被鍨嬪簲璇ユ斁鍦–ontainer閲岄潰鐨勶紝Loc_Container琛ㄥ彧鏀惧叧绯伙紝涓嶈繃鏆傛椂鍏堣繖鏍锋敼鍚�+ var cntrItemRel = db.Queryable<TN_Container_ItemType>()
+ .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
+ var insertContainerItemType = false;
+ if (cntrItemRel == null) {
+ insertContainerItemType = true;
+ cntrItemRel = new TN_Container_ItemType {
+ S_ITEM_CODE = cgDetail.S_ITEM_CODE, // 鐗╂枡绫诲瀷瀵逛簬濂借繍绠辫�瑷�叾瀹炰笉鐢紝涓昏鏄被鍨�+ S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
+ S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
+ };
}
// 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)
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
+ .OrderBy(l => l.N_LAYER) // 鎸夎揣鏋舵渶浣庢帓搴� .First();
if (endLoc == null) {
- info = "婊＄鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
+ info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
+ // 鏁版嵁搴撴搷浣滈儴鍒� var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
+ if (insertContainerItemType) {
+ if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆瀹瑰櫒淇℃伅澶辫触锛� + JsonConvert.SerializeObject(cntrItemRel);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(5, info);
+ }
+ }
+
+ if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(5, info);
+ }
+
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
it.S_LOCK_STATE,
it.S_LOCK_OP,
- it.T_MODIFY
+ it.T_MODIFY,
+ it.N_CURRENT_NUM, // 璧风偣璐т綅缁戝畾鍚庯紝灏嗚揣浣嶇姸鎬佹洿鏂� }).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(5, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -108,14 +145,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();
@@ -131,147 +168,92 @@
}
}
- ///// <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>
+ /// <remarks>
+ /// 浜哄伐灏嗙┖鎵樼洏閫氳繃鎺ラ┏浣嶅叆搴擄紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
+ /// 鐢变簬绌烘墭鐩樹竴鑸槸鍑哄簱鍗歌揣鍚庤幏寰楋紝鑰屽嚭搴撴椂娌℃湁鎵嬪姩鍗歌揣鐨勯�杈戯紝鎵�互闇�鍦ㄥ叆搴撶殑鏃跺�鍐嶅垹闄ゆ棫缁戝畾淇℃伅
+ /// </remarks>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
- var taskName = TaskName.鎵樼洏_绌烘墭鍏ュ簱;
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(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)
+ .Where(l => l.S_CODE == model.StartLoc) // 鎸囧畾锛氳捣鐐硅揣浣�+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓嶈揣浣嶄负绌�+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆{model.StartLoc}涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣峽model.StartLoc}锛屾垨涓嶅叿澶囪姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
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();
+ // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�+ // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
+ var cgDetailOld = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
- if (locCntrRel == null) {
- info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝姝ゆ椂瀹瑰櫒浠嶇劧涓庢棫鐨勫嚭搴撹揣浣嶇粦瀹氾紝闇�妫�煡
+ var locCntrRelOld = db.Queryable<TN_Loc_Container>()
+ .Where(c => c.S_CNTR_CODE == model.CntrCode).First();
+
+ //var locOld = new TN_Location();
+ TN_Location locOld = null;
+ if (locCntrRelOld != null) { // 濡傛灉闇�瑙ｇ粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
+ locOld = db.Queryable<TN_Location>()
+ .Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
+ if (locOld != null) {
+ locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
+ }
+ }
+ //else {
+ // locOld = null;
+ //}
+
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾锛�+ var locCntrRel = new TN_Loc_Container {
+ S_LOC_CODE = model.StartLoc,
+ S_CNTR_CODE = model.CntrCode,
+ S_CNTR_TYPE = "鎵樼洏",
+ };
+
+ // 姣忎釜鏂版彃鍏ュ鍣ㄧ殑閫昏緫锛岄兘闇�鏌ヨ杩欎釜琛ㄦ槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄤ篃鍔犲叆锛屽鏋滃瓨鍦細鏆備笉鏇存柊缁撴灉锛堝緟瀹氾級
+ // 鏇磋缁嗙殑锛屾槸绌虹鍏ュ簱锛屽拰婊℃枡涓嬬嚎杩欎袱涓祦绋嬬殑瀹瑰櫒鍙兘鏄柊鐨勶紝鍏朵綑瀹瑰櫒涓�畾鏄棫鐨勶紝鏃犻渶鍐嶅垽鏂�+ // 涓ユ牸鏉ヨ锛屽鍣ㄧ被鍨嬪簲璇ユ斁鍦–ontainer閲岄潰鐨勶紝Loc_Container琛ㄥ彧鏀惧叧绯伙紝涓嶈繃鏆傛椂鍏堣繖鏍锋敼鍚�+ var cntrItemRel = db.Queryable<TN_Container_ItemType>()
+ .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
+ var insertContainerItemType = false;
+ if (cntrItemRel == null) {
+ insertContainerItemType = true;
+ cntrItemRel = new TN_Container_ItemType {
+ S_ITEM_CODE = "", // 绌烘墭鐩樺垰鍏ュ簱锛屾病鏈夌墿鏂欑被鍨嬶紝灏遍粯璁ゅ厛涓虹┖
+ S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
+ S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
+ };
}
// TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.绌烘墭瀛樻斁鍖篯.Contains(a.S_AREA_CODE))
- .OrderBy(l => l.N_LAYER)
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0)
+ .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL })
.First();
if (endLoc == null) {
- info = $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅";
+ info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
@@ -279,10 +261,53 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
+ if (insertContainerItemType) {
+ if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆瀹瑰櫒淇℃伅澶辫触锛� + JsonConvert.SerializeObject(cntrItemRel);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(5, info);
+ }
+ }
+
+ if (cgDetailOld != null) {
+ if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
+ info = $"鍒犻櫎鏃х墿鏂欎俊鎭け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(5, info);
+ }
+ }
+
+ if (locCntrRelOld != null) {
+ if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
+ info = $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯诲け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(5, info);
+ }
+ }
+
+ if (locOld != null) {
+ if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
+ info = $"鏇存柊鏃ц揣浣嶅鍣ㄦ暟閲忓け璐ワ細" + JsonConvert.SerializeObject(locOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(5, info);
+ }
+ }
+
+ if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(5, info);
+ }
+
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
it.S_LOCK_STATE,
@@ -292,7 +317,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 {
@@ -304,14 +329,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();
@@ -330,16 +355,25 @@
/// <summary>
/// 濂借繍绠�绌虹鍏ュ簱(PDA)
/// </summary>
+ /// <remarks>
+ /// 浜哄伐灏嗙┖绠遍�杩囨帴椹充綅鍏ュ簱锛岄渶瑕佹柊缁戝畾瀹瑰櫒璐т綅<br/>
+ /// 鐢变簬绌虹涓�埇鏄嚭搴撳嵏璐у悗鑾峰緱锛岃�鍑哄簱鏃舵病鏈夋墜鍔ㄥ嵏璐х殑閫昏緫锛屾墍浠ラ渶瑕佸湪鍏ュ簱鐨勬椂鍊欏啀鍒犻櫎鏃х粦瀹氫俊鎭�+ /// </remarks>
/// <returns></returns>
public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
- var taskName = TaskName.濂借繍绠盻绌虹鍏ュ簱;
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(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) // 绛涢�锛氭湁璐ц揣浣�+ .Where(l => l.S_CODE == model.StartLoc)
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓嶈揣浣嶄负绌�+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
@@ -348,34 +382,114 @@
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();
+ // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�+ // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
+ var cgDetailOld = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
- if (locCntrRel == null) {
- info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
+ // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝姝ゆ椂瀹瑰櫒浠嶇劧涓庢棫鐨勫嚭搴撹揣浣嶇粦瀹氾紝闇�妫�煡
+ var locCntrRelOld = db.Queryable<TN_Loc_Container>()
+ .Where(c => c.S_CNTR_CODE == model.CntrCode).First();
+
+ //var locOld = new TN_Location();
+ TN_Location locOld = null;
+ if (locCntrRelOld != null) { // 濡傛灉闇�瑙ｇ粦瀹瑰櫒璐т綅锛屼篃闇�淇敼璐т綅淇℃伅
+ locOld = db.Queryable<TN_Location>()
+ .Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
+ if (locOld != null) {
+ locOld.N_CURRENT_NUM = 0; // 濡傛灉鏃ц揣浣嶅瓨鍦紝灏嗘棫璐т綅鐨勬暟閲忚缃负 0
+ }
+ }
+ //else {
+ // locOld = null;
+ //}
+
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+ var locCntrRel = new TN_Loc_Container {
+ S_LOC_CODE = model.StartLoc,
+ S_CNTR_CODE = model.CntrCode,
+ S_CNTR_TYPE = "濂借繍绠�,
+ };
+
+ // 姣忎釜鏂版彃鍏ュ鍣ㄧ殑閫昏緫锛岄兘闇�鏌ヨ杩欎釜琛ㄦ槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄤ篃鍔犲叆锛屽鏋滃瓨鍦細鏆備笉鏇存柊缁撴灉锛堝緟瀹氾級
+ // 鏇磋缁嗙殑锛屾槸绌虹鍏ュ簱锛屽拰婊℃枡涓嬬嚎杩欎袱涓祦绋嬬殑瀹瑰櫒鍙兘鏄柊鐨勶紝鍏朵綑瀹瑰櫒涓�畾鏄棫鐨勶紝鏃犻渶鍐嶅垽鏂�+ // 涓ユ牸鏉ヨ锛屽鍣ㄧ被鍨嬪簲璇ユ斁鍦–ontainer閲岄潰鐨勶紝Loc_Container琛ㄥ彧鏀惧叧绯伙紝涓嶈繃鏆傛椂鍏堣繖鏍锋敼鍚�+ var cntrItemRel = db.Queryable<TN_Container_ItemType>()
+ .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
+ var insertContainerItemType = false;
+ if (cntrItemRel == null) {
+ insertContainerItemType = true;
+ cntrItemRel = new TN_Container_ItemType {
+ S_ITEM_CODE = "", // 绌烘墭鐩樺垰鍏ュ簱锛屾病鏈夌墿鏂欑被鍨嬶紝灏遍粯璁ゅ厛涓虹┖
+ S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
+ S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
+ };
}
- // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
+ // 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();
+ .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;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
+ if (insertContainerItemType) {
+ if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆瀹瑰櫒淇℃伅澶辫触锛� + JsonConvert.SerializeObject(cntrItemRel);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(5, info);
+ }
+ }
+
+ if (cgDetailOld != null) {
+ if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
+ info = $"鍒犻櫎鏃х墿鏂欎俊鎭け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(5, info);
+ }
+ }
+
+ if (locCntrRelOld != null) {
+ if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
+ info = $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯诲け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(5, info);
+ }
+ }
+
+ if (locOld != null) {
+ if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
+ info = $"鏇存柊鏃ц揣浣嶅鍣ㄦ暟閲忓け璐ワ細" + JsonConvert.SerializeObject(locOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(5, info);
+ }
+ }
+
+ 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,
@@ -423,49 +537,63 @@
/// <summary>
/// 鎵樼洏-绌烘墭涓婄嚎(PDA)
/// </summary>
+ /// <remarks>
+ /// 浜哄伐鏍规嵁褰撳墠鐢熶骇鐗╂枡鎵�渶鐨勫鍣ㄧ被鍨嬶紝鍛煎彨AGV浠庣┖瀹瑰櫒璐ф灦涓彨涓�釜绗﹀悎瑕佹眰鐨勬墭鐩�+ /// </remarks>
/// <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 taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
+ var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ var endAreaName = AreaName.B鍖呰鍖�
+
try {
- // TODO 绗﹀悎鐗╂枡淇℃伅鐨勮揣浣�+ // 鏌ュ鍣�鐗╂枡绫诲瀷琛�+ var cntrItemRel = db.Queryable<TN_Container_ItemType>()
+ .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "鎵樼洏")
+ .First();
+ // 濡傛灉琛ㄤ腑瀛樺湪杩欎釜鎵樼洏淇℃伅锛屼笖鐗╂枡绫诲瀷涓庝笂绾挎墍闇�墿鏂欎笉绗︼紝鎶ラ敊
+ // 濡傛灉涓嶅瓨鍦紝涓嶄綔闄愬埗锛堣浣滅涓�涓婄嚎锛�+ 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>()
- .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) // 绛涢�锛氭湁璐ц揣浣�+ .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 鑱旇〃锛氳揣浣嶅鍣ㄥ叧绯昏〃
+ .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 闄愬畾鍦ㄧ┖鎵樺瓨鏀惧尯涓壘瀹瑰櫒璐т綅
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭病鏈夐攣鐘舵�
+ .Where(l => l.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣� .First();
if (startLoc == null) {
- return NewSimpleResult(2, $"娌℃湁鍚堥�鐨勮捣鐐逛綅缃�);
- }
-
- 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}'");
+ info = $"鍦ㄧ┖鎵樺瓨鏀惧尯涓紝鎵句笉鍒扮鍚坽model.ItemCode}鐗╂枡锛屼笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
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) // 绛涢�锛氱┖璐т綅
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
.First();
if (endLoc == null) {
- return NewSimpleResult(4, $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�);
+ info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
}
- var cntId = locCntrRel.S_CNTR_CODE;
+ var cntId = model.CntId;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -518,45 +646,45 @@
/// <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 = "";
+
+ var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
+ var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ var endAreaName = AreaName.K绌虹鎿嶄綔鍖�
+
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();
+ .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
+ .Where((l, c) => c.S_CNTR_CODE == model.CntId)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 1)
+ .First();
if (startLoc == null) {
- return NewSimpleResult(2, $"娌℃湁鍚堥�鐨勮捣鐐逛綅缃�);
- }
-
- 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}'");
+ info = $"鍦�{startAreaName}'涓紝鎵句笉鍒扮紪鐮佷负{model.CntId}鐨勭┖濂借繍绠�;
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
}
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)
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0)
.First();
if (endLoc == null) {
- return NewSimpleResult(4, $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�);
+ info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
}
- var cntId = locCntrRel.S_CNTR_CODE;
+ var cntId = model.CntId;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -603,89 +731,19 @@
}
}
- /// <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) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
- }
- }
+
/// <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 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)
@@ -699,19 +757,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(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .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[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
- info = "娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒板鍣▄model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -719,25 +773,26 @@
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) // 绛涢�锛氱┖璐т綅
+ .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(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)
+ .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}");
}
-
if (endLoc == null) {
- return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
+ info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
cgDetail.N_ITEM_STATE = 0;
@@ -746,8 +801,8 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
@@ -801,17 +856,32 @@
return NewSimpleResult(1, info);
}
}
+
+ /// <summary>
+ /// 鎶芥-涓嶅悎鏍肩Щ搴�PDA)
+ /// </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 taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
+
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, "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡");
}
@@ -827,7 +897,9 @@
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") // 绛涢�锛氭湭涓婇攣
+ .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) {
@@ -839,7 +911,8 @@
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();
+ .Where(a => a.N_CURRENT_NUM == 0)
+ .First();
if (endLoc == null) {
return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
@@ -851,8 +924,8 @@
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
@@ -907,36 +980,71 @@
}
}
+ /// <summary>
+ /// 浣欐枡鍥炲簱/灏剧鍥炲簱(PDA)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
public static SimpleResult RestBack(RestBackInfo model) {
- var taskName = TaskName.灏剧鍥炲簱;
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ var taskName = TaskName.W灏剧鍥炲簱;
+
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();
+
+ if (startLoc == null) {
+ info = $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�鏈夎揣鐗�;
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
+ }
var locCntrRel = db.Queryable<TN_Loc_Container>()
.Where(c => c.S_LOC_CODE == model.StartLoc)
.First();
if (locCntrRel == null) {
- return NewSimpleResult(2, $"璧风偣璐т綅 {model.StartLoc}");
+ info = $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}鎵�粦瀹氱殑瀹瑰櫒";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
- 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();
+ //var endLoc = new TN_Location();
+ TN_Location endLoc = null;
+ 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;
+ //}
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);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -984,58 +1092,8 @@
}
}
- 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;
- }
- }
-
/// <summary>
- /// 鎴愬搧鑳跺嚭搴�WMS)
+ /// 鎴愬搧鑳跺嚭搴�PDA) 寰呭畾锛屾殏鏃朵笉闇�姝ゅ姛鑳� /// </summary>
/// <remarks>
/// WMS鎻愪緵鍑哄簱鐨勭墿鏂欑被鍨嬩笌鏁伴噺锛岃皟鐢ㄦ帴鍙ｇ敱WCS鐢熸垚鍏蜂綋鐨勫嚭搴撲换鍔★紝鐒跺悗WCS鍚庡彴杞澶勭悊
@@ -1044,14 +1102,12 @@
/// <returns></returns>
public static SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
var info = "";
+
+ var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+
try {
- if (string.IsNullOrEmpty(orderNo)) {
- info = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
- }
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
var cgDetailList = SelectCgByTotalQty(model);
@@ -1066,7 +1122,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
};
@@ -1101,7 +1156,9 @@
tran.CommitTran();
}
- return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+ info = "鐢熸垚鍑哄簱鍗曟垚鍔�;
+ LogHelper.Info(info);
+ return NewSimpleResult(0, info);
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
@@ -1116,54 +1173,63 @@
/// <returns></returns>
public static SimpleResult FinishedOutboundForce(FinishedOutboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
var info = "";
+
+ var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+
try {
- if (string.IsNullOrEmpty(orderNo)) {
- return NewSimpleResult(2, "鍑哄簱鍗曞彿涓嶈兘涓虹┖");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+
+ var cgDetailList = SelectCgByTotalQty(model);
+
+ if (cgDetailList.Count == 0) {
+ info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
+ LogHelper.Info(info);
+ return NewSimpleResult(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,
+ 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) {
tran.RollbackTran();
- return NewSimpleResult(5, "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order));
+ info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
+ }
+
+ if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
}
tran.CommitTran();
}
- return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+ info = "鐢熸垚鍑哄簱鍗曟垚鍔�;
+ LogHelper.Info(info);
+ return NewSimpleResult(0, info);
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
@@ -1178,9 +1244,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);
@@ -1238,159 +1305,141 @@
}
}
- /// <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) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
- }
- }
-
- 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.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 $"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();
var info = "";
try {
+ // 灏嗕笅鍙戠殑淇℃伅鍏堝瓨鍌ㄥ埌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_CNTR_CODE = model.CntrCode, // 鏂欑缂栧彿锛堝緟瀹氾紝鐜板湪鏆傛椂璁惧畾涓哄崥瀹炰笅鍙戯級
S_BATCH_NO = model.BatchNo,
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 = "";
+ //}
+
+ //if (model.ProdLineId.Trim() != "3" || model.ProdLineId.Trim() != "4") {
+ // info = $"涓嶅悎娉曠殑浜х嚎鍙穥model.ProdLineId}锛氬ソ杩愮浜х嚎鍙峰繀椤讳负 3 鎴�4";
+ // LogHelper.Info(info);
+ // return NewMesResult(2, info);
+ //}
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
- return NewWmsResult(2, 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();
}
info = "鎻掑叆鐗╂枡淇℃伅鎴愬姛";
- return NewWmsResult(0, info);
+ return NewMesResult(0, info);
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewWmsResult(1, info);
+ return NewMesResult(1, info);
+ }
+ }
+
+ public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
+ var db = new SqlHelper<object>().GetInstance();
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+ var info = "";
+ try {
+ 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}";
+ LogHelper.InfoEx(ex);
+ return NewErpResult(1, info);
}
}
}
--
Gitblit v1.9.1