From 99d001bbf2a0371373e15c97d3c6c7dcf45e97e3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 13 六月 2025 15:44:22 +0800
Subject: [PATCH] 修复空托上线与满托下线联调的逻辑错误
---
api/ApiHelper.cs | 1147 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 746 insertions(+), 401 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index fc8de9c..d851211 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -1,136 +1,137 @@
锘縰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>
+ /// <remarks>
+ /// 浜哄伐锛氫骇绾�=>婊＄鎿嶄綔鍖�br/>
+ /// PDA锛氳皟鐢ㄦ帴鍙ｏ紝鍛煎彨AGV<br/>
+ /// AGV锛氭弧绠辨搷浣滃尯==鎼繍==>璐ф灦鍖猴紙涓嶆寚瀹氱粓鐐硅揣鍖猴級
+ /// </remarks>
+ /// <param name="model">鍖呭惈锛氱墿鏂欎俊鎭�璧风偣璐т綅</param>
/// <returns></returns>
public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭�- var startAreaName = AreaName.M婊＄鎿嶄綔鍖�
- var endAreaName = AreaName.M婊＄璐ф灦鍖�
+ const string taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱;
+ const string startAreaName = AreaName.M婊＄鎿嶄綔鍖�
+ const string endAreaName = AreaName.M婊＄璐ф灦鍖�
try {
- // 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
+ if (model.Num <= 0) {
+ info = $"鐗╂枡鏁伴噺'{model.Num}'涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬0";
+ LogHelper.Info(info);
+ return NewSimpleResult(400, info);
+ }
+
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();
+ .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo)
+ .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮")
+ .First(); // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹�
if (cgDetail == null) {
info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ return NewSimpleResult(1, info);
}
- // 璧风偣璐т綅缁戝畾鍚庯紝鍙互涓嶇珛鍗宠缃甆_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[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => l.S_CODE == model.StartLoc)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓� .First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣峽model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
- return NewSimpleResult(3, info);
- }
+ return NewSimpleResult(2, info);
+ }
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = model.StartLoc,
+ S_LOC_CODE = startLoc.S_CODE,
S_CNTR_CODE = cgDetail.S_CNTR_CODE,
S_CNTR_TYPE = "濂借繍绠�,
};
- // TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖� var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0)
.OrderBy(l => l.N_LAYER) // 鎸夎揣鏋舵渶浣庢帓搴�- .First();
+ .First();// TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖�
if (endLoc == null) {
- info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
+ info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
+ return NewSimpleResult(3, info);
+ }
- var cntId = locCntrRel.S_CNTR_CODE;
+ LocationHelper.LockStartLoc(ref startLoc);
+ LocationHelper.LockEndLoc(ref endLoc);
+ var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙� var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
-
- LocationHelper.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);
+ info = $"鎻掑叆銆愯揣浣嶅鍣ㄧ粦瀹氥�琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(locCntrRel);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
it.S_LOCK_STATE,
it.S_LOCK_OP,
- it.T_MODIFY
+ it.T_MODIFY,
+ it.N_CURRENT_NUM, // 璧风偣璐т綅缁戝畾鍚庯紝灏嗚揣浣嶇姸鎬佹洿鏂� }).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, 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
+ it.T_MODIFY,
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -138,83 +139,151 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
/// <summary>
/// 鎵樼洏-绌烘墭鍏ュ簱(PDA)
/// </summary>
- /// <param name="model"></param>
+ /// <remarks>
+ /// 浜哄伐灏嗙┖鎵樼洏閫氳繃鎺ラ┏浣嶅叆搴擄紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
+ /// 鐢变簬绌烘墭鐩樹竴鑸槸鍑哄簱鍗歌揣鍚庤幏寰楋紝鑰屽嚭搴撴椂娌℃湁鎵嬪姩鍗歌揣鐨勯�杈戯紝鎵�互闇�鍦ㄥ叆搴撶殑鏃跺�鍐嶅垹闄ゆ棫缁戝畾淇℃伅
+ /// </remarks>
+ /// <param name="model">鍖呭惈锛氳捣鐐硅揣浣嶃�瀹瑰櫒鍙枫�瀹瑰櫒绫诲瀷銆佺粓鐐硅揣鍖�/param>
/// <returns></returns>
public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱;
- var startAreaName = AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖�
- var endAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ const string taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱;
+ const string startAreaName = AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖�
+ const string endAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ const string cntrType = "鎵樼洏";
try {
- // 鐜板湪PDA娌℃湁鍗曠嫭鐨勭粦瀹氭祦绋嬶紝缁戝畾鍦ㄥ叆搴撴椂瀹屾垚
var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == model.StartLoc) // 鎸囧畾锛氳捣鐐硅揣浣�- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓嶈揣浣嶄负绌�- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => l.S_CODE == model.StartLoc)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 0)
.First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆{model.StartLoc}涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囪捣鐐瑰彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+ LogHelper.Info(info);
+ return NewSimpleResult(1, info);
+ }
+
+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+ .First();
+
+ if (cntr == null) {
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
+ if (cntr.S_TYPE != cntrType) { // 绌烘墭鍏ュ簱
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
+ }
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+ // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�+ // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
+ var cgDetailOld = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == model.CntrCode)
+ .First();
+
+ // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝姝ゆ椂瀹瑰櫒浠嶇劧涓庢棫鐨勫嚭搴撹揣浣嶇粦瀹氾紝闇�妫�煡
+ var locCntrRelOld = db.Queryable<TN_Loc_Container>()
+ .Where(c => c.S_CNTR_CODE == model.CntrCode)
+ .First();
+
+ 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
+ locOld.T_MODIFY = DateTime.Now;
+ }
+ }
+
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾锛� var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = model.StartLoc,
- S_CNTR_CODE = model.CntrCode,
- S_CNTR_TYPE = "鎵樼洏",
+ S_LOC_CODE = startLoc.S_CODE,
+ S_CNTR_CODE = cntr.S_CODE,
+ S_CNTR_TYPE = cntrType, // 绌烘墭鍏ュ簱
};
- // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 0)
- .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL })
+ .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
.First();
if (endLoc == null) {
- info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
+ info = $"鍦ㄣ�{endAreaName}銆戜腑娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻锛氭湭涓婇攣銆佹棤璐х墿";
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
- var cntId = locCntrRel.S_CNTR_CODE;
+ LocationHelper.LockStartLoc(ref startLoc);
+ LocationHelper.LockEndLoc(ref endLoc);
+ var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙� var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�-
using (var tran = db.Ado.UseTran()) {
+ if (cgDetailOld != null) {
+ if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
+ info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
+ }
+ }
+
+ if (locCntrRelOld != null) {
+ if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
+ info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
+ }
+ }
+
+ if (locOld != null) {
+ if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
+ info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
+ }
+ }
+
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
it.S_LOCK_STATE,
it.S_LOCK_OP,
- it.T_MODIFY
+ it.T_MODIFY,
+ it.N_CURRENT_NUM
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -224,70 +293,109 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(0, info);
}
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
/// <summary>
/// 濂借繍绠�绌虹鍏ュ簱(PDA)
/// </summary>
+ /// <remarks>
+ /// 浜哄伐锛氱┖绠�=鎼繍==>鍏ュ簱鎺ラ┏浣嶏紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
+ /// 鐢变簬绌虹涓�埇鏄嚭搴撳嵏璐у悗鑾峰緱锛岃�鍑哄簱鏃舵病鏈夋墜鍔ㄥ嵏璐х殑閫昏緫锛屾墍浠ラ渶瑕佸湪鍏ュ簱鐨勬椂鍊欏啀鍒犻櫎鏃х粦瀹氫俊鎭�+ /// </remarks>
/// <returns></returns>
public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
- var startAreaName = AreaName.K绌虹鍏ュ簱鎺ラ┏鍖�
- var endAreaName = AreaName.K绌虹璐ф灦鍖�
+ const string taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
+ const string startAreaName = AreaName.K绌虹鍏ュ簱鎺ラ┏鍖�
+ const string endAreaName = AreaName.K绌虹璐ф灦鍖�
+ const string cntrType = "濂借繍绠�;
try {
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == model.StartLoc)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
- .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓嶈揣浣嶄负绌�- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓� .First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆{model.StartLoc}涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+ .First();
+
+ if (cntr == null) {
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
+ }
+ if (cntr.S_TYPE != cntrType) {
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌杈撳叆鐨勫鍣ㄧ被鍨�{cntrType}'涓嶅悓锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
+ }
+
+ // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�+ // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙ｉ櫎
+ var cgDetailOld = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
+
+ // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝姝ゆ椂瀹瑰櫒浠嶇劧涓庢棫鐨勫嚭搴撹揣浣嶇粦瀹氾紝闇�妫�煡
+ var locCntrRelOld = db.Queryable<TN_Loc_Container>()
+ .Where(c => c.S_CNTR_CODE == model.CntrCode).First();
+
+ 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
+ }
+ }
+
// 缁戝畾璐т綅鍜屽鍣ㄥ彿
var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = model.StartLoc,
- S_CNTR_CODE = model.CntrCode,
- S_CNTR_TYPE = "濂借繍绠�,
+ S_LOC_CODE = startLoc.S_CODE,
+ S_CNTR_CODE = cntr.S_CODE,
+ S_CNTR_TYPE = cntrType,
};
- // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀�+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�+
var endLoc = db.Queryable<TN_Location>()
.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 0)
- .OrderBy(l => new { l.N_LAYER })
+ .OrderBy(l => new { l.N_LAYER }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀� .First();
if (endLoc == null) {
@@ -297,29 +405,58 @@
}
var cntId = locCntrRel.S_CNTR_CODE;
+
+ LocationHelper.LockStartLoc(ref startLoc);
+ LocationHelper.LockEndLoc(ref endLoc);
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�-
using (var tran = db.Ado.UseTran()) {
+ // 瀛樺湪鏃с�鐗╂枡鏄庣粏銆戣〃鏃讹紝鍒犻櫎鏃ц〃
+ if (cgDetailOld != null) {
+ if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
+ info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
+ }
+ }
+ // 瀛樺湪鏃с�璐т綅瀹瑰櫒缁戝畾銆戣〃鏃讹紝鍒犻櫎鏃ц〃
+ if (locCntrRelOld != null) {
+ if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
+ info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
+ }
+ }
+
+ if (locOld != null) {
+ if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
+ info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
+ }
+ }
+
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
it.S_LOCK_STATE,
it.S_LOCK_OP,
- it.T_MODIFY
+ it.T_MODIFY,
+ it.N_CURRENT_NUM
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -329,20 +466,20 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -350,68 +487,106 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
/// <summary>
/// 鎵樼洏-绌烘墭涓婄嚎(PDA)
/// </summary>
- /// <param name="model"></param>
+ /// <remarks>
+ /// 浜哄伐鏍规嵁褰撳墠鐢熶骇鐗╂枡鎵�渶鐨勫鍣ㄧ被鍨嬶紝鍛煎彨AGV浠庣┖瀹瑰櫒璐ф灦涓彨涓�釜绗﹀悎瑕佹眰鐨勬墭鐩�+ /// </remarks>
+ /// <param name="model">鍖呭惈锛氬鍣ㄥ彿銆佺墿鏂欑紪鐮�/param>
/// <returns></returns>
public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
- var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ const string taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
+ const string startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ const string endAreaName = AreaName.B鍖呰鍖�
+ const string cntrType = "鎵樼洏";
try {
- // 鏌ュ鍣�鐗╂枡绫诲瀷琛�- var cntrItemRel = db.Queryable<TN_Container_ItemType>()
- .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "鎵樼洏")
+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == model.CntId)
.First();
- // 濡傛灉琛ㄤ腑瀛樺湪杩欎釜鎵樼洏淇℃伅锛屼笖鐗╂枡绫诲瀷涓庝笂绾挎墍闇�墿鏂欎笉绗︼紝鎶ラ敊
- // 濡傛灉涓嶅瓨鍦紝涓嶄綔闄愬埗锛堣浣滅涓�涓婄嚎锛�- if (cntrItemRel != null && cntrItemRel.S_ITEM_CODE != model.ItemCode) {
- info = $"瀹瑰櫒{model.CntId}宸茬粡涓庣墿鏂欑被鍨媨cntrItemRel.S_ITEM_CODE}缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂檣model.ItemCode}";
+
+ if (cntr == null) {
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(1, info);
+ }
+ if (cntr.S_TYPE != cntrType) { // 瀹瑰櫒绫诲瀷榛樿涓嶄細涓虹┖
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷鏄�{cntr.S_TYPE}锛屼笉鏄�{cntrType}'锛�;
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
+ var needUpdateContainer = false;
+ if (string.IsNullOrEmpty(cntr.S_SPEC)) {
+ // TEMP 鐩墠娴佺▼锛氬鏋滃鍣ㄨ〃涓鏍硷紙鐗╂枡缂栫爜锛変负绌猴紝鏍规嵁娴佺▼鐨勭墿鏂欎俊鎭啓鍏�+ // 寰呭畾锛氬悗闈㈠彲鑳戒細鏇存敼娴佺▼锛屾垨鑰呯敤鍏朵粬淇℃伅锛堝鐗╂枡绫诲瀷/瑙勬牸锛変綔涓哄鍣ㄧ殑瑙勬牸
+
+ needUpdateContainer = true;
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄥ鍣ㄨ〃涓�瑙勬牸锛堢墿鏂欑紪鐮侊級涓虹┖锛屽皢鐗╂枡缂栫爜'{model.ItemCode}'鍐欏叆瀹瑰櫒鐨勮鏍�;
+ LogHelper.Info(info);
+
+ cntr.S_SPEC = model.ItemCode;
+ }
+ else if (cntr.S_SPEC != model.ItemCode) {
+ info = $"瀹瑰櫒'{model.CntId}'宸茬粡涓庣墿鏂欑被鍨�{cntr.S_SPEC}'缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂�{model.ItemCode}'";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
+ }
+
var startLoc = db.Queryable<TN_Location>()
- .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 鑱旇〃锛氳揣浣嶅鍣ㄥ叧绯昏〃
- .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 闄愬畾鍦ㄧ┖鎵樺瓨鏀惧尯涓壘瀹瑰櫒璐т綅
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭病鏈夐攣鐘舵�
- .Where(l => l.N_CURRENT_NUM == 1) // 绛涢�锛氭湁璐ц揣浣�+ .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
+ .Where((l, c) => c.S_CNTR_CODE == model.CntId)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
+ .Where(l => l.N_CURRENT_NUM == 1)
.First();
if (startLoc == null) {
- info = $"鍦ㄧ┖鎵樺瓨鏀惧尯涓紝鎵句笉鍒扮鍚坽model.ItemCode}鐗╂枡锛屼笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
+ info = $"鍦�{startAreaName}'涓紝鎵句笉鍒伴�鐢ㄤ簬{model.ItemCode}鐗╂枡銆佷笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
var endLoc = db.Queryable<TN_Location>()
- //.Where(l => Settings.AreaMap[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) // 绛涢�锛氱┖璐т綅
+ .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) {
- info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+ info = $"鍦�{endAreaName}'涓紝鎵句笉鍒板悎閫傜殑銆愮粓鐐硅揣浣嶃�锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
var cntId = model.CntId;
+
+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ cntr.S_SOURCE = task.S_CODE; // 鐢ㄤ换鍔″彿浣滀负瀹瑰櫒鏇存柊鐨勪緷鎹�+ cntr.T_MODIFY = DateTime.Now;
using (var tran = db.Ado.UseTran()) {
+ if (needUpdateContainer) {
+ if (db.Updateable<TN_Container>(cntr)
+ .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鏇存柊琛ㄥ鍣ㄨ〃澶辫触锛� + JsonConvert.SerializeObject(cntr);
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
+ }
+ }
+
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
it.S_LOCK_STATE,
@@ -419,9 +594,9 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -431,20 +606,20 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -452,7 +627,7 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
@@ -465,32 +640,49 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
- var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+ const string taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
+ const string startAreaName = AreaName.K绌虹璐ф灦鍖�
+ const string endAreaName = AreaName.K绌虹鎿嶄綔鍖�
+ const string cntrType = "濂借繍绠�;
try {
+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == model.CntId)
+ .First();
+
+ if (cntr == null) {
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+ LogHelper.Info(info);
+ return NewSimpleResult(1, info);
+ }
+ if (cntr.S_TYPE != cntrType) {
+ info = $"瀹瑰櫒'{model.CntId}'鍦ㄣ�瀹瑰櫒琛ㄣ�涓殑绫诲瀷={cntr.S_TYPE}锛屼笉鏄�{cntrType}'锛�;
+ 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, c) => c.S_CNTR_CODE == model.CntId)
+ .Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == "濂借繍绠�)
.Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 1)
.First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓紝鎵句笉鍒扮紪鐮佷负{model.CntId}鐨勭┖濂借繍绠�;
+ info = $"鍦�{startAreaName}'涓紝鎵句笉鍒板瓨鏀惧鍣ㄧ紪鐮�{model.CntId}鐨勭┖濂借繍绠辩殑銆愯捣鐐硅揣浣嶃�锛屾垨涓嶆弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=1";
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
var endLoc = db.Queryable<TN_Location>()
- //.Where(l => Settings.AreaMap[AreaName.B鍖呰鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 0)
.First();
if (endLoc == null) {
- info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+ info = $"鍦�{endAreaName}'涓紝鎵句笉鍒板悎閫傜殑銆愮粓鐐硅揣浣嶃�锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=0";
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
@@ -498,8 +690,8 @@
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 {
@@ -509,9 +701,9 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -521,20 +713,20 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -542,7 +734,7 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
@@ -556,8 +748,9 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- var taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
- var startAreaName = AreaName.C鎶芥鍖�
+ const string taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
+ const string startAreaName = AreaName.C鎶芥鍖�
+ var endAreaName = "";
try {
var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -565,12 +758,20 @@
.First();
if (cgDetail == null) {
- return NewSimpleResult(2, "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡锛� + JsonConvert.SerializeObject(model));
+ info = "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡锛� + JsonConvert.SerializeObject(model);
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
}
var locCntrRel = db.Queryable<TN_Loc_Container>()
.Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
.First();
+
+ if (locCntrRel == null) {
+ info = $"瀹瑰櫒{model.CntrCode}鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
+ }
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
@@ -582,50 +783,53 @@
if (startLoc == null) {
info = $"鍦�{startAreaName}'涓病鏈夋壘鍒板鍣▄model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(4, info);
}
- var endLoc = new TN_Location();
+ TN_Location endLoc = null;
if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
+ endAreaName = AreaName.M婊℃墭璐ф灦鍖�
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
.First();
}
else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�) {
+ endAreaName = AreaName.M婊＄璐ф灦鍖�
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 0)
.First();
}
else {
- return NewSimpleResult(2, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
+ return NewSimpleResult(-1, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
}
if (endLoc == null) {
- info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+ info = $"鍦ㄣ�{endAreaName}銆戜腑娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝鎴栦笉婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲忎负 0";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
cgDetail.N_ITEM_STATE = 0;
cgDetail.S_ITEM_STATE = "鍚堟牸";
+ cgDetail.T_MODIFY = DateTime.Now;
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
- 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 =>
- new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
+ new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = "淇敼鐗╂枡鐘舵�涓哄悎鏍�澶辫触";
+ info = $"鐢熸垚'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'鍚堟牸'澶辫触";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -635,9 +839,9 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -646,39 +850,49 @@
it.S_LOCK_OP,
it.T_MODIFY
}).ExecuteCommand() <= 0) {
-
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- return NewSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
+ LogHelper.Info(info);
+ return NewSimpleResult(0, info);
}
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
+
+ /// <summary>
+ /// 鎶芥-涓嶅悎鏍肩Щ搴�PDA)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
- var taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ const string taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
+ const string startAreaName = AreaName.C鎶芥鍖�
+ const string endAreaName = AreaName.C鎶芥寮傚父鍖�
+
try {
- if (!Settings.AreaMap[AreaName.C鎶芥寮傚父鍖篯.Contains(model.EndArea)) {
- info = $"缁堢偣搴撳尯{model.EndArea}涓嶅睘浜巤AreaName.C鎶芥寮傚父鍖簘";
+ if (!Settings.AreaMap[endAreaName].Contains(model.EndArea)) {
+ info = $"杈撳叆鐨勭粓鐐瑰簱鍖�{model.EndArea}'涓嶅睘浜�{endAreaName}'!";
LogHelper.Info(info);
return NewSimpleResult(1, info);
}
@@ -688,31 +902,32 @@
.First();
if (cgDetail == null) {
-
- return NewSimpleResult(2, "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡");
+ info = $"娌℃湁鍦ㄧ墿鏂欐槑缁嗚〃涓紝鎵惧埌鐗╂枡缂栫爜={model.ItemCode}銆佸鍣ㄧ紪鐮�{model.CntrCode}鐨勭墿鏂�;
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
}
var locCntrRel = db.Queryable<TN_Loc_Container>()
.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();
+ if (locCntrRel == null) {
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄨ揣浣嶅鍣ㄥ叧绯昏〃涓笉瀛樺湪";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
+ }
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 1)
- .Where(l => Settings.AreaMap[AreaName.C鎶芥鍖篯.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
- info = "娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{locCntrRel.S_LOC_CODE}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(2, info);
}
var endLoc = db.Queryable<TN_Location>()
@@ -722,7 +937,9 @@
.First();
if (endLoc == null) {
- return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
+ info = $"鍦ㄧ粓鐐硅揣鍖�{model.EndArea}'涓紝娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
cgDetail.N_ITEM_STATE = 2;
@@ -731,16 +948,16 @@
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 =>
new { it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = "淇敼鐗╂枡鐘舵�涓哄悎鏍�澶辫触";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'涓嶅悎鏍�澶辫触";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -750,9 +967,9 @@
it.T_MODIFY
}).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -761,118 +978,21 @@
it.S_LOCK_OP,
it.T_MODIFY
}).ExecuteCommand() <= 0) {
-
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣�{endLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
- info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}";
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
- 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) {
- info = $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�鏈夎揣鐗�;
- LogHelper.Info(info);
- return NewSimpleResult(3, info);
- }
-
- 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;
- }
-
- if (endLoc == null) {
- 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); // 缁堢偣鍏ュ簱閿�-
- 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}";
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -880,12 +1000,122 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(-1, info);
}
}
/// <summary>
- /// 鎴愬搧鑳跺嚭搴�WMS)
+ /// 浣欐枡鍥炲簱/灏剧鍥炲簱(PDA)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public static SimpleResult RestBack(RestBackInfo model) {
+ var db = new SqlHelper<object>().GetInstance();
+ var info = "";
+
+ const string taskName = TaskName.W灏剧鍥炲簱;
+ var endAreaName = "";
+
+ 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) {
+ info = $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}鎵�粦瀹氱殑瀹瑰櫒";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
+ }
+
+ TN_Location endLoc = null;
+ if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
+ endAreaName = AreaName.M婊℃墭璐ф灦鍖�
+ endLoc = db.Queryable<TN_Location>()
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0)
+ .First();
+ }
+ else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�){
+ endAreaName = AreaName.M婊＄璐ф灦鍖�
+ endLoc = db.Queryable<TN_Location>()
+ .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
+ .Where(l => l.N_CURRENT_NUM == 0)
+ .First();
+ }
+
+ if (endLoc == null) {
+ info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
+ }
+
+ var cntId = locCntrRel.S_CNTR_CODE;
+
+ LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+ LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+
+ using (var tran = db.Ado.UseTran()) {
+ if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
+ 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(500, 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(500, info);
+ }
+
+ if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
+ }
+
+ tran.CommitTran();
+ info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屼换鍔″彿={task.S_CODE}锛屽鍣ㄥ彿={cntId}锛岃捣鐐�{startLoc.S_CODE}锛岀粓鐐�{endLoc.S_CODE}";
+ LogHelper.Info(info);
+ return NewSimpleResult(0, info);
+ }
+ }
+ catch (Exception ex) {
+ info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+ LogHelper.InfoEx(ex);
+ return NewSimpleResult(-1, info);
+ }
+ }
+
+ /// <summary>
+ /// 鎴愬搧鑳跺嚭搴�PDA) 寰呭畾锛屾殏鏃朵笉闇�姝ゅ姛鑳� /// </summary>
/// <remarks>
/// WMS鎻愪緵鍑哄簱鐨勭墿鏂欑被鍨嬩笌鏁伴噺锛岃皟鐢ㄦ帴鍙ｇ敱WCS鐢熸垚鍏蜂綋鐨勫嚭搴撲换鍔★紝鐒跺悗WCS鍚庡彴杞澶勭悊
@@ -894,16 +1124,14 @@
/// <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 cgDetailList = SelectCgByTotalQty(model);
+ const string taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+
+ try {
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
+
+ var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
if (cgDetailList.Count == 0) {
info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -916,7 +1144,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
};
@@ -951,7 +1178,9 @@
tran.CommitTran();
}
- return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+ info = "鐢熸垚鍑哄簱鍗曟垚鍔�;
+ LogHelper.Info(info);
+ return NewSimpleResult(0, info);
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
@@ -966,54 +1195,63 @@
/// <returns></returns>
public static SimpleResult FinishedOutboundForce(FinishedOutboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
var info = "";
+
+ const string taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+
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) {
+ 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}";
@@ -1022,14 +1260,14 @@
}
}
- 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 targetNum = qty;
var info = "";
try {
var targetCg = db.Queryable<TN_CG_Detail>()
- .Where(a => a.S_ITEM_CODE == model.ItemCode && a.S_BATCH_NO == model.BatchNo)
+ .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) //鍒氬ソ鏈変竴琛屾弧瓒虫潯浠�@@ -1042,10 +1280,18 @@
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)
@@ -1053,13 +1299,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) //娌℃湁婊¤冻鏉′欢鐨� {
@@ -1096,45 +1341,82 @@
}
/// <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 = "";
try {
+ if (string.IsNullOrEmpty(model.ItemCode)) {
+ info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氱墿鏂欑紪鐮侊紙itemCode锛変笉鑳戒负绌�;
+ LogHelper.Info(info);
+ return NewMesResult(400, info);
+ }
+ if (string.IsNullOrEmpty(model.CntrCode)) {
+ info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氬鍣ㄧ紪鐮侊紙CntrCode锛変笉鑳戒负绌�;
+ LogHelper.Info(info);
+ return NewMesResult(400, info);
+ }
+ if (string.IsNullOrEmpty(model.BatchNo)) {
+ info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氭壒娆″彿锛圔atchNo锛変笉鑳戒负绌�;
+ LogHelper.Info(info);
+ return NewMesResult(400, info);
+ }
+ if (model.ItemNum <= 0) {
+ info = $"鍗氬疄涓嬪彂鐗╂枡淇℃伅锛氬弬鏁颁笉鍚堟硶锛氳揣鍝佹暟閲忥紙ItemNum锛夊簲璇ュぇ浜�0";
+ LogHelper.Info(info);
+ return NewMesResult(400, info);
+ }
+
+ // TEMP 鐩墠娴佺▼锛氬鍗氬疄涓嬪彂鐨勪俊鎭篃杩涜妫�煡锛屾湭鎵惧埌灏辨姤閿欙紝鍚庨潰鏈夐渶姹傚啀鏇存敼
+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == model.CntrCode) // 瀵逛簬鍓嶅彴绋嬪簭鑰岃█锛孲_CODE灏辨槸涓婚敭锛岀淮鎶ゆ椂蹇呭畾鍞竴
+ .First();
+
+ if (cntr == null) {
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓笉瀛樺湪锛岃鍦ㄥ墠鍙伴〉闈腑缁存姢锛�;
+ LogHelper.Info(info);
+ return NewMesResult(1, info);
+ }
+ if (cntr.S_TYPE != "濂借繍绠�) {
+ info = $"瀹瑰櫒'{model.CntrCode}'鍦ㄥ鍣ㄨ〃涓殑绫诲瀷涓�{cntr.S_TYPE}'锛屼笌褰撳墠瀹瑰櫒绫诲瀷'濂借繍绠�涓嶅悓锛�;
+ LogHelper.Info(info);
+ return NewMesResult(2, info);
+ }
+
+ // 灏嗕笅鍙戠殑淇℃伅鍏堝瓨鍌ㄥ埌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 = "";
+ //}
+
+ //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 NewMesResult(2, info);
+ return NewMesResult(500, info);
}
-
- //if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
- // return NewWmsResult(2, info);
- //}
tran.CommitTran();
}
@@ -1145,30 +1427,82 @@
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewMesResult(1, info);
+ return NewMesResult(-1, info);
}
}
- public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
+ public static ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
var info = "";
try {
- if (string.IsNullOrEmpty(orderNo)) {
- info = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
+ // 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
+ if (model.pzsl <= 0) {
+ info = $"鐗╂枡鏁伴噺(pzsl){model.pzsl}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
LogHelper.Info(info);
- return NewErpResult(2, info);
+ return NewErpResult(400, 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
- });
+ var outboundPlan = new TN_Outbound_Plan {
+ JHDH = model.jhdh, // 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
+ CKZT = model.ckzt, // 鍑哄簱鐘舵�
+ JHLB = model.jhlb, // 璁″垝绫诲埆
+ CKDH = model.ckdh, // 鍙傝�鍗曞彿
+ CPH = model.cph, // 杞︾墝鍙�+ YSFS = model.ysfs, // 杩愯緭鏂瑰紡
+ CPZT = model.cpzt, // 浜у搧鐘舵�
+ MDDW = model.mddw, // 涔版柇鍗曚綅
+ CPDM = model.cpdm, // 浜у搧浠ｇ爜
+ CPLB = model.cplb, // 浜у搧绫诲埆
+ CPLBMX = model.cplbmx, // 浜у搧绫诲埆鏄庣粏
+ PP = model.pp, // 鍝佺墝
+ DJ = model.dj, // 绛夌骇
+ GH = model.gh, // 缃愬彿
+ PH = model.ph, // 鎵瑰彿
+ BZLX = model.bzlx, // 鍖呰绫诲瀷
+ PZDH = model.pzdh, // 娲捐鍗曞彿
+ PZD_DW = model.pzd_dw, // 娲捐鍗曞崟浣�+ PZD_DYBH = model.pzd_dybh, // 娲捐鍗曡皟杩愮紪鍙�+ PZJS = model.pzjs, // 娲捐浠舵暟
+ PZSL = model.pzsl, // 娲捐鏁伴噺
+ PZ_RQ = model.pz_rq, // 娲捐鏃ユ湡(yyyy-mm-dd)
+ PZ_CZRQ = model.pz_czrq, // 娲捐鎿嶄綔鏃ユ湡
+ PZ_ZFBJ = model.pz_zfbj, // 娲捐浣滃簾鏍囪
+ PZ_ZFRQ = model.pz_zfrq, // 娲捐浣滃簾鏃ユ湡
+ PZ_BZ = model.pz_bz, // 娲捐澶囨敞
+ CKDBH = model.ckdbh, // 鍑哄簱鍗曠紪鍙�+ SFJS = model.sfjs, // 瀹炲彂浠舵暟
+ SFSL = model.sfsl, // 瀹炲彂鏁伴噺
+ SFCS = model.sfcs, // 瀹炲彂杞︽暟
+ ZCSJ = model.zcsj, // 瑁呰溅鏃堕棿
+ JLDW = model.jldw, // 璁￠噺鍗曚綅
+ FHRQ = model.fhrq, // 鍙戣揣鏃ユ湡
+ CKDM = model.ckdm, // 浠撳簱浠ｇ爜
+ FHR = model.fhr, // 鍙戣揣浜�+ CZYDM = model.czydm, // 鎿嶄綔鍛�+ SHR_USERNAME = model.shr_username, // 瀹℃牳浜�+ SHRQ = model.shrq, // 瀹℃牳鏃ユ湡
+ ZFBJ = model.zfbj, // 浣滃簾鏍囪
+ ZFRQ = model.zfrq, // 浣滃簾鏃ユ湡
+ JSDW = model.jsdw, // 缁撶畻鍗曚綅
+ SHDW = model.shdw, // 鏀惰揣鍗曚綅
+ YSDW = model.ysdw, // 杩愯緭鍗曚綅
+ LXR = model.lxr, // 鑱旂郴浜�+ RY_ZXG = model.ry_zxg, // 瑁呭嵏宸�+ RY_CCSJ = model.ry_ccsj, // 鍙夎溅鍙告満
+ ERPHX_JHDH = model.erphx_jhdh, // erp浜よ揣鍗曞彿
+ ERPHX_WLBM = model.erphx_wlbm, // erp鐗╂枡缂栫爜
+ ERPHX_WLMC = model.erphx_wlmc, // erp鐗╂枡鍚嶇О
+ ERPHX_CJRQ = model.erphx_cjrq, // erp鍒涘缓鏃ユ湡
+ HW = model.hw, // 璐т綅
+ HWZT = model.hwzt // 璐т綅鐘舵�
+ };
+
+ var cgDetailList = SelectCgByTotalQty(
+ qty: (int)model.pzsl,
+ itemCode: model.cpdm,
+ batchNo: model.ph
+ );
if (cgDetailList.Count == 0) {
info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -1178,12 +1512,12 @@
var order = new TN_Outbound_Order {
S_NO = orderNo,
- S_ITEM_CODE = model.ItemCode,
- S_BATCH = model.BatchNo,
- N_END_NUM = model.Qty,
+ S_ITEM_CODE = model.cpdm,
+ S_BATCH = model.ph,
+ N_END_NUM = (int)model.pzsl,
//F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
- S_END_AREA = model.EndArea,
- S_BS_NO = model.ErpNo,
+ S_END_AREA = model.ysfs == "姹借溅" ? "QCCKQ" : "HCCKQ", // 鏆傛椂鐢ㄨ繍杈撴柟寮忥紙鐏溅/姹借溅锛夋潵鍖哄垎缁堢偣璐у尯
+ S_BS_NO = model.jhdh,
S_BS_TYPE = "ERP",
};
@@ -1195,7 +1529,9 @@
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
+ S_END_AREA = order.S_END_AREA, // order涓篸etail鐨勬瘡涓�釜璐т綅璁剧疆缁堢偣鍊�+ S_BS_NO = order.S_BS_NO,
+ S_BS_TYPE= order.S_BS_TYPE,
};
detailList.Add(detail);
}
@@ -1205,20 +1541,29 @@
tran.RollbackTran();
info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
LogHelper.Info(info);
- return NewErpResult(2, info);
+ return NewErpResult(500, info);
}
if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
LogHelper.Info(info);
- return NewErpResult(4, info);
+ return NewErpResult(500, info);
+ }
+
+ if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曡鍒掕褰曡〃澶辫触";
+ LogHelper.Info(info);
+ return NewErpResult(500, info);
}
tran.CommitTran();
}
- return NewErpResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+ info = $"鐢熸垚鍑哄簱鍗曟垚鍔�;
+ LogHelper.Info(info);
+ return NewErpResult(0, info);
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
--
Gitblit v1.9.1