From b183905d45e279eca8a845f532fc2d2edd540edb Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 10 七月 2025 17:27:42 +0800
Subject: [PATCH] 重构盘点单表结构，修复部分盘点逻辑
---
HH.WCS.Mobox3.AnGang.csproj | 7
models/TN_Count_Diff.cs | 21 +
models/TN_AG_Count_Order.cs | 25 ++
models/TN_Count_CG_Detail.cs | 22 +
core/Monitor.cs | 132 +++++++++++
util/Settings.cs | 4
models/TN_Count_Plan.cs | 41 +++
api/ApiHelper.cs | 327 +++++++++++++++++++++++++++
models/TN_Count_Order.cs | 27 ++
models/TN_AG_Count_Plan.cs | 16 +
api/ApiModel.cs | 3
api/MoboxController.cs | 66 +++++
models/TN_AG_Count_Diff.cs | 15 +
13 files changed, 704 insertions(+), 2 deletions(-)
diff --git a/HH.WCS.Mobox3.AnGang.csproj b/HH.WCS.Mobox3.AnGang.csproj
index 3cf0433..0b624af 100644
--- a/HH.WCS.Mobox3.AnGang.csproj
+++ b/HH.WCS.Mobox3.AnGang.csproj
@@ -267,6 +267,13 @@
<Compile Include="App_Start\SwaggerControllerDescProvider.cs" />
<Compile Include="device\SnapDevice.cs" />
<Compile Include="device\SnapManager.cs" />
+ <Compile Include="models\TN_AG_Count_Diff.cs" />
+ <Compile Include="models\TN_AG_Count_Order.cs" />
+ <Compile Include="models\TN_AG_Count_Plan.cs" />
+ <Compile Include="models\TN_Count_CG_Detail.cs" />
+ <Compile Include="models\TN_Count_Diff.cs" />
+ <Compile Include="models\TN_Count_Order.cs" />
+ <Compile Include="models\TN_Count_Plan.cs" />
<Compile Include="models\TN_Inbound_DataRecord.cs" />
<Compile Include="models\TN_Outbound_DataRecord.cs" />
<Compile Include="core\WMSCore.cs" />
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 285284f..10aca34 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -358,7 +358,7 @@
$"鎻掑叆瀹瑰櫒璐у搧鏄庣粏琛ㄥけ璐ワ細瀹瑰櫒{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,
@@ -1097,5 +1097,330 @@
return BuildErpResult(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();
+
+ 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[AreaIndex.H璐ф灦鍖篯.Contains(a.S_AREA_CODE));
+ if (startLoc == null) {
+ return BuildSimpleResult(2, $"璧风偣浣嶇疆 {model.startLoc} 涓嶇鍚堝嚭搴撴潯浠�);
+ }
+
+ 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}");
+ }
+ }
+
+ /// <summary>
+ /// 鐩樼偣鐞嗚揣鍥炲簱(WMS)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ internal static SimpleResult CheckInbound(CheckInboundInfo model) {
+ var taskName = TaskName.鐩樼偣鐞嗚揣鍥炲簱;
+ var db = new SqlHelper<object>().GetInstance();
+
+ 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[AreaIndex.X鍗歌揣鍖篯.Contains(a.S_AREA_CODE));
+ if (startLoc == null) {
+ return BuildSimpleResult(2, $"璧风偣浣嶇疆 {model.startLoc} 涓嶇鍚堝洖搴撴潯浠�);
+ }
+
+ 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" && Settings.Areas[AreaIndex.H璐ф灦鍖篯.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.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 SimpleResult CreateCountPlan(CreateCountPlanInfo model) {
+ // var db = new SqlHelper<object>().GetInstance();
+ // try {
+
+ // var countPlan = new TN_Count_Plan() {
+ // S_CP_NO = GenerateNo("鐩樼偣璁″垝", "PDJH"), // CP =銆婸DJH
+ // 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 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();
+
+ // if (countPlan == null) {
+ // return BuildSimpleResult(2, $"鐩樼偣璁″垝鍗曞彿 '{model.planId}' 涓嶅瓨鍦�);
+ // }
+
+ // var countOrder = new TN_Count_Order() {
+ // S_CP_NO = model.planId,
+ // S_COUNT_NO = GenerateNo("鐩樼偣鍗�, "PDD"), // CN =銆婸DD
+ // };
+
+ // 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 (cgDetail == null) {
+ // return BuildSimpleResult(3, $"鏈壘鍒版寚瀹氳揣浣峽countPlan.S_LOC_CODE}涓婄殑鐗╂枡");
+ // }
+
+ // 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,
+ // };
+
+ // countDetailList.Add(countDetail);
+ // }
+ // else if (countPlan.S_TYPE == "鐗╂枡") {
+ // var cgDetail = db.Queryable<TN_CG_Detail>()
+ // .Where(d => d.S_ITEM_CODE == countPlan.S_ITEM_CODE).First(); // ToList -> First
+
+ // if (cgDetail == null) {
+ // return BuildSimpleResult(3, $"鏈壘鍒版寚瀹氱殑鐗╂枡{countPlan.S_ITEM_CODE}");
+ // }
+
+ // //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,
+ // // };
+
+ // // countDetailList.Add(countDetail);
+ // //}
+
+ // 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,
+ // };
+
+ // countDetailList.Add(countDetail);
+ // }
+ // else {
+ // return BuildSimpleResult(3, $"璁″垝鍗�{model.planId}'鐨勭被鍨媨countPlan.S_TYPE}涓嶅悎娉�);
+ // }
+
+ // 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_CG_Detail>(countDetailList).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // info = "鍒涘缓鐩樼偣鍗曟槑缁嗗け璐�;
+ // return BuildSimpleResult(3, info);
+ // }
+
+ // tran.CommitTran();
+ // }
+
+ // return BuildSimpleResult(0, "鍒涘缓鐩樼偣鍗曟垚鍔�);
+ // }
+ // catch (Exception ex) {
+
+ // return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
+ // }
+ //}
+
+ 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();
+
+ //if (cgDetail == null) {
+ // return BuildSimpleResult(2, $"鎵句笉鍒板鍣ㄥ彿'{model.cntrCode}'瀵瑰簲鐨勭墿鏂�);
+ //}
+
+ var locCntrRel = db.Queryable<TN_Loc_Container>()
+ //.LeftJoin<TN_CG_Detail>((c, d) => c.S_CNTR_CODE == d.S_CNTR_CODE)
+ .Where(c => c.S_LOC_CODE == model.locCode).First();
+ if (locCntrRel == null) {
+ return BuildSimpleResult(2, $"褰撳墠璐т綅{model.locCode}娌℃湁瀹瑰櫒锛�);
+ }
+
+ var cgDetail = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
+ if (cgDetail == null) {
+ return BuildSimpleResult(3, $"褰撳墠璐т綅{model.locCode}涓婄殑瀹瑰櫒{locCntrRel.S_CNTR_CODE}娌℃湁鐗╁搧锛�);
+ }
+
+ //var countDiff = new TN_Count_Diff {
+ // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ // F_QTY = cgDetail.F_QTY,
+ // F_ACTUAL_QTY = model.qty
+ //};
+
+ var countDiff = db.Queryable<TN_AG_Count_Diff>().Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
+ if (countDiff == null) {
+ return BuildSimpleResult(4, $"褰撳墠鐗╂枡鎵�湪瀹瑰櫒{locCntrRel.S_CNTR_CODE}鐗╂枡淇℃伅娌℃湁鐢熸垚瀵瑰簲鐨勭洏鐐瑰樊寮傝〃锛�);
+ }
+
+ countDiff.F_QTY = cgDetail.F_QTY;
+ countDiff.F_ACTUAL_QTY = model.qty;
+ //countDiff.S_ITEM_CODE = cgDetail.S_ITEM_CODE;
+
+ //if (db.Insertable<TN_Count_Diff>(countDiff).ExecuteCommand() <= 0) {
+ // return BuildSimpleResult(3, $"鎻掑叆鐩樼偣宸紓琛ㄥけ璐�);
+ //}
+
+ if (db.Updateable<TN_AG_Count_Diff>(countDiff).ExecuteCommand() <= 0) {
+ return BuildSimpleResult(5, $"鎻掑叆鐩樼偣宸紓琛ㄥけ璐�);
+ }
+
+ return BuildSimpleResult(0, "鐩樼偣宸紓瀹屾垚");
+
+ }
+ catch (Exception ex) {
+ return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
+ }
+ }
+
+
}
}
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index b4d438b..c6eb912 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -228,7 +228,8 @@
}
public class CountProductInfo {
- public string cntrCode { get; set; }
+ //public string cntrCode { get; set; }
+ public string locCode { get; set; }
public float qty { get; set; }
}
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 51d084f..0ab6099 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -84,5 +84,71 @@
LogHelper.Info("瑙﹀彂API锛氬彇娑堜换鍔� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CancelTask(model);
}
+
+ // 鐩樼偣鍔熻兘锛堟柊锛�+
+
+
+ // 澶囩敤锛氱洏鐐圭浉鍏冲姛鑳斤紙鎭㈠锛�-----------------------------------
+
+ ///// <summary>
+ ///// 鍒涘缓鐩樼偣璁″垝鍗�WMS)
+ ///// </summary>
+ ///// <param name="model"></param>
+ ///// <returns></returns>
+ //[HttpPost]
+ //[Route("CreateCountPlan")]
+ //public SimpleResult CreateCountPlan(CreateCountPlanInfo model) {
+ // LogHelper.Info("瑙﹀彂API锛氬垱寤虹洏鐐硅鍒掑崟(WMS)" + JsonConvert.SerializeObject(model), "API");
+ // return ApiHelper.CreateCountPlan(model);
+ //}
+
+ ///// <summary>
+ ///// 鍒涘缓鐩樼偣鍗�PDA)
+ ///// </summary>
+ ///// <param name="model"></param>
+ ///// <returns></returns>
+ //[HttpPost]
+ //[Route("CreateCountOrder")]
+ //public SimpleResult CreateCountOrder(CreateCountOrderInfo model) {
+ // LogHelper.Info("瑙﹀彂API锛氬垱寤虹洏鐐瑰崟(PDA)" + JsonConvert.SerializeObject(model), "API");
+ // return ApiHelper.CreateCountOrder(model);
+ //}
+
+ /// <summary>
+ /// 鐩樼偣鐞嗚揣(PDA)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("CountProduct")]
+ public SimpleResult CountProduct(CountProductInfo model) {
+ LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐�PDA)" + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.CountProduct(model);
+ }
+
+ /// <summary>
+ /// 鐩樼偣鐞嗚揣鍑哄簱(WMS)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("CheckOutbound")]
+ public SimpleResult CheckOutbound(CheckOutboundInfo model) {
+ LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴�WMS)" + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.CheckOutbound(model);
+ }
+
+ /// <summary>
+ /// 鐩樼偣鐞嗚揣鍥炲簱(WMS)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("CheckInbound")]
+ public SimpleResult CheckInbound(CheckInboundInfo model) {
+ LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у洖搴�WMS)" + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.CheckInbound(model);
+ }
}
}
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 3f81d23..ec11518 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -146,6 +146,138 @@
LogHelper.Info($"鍙戠敓浜嗗紓甯革細{ex.Message}");
}
}
+
+ // 鐩樼偣鍔熻兘锛堟柊锛�----------------------------------------
+
+
+
+ // 澶囩敤锛氱洏鐐圭浉鍏冲姛鑳斤紙鎭㈠锛�-----------------------------------
+
+ //public static void CheckCountOrder() {
+ // var taskName = TaskName.鐩樼偣鐞嗚揣鍑哄簱;
+ // var db = new SqlHelper<object>().GetInstance();
+ // var info = "";
+
+ // try {
+ // var orderList = db.Queryable<TN_Count_Order>()
+ // .Where(c => c.N_B_STATE == 1)
+ // .OrderBy(c => c.T_CREATE, SqlSugar.OrderByType.Asc)
+ // .ToList();
+
+ // if (orderList.Count == 0) {
+ // LogHelper.Info($"杞--{taskName}--鏆傛棤寰呮墽琛岀殑{taskName}鍗�);
+ // return;
+ // }
+
+ // var detailList = new List<TN_Count_CG_Detail>();
+ // foreach (var order in orderList) {
+ // var doingCount = db.Queryable<TN_Count_CG_Detail>()
+ // .Count(d => d.S_COUNT_NO == order.S_COUNT_NO && d.N_B_STATE >= 2); // 鎵ц涓�+ // var allCount = db.Queryable<TN_Count_CG_Detail>()
+ // .Count(d => d.S_COUNT_NO == order.S_COUNT_NO);
+ // LogHelper.Info($"杞--{taskName}--缁熻{taskName}鍗�{order.S_COUNT_NO}'浠诲姟宸蹭笅鍙戯細{doingCount}/{allCount}");
+
+ // if (doingCount == allCount) {
+ // order.N_B_STATE = 2; // 鎵�湁浠诲姟閮藉凡鎵ц
+ // db.Updateable<TN_Count_Order>(order).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
+ // continue;
+ // }
+
+ // var countCgDetailList = db.Queryable<TN_Count_CG_Detail>()
+ // .Where(a => a.S_COUNT_NO == order.S_COUNT_NO && a.N_B_STATE == 1) // 宸蹭笅鍙�+ // .ToList();
+
+ // if (countCgDetailList.Count == 0) {
+ // LogHelper.Info($"杞--{taskName}--{taskName}鍗曟槑缁嗙姸鎬佸紓甯�);
+ // continue;
+ // }
+
+ // detailList.AddRange(countCgDetailList);
+ // }
+
+ // if (detailList.Count == 0) {
+ // return;
+ // }
+
+ // foreach (var detail in detailList) {
+ // 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 == detail.S_CNTR_CODE)
+ // .First();
+
+ // if (startLoc == null) {
+ // LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
+ // continue;
+ // }
+
+ // var endLoc = db.Queryable<TN_Location>()
+ // .Where(a => Settings.Areas[0].Contains(a.S_AREA_CODE))
+ // .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y")
+ // .Where(a => a.N_CURRENT_NUM == 0).First();
+
+ // if (endLoc == null) {
+ // LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛佸崟鍙蜂负 '{detail.S_COUNT_NO}'");
+ // continue;
+ // }
+
+ // detail.N_B_STATE = 2;
+
+ // var cntId = detail.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_Count_CG_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // LogHelper.Info($"杞--{taskName}--淇敼鏄庣粏琛ㄧ姸鎬佷负瀹屾垚澶辫触锛�);
+ // }
+
+ // 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);
+ // continue;
+ // }
+
+ // 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);
+ // continue;
+ // }
+
+ // if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
+ // tran.RollbackTran();
+ // info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ // LogHelper.Info(info);
+ // continue;
+ // }
+
+ // tran.CommitTran();
+ // info = $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
+ // LogHelper.Info(info);
+ // //continue;
+ // }
+ // }
+ // }
+ // catch (Exception ex) {
+ // info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+ // LogHelper.Info(info);
+ // }
+ //}
}
}
diff --git a/models/TN_AG_Count_Diff.cs b/models/TN_AG_Count_Diff.cs
new file mode 100644
index 0000000..c964b45
--- /dev/null
+++ b/models/TN_AG_Count_Diff.cs
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HH.WCS.Mobox3.AnGang.models {
+ public class TN_AG_Count_Diff {
+ public string S_COUNT_NO { get; set; }
+ public string S_CNTR_CODE { get; set; }
+ public float F_QTY { get; set; } = 0f;
+ public float F_ACTUAL_QTY { get; set; } = 0f;
+ public string S_ITEM_CODE { get; set; }
+ }
+}
diff --git a/models/TN_AG_Count_Order.cs b/models/TN_AG_Count_Order.cs
new file mode 100644
index 0000000..06b3ee4
--- /dev/null
+++ b/models/TN_AG_Count_Order.cs
@@ -0,0 +1,25 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using SqlSugar;
+
+namespace HH.WCS.Mobox3.AnGang.models {
+ [SugarTable("TN_AG_Count_Order")]
+ public class TN_AG_Count_Order {
+ public string S_COUNT_NO { get; set; }
+ public string S_CP_NO { get; set; }
+
+ //public string S_LOC_CODE { get; set; }
+ public string S_CNTR_CODE { get; set; }
+
+ public string S_ITEM_CODE { get; set; }
+
+ /// <summary>
+ /// 0 寰呯洏鐐癸紱1 鐩樼偣鎵ц涓紱2 鐩樼偣瀹屾垚寰呭洖搴擄紱3 鍥炲簱瀹屾垚锛堝彧鏈夊洖搴撳畬鎴愭椂鍙互鎵ц涓嬩竴涓换鍔★級
+ /// </summary>
+ public int N_B_STATE { get; set; }
+ }
+}
diff --git a/models/TN_AG_Count_Plan.cs b/models/TN_AG_Count_Plan.cs
new file mode 100644
index 0000000..4ac7a7e
--- /dev/null
+++ b/models/TN_AG_Count_Plan.cs
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using SqlSugar;
+
+namespace HH.WCS.Mobox3.AnGang.models {
+ [SugarTable("TN_AG_Count_Plan")]
+ public class TN_AG_Count_Plan {
+ public string S_CP_NO { get; set; }
+
+ public int N_B_STATE { get; set; }
+ }
+}
diff --git a/models/TN_Count_CG_Detail.cs b/models/TN_Count_CG_Detail.cs
new file mode 100644
index 0000000..ce584a7
--- /dev/null
+++ b/models/TN_Count_CG_Detail.cs
@@ -0,0 +1,22 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using SqlSugar;
+
+namespace HH.WCS.Mobox3.AnGang.models {
+ /// <summary>
+ /// 銆愭棫銆戠洏鐐瑰崟鏄庣粏琛�+ /// </summary>
+ [SugarTable("TN_Count_CG_Detail")]
+ public class TN_Count_CG_Detail : BaseModel {
+ public string S_COUNT_NO { get; set; }
+ public string S_ITEM_CODE { get; set; }
+ public string S_CNTR_CODE { get; set; }
+
+ public int N_B_STATE { get; set; }
+
+ }
+}
diff --git a/models/TN_Count_Diff.cs b/models/TN_Count_Diff.cs
new file mode 100644
index 0000000..f2fb221
--- /dev/null
+++ b/models/TN_Count_Diff.cs
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using SqlSugar;
+
+namespace HH.WCS.Mobox3.AnGang.models {
+ /// <summary>
+ /// 銆愭棫銆戠洏鐐瑰樊寮傝〃
+ /// </summary>
+ [SugarTable("TN_Count_Diff")]
+ public class TN_Count_Diff : BaseModel {
+ public string S_COUNT_NO { get; set; }
+ public string S_CNTR_CODE { get; set; }
+ public float F_QTY { get; set; }
+ public float F_ACTUAL_QTY { get; set; }
+ public string S_ITEM_CODE { get; set; }
+ }
+}
diff --git a/models/TN_Count_Order.cs b/models/TN_Count_Order.cs
new file mode 100644
index 0000000..6b7e5a0
--- /dev/null
+++ b/models/TN_Count_Order.cs
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using SqlSugar;
+
+namespace HH.WCS.Mobox3.AnGang.models {
+ /// <summary>
+ /// 銆愭棫銆戠洏鐐瑰崟琛�+ /// </summary>
+ [SugarTable("TN_Count_Order")]
+ public class TN_Count_Order : BaseModel {
+ public string S_CP_NO { get; set; }
+
+ /// <summary>
+ /// 鐩樼偣鍗曞彿
+ /// </summary>
+ public string S_COUNT_NO { get; set; }
+
+ /// <summary>
+ /// 涓氬姟鐘舵�锛�绛夊緟鎵ц 1宸叉墽琛屽緟鐢熸垚浠诲姟 2浠诲姟鎵ц涓�3浠诲姟瀹屾垚
+ /// </summary>
+ public int N_B_STATE { get; set; }
+ }
+}
diff --git a/models/TN_Count_Plan.cs b/models/TN_Count_Plan.cs
new file mode 100644
index 0000000..910faa5
--- /dev/null
+++ b/models/TN_Count_Plan.cs
@@ -0,0 +1,41 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using SqlSugar;
+
+namespace HH.WCS.Mobox3.AnGang.models {
+ /// <summary>
+ /// 銆愭棫銆戠洏鐐硅鍒掕〃
+ /// </summary>
+ [SugarTable("TN_Count_Plan")]
+ public class TN_Count_Plan : BaseModel {
+ /// <summary>
+ /// 鐩樼偣璁″垝鍙�+ /// </summary>
+ public string S_CP_NO { get; set; }
+
+ /// <summary>
+ /// 鐩樼偣绫诲瀷锛氳揣鐗╃洏鐐�璐т綅鐩樼偣
+ /// </summary>
+ public string S_TYPE { get; set; }
+
+ /// <summary>
+ /// 鐩樼偣鐘舵�锛� 鈥�鏈墽琛�1 鈥�鍚姩涓�2 鈥�鎵ц涓�3 鈥�瀹屾垚 4 鈥�鍑洪敊
+ /// </summary>
+ public int N_B_STATE { get; set; } = 0;
+
+ ///// <summary>
+ ///// 璁″垝鐩樼偣鐗╂枡鏁伴噺
+ ///// </summary>
+ //public int N_PLAN_TOTAL { get; set; }
+
+ // ------
+
+ public string S_LOC_CODE { get; set; } = "";
+
+ public string S_ITEM_CODE { get; set; } = "";
+ }
+}
diff --git a/util/Settings.cs b/util/Settings.cs
index 796fe32..4585a8a 100644
--- a/util/Settings.cs
+++ b/util/Settings.cs
@@ -110,6 +110,10 @@
public const string 浜у搧鍏ュ簱 = "浜у搧鍏ュ簱";
public const string 浜у搧閮ㄥ垎鍑哄簱 = "浜у搧閮ㄥ垎鍑哄簱";
public const string 浜у搧閮ㄥ垎鍥炲簱 = "浜у搧閮ㄥ垎鍥炲簱";
+
+ // 澶囩敤锛氱洏鐐圭悊璐у嚭搴擄紙鎭㈠锛�+ public const string 鐩樼偣鐞嗚揣鍑哄簱 = "鐩樼偣鐞嗚揣鍑哄簱";
+ public const string 鐩樼偣鐞嗚揣鍥炲簱 = "鐩樼偣鐞嗚揣鍥炲簱";
}
public class AreaIndex {
--
Gitblit v1.9.1