From 0e829f4a5321c10900e1f4130a80f2e8c804a08e Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 19 六月 2025 17:30:47 +0800
Subject: [PATCH] 修复取消订单和更改终点货区流程与国自AGV交互的部分细节问题
---
api/ApiHelper.cs | 615 +++++++++++++++++++++++++++++++------------------------
1 files changed, 341 insertions(+), 274 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 19d79e6..a5e3514 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -3,6 +3,8 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+
+using HH.WCS.Mobox3.AnGang.dispatch;
using HH.WCS.Mobox3.AnGang.models;
using HH.WCS.Mobox3.AnGang.util;
using HH.WCS.Mobox3.AnGang.wms;
@@ -105,11 +107,11 @@
}
}
- //internal static string GenerateNo(string snType, string prefix) {
- // var id = SYSHelper.GetSerialNumber(snType, prefix);
- // var date = DateTime.Now.ToString("yyMMdd");
- // return $"TN{date}{id.ToString().PadLeft(4, '0')}";
- //}
+ internal static string GenerateNo(string snType, string prefix) {
+ var id = SYSHelper.GetSerialNumber(snType, prefix);
+ var date = DateTime.Now.ToString("yyMMdd");
+ return $"{prefix}{date}-{id.ToString().PadLeft(5, '0')}"; // 褰㈠锛欳N250525-00011
+ }
/// <summary>
/// PDA閫夋嫨缁堢偣璐т綅
@@ -183,13 +185,13 @@
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Task>(task).UpdateColumns(a => a.S_END_LOC).ExecuteCommand() <= 0) {
tran.RollbackTran();
- return BuildSimpleResult(7, $"浠诲姟{task.S_CODE}淇敼澶辫触锛屼慨鏀圭粓鐐逛綅缃负{endLoc.S_CODE}");
+ return BuildSimpleResult(500, $"浠诲姟{task.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(7, $"浠诲姟{task.S_CODE}淇敼澶辫触锛屼慨鏀圭粓鐐逛綅缃负{endLoc.S_CODE}");
+ return BuildSimpleResult(500, $"浠诲姟{task.S_CODE}淇敼澶辫触锛屼慨鏀圭粓鐐逛綅缃负{endLoc.S_CODE}");
}
tran.CommitTran();
@@ -239,6 +241,8 @@
LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿� LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+
+ var res = GZRobot.QueryInteractInfo(3);
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -353,16 +357,16 @@
task.N_B_STATE = 4;
task.S_B_STATE = "鍙栨秷";
- var starloc = db.Queryable<TN_Location>().First(a => a.S_CODE == task.S_START_LOC);
+ var startloc = db.Queryable<TN_Location>().First(a => a.S_CODE == task.S_START_LOC);
var endloc = db.Queryable<TN_Location>().First(a => a.S_CODE == task.S_END_LOC);
//var locCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == task.S_CNTR_CODE);
//var cg = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == task.S_CNTR_CODE);
- if (starloc != null) {
- starloc.N_LOCK_STATE = 0;
- starloc.S_LOCK_STATE = "鏃�;
+ if (startloc != null) {
+ startloc.N_LOCK_STATE = 0;
+ startloc.S_LOCK_STATE = "鏃�;
//starloc.N_CURRENT_NUM = 0;
- starloc.T_MODIFY = System.DateTime.Now;
+ startloc.T_MODIFY = System.DateTime.Now;
}
if (endloc != null) {
@@ -372,45 +376,45 @@
endloc.T_MODIFY = System.DateTime.Now;
}
+ if (!int.TryParse(task.S_EQ_TASK_CODE, out var code)) {
+ return BuildSimpleResult(1, $"褰撳墠浠诲姟{task.S_CODE}娌℃湁鎵惧埌瀵瑰簲鐨勫浗鑷狝GV orderId锛�);
+ }
+ var res = GZRobot.CancelGZOrder(code);
+ if (!res) {
+ return BuildSimpleResult(2, $"鍥借嚜AGV鍙栨秷浠诲姟澶辫触锛�);
+ }
+
using (var tran = db.Ado.UseTran()) {
- if (db.Updateable<TN_Location>(starloc).ExecuteCommand() <= 0) {
+ if (db.Updateable<TN_Location>(startloc).ExecuteCommand() <= 0) {
tran.RollbackTran();
-
- info = $"浠诲姟{task.S_CODE}鍙栨秷澶辫触";
-
- return BuildSimpleResult(0, info);
+ info = $"浠诲姟{task.S_CODE}鍙栨秷澶辫触锛氫慨鏀硅捣鐐硅揣浣嶉攣鐘舵�澶辫触";
+ return BuildSimpleResult(500, info);
}
if (endloc != null) {
if (db.Updateable<TN_Location>(endloc).ExecuteCommand() <= 0) {
tran.RollbackTran();
-
- info = $"浠诲姟{task.S_CODE}鍙栨秷澶辫触";
-
- return BuildSimpleResult(0, info);
+ info = $"浠诲姟{task.S_CODE}鍙栨秷澶辫触锛氫慨鏀圭粓鐐硅揣浣嶉攣鐘舵�澶辫触";
+ return BuildSimpleResult(500, info);
}
}
if (db.Updateable<TN_Task>(task).ExecuteCommand() <= 0) {
- if (db.Updateable<TN_Location>(endloc).ExecuteCommand() <= 0) {
- tran.RollbackTran();
-
- info = $"浠诲姟{task.S_CODE}鍙栨秷澶辫触";
-
- return BuildSimpleResult(0, info);
- }
+ tran.RollbackTran();
+ info = $"浠诲姟{task.S_CODE}鍙栨秷澶辫触";
+ return BuildSimpleResult(500, info);
}
tran.CommitTran();
-
info = $"浠诲姟{task.S_CODE}鍙栨秷鎴愬姛";
-
return BuildSimpleResult(0, info);
}
}
else {
return BuildSimpleResult(3, $"鍙湁浠诲姟鍙风姸鎬佷负 绛夊緟 鎴�宸叉帹閫�鐨勪换鍔℃墠鑳藉彇娑�);
+
+ // return CancelTaskIfForced(model, task); // 澶囩敤鍑芥暟锛屽鏋滅敳鏂硅姹備换鍔℃墽琛屼腑涔熷彇娑堬紝鍐嶈皟鐢� }
}
@@ -419,301 +423,331 @@
}
}
- public static SimpleResult CreateCountPlan(CreateCountPlanInfo model) {
- var db = new SqlHelper<object>().GetInstance();
- try {
-
- var countPlan = new TN_Count_Plan() {
- S_CP_NO = GenerateNo("鐩樼偣璁″垝", "CP"),
- S_TYPE = model.countType,
- };
-
- if (model.countType == "璐т綅") {
- countPlan.S_LOC_CODE = model.targetId;
- }
- else if (model.countType == "鐗╂枡") {
- countPlan.S_ITEM_CODE = model.targetId;
- }
- else {
- return BuildSimpleResult(2, $"鍒涘缓鐩樼偣璁″垝澶辫触锛氫笉鍚堟硶鐨勭洏鐐圭被鍨�'{model.countType}'");
- }
-
- if (db.Insertable<TN_Count_Plan>(countPlan).ExecuteCommand() <= 0) {
- return BuildSimpleResult(2, "鍒涘缓鐩樼偣璁″垝澶辫触");
- }
-
- return BuildSimpleResult(0, "鍒涘缓鐩樼偣璁″垝鎴愬姛");
-
- }
- catch (Exception ex) {
-
- return BuildSimpleResult(1, ex.Message);
- }
+ public static SimpleResult CancelTaskIfForced(CancleTaskInfo model, TN_Task task) {
+ return BuildSimpleResult(3, $"鍙湁浠诲姟鍙风姸鎬佷负 绛夊緟 鎴�宸叉帹閫�鐨勪换鍔℃墠鑳藉彇娑�);
}
- public static SimpleResult CreateCountOrder(CreateCountOrderInfo model) {
- var db = new SqlHelper<object>().GetInstance();
- var info = "";
- try {
- var countPlan = db.Queryable<TN_Count_Plan>()
- .Where(a => a.S_CP_NO == model.planId).First();
+ //public static SimpleResult CreateCountPlan(CreateCountPlanInfo model) {
+ // var db = new SqlHelper<object>().GetInstance();
+ // try {
- if (countPlan == null) {
- return BuildSimpleResult(2, $"鐩樼偣璁″垝鍗曞彿 '{model.planId}' 涓嶅瓨鍦�);
- }
+ // var countPlan = new TN_Count_Plan() {
+ // S_CP_NO = GenerateNo("鐩樼偣璁″垝", "CP"),
+ // S_TYPE = model.countType,
+ // };
- var countOrder = new TN_Count_Order() {
- S_CP_NO = model.planId,
- S_COUNT_NO = GenerateNo("鐩樼偣鍗�, "CN"),
- };
+ // if (model.countType == "璐т綅") {
+ // countPlan.S_LOC_CODE = model.targetId;
+ // }
+ // else if (model.countType == "鐗╂枡") {
+ // countPlan.S_ITEM_CODE = model.targetId;
+ // }
+ // else {
+ // return BuildSimpleResult(2, $"鍒涘缓鐩樼偣璁″垝澶辫触锛氫笉鍚堟硶鐨勭洏鐐圭被鍨�'{model.countType}'");
+ // }
- var countDetailList = new List<TN_Count_CG_Detail>();
- if (countPlan.S_TYPE == "璐т綅") {
- var cgDetail = db.Queryable<TN_Location, TN_Loc_Container, TN_CG_Detail>
- ((l, c, d) => l.S_CODE == c.S_LOC_CODE && c.S_CNTR_CODE == d.S_CNTR_CODE)
- .Where(l => l.S_CODE == countPlan.S_LOC_CODE)
- .Select((l, c, d) => d).First();
+ // if (db.Insertable<TN_Count_Plan>(countPlan).ExecuteCommand() <= 0) {
+ // return BuildSimpleResult(2, "鍒涘缓鐩樼偣璁″垝澶辫触");
+ // }
- var countDetail = new TN_Count_CG_Detail {
- S_COUNT_NO = countOrder.S_COUNT_NO,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- };
+ // return BuildSimpleResult(0, "鍒涘缓鐩樼偣璁″垝鎴愬姛");
- countDetailList.Add(countDetail);
- }
- else if (countPlan.S_TYPE == "鐗╂枡") {
- var cgDetailList = db.Queryable<TN_CG_Detail>()
- .Where(d => d.S_ITEM_CODE == countPlan.S_ITEM_CODE).ToList();
+ // }
+ // catch (Exception ex) {
- foreach (var cgDetail in cgDetailList) {
- var countDetail = new TN_Count_CG_Detail {
- S_COUNT_NO = countOrder.S_COUNT_NO,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- };
+ // return BuildSimpleResult(1, ex.Message);
+ // }
+ //}
- countDetailList.Add(countDetail);
- }
- }
- else {
- return BuildSimpleResult(3, $"璁″垝鍗�{model.planId}'鐨勭被鍨媨countPlan.S_TYPE}涓嶅悎娉�);
- }
+ //public static SimpleResult CreateCountOrder(CreateCountOrderInfo model) {
+ // var db = new SqlHelper<object>().GetInstance();
+ // var info = "";
+ // try {
+ // var countPlan = db.Queryable<TN_Count_Plan>()
+ // .Where(a => a.S_CP_NO == model.planId).First();
- using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_Count_Order>(countOrder).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = "鍒涘缓鐩樼偣鍗曞け璐�;
- return BuildSimpleResult(2, info);
- }
+ // if (countPlan == null) {
+ // return BuildSimpleResult(2, $"鐩樼偣璁″垝鍗曞彿 '{model.planId}' 涓嶅瓨鍦�);
+ // }
- if (db.Insertable<TN_Count_CG_Detail>(countDetailList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = "鍒涘缓鐩樼偣鍗曟槑缁嗗け璐�;
- return BuildSimpleResult(3, info);
- }
+ // var countOrder = new TN_Count_Order() {
+ // S_CP_NO = model.planId,
+ // S_COUNT_NO = GenerateNo("鐩樼偣鍗�, "CN"),
+ // };
- tran.CommitTran();
- }
+ // var countDetailList = new List<TN_Count_CG_Detail>();
+ // if (countPlan.S_TYPE == "璐т綅") {
+ // var cgDetail = db.Queryable<TN_Location, TN_Loc_Container, TN_CG_Detail>
+ // ((l, c, d) => l.S_CODE == c.S_LOC_CODE && c.S_CNTR_CODE == d.S_CNTR_CODE)
+ // .Where(l => l.S_CODE == countPlan.S_LOC_CODE)
+ // .Select((l, c, d) => d).First();
- return BuildSimpleResult(0, "鍒涘缓鐩樼偣鍗曟垚鍔�);
- }
- catch (Exception ex) {
+ // var countDetail = new TN_Count_CG_Detail {
+ // S_COUNT_NO = countOrder.S_COUNT_NO,
+ // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ // };
- return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
- }
- }
+ // countDetailList.Add(countDetail);
+ // }
+ // else if (countPlan.S_TYPE == "鐗╂枡") {
+ // var cgDetailList = db.Queryable<TN_CG_Detail>()
+ // .Where(d => d.S_ITEM_CODE == countPlan.S_ITEM_CODE).ToList();
- public static SimpleResult CountProduct(CountProductInfo model) {
- var db = new SqlHelper<object>().GetInstance();
- try {
- var cgDetail = db.Queryable<TN_CG_Detail>()
- .Where(d => d.S_CNTR_CODE == model.cntrCode).First();
+ // foreach (var cgDetail in cgDetailList) {
+ // var countDetail = new TN_Count_CG_Detail {
+ // S_COUNT_NO = countOrder.S_COUNT_NO,
+ // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ // };
- if (cgDetail == null) {
- return BuildSimpleResult(2, $"鎵句笉鍒板鍣ㄥ彿'{model.cntrCode}'瀵瑰簲鐨勭墿鏂�);
- }
+ // countDetailList.Add(countDetail);
+ // }
+ // }
+ // else {
+ // return BuildSimpleResult(3, $"璁″垝鍗�{model.planId}'鐨勭被鍨媨countPlan.S_TYPE}涓嶅悎娉�);
+ // }
- var countDiff = new TN_Count_Diff {
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- F_QTY = cgDetail.F_QTY,
- F_ACTUAL_QTY = model.qty
- };
+ // using (var tran = db.Ado.UseTran()) {
+ // if (db.Insertable<TN_Count_Order>(countOrder).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // info = "鍒涘缓鐩樼偣鍗曞け璐�;
+ // return BuildSimpleResult(2, info);
+ // }
- if (db.Insertable<TN_Count_Diff>(countDiff).ExecuteCommand() <= 0) {
- return BuildSimpleResult(3, $"鎻掑叆鐩樼偣宸紓琛ㄥけ璐�);
- }
+ // if (db.Insertable<TN_Count_CG_Detail>(countDetailList).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // info = "鍒涘缓鐩樼偣鍗曟槑缁嗗け璐�;
+ // return BuildSimpleResult(3, info);
+ // }
- return BuildSimpleResult(0, "鐩樼偣宸紓瀹屾垚");
+ // tran.CommitTran();
+ // }
- }
- catch (Exception ex) {
- return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
- }
- }
+ // return BuildSimpleResult(0, "鍒涘缓鐩樼偣鍗曟垚鍔�);
+ // }
+ // catch (Exception ex) {
- internal static string GenerateNo(string snType, string prefix) {
- var id = SYSHelper.GetSerialNumber(snType, prefix);
-
- var date = DateTime.Now.ToString("yyMMdd");
- return $"{prefix}{date}{id.ToString().PadLeft(4, '0')}";
- }
+ // return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
+ // }
+ //}
- /// <summary>
- /// 鐩樼偣鐞嗚揣鍑哄簱(WMS)
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- internal static SimpleResult CheckOutbound(CheckOutboundInfo model) {
- var taskName = TaskName.鐩樼偣鐞嗚揣鍑哄簱;
- var db = new SqlHelper<object>().GetInstance();
+ //public static SimpleResult CountProduct(CountProductInfo model) {
+ // var db = new SqlHelper<object>().GetInstance();
+ // try {
+ // var cgDetail = db.Queryable<TN_CG_Detail>()
+ // .Where(d => d.S_CNTR_CODE == model.cntrCode).First();
- try {
- // 璧风偣浣嶇疆锛氬彇鏀捐揣鍖猴紙鏈夎揣鐗┿�娌℃湁閿併�宸插惎鐢級
- var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 1 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && Settings.Areas[0].Contains(a.S_AREA_CODE));
- if (startLoc == null) {
- return BuildSimpleResult(2, $"璧风偣浣嶇疆 {model.startLoc} 涓嶇鍚堝嚭搴撴潯浠�);
- }
+ // if (cgDetail == null) {
+ // return BuildSimpleResult(2, $"鎵句笉鍒板鍣ㄥ彿'{model.cntrCode}'瀵瑰簲鐨勭墿鏂�);
+ // }
- var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
- if (locCntrRel == null) {
- return BuildSimpleResult(3, $"璧风偣浣嶇疆 {model.startLoc} 娌℃湁缁戝畾瀹瑰櫒锛屾棤鍙洖搴撶殑鐗╂枡");
- }
+ // var countDiff = new TN_Count_Diff {
+ // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ // F_QTY = cgDetail.F_QTY,
+ // F_ACTUAL_QTY = model.qty
+ // };
- // 缁堢偣浣嶇疆锛氳揣鏋讹紙娌℃湁璐х墿锛屾病鏈夐攣锛�- 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");
- if (endLoc == null) {
- return BuildSimpleResult(4, $"缁堢偣浣嶇疆 {model.endLoc} 涓嶅叿澶囨斁璐ф潯浠�);
- }
+ // if (db.Insertable<TN_Count_Diff>(countDiff).ExecuteCommand() <= 0) {
+ // return BuildSimpleResult(3, $"鎻掑叆鐩樼偣宸紓琛ㄥけ璐�);
+ // }
- var cntID = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntID, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ // return BuildSimpleResult(0, "鐩樼偣宸紓瀹屾垚");
- 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();
- return BuildSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntID} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
- }
+ // }
+ // catch (Exception ex) {
+ // return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
+ // }
+ //}
- 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}");
- }
+ ///// <summary>
+ ///// 鐩樼偣鐞嗚揣鍑哄簱(WMS)
+ ///// </summary>
+ ///// <param name="model"></param>
+ ///// <returns></returns>
+ //internal static SimpleResult CheckOutbound(CheckOutboundInfo model) {
+ // var taskName = TaskName.鐩樼偣鐞嗚揣鍑哄簱;
+ // var db = new SqlHelper<object>().GetInstance();
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- return BuildSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntID} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
+ // try {
+ // // 璧风偣浣嶇疆锛氬彇鏀捐揣鍖猴紙鏈夎揣鐗┿�娌℃湁閿併�宸插惎鐢級
+ // var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 1 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && Settings.Areas[0].Contains(a.S_AREA_CODE));
+ // if (startLoc == null) {
+ // return BuildSimpleResult(2, $"璧风偣浣嶇疆 {model.startLoc} 涓嶇鍚堝嚭搴撴潯浠�);
+ // }
- tran.CommitTran();
- return BuildSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntID} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
- }
- catch (Exception ex) {
- return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
- }
- }
+ // var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
+ // if (locCntrRel == null) {
+ // return BuildSimpleResult(3, $"璧风偣浣嶇疆 {model.startLoc} 娌℃湁缁戝畾瀹瑰櫒锛屾棤鍙洖搴撶殑鐗╂枡");
+ // }
- /// <summary>
- /// 鐩樼偣鐞嗚揣鍥炲簱(WMS)
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- internal static SimpleResult CheckInbound(CheckInboundInfo model) {
- var taskName = TaskName.鐩樼偣鐞嗚揣鍥炲簱;
- var db = new SqlHelper<object>().GetInstance();
+ // // 缁堢偣浣嶇疆锛氳揣鏋讹紙娌℃湁璐х墿锛屾病鏈夐攣锛�+ // 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");
+ // if (endLoc == null) {
+ // return BuildSimpleResult(4, $"缁堢偣浣嶇疆 {model.endLoc} 涓嶅叿澶囨斁璐ф潯浠�);
+ // }
- try {
- // 璧风偣浣嶇疆锛氬彇鏀捐揣鍖猴紙鏈夎揣鐗┿�娌℃湁閿併�宸插惎鐢級
- var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 1 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && Settings.Areas[0].Contains(a.S_AREA_CODE));
- if (startLoc == null) {
- return BuildSimpleResult(2, $"璧风偣浣嶇疆 {model.startLoc} 涓嶇鍚堝洖搴撴潯浠�);
- }
+ // var cntID = locCntrRel.S_CNTR_CODE;
+ // var task = WCSHelper.BuildTask(startLoc, endLoc, cntID, taskName);
+ // LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�+ // LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�
- var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
- if (locCntrRel == null) {
- return BuildSimpleResult(3, $"璧风偣浣嶇疆 {model.startLoc} 娌℃湁缁戝畾瀹瑰櫒锛屾棤鍙洖搴撶殑鐗╂枡");
- }
+ // 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();
+ // return BuildSimpleResult(500,
+ // $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntID} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}");
+ // }
- // 缁堢偣浣嶇疆锛氳揣鏋讹紙娌℃湁璐х墿锛屾病鏈夐攣锛�- 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");
- if (endLoc == null) {
- return BuildSimpleResult(4, $"缁堢偣浣嶇疆 {model.endLoc} 涓嶅叿澶囨斁璐ф潯浠�);
- }
+ // 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}");
+ // }
- var cntID = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntID, taskName);
- LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�- LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+ // if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // return BuildSimpleResult(500,
+ // $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntID} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
+ // }
- 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();
- 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}");
+ // }
+ //}
- 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}");
- }
+ ///// <summary>
+ ///// 鐩樼偣鐞嗚揣鍥炲簱(WMS)
+ ///// </summary>
+ ///// <param name="model"></param>
+ ///// <returns></returns>
+ //internal static SimpleResult CheckInbound(CheckInboundInfo model) {
+ // var taskName = TaskName.鐩樼偣鐞嗚揣鍥炲簱;
+ // var db = new SqlHelper<object>().GetInstance();
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- return BuildSimpleResult(500,
- $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntID} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
+ // try {
+ // // 璧风偣浣嶇疆锛氬彇鏀捐揣鍖猴紙鏈夎揣鐗┿�娌℃湁閿併�宸插惎鐢級
+ // var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 1 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && Settings.Areas[0].Contains(a.S_AREA_CODE));
+ // if (startLoc == null) {
+ // return BuildSimpleResult(2, $"璧风偣浣嶇疆 {model.startLoc} 涓嶇鍚堝洖搴撴潯浠�);
+ // }
- tran.CommitTran();
- return BuildSimpleResult(0,
- $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntID} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣鏋�{endLoc.S_CODE}");
- }
- }
- catch (Exception ex) {
- return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
- }
- }
+ // var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
+ // if (locCntrRel == null) {
+ // return BuildSimpleResult(3, $"璧风偣浣嶇疆 {model.startLoc} 娌℃湁缁戝畾瀹瑰櫒锛屾棤鍙洖搴撶殑鐗╂枡");
+ // }
+
+ // // 缁堢偣浣嶇疆锛氳揣鏋讹紙娌℃湁璐х墿锛屾病鏈夐攣锛�+ // 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");
+ // 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.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 ErpResult InboundDataSync(InboundDataSyncInfo model) {
+ //return BuildErpResult(1, "娴嬭瘯");
+
var db = new SqlHelper<object>().GetInstance();
try {
var err = "";
var cgDetailList = new List<TN_CG_Detail>();
- foreach (var inboundData in model.stockTransactions) {
+ var recordList = new List<TN_Inbound_DataRecord>();
+
+ foreach (var transaction in model.stockTransactions) {
+ // 鍐欏叆璁板綍琛�+ var record = new TN_Inbound_DataRecord {
+ S_LOCATION_CODE = transaction.locationCode,
+ S_STOCK_TRANS = transaction.stockTransactionId,
+ S_ITEM_CODE = transaction.itemCode,
+ S_ITEM_NAME = transaction.itemName,
+ S_ITEM_SHORT_DESC = transaction.itemShortDesc,
+ S_STOCK_QUANTITY = transaction.stockQuantity,
+ S_IN_QUANTITY = transaction.inQuantity,
+ S_TOTAL_PRICE = transaction.totalPrice,
+ S_STOCK_IN_TIME = transaction.stockInTime,
+ S_STORE_KEEPER = transaction.storeKeeper,
+ S_LINE_CODE = transaction.lineCode,
+ S_DELIVERY_ITEM_NO = transaction.deliveryItemNo,
+ S_SUPPLIER_NAME = transaction.supplierName,
+ S_INVENTORY_MAN = transaction.inventoryManager
+ };
+ recordList.Add(record);
+
+ // 鏌ヨ瀵瑰簲鐗╂枡
var cgDetail = db.Queryable<TN_Location, TN_Loc_Container, TN_CG_Detail>
((l, c, d) => l.S_CODE == c.S_LOC_CODE && c.S_CNTR_CODE == d.S_CNTR_CODE)
- .Where(l => l.S_CODE == inboundData.locationCode)
+ .Where(l => l.S_CODE == transaction.locationCode)
.Select((l, c, d) => d)
.First();
-
+
if (cgDetail == null) {
- err += $"鍌ㄤ綅鐮亄inboundData.locationCode}瀵瑰簲鐨勮揣浣嶇墿鏂欎笉瀛樺湪锛�;
+ err += $"鍌ㄤ綅鐮亄transaction.locationCode}瀵瑰簲鐨勮揣浣嶇墿鏂欎笉瀛樺湪锛�;
continue;
}
+ cgDetail.S_ITEM_CODE = transaction.itemCode;
+ cgDetail.S_ITEM_NAME = transaction.itemName;
- cgDetail.S_ITEM_CODE = inboundData.itemCode;
- cgDetail.S_ITEM_NAME = inboundData.itemName;
-
cgDetailList.Add(cgDetail);
}
- if (db.Updateable<TN_CG_Detail>(cgDetailList).ExecuteCommand() <= 0) {
- return BuildErpResult(500, $"鏇存敼鐗╂枡淇℃伅澶辫触");
+ using (var tran = db.Ado.UseTran()) {
+ if (db.Insertable<TN_Inbound_DataRecord>(recordList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildErpResult(500, $"鍐欏叆鍏ュ簱璁板綍琛ㄥけ璐�);
+ }
+
+ if (db.Updateable<TN_CG_Detail>(cgDetailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildErpResult(500, $"鏇存敼鐗╂枡淇℃伅澶辫触");
+ }
+
+ tran.CommitTran();
}
if (err != "") {
- return BuildErpResult(2, err);
+ return BuildErpResult(2, err + "鍏朵粬淇℃伅姝ｅ父宸插啓鍏�);
}
return BuildErpResult(0, $"鏇存敼鐗╂枡淇℃伅鎴愬姛");
@@ -724,34 +758,67 @@
}
public static ErpResult OutboundDataSync(OutboundDataSyncInfo model) {
+ //return BuildErpResult(1, "娴嬭瘯");
+
var db = new SqlHelper<object>().GetInstance();
try {
var err = "";
var cgDetailList = new List<TN_CG_Detail>();
- foreach (var inboundData in model.materialIssues) {
+ var recordList = new List<TN_Outbound_DataRecord>();
+
+ foreach (var issue in model.materialIssues) {
+ // 鍐欏叆璁板綍琛�+ var record = new TN_Outbound_DataRecord {
+ S_LOCATION_CODE = issue.locationCode,
+ S_ORDER_NO = issue.withdrawalOrderNo,
+ S_ITEM_CODE = issue.itemCode,
+ S_ITEM_NAME = issue.itemName,
+ S_SHORT_DESC = issue.itemShortDesc,
+ S_ACTUAL_QTY = issue.actualIssuedQty,
+ S_ISSUED_AMOUNT = issue.issuedAmount,
+ S_SUPPLIER_NAME = issue.supplierName,
+ S_ISSUER = issue.issuer,
+ S_ISSUE_DATE = issue.issueDate,
+ S_STORE_KEEPER = issue.storeKeeper,
+ S_LINE_CODE = issue.lineCode,
+ S_BATCH_NO = issue.batchNo
+ };
+ recordList.Add(record);
+
+ // 鏌ヨ瀵瑰簲鐗╂枡
var cgDetail = db.Queryable<TN_Location, TN_Loc_Container, TN_CG_Detail>
((l, c, d) => l.S_CODE == c.S_LOC_CODE && c.S_CNTR_CODE == d.S_CNTR_CODE)
- .Where(l => l.S_CODE == inboundData.locationCode)
+ .Where(l => l.S_CODE == issue.locationCode)
.Select((l, c, d) => d)
.First();
if (cgDetail == null) {
- err += $"鍌ㄤ綅鐮亄inboundData.locationCode}瀵瑰簲鐨勮揣浣嶇墿鏂欎笉瀛樺湪锛�;
+ err += $"鍌ㄤ綅鐮亄issue.locationCode}瀵瑰簲鐨勮揣浣嶇墿鏂欎笉瀛樺湪锛�;
continue;
}
- cgDetail.S_ITEM_CODE = inboundData.itemCode;
- cgDetail.S_ITEM_NAME = inboundData.itemName;
+ cgDetail.S_ITEM_CODE = issue.itemCode;
+ cgDetail.S_ITEM_NAME = issue.itemName;
cgDetailList.Add(cgDetail);
}
- if (db.Updateable<TN_CG_Detail>(cgDetailList).ExecuteCommand() <= 0) {
- return BuildErpResult(500, $"鏇存敼鐗╂枡淇℃伅澶辫触");
+ using (var tran = db.Ado.UseTran()) {
+ if (db.Insertable<TN_Outbound_DataRecord>(recordList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildErpResult(500, $"鍐欏叆鍑哄簱璁板綍琛ㄥけ璐�);
+ }
+
+ if (db.Updateable<TN_CG_Detail>(cgDetailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return BuildErpResult(500, $"鏇存敼鐗╂枡淇℃伅澶辫触");
+ }
+
+ tran.CommitTran();
}
if (err != "") {
- return BuildErpResult(2, err);
+ return BuildErpResult(2, err + "鍏朵粬淇℃伅姝ｅ父宸插啓鍏�);
}
return BuildErpResult(0, $"鏇存敼鐗╂枡淇℃伅鎴愬姛");
--
Gitblit v1.9.1