From 570a2d760cc1f2b78922d91d941ef81f01199e4c Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 10 六月 2025 16:43:05 +0800
Subject: [PATCH] 完善ERP下发信息的处理和出库单生成流程
---
api/ApiHelper.cs | 406 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 301 insertions(+), 105 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index a24a1cb..c415618 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -32,6 +32,13 @@
var endAreaName = AreaName.M婊＄璐ф灦鍖� // 缁堢偣璐у尯
try {
+ // 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
+ if (model.Num <= 0 ) {
+ info = $"鐗╂枡鏁伴噺{model.Num}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
+ LogHelper.Info(info);
+ return NewSimpleResult(400, info);
+ }
+
// 璐存爣鏈轰細鎻愬墠灏嗙墿鏂欎俊鎭啓鍏G_Detail琛ㄤ腑
// 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -70,21 +77,44 @@
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 = cgDetail.S_ITEM_CODE, // 鐗╂枡绫诲瀷瀵逛簬濂借繍绠辫�瑷�叾瀹炰笉鐢紝涓昏鏄被鍨�- S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
- S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
+ var needInsertContainer = false;
+ var needUpdateContainer = false;
+
+ // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
+ // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
+ if (cntr == null) {
+ needInsertContainer = true;
+ LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
+
+ cntr = new TN_Container {
+ S_CODE = locCntrRel.S_CNTR_CODE,
+ S_SPEC = cgDetail.S_ITEM_CODE, // 鐧昏瀹瑰櫒瀵瑰簲鐨勭墿鏂欑紪鍙�
+ S_TYPE = "鏂欑", // 瀹瑰櫒绫诲瀷锛氭枡绠憋紙濂借繍绠憋級
+ S_SOURCE = taskName,
};
}
+ else {
+ // 濡傛灉瀹瑰櫒瀛樺湪锛屼絾娌℃湁绫诲瀷鎴栨病鏈夐�鐢ㄧ殑鐗╂枡缂栧彿锛岄渶瑕佹洿鏂帮紝骞跺皢瀹瑰櫒鏉ユ簮璁剧疆涓轰换鍔″悕绉�+ if (string.IsNullOrEmpty(cntr.S_TYPE)) {
+ needUpdateContainer = true;
+ LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑鐧昏浣嗘病鏈夌被鍨嬶紝" +
+ $"鏇存柊绫诲瀷涓猴細鏂欑锛屽苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
+ cntr.S_TYPE = "鏂欑"; // 瀹瑰櫒绫诲瀷锛氭枡绠憋紙濂借繍绠憋級
+ cntr.S_SOURCE = taskName;
+ }
+ if (string.IsNullOrEmpty(cntr.S_SPEC)) {
+ needUpdateContainer = true;
+ LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑鐧昏浣嗘病鏈夐�鐢ㄧ墿鏂欑紪鐮侊紝" +
+ $"鏇存柊鐗╂枡缂栫爜涓猴細{cgDetail.S_ITEM_CODE}锛屽苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
+
+ cntr.S_SPEC = cgDetail.S_ITEM_CODE; // 瑙勬牸锛氱墿鏂欑紪鍙�+ cntr.S_SOURCE = taskName;
+ }
+ }
+
// TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖� var endLoc = db.Queryable<TN_Location>()
.Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
@@ -99,20 +129,29 @@
return NewSimpleResult(4, info);
}
- // 鏁版嵁搴撴搷浣滈儴鍒�+
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿� LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
+ // 鏁版嵁搴撴搷浣滀簨鍔￠儴鍒嗭細閿欒缂栫爜锛�00
using (var tran = db.Ado.UseTran()) {
- if (insertContainerItemType) {
- if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆瀹瑰櫒淇℃伅澶辫触锛� + JsonConvert.SerializeObject(cntrItemRel);
+ if (needInsertContainer) {
+ if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
+ }
+ }
+ else if (needUpdateContainer) {
+ if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
}
}
@@ -120,7 +159,7 @@
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 {
@@ -133,7 +172,7 @@
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 {
@@ -145,14 +184,14 @@
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}";
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
}
tran.CommitTran();
@@ -175,7 +214,7 @@
/// 浜哄伐灏嗙┖鎵樼洏閫氳繃鎺ラ┏浣嶅叆搴擄紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
/// 鐢变簬绌烘墭鐩樹竴鑸槸鍑哄簱鍗歌揣鍚庤幏寰楋紝鑰屽嚭搴撴椂娌℃湁鎵嬪姩鍗歌揣鐨勯�杈戯紝鎵�互闇�鍦ㄥ叆搴撶殑鏃跺�鍐嶅垹闄ゆ棫缁戝畾淇℃伅
/// </remarks>
- /// <param name="model"></param>
+ /// <param name="model">鍖呭惈锛氳捣鐐硅揣浣嶃�瀹瑰櫒鍙枫�瀹瑰櫒绫诲瀷銆佺粓鐐硅揣鍖�/param>
/// <returns></returns>
public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
var db = new SqlHelper<object>().GetInstance();
@@ -225,19 +264,34 @@
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,
+ var needInsertContainer = false;
+ var needUpdateContainer = false;
+
+ // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
+ // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
+ if (cntr == null) {
+ needInsertContainer = true;
+ LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
+
+ cntr = new TN_Container {
+ S_CODE = locCntrRel.S_CNTR_CODE,
+ S_SPEC = "", // 绌烘墭锛岀墿鏂欑紪鐮佸厛璁剧疆涓虹┖
+ S_TYPE = locCntrRel.S_CNTR_TYPE, // 瀹瑰櫒绫诲瀷锛氭墭鐩�+ S_SOURCE = taskName,
};
+ }
+ else {
+ // 濡傛灉瀹瑰櫒瀛樺湪锛屼絾娌℃湁绫诲瀷鎴栨病鏈夐�鐢ㄧ殑鐗╂枡缂栧彿锛岄渶瑕佹洿鏂帮紝骞跺皢瀹瑰櫒鏉ユ簮璁剧疆涓轰换鍔″悕绉�+ if (string.IsNullOrEmpty(cntr.S_TYPE)) {
+ needUpdateContainer = true;
+ LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑鐧昏浣嗘病鏈夌被鍨嬶紝" +
+ $"鏇存柊绫诲瀷涓猴細鎵樼洏锛屽苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
+
+ cntr.S_TYPE = "鎵樼洏"; // 瀹瑰櫒绫诲瀷锛氭墭鐩�+ }
+ // 绌烘墭涓嶆洿鏂扮墿鏂欑紪鐮� }
// TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
@@ -261,12 +315,20 @@
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);
+ if (needInsertContainer) {
+ if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
+ }
+ }
+ else if (needUpdateContainer) {
+ if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
}
}
@@ -403,19 +465,34 @@
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,
+ var needInsertContainer = false;
+ var needUpdateContainer = false;
+
+ // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�+ var cntr = db.Queryable<TN_Container>()
+ .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
+ // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
+ if (cntr == null) {
+ needInsertContainer = true;
+ LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
+
+ cntr = new TN_Container {
+ S_CODE = locCntrRel.S_CNTR_CODE,
+ S_SPEC = "", // 绌虹锛岀墿鏂欑紪鐮佸厛璁剧疆涓虹┖
+ S_TYPE = locCntrRel.S_CNTR_TYPE, // 瀹瑰櫒绫诲瀷锛氭枡绠憋紙濂借繍绠憋級
+ S_SOURCE = taskName,
};
+ }
+ else {
+ // 濡傛灉瀹瑰櫒瀛樺湪锛屼絾娌℃湁绫诲瀷鎴栨病鏈夐�鐢ㄧ殑鐗╂枡缂栧彿锛岄渶瑕佹洿鏂帮紝骞跺皢瀹瑰櫒鏉ユ簮璁剧疆涓轰换鍔″悕绉�+ if (string.IsNullOrEmpty(cntr.S_TYPE)) {
+ needUpdateContainer = true;
+ LogHelper.Info($"璧风偣璐т綅鐨勫鍣細{locCntrRel.S_CNTR_CODE}锛屽湪瀹瑰櫒琛ㄤ腑鐧昏浣嗘病鏈夌被鍨嬶紝" +
+ $"鏇存柊绫诲瀷涓猴細鏂欑锛屽苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
+
+ cntr.S_TYPE = "鏂欑"; // 瀹瑰櫒绫诲瀷锛氭枡绠憋紙濂借繍绠憋級
+ }
+ // 绌虹涓嶆洿鏂扮墿鏂欑紪鐮� }
// TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀�@@ -439,12 +516,20 @@
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);
+ if (needInsertContainer) {
+ if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(5, info);
+ return NewSimpleResult(500, info);
+ }
+ }
+ else if (needUpdateContainer) {
+ if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
+ tran.RollbackTran();
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
}
}
@@ -532,7 +617,7 @@
/// <remarks>
/// 浜哄伐鏍规嵁褰撳墠鐢熶骇鐗╂枡鎵�渶鐨勫鍣ㄧ被鍨嬶紝鍛煎彨AGV浠庣┖瀹瑰櫒璐ф灦涓彨涓�釜绗﹀悎瑕佹眰鐨勬墭鐩� /// </remarks>
- /// <param name="model"></param>
+ /// <param name="model">b鍖呭惈锛氬鍣ㄥ彿銆佺墿鏂欑紪鐮�/param>
/// <returns></returns>
public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
var db = new SqlHelper<object>().GetInstance();
@@ -543,16 +628,24 @@
var endAreaName = AreaName.B鍖呰鍖�
try {
- // 鏌ュ鍣�鐗╂枡绫诲瀷琛�- var cntrItemRel = db.Queryable<TN_Container_ItemType>()
- .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "鎵樼洏")
- .First();
- // 濡傛灉琛ㄤ腑瀛樺湪杩欎釜鎵樼洏淇℃伅锛屼笖鐗╂枡绫诲瀷涓庝笂绾挎墍闇�墿鏂欎笉绗︼紝鎶ラ敊
+ // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�+ 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}";
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
+ if (cntr != null) {
+ // 濡傛灉瀛樺湪瀹瑰櫒鍙凤紝浣嗙被鍨嬩笉鏄墭鐩橈紝鎶ラ敊
+ if (!string.IsNullOrEmpty(cntr.S_TYPE) && cntr.S_TYPE != "鎵樼洏") {
+ info = $"瀹瑰櫒鍦ㄥ鍣ㄨ〃涓壘鍒帮紝浣嗙被鍨嬫槸锛歿cntr.S_TYPE}锛屼笉鏄瘂taskName}鎵�渶鐨勶細鎵樼洏";
+ LogHelper.Info(info);
+ return NewSimpleResult(1, info);
+ }
+ // 濡傛灉琛ㄤ腑鐗╂枡缂栫爜涓嶄负绌猴紝涓斾笌涓婄嚎鎵�渶鐗╂枡涓嶄竴鑷达紝鎶ラ敊
+ if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != model.ItemCode) {
+ info = $"瀹瑰櫒{model.CntId}宸茬粡涓庣墿鏂欑被鍨媨cntr.S_SPEC}缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂檣model.ItemCode}";
+ LogHelper.Info(info);
+ return NewSimpleResult(2, info);
+ }
}
var startLoc = db.Queryable<TN_Location>()
@@ -742,12 +835,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)
@@ -759,7 +860,7 @@
if (startLoc == null) {
info = $"鍦�{startAreaName}'涓病鏈夋壘鍒板鍣▄model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
LogHelper.Info(info);
- return NewSimpleResult(0, info);
+ return NewSimpleResult(4, info);
}
var endLoc = new TN_Location();
@@ -778,7 +879,7 @@
.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) {
@@ -880,6 +981,12 @@
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)
@@ -1093,9 +1200,9 @@
var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
try {
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
- var cgDetailList = SelectCgByTotalQty(model);
+ var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
if (cgDetailList.Count == 0) {
info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -1164,9 +1271,9 @@
var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
try {
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
- var cgDetailList = SelectCgByTotalQty(model);
+ var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
if (cgDetailList.Count == 0) {
info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -1224,14 +1331,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) //鍒氬ソ鏈変竴琛屾弧瓒虫潯浠�@@ -1244,10 +1351,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)
@@ -1255,13 +1370,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) //娌℃湁婊¤冻鏉′欢鐨� {
@@ -1307,12 +1421,33 @@
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);
+ }
+
// 灏嗕笅鍙戠殑淇℃伅鍏堝瓨鍌ㄥ埌CG琛ㄤ腑锛堟鏃舵墭鐩樻病鏈変笌浜х嚎澶勭殑璐т綅缁戝畾锛� var detail = new TN_CG_Detail {
- S_ITEM_CODE = model.ItemCode,
- S_ITEM_NAME = model.ItemName,
- S_CNTR_CODE = model.CntrCode, // 鏂欑缂栧彿锛堝緟瀹氾紝鐜板湪鏆傛椂璁惧畾涓哄崥瀹炰笅鍙戯級
- 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,
@@ -1335,7 +1470,7 @@
if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
- return NewMesResult(2, info);
+ return NewMesResult(500, info);
}
tran.CommitTran();
@@ -1351,26 +1486,78 @@
}
}
- 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 = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -1380,12 +1567,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",
};
@@ -1397,7 +1584,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);
}
@@ -1417,6 +1606,13 @@
return NewErpResult(4, info);
}
+ if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曡鍒掕褰曡〃澶辫触";
+ LogHelper.Info(info);
+ return NewErpResult(500, info);
+ }
+
tran.CommitTran();
}
--
Gitblit v1.9.1