From abf782e4e9d505184652635aa0912781f572f843 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 24 七月 2025 17:26:41 +0800
Subject: [PATCH] 后端实现添加物料绑定货位, 优化货位容器绑定时容器表插入, 多个物料信息记录的功能
---
core/Monitor.cs | 41 ++++-
api/ApiHelper.cs | 327 ++++++++++++++++++++++++++--------------------
api/ApiModel.cs | 2
api/MoboxController.cs | 2
4 files changed, 217 insertions(+), 155 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index ee439de..2466c03 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -57,6 +57,11 @@
F_QTY = model.ItemCount, // 0f by default
};
+ var cntr = new TN_Container() {
+ S_CODE = cntId,
+ N_DETAIL_COUNT = 1
+ };
+
startLoc.N_CURRENT_NUM = 1;
var endLocCode = "0"; // 鍋囩殑榛樿缁堢偣鍦板潃
@@ -78,6 +83,11 @@
// 鏃犺鏄惁閫夋嫨缁堢偣璐ф灦锛岄兘绛夊埌绉伴噸涔嬪悗鍐嶈绠楃粓鐐硅揣浣� using (var tran = db.Ado.UseTran()) {
+ if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildSimpleResult(500,
+ $"鎻掑叆瀹瑰櫒琛ㄥ叧绯诲け璐� 瀹瑰櫒{cntr.S_CODE}, 鏄庣粏鏉℃暟={cntr.N_DETAIL_COUNT}");
+ }
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
@@ -125,9 +135,132 @@
return $"{prefix}{date}-{id.ToString().PadLeft(5, '0')}"; // 褰㈠锛欳N250525-00011
}
- public static SimpleResult AddCgDetail(AddCgDetailInfo model) {
+ /// <summary>
+ /// 鎸囧畾璐т綅鍏ュ簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ internal static SimpleResult InboundLoc(InboundLocInfo model) {
+ var taskName = TaskName.鎸囧畾璐т綅鍏ュ簱;
+ var db = new SqlHelper<object>().GetInstance();
+
+ var startAreas = Settings.Areas[AreaIndex.Q鍙栬揣鍖篯;
+ var endAreas = Settings.Areas[AreaIndex.H璐ф灦鍖篯;
+
+ try {
+ // 璧风偣浣嶇疆锛氬彇鏀捐揣鍖猴紙鏈夎揣鐗┿�娌℃湁閿併�宸插惎鐢級
+ var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && startAreas.Contains(a.S_AREA_CODE));
+ if (startLoc == null) {
+ return BuildSimpleResult(1, $"璧风偣浣嶇疆{model.startLoc}涓嶅瓨鍦ㄦ垨涓嶆弧瓒宠姹傦細(1)娌℃湁閿佺姸鎬�(2)灞炰簬鍙栨斁璐у尯");
+ }
+
+ //var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
+ //if (locCntrRel == null) {
+ // return BuildSimpleResult(3, $"璧风偣浣嶇疆 {model.startLoc} 娌℃湁缁戝畾瀹瑰櫒锛屾棤鍙洖搴撶殑鐗╂枡");
+ //}
+
+ var cntId = GenerateNo("瀹瑰櫒鍙�, "CN");
+ //var cgId = GenerateNo("鐗╂枡鍙�, "CG");
+ var cgId = string.IsNullOrEmpty(model.ItemCode) ? GenerateNo("鐗╂枡鍙�, "CG") : model.ItemCode;
+
+ // 棣栨鍏ュ簱锛氱粦瀹氫俊鎭紝鍏堝皢璧风偣浣嶇疆涓庡鍣ㄧ粦瀹氾紝瀹瑰櫒涓庣墿鏂欑粦瀹�+ var locCntrRel = new TN_Loc_Container() {
+ S_LOC_CODE = startLoc.S_CODE,
+ S_CNTR_CODE = cntId,
+ N_LOCK_STATE = string.IsNullOrEmpty(model.ItemCode) ? 0 : 1,
+ };
+
+ var cgDetail = new TN_CG_Detail() {
+ S_ITEM_CODE = cgId,
+ S_CNTR_CODE = cntId,
+ //S_ITEM_NAME = model.ItemName,
+ S_LOC_CODE = startLoc.S_CODE, // ADD锛氳ˉ鍏呴拡瀵筆DA鍒嗘嫞
+ N_LOCK_STATE = locCntrRel.N_LOCK_STATE,
+ S_ITEM_SHORT_DESC = string.IsNullOrEmpty(model.ItemShortDesc) ? "" : model.ItemShortDesc,
+ S_ITEM_NAME = string.IsNullOrEmpty(model.ItemName) ? "" : model.ItemName,
+ F_QTY = model.ItemCount, // 0f by default
+ };
+
+ var cntr = new TN_Container() {
+ S_CODE = cntId,
+ N_DETAIL_COUNT = 1
+ };
+
+ startLoc.N_CURRENT_NUM = 1;
+
+ // 缁堢偣浣嶇疆锛氳揣鏋讹紙娌℃湁璐х墿锛屾病鏈夐攣锛�+ var endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.endLoc && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && endAreas.Contains(a.S_AREA_CODE));
+ if (endLoc == null) {
+ return BuildSimpleResult(4, $"缁堢偣浣嶇疆 {model.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_Container>(cntr).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildSimpleResult(500,
+ $"鎻掑叆瀹瑰櫒琛ㄥ叧绯诲け璐� 瀹瑰櫒{cntr.S_CODE}, 鏄庣粏鏉℃暟={cntr.N_DETAIL_COUNT}");
+ }
+
+ if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildSimpleResult(500,
+ $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛ㄥけ璐ワ細璐т綅{locCntrRel.S_LOC_CODE}锛屽鍣▄locCntrRel.S_CNTR_CODE}");
+ }
+
+ if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildSimpleResult(500,
+ $"鎻掑叆瀹瑰櫒璐у搧鏄庣粏琛ㄥけ璐ワ細瀹瑰櫒{cgDetail.S_CNTR_CODE}锛岀墿鏂檣cgDetail.S_ITEM_CODE}");
+ }
+
+ 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();
+ return BuildSimpleResult(500,
+ $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
+ }
+
+ 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();
+ return BuildSimpleResult(500,
+ $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ }
+
+ if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildSimpleResult(500,
+ $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ }
+
+ tran.CommitTran();
+ return BuildSimpleResult(0,
+ $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ }
+ }
+ catch (Exception ex) {
+ return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
+ }
+ }
+
+ public static async Task<SimpleResult> AddCgDetail(AddCgDetailInfo model) {
var db = new SqlHelper<object>().GetInstance();
try {
+ await Task.Delay(500); // 绛夊緟 Mobox 娣诲姞涓昏〃瀹屾垚
+
var startLoc = db.Queryable<TN_Location>()
.Where(a => a.S_CODE == model.LocCode)
.Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y")
@@ -142,23 +275,42 @@
startLoc.N_CURRENT_NUM = 1;
+ var cntId = GenerateNo("瀹瑰櫒鍙�, "CN");
+
var locCntrRel = new TN_Loc_Container() {
S_LOC_CODE = model.LocCode,
- S_CNTR_CODE = model.CntrCode,
+ S_CNTR_CODE = cntId,
N_LOCK_STATE = string.IsNullOrEmpty(model.ItemCode) ? 0 : 1,
};
- var cgDetail = new TN_CG_Detail() {
- S_ITEM_CODE = model.ItemCode,
- S_CNTR_CODE = model.CntrCode,
- S_LOC_CODE = model.LocCode, // ADD锛氳ˉ鍏呴拡瀵筆DA鍒嗘嫞
- N_LOCK_STATE = locCntrRel.N_LOCK_STATE,
- S_ITEM_SHORT_DESC = string.IsNullOrEmpty(model.ItemShortDesc) ? "" : model.ItemShortDesc,
- S_ITEM_NAME = string.IsNullOrEmpty(model.ItemName) ? "" : model.ItemName,
- F_QTY = model.ItemCount, // 0f by default
+ //var cgDetail = new TN_CG_Detail() {
+ // S_ITEM_CODE = model.ItemCode,
+ // S_CNTR_CODE = model.CntrCode,
+ // S_LOC_CODE = model.LocCode, // ADD锛氳ˉ鍏呴拡瀵筆DA鍒嗘嫞
+ // N_LOCK_STATE = locCntrRel.N_LOCK_STATE,
+ // S_ITEM_SHORT_DESC = string.IsNullOrEmpty(model.ItemShortDesc) ? "" : model.ItemShortDesc,
+ // S_ITEM_NAME = string.IsNullOrEmpty(model.ItemName) ? "" : model.ItemName,
+ // F_QTY = model.ItemCount, // 0f by default
+ //};
+
+ var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_LOC_CODE == model.LocCode && d.S_CNTR_CODE == "鑷姩鐢熸垚").First();
+ if (cgDetail == null) {
+ return BuildSimpleResult(3, $"Mobox 瀹瑰櫒璐у搧鏄庣粏琛ㄦ湭鍒涘缓鎴愬姛!");
+ }
+ cgDetail.S_CNTR_CODE = cntId;
+
+ var cntr = new TN_Container() {
+ S_CODE = cntId,
+ N_DETAIL_COUNT = 1
};
using (var tran = db.Ado.UseTran()) {
+
+ if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildSimpleResult(500,
+ $"鎻掑叆瀹瑰櫒琛ㄥ叧绯诲け璐� 瀹瑰櫒{cntr.S_CODE}, 鏄庣粏鏉℃暟={cntr.N_DETAIL_COUNT}");
+ }
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
@@ -166,10 +318,10 @@
$"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛ㄥけ璐ワ細璐т綅{locCntrRel.S_LOC_CODE}锛屽鍣▄locCntrRel.S_CNTR_CODE}");
}
- if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
+ if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(d => new { d.S_CNTR_CODE }).ExecuteCommand() <= 0) {
tran.RollbackTran();
return BuildSimpleResult(500,
- $"鎻掑叆瀹瑰櫒璐у搧鏄庣粏琛ㄥけ璐ワ細瀹瑰櫒{cgDetail.S_CNTR_CODE}锛岀墿鏂檣cgDetail.S_ITEM_CODE}");
+ $"鏇存柊瀹瑰櫒璐у搧鏄庣粏琛ㄥけ璐ワ細瀹瑰櫒{cgDetail.S_CNTR_CODE}锛岀墿鏂檣cgDetail.S_ITEM_CODE}");
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -468,115 +620,7 @@
}
}
- /// <summary>
- /// 鎸囧畾璐т綅鍏ュ簱
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- internal static SimpleResult InboundLoc(InboundLocInfo model) {
- var taskName = TaskName.鎸囧畾璐т綅鍏ュ簱;
- var db = new SqlHelper<object>().GetInstance();
-
- var startAreas = Settings.Areas[AreaIndex.Q鍙栬揣鍖篯;
- var endAreas = Settings.Areas[AreaIndex.H璐ф灦鍖篯;
-
- try {
- // 璧风偣浣嶇疆锛氬彇鏀捐揣鍖猴紙鏈夎揣鐗┿�娌℃湁閿併�宸插惎鐢級
- var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && startAreas.Contains(a.S_AREA_CODE));
- if (startLoc == null) {
- return BuildSimpleResult(1, $"璧风偣浣嶇疆{model.startLoc}涓嶅瓨鍦ㄦ垨涓嶆弧瓒宠姹傦細(1)娌℃湁閿佺姸鎬�(2)灞炰簬鍙栨斁璐у尯");
- }
-
- //var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
- //if (locCntrRel == null) {
- // return BuildSimpleResult(3, $"璧风偣浣嶇疆 {model.startLoc} 娌℃湁缁戝畾瀹瑰櫒锛屾棤鍙洖搴撶殑鐗╂枡");
- //}
-
- var cntId = GenerateNo("瀹瑰櫒鍙�, "CN");
- //var cgId = GenerateNo("鐗╂枡鍙�, "CG");
- var cgId = string.IsNullOrEmpty(model.ItemCode) ? GenerateNo("鐗╂枡鍙�, "CG") : model.ItemCode;
-
- // 棣栨鍏ュ簱锛氱粦瀹氫俊鎭紝鍏堝皢璧风偣浣嶇疆涓庡鍣ㄧ粦瀹氾紝瀹瑰櫒涓庣墿鏂欑粦瀹�- var locCntrRel = new TN_Loc_Container() {
- S_LOC_CODE = startLoc.S_CODE,
- S_CNTR_CODE = cntId,
- N_LOCK_STATE = string.IsNullOrEmpty(model.ItemCode) ? 0 : 1,
- };
-
- var cgDetail = new TN_CG_Detail() {
- S_ITEM_CODE = cgId,
- S_CNTR_CODE = cntId,
- //S_ITEM_NAME = model.ItemName,
- S_LOC_CODE = startLoc.S_CODE, // ADD锛氳ˉ鍏呴拡瀵筆DA鍒嗘嫞
- N_LOCK_STATE = locCntrRel.N_LOCK_STATE,
- S_ITEM_SHORT_DESC = string.IsNullOrEmpty(model.ItemShortDesc) ? "" : model.ItemShortDesc,
- S_ITEM_NAME = string.IsNullOrEmpty(model.ItemName) ? "" : model.ItemName,
- F_QTY = model.ItemCount, // 0f by default
- };
-
- startLoc.N_CURRENT_NUM = 1;
-
- // 缁堢偣浣嶇疆锛氳揣鏋讹紙娌℃湁璐х墿锛屾病鏈夐攣锛�- var endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.endLoc && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && endAreas.Contains(a.S_AREA_CODE));
- if (endLoc == null) {
- return BuildSimpleResult(4, $"缁堢偣浣嶇疆 {model.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) {
- tran.RollbackTran();
- return BuildSimpleResult(500,
- $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛ㄥけ璐ワ細璐т綅{locCntrRel.S_LOC_CODE}锛屽鍣▄locCntrRel.S_CNTR_CODE}");
- }
-
- if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- return BuildSimpleResult(500,
- $"鎻掑叆瀹瑰櫒璐у搧鏄庣粏琛ㄥけ璐ワ細瀹瑰櫒{cgDetail.S_CNTR_CODE}锛岀墿鏂檣cgDetail.S_ITEM_CODE}");
- }
-
- 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();
- return BuildSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
- }
-
- 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();
- return BuildSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
-
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- return BuildSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
-
- tran.CommitTran();
- return BuildSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
- }
- catch (Exception ex) {
- return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
- }
- }
+
/// <summary>
/// 璐т綅瀹瑰櫒瑙ｇ粦
@@ -812,15 +856,14 @@
}
var insetRecordList = new List<TN_Inbound_DataRecord>();
- var deleteRecordOldList = new List<TN_Inbound_DataRecord> ();
+ //var deleteRecordOldList = new List<TN_Inbound_DataRecord> ();
foreach (var transaction in model.stockTransactions) {
- var recordOld = db.Queryable<TN_Inbound_DataRecord>()
- .Where(r => r.S_LOCATION_CODE == transaction.locationCode.Trim()).First();
- if (recordOld != null) {
- deleteRecordOldList.Add(recordOld);
-
- }
+ //var recordOld = db.Queryable<TN_Inbound_DataRecord>()
+ // .Where(r => r.S_LOCATION_CODE == transaction.locationCode.Trim()).First();
+ //if (recordOld != null) {
+ // deleteRecordOldList.Add(recordOld);
+ //}
if (!float.TryParse(transaction.inQuantity, out var _) || !float.TryParse(transaction.stockQuantity, out var _)) {
return BuildErpResult(400, $"鍏ュ簱鏁伴噺鎴栧簱瀛樻暟閲忎笉鍚堟硶! 璇风‘淇濆瓧绗︿覆鐨勫�鍙互瑙ｆ瀽涓烘暟鍊� 搴撳瓨浜ゆ槗鏄庣粏鍙�'{transaction.stockTransactionId}', 鍏ュ簱鏁伴噺='{transaction.inQuantity}', 搴撳瓨鏁伴噺='{transaction.stockQuantity}'");
@@ -848,10 +891,10 @@
}
using (var tran = db.Ado.UseTran()) {
- if (deleteRecordOldList.Count != 0 && db.Deleteable<TN_Inbound_DataRecord>(deleteRecordOldList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- return BuildErpResult(500, $"鍒犻櫎鏃у叆搴撹褰曟暟鎹け璐ワ細{JsonConvert.SerializeObject(deleteRecordOldList)}");
- }
+ //if (deleteRecordOldList.Count != 0 && db.Deleteable<TN_Inbound_DataRecord>(deleteRecordOldList).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // return BuildErpResult(500, $"鍒犻櫎鏃у叆搴撹褰曟暟鎹け璐ワ細{JsonConvert.SerializeObject(deleteRecordOldList)}");
+ //}
if (db.Insertable<TN_Inbound_DataRecord>(insetRecordList).ExecuteCommand() <= 0) {
tran.RollbackTran();
@@ -877,13 +920,13 @@
}
var insetRecordList = new List<TN_Outbound_DataRecord>();
- var deleteRecordOldList = new List<TN_Outbound_DataRecord>();
+ //var deleteRecordOldList = new List<TN_Outbound_DataRecord>();
foreach (var issue in model.materialIssues) {
- var recordOld = db.Queryable<TN_Outbound_DataRecord>()
- .Where(r => r.S_LOCATION_CODE == issue.locationCode.Trim()).First();
- if (recordOld != null) {
- deleteRecordOldList.Add(recordOld);
- }
+ //var recordOld = db.Queryable<TN_Outbound_DataRecord>()
+ // .Where(r => r.S_LOCATION_CODE == issue.locationCode.Trim()).First();
+ //if (recordOld != null) {
+ // deleteRecordOldList.Add(recordOld);
+ //}
if (!float.TryParse(issue.actualIssuedQty, out var _)) {
return BuildErpResult(400, $"瀹炲彂鏁伴噺涓嶅悎娉� 璇风‘淇濆瓧绗︿覆鐨勫�鍙互瑙ｆ瀽涓烘暟鍊� 棰嗙敤鍗曞彿='{issue.withdrawalOrderNo}', 瀹炲彂鏁伴噺='{issue.actualIssuedQty}'");
@@ -909,10 +952,10 @@
}
using (var tran = db.Ado.UseTran()) {
- if (deleteRecordOldList.Count != 0 && db.Deleteable<TN_Outbound_DataRecord>(deleteRecordOldList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- return BuildErpResult(500, $"鍒犻櫎鏃у嚭搴撹褰曟暟鎹け璐ワ細{JsonConvert.SerializeObject(deleteRecordOldList)}");
- }
+ //if (deleteRecordOldList.Count != 0 && db.Deleteable<TN_Outbound_DataRecord>(deleteRecordOldList).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // return BuildErpResult(500, $"鍒犻櫎鏃у嚭搴撹褰曟暟鎹け璐ワ細{JsonConvert.SerializeObject(deleteRecordOldList)}");
+ //}
if (db.Insertable<TN_Outbound_DataRecord>(insetRecordList).ExecuteCommand() <= 0) {
tran.RollbackTran();
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index ee9e5a2..567fccb 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -182,7 +182,7 @@
public class AddCgDetailInfo {
public string LocCode { get; set; }
- public string CntrCode { get; set; }
+ //public string CntrCode { get; set; }
public string ItemCode { get; set; }
public string ItemName { get; set; }
public string ItemShortDesc { get; set; }
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 3cba030..dba5ad7 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -31,7 +31,7 @@
[Route("AddCgDetail")]
public SimpleResult AddCgDetail(AddCgDetailInfo model) {
LogHelper.Info("瑙﹀彂API锛欰ddCgDetail: 娣诲姞瀹瑰櫒璐у搧鏄庣粏" + JsonConvert.SerializeObject(model), "API");
- return ApiHelper.AddCgDetail(model);
+ return ApiHelper.AddCgDetail(model).Result;
}
/// <summary>
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 15f10ec..9fbbcb6 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -28,35 +28,54 @@
var needDeleteDataList = new List<TN_Inbound_DataRecord>();
var needUpdateLocCntrRelList = new List<TN_Loc_Container>();
- var needUpdateCgDetailList = new List<TN_CG_Detail>();
+ //var needUpdateCgDetailList = new List<TN_CG_Detail>();
+
+ var needDeleteCgDetailList = new List<TN_CG_Detail>();
+ var needInsertCgDetailList = new List<TN_CG_Detail>();
+ var needUpdateCntrList = new List<TN_Container>();
+
foreach (var inboundData in inboundDataList) {
var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_LOC_CODE == inboundData.S_LOCATION_CODE).First();
// 鏆傛椂涓嶈�铏戝鏋滃綋鍓嶅叧绯昏〃锛岄攣鐘舵�涓�锛堝凡缁廍RP瑕嗙洊杩囷級鐨勬儏鍐碉紝榛樿鏈夊氨瑕嗙洊
if (locCntrRel != null) {
- var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
- if (cgDetail == null) {
+ var cgDetailList = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).ToList();
+ if (cgDetailList.Count == 0) {
LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細璐т綅瀹瑰櫒琛ㄤ腑锛屽寘鍚揣浣�{locCntrRel.S_LOC_CODE}, 瀹瑰櫒={locCntrRel.S_CNTR_CODE}锛涗絾瀹瑰櫒瀵瑰簲鐨勭墿鏂欒〃锛屾病鏈夋壘鍒扮墿鏂欙紒");
continue;
}
+
+ cgDetailList.ForEach(d => {
+ if (!needDeleteCgDetailList.Contains(d)) {
+ needDeleteCgDetailList.Add(d);
+ }
+ });
+
+ // 闂瓺S , 鐢╨inq浼樺寲
+ var cntr = needUpdateCntrList.Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).FirstOrDefault();
+ if (cntr != null) {
+
+ }
+
// ERP 鏁版嵁 -> CG_Detail
+ var cgDetail = cgDetailList.FirstOrDefault();
cgDetail.S_ITEM_CODE = inboundData.S_ITEM_CODE;
cgDetail.S_ITEM_SHORT_DESC = inboundData.S_ITEM_SHORT_DESC; // 鐗╂枡鐭弿杩�- //cgDetail.S_INVENTORY_MAN = inboundData.S_INVENTORY_MAN; // 搴撳瓨璐ｄ换浜哄鍚� cgDetail.S_IN_QUANTITY = inboundData.S_IN_QUANTITY; // 鍏ュ簱鏁伴噺
cgDetail.S_STOCK_QUANTITY = inboundData.S_STOCK_QUANTITY; // 搴撳瓨鏁伴噺
cgDetail.S_TOTAL_PRICE = inboundData.S_TOTAL_PRICE; // 搴撳瓨鎬讳环
cgDetail.S_STORE_KEEPER = inboundData.S_STORE_KEEPER;
cgDetail.S_LINE_CODE = inboundData.S_LINE_CODE;
cgDetail.F_QTY = float.Parse(inboundData.S_IN_QUANTITY);
-
cgDetail.T_MODIFY = DateTime.Now;
+ //cgDetail.S_INVENTORY_MAN = inboundData.S_INVENTORY_MAN; // 搴撳瓨璐ｄ换浜哄鍚�
locCntrRel.N_LOCK_STATE = 1;
cgDetail.N_LOCK_STATE = 1;
+
locCntrRel.T_MODIFY = DateTime.Now;
needUpdateLocCntrRelList.Add(locCntrRel);
- needUpdateCgDetailList.Add(cgDetail);
+ //needUpdateCgDetailList.Add(cgDetailList);
needDeleteDataList.Add(inboundData);
}
}
@@ -72,11 +91,11 @@
return;
}
- if (needUpdateCgDetailList.Count > 0 && db.Updateable<TN_CG_Detail>(needUpdateCgDetailList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細鏍规嵁ERP淇℃伅锛屾洿鏂扮墿鏂欎俊鎭〃澶辫触锛� + JsonConvert.SerializeObject(needUpdateCgDetailList));
- return;
- }
+ //if (needUpdateCgDetailList.Count > 0 && db.Updateable<TN_CG_Detail>(needUpdateCgDetailList).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細鏍规嵁ERP淇℃伅锛屾洿鏂扮墿鏂欎俊鎭〃澶辫触锛� + JsonConvert.SerializeObject(needUpdateCgDetailList));
+ // return;
+ //}
if (needUpdateLocCntrRelList.Count > 0 && db.Updateable<TN_Loc_Container>(needUpdateLocCntrRelList).ExecuteCommand() <= 0) {
tran.RollbackTran();
--
Gitblit v1.9.1