From afbd33474dfd3f9f19b0829cf9d544a5afae1249 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期三, 04 六月 2025 17:02:48 +0800
Subject: [PATCH] 1.增加出库任务大屏接口 实体类 测试流程 2.空托出入库 半托 先进先出逻辑优化
---
api/WmsSpaHelper.cs | 256 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 194 insertions(+), 62 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index fbd8f0f..a677c7d 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -30,7 +30,6 @@
using System.Security.Policy;
using HH.WCS.Mobox3.pinggao.models;
using static HH.WCS.Mobox3.pinggao.wms.WMSHelper;
-using WHTest;
using System.Net;
using SqlSugar;
using static HH.WCS.Mobox3.pinggao.models.SapRoot.GYSDto;
@@ -46,6 +45,34 @@
}
+ public static bool MaterPanduan(string ItemCode,double count) {
+ bool panduan = true;
+ var db = new SqlHelper<object>().GetInstance();
+
+ var po = db.Queryable<TN_Material_KC>().Where(a => a.S_ITEM_CODE == ItemCode).First();
+
+ var po1 = db.Queryable<CntrItemRel>().Where(a => a.S_ITEM_CODE == ItemCode).First();
+ if (po != null)
+ {
+ if (po1!=null)
+ {
+ double sl= po1.F_QTY + count;
+ if (sl>po.N_COUNT)
+ {
+ panduan = false;
+ }
+ }
+ if (count > po.N_COUNT)
+ {
+ panduan = false;
+ }
+ }
+ else
+ {
+ panduan = false;
+ }
+ return panduan;
+ }
/// <summary>
/// 鏁版嵁
/// </summary>
@@ -424,6 +451,17 @@
}
foreach (var item in items.ITEM)
{
+ bool v = MaterPanduan(item.WLBM, item.SL);
+ if (!v)
+ {
+ result.resultMsg = "澶辫触";
+ result.WLPZBH = items.HEAD.WLPZH;
+ result.resultCode = 1;
+ result.WLPZND = items.HEAD.WLPZND;
+ result.resultMsg = $"鐗╂枡{item.WLBM}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
+ simpleResults.Add(result);
+ continue;
+ }
///鍒ゆ柇鏄惁閮芥湁鍐查攢鍑瘉缂栧彿
if (string.IsNullOrEmpty(item.CXPZH))
{
@@ -1134,9 +1172,9 @@
result.resultCode = 1;
result.resultMsg = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
- result.resultMsg = "澶辫触";
result.WLPZBH = itemwlpz.HEAD.WLPZH;
result.WLPZND = itemwlpz.HEAD.ND;
+ simpleResults.Add(result);
continue;
/* throw new Exception($"鐗╂枡{a.WLH}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�)*/
;
@@ -1186,9 +1224,20 @@
po.Details = new List<TN_Inbound_Detail>();
if (itemwlpz.ITEM.Count > 0)
{
- itemwlpz.ITEM.ForEach(a =>
+ foreach (var a in itemwlpz.ITEM)
+
{
-
+ bool v = MaterPanduan(a.WLBM, a.SL);
+ if (!v)
+ {
+ result.resultMsg = "澶辫触";
+ result.WLPZBH = itemwlpz.HEAD.WLPZH;
+ result.resultCode = 1;
+ result.WLPZND = itemwlpz.HEAD.ND;
+ result.resultMsg = $"鐗╂枡{a.WLBM}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
+ simpleResults.Add(result);
+ continue;
+ }
po.Details.Add(new TN_Inbound_Detail
{
S_IO_NO = itemwlpz.HEAD.WLPZH,
@@ -1210,7 +1259,7 @@
});
//}
- });
+ }
db.Insertable<TN_Inbound_Order>(po).ExecuteCommand();
db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand();
db.CommitTran();
@@ -1224,8 +1273,19 @@
var Details = new List<TN_Inbound_Detail>();
if (itemwlpz.ITEM.Count > 0)
{
- itemwlpz.ITEM.ForEach(a =>
+ foreach (var a in itemwlpz.ITEM)
{
+ bool v = MaterPanduan(a.WLBM, a.SL);
+ if (!v)
+ {
+ result.resultMsg = "澶辫触";
+ result.WLPZBH = itemwlpz.HEAD.WLPZH;
+ result.resultCode = 1;
+ result.WLPZND = itemwlpz.HEAD.ND;
+ result.resultMsg = $"鐗╂枡{a.WLBM}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
+ simpleResults.Add(result);
+ continue;
+ }
if (po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).Count() > 0)
{
var poq = po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).FirstOrDefault();
@@ -1254,19 +1314,20 @@
});
}
- });
+ }
db.Insertable<TN_Inbound_Detail>(Details).ExecuteCommand();
db.CommitTran();
}
}
}
- result.resultMsg = "鎴愬姛";
- result.WLPZBH = itemwlpz.HEAD.WLPZH;
- result.WLPZND = itemwlpz.HEAD.ND;
- result.resultCode = 0;
- result.resultMsg = "";
- simpleResults.Add(result);
+
+ var result2 = new SimpleResult();
+ result2.resultMsg = "鎴愬姛";
+ result2.WLPZBH = itemwlpz.HEAD.WLPZH;
+ result2.WLPZND = itemwlpz.HEAD.ND;
+ result2.resultCode = 0;
+ simpleResults.Add(result2);
db.CommitTran();
}
}
@@ -1332,8 +1393,20 @@
po.Details = new List<TN_Inbound_Detail>();
if (itemwlpz.ITEM.Count > 0)
{
- itemwlpz.ITEM.ForEach(a =>
+ foreach (var a in itemwlpz.ITEM)
+
{
+ bool v = MaterPanduan(a.WLBH, a.SL);
+ if (!v)
+ {
+ result.resultMsg = "澶辫触";
+ result.WLPZBH = itemwlpz.HEAD.WLPZBH;
+ result.resultCode = 1;
+ result.WLPZND = itemwlpz.HEAD.WLPZNF;
+ result.resultMsg = $"鐗╂枡{a.WLBH}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
+ simples.Add(result);
+ continue;
+ }
#region 涓嶉渶瑕� //if (a.ITEM1.Select(s => s.XLH).Count() > 0)//鍒ゆ柇搴忓垪鍙锋槸鍚︿负澶氫釜
//{
@@ -1385,7 +1458,7 @@
});
//}
- });
+ }
db.Insertable<TN_Inbound_Order>(po).ExecuteCommand();
db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand();
db.CommitTran();
@@ -1397,8 +1470,20 @@
var Details = new List<TN_Inbound_Detail>();
if (itemwlpz.ITEM.Count > 0)
{
- itemwlpz.ITEM.ForEach(a =>
+ foreach (var a in itemwlpz.ITEM)
+
{
+ bool v = MaterPanduan(a.WLBH, a.SL);
+ if (!v)
+ {
+ result.resultMsg = "澶辫触";
+ result.WLPZBH = itemwlpz.HEAD.WLPZBH;
+ result.resultCode = 1;
+ result.WLPZND = itemwlpz.HEAD.WLPZNF;
+ result.resultMsg = $"鐗╂枡{a.WLBH}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
+ simples.Add(result);
+ continue;
+ }
if (po.Details.Where(s => s.S_ITEM_CODE == a.WLBH).Count() > 0)
{
var poq = po.Details.Where(s => s.S_ITEM_CODE == a.WLBH).FirstOrDefault();
@@ -1432,7 +1517,7 @@
});
}
- });
+ }
db.Insertable<TN_Inbound_Detail>(Details).ExecuteCommand();
db.CommitTran();
@@ -1756,7 +1841,7 @@
result.resultMsg = "鎴愬姛";
result.resultCode = 0;
//鏍￠獙鍏ュ簱鍗曟暟閲忥紝涓嶅彲浠ヨ秴锛屾垚鍔熷悗鎻掑叆鎵樼洏鐗╂枡琛紝鏇存柊鍏ュ簱鍗曠疮璁℃暟閲�- result = AddInboundOrder(model.MaterList, model.cntr_code);
+ result = AddInboundOrder(model.MaterList, model.cntr_code,model.cntr_type);
#region MyRegion
@@ -1854,13 +1939,17 @@
return result;
}
//鍒ゆ柇鎵樼洏鏄惁宸茬粡鐢熸垚浠诲姟锛屽鏋滄病鏈夊垯鐢熸垚
- var wmsTaskcs = WMSHelper.GetWmsTaskByCntr(model.cntr_code);
- if (wmsTaskcs != null)
+ if (!string.IsNullOrEmpty(model.cntr_code))
{
- result.resultCode = 3;
- result.resultMsg = $"璧风偣{model.start} 鎵樼洏{model.cntr_code}宸茬粡鍒涘缓浠诲姟锛岃鍕块噸澶嶇敵璇�;
- return result;
+ var wmsTaskcs = WMSHelper.GetWmsTaskByCntr(model.cntr_code);
+ if (wmsTaskcs != null)
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"璧风偣{model.start} 鎵樼洏{model.cntr_code}宸茬粡鍒涘缓浠诲姟锛岃鍕块噸澶嶇敵璇�;
+ return result;
+ }
}
+
//鍑哄簱
if (model.Type==2)
{
@@ -1881,6 +1970,16 @@
{
start= db.Queryable<Location>().Where(it => it.S_CODE == loc.S_LOC_CODE).First();
}
+ }
+ else if (!string.IsNullOrEmpty(model.item_code))
+ {
+ start = db.Queryable<LocCntrRel>()
+ .LeftJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE&&cir.S_CNTR_TYPE=="鍗婃墭")
+ .Where((lcr, cir) => cir.S_CNTR_CODE != null)
+ .LeftJoin<Location>((lcr, cir, loc) => lcr.S_LOC_CODE == loc.S_CODE && loc.S_AREA_CODE == "HJQ")
+ .OrderBy((lcr, cir) => cir.T_CREATE)
+ .Select((lcr, cir, loc) => loc).ToList() // 杩斿洖 Location 瀵硅薄
+ .FirstOrDefault(); // 鎴栬� Take(1).ToList()[0]
}
else
{
@@ -1908,7 +2007,7 @@
start = db.Queryable<LocCntrRel>()
.LeftJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE)
.Where((lcr, cir) => cir.S_CNTR_CODE == null) // 鎵惧嚭鏈鍗犵敤鐨勫鍣�- .LeftJoin<Location>((lcr, cir, loc) => lcr.S_LOC_CODE == loc.S_CODE&&loc.S_AREA_CODE== "HJQ")
+ .LeftJoin<Location>((lcr, cir, loc) => lcr.S_LOC_CODE == loc.S_CODE && loc.S_AREA_CODE == "HJQ")
.Select((lcr, cir, loc) => loc).ToList() // 杩斿洖 Location 瀵硅薄
.FirstOrDefault(); // 鎴栬� Take(1).ToList()[0]
}
@@ -1941,7 +2040,7 @@
};
if (WMSHelper.CreateWmsTask(wmsTask))
{
- LocationHelper.LockLoc(start.S_CODE, 1);
+ LocationHelper.LockLoc(start.S_CODE, 2);
result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
}
@@ -1952,6 +2051,7 @@
Location end = new Location();
if (!string.IsNullOrEmpty(model.cntr_code))
{
+
#region MyRegion
//var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
//var S_LOC_CODElist = db.Queryable<LocCntrRel>().Where(s=>!list.Contains(s.S_CNTR_CODE)).Select(s=>s.S_LOC_CODE).ToArray();
@@ -2087,7 +2187,11 @@
}
//閫氱敤鎺ュ彛 瀵瑰鍣ㄨ揣鍝佺殑鍒犲噺 鍜岀敓鎴愬洖搴撳崟 閮借鐢ㄧ殑鎺ュ彛
- result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE);
+ result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE,model.cntr_type);
+ if (result.resultCode==1)
+ {
+ return result;
+ }
#region 鍗囬檷閲�
bool adds = true;
@@ -2184,7 +2288,7 @@
LogHelper.Info($"mobox 搴撳尯闄嶉噺鎺ュ彛杩斿洖涓虹┖");
}
- if (adds) addOnShelves(po, model.cntr_code, 2);
+ //if (adds) addOnShelves(po, model.cntr_code, 2);
}
else LogHelper.Info($"鎵樼洏{model.cntr_code}鏃犻渶瑕佸崌闄嶉噺鐨勭墿鏂�);
@@ -2195,6 +2299,7 @@
}
catch (Exception e)
{
+ LogHelper.Info($"鎶ラ敊{e.Message}");
result.resultMsg = e.Message;
db.RollbackTran();
return result;
@@ -2203,7 +2308,7 @@
}
}
- public static async Task<SimpleResult> TYAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, bool isHK, string start, string S_OUT_TYPE)
+ public static async Task<SimpleResult> TYAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, bool isHK, string start, string S_OUT_TYPE,string cntr_type)
{
// var db = new SqlHelper<object>().GetInstance();
//using (var db = new SqlHelper<object>().GetInstance())
@@ -2234,6 +2339,7 @@
if (cir != null)
{
cir.F_QTY -= item.qty;
+ cir.S_CNTR_TYPE = cntr_type;
cir.F_ALLOC_QTY -= item.qty;
cir.T_MODIFY = DateTime.Now;
if (cir.F_QTY == 0)
@@ -2242,10 +2348,8 @@
}
else
{
- db.Updateable(cir).UpdateColumns(it => new { it.F_QTY, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();
+ db.Updateable(cir).UpdateColumns(it => new { it.F_QTY,it.S_CNTR_TYPE, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();
//娣诲姞鍥炲簱浣滀笟
-
-
}
}
else
@@ -2256,31 +2360,7 @@
LogHelper.Info($"鐗╂枡涓嶅瓨鍦▄item.item_code}");
return result;
}
- if (isHK)
- {
- var wmsTask = new WMSTask
- {
- S_CNTR_CODE = cntr_code,
- S_CODE = WMSHelper.GenerateTaskNo(),
- S_START_LOC = start,
- S_START_AREA = startinfo.S_AREA_CODE,
- S_START_WH = startinfo.S_WH_CODE,
- S_END_LOC = startinfo.S_CODE,
- S_END_AREA = startinfo.S_AREA_CODE,
- S_END_WH = startinfo.S_WH_CODE,
-
- N_TYPE = 1,
- // S_TYPE = WMSTask.GetTypeStr(1),
- S_TYPE = "鍥炲簱",
- S_OP_DEF_CODE = "",
- S_OP_DEF_NAME = "pda鍏ュ簱"
- };
- if (WMSHelper.CreateWmsTask(wmsTask))
- {
- LocationHelper.LockLoc(start, 1);
- result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
- }
- }
+
OutboundRecord outboundRecord = new OutboundRecord();
outboundRecord.S_WLPZBH = pz?.S_WLPZBH;
outboundRecord.S_WLPZND = pz?.S_WLPZND;
@@ -2300,14 +2380,65 @@
return result;
}
}
- db.Insertable<OutboundRecord>(records).ExecuteCommand();
+ if (isHK)
+ {
+ var locs= db.Queryable<WCSTask>().Where(a =>a.S_TYPE.Contains("鍑哄簱")&& a.S_CNTR_CODE == cntr_code&&a.N_B_STATE==3).OrderByDescending(s=>s.T_END_TIME).First();
+ if (locs!=null)
+ {
+ var cntr= db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_DC_NO== locs.S_BS_NO).First();
+ if (cntr!=null)
+ {
+ cntr.S_SORT_TYPE = "宸插垎鎷�;
+ db.Updateable(cntr).UpdateColumns(it => new { it.S_SORT_TYPE }).ExecuteCommand();
+ }
+ else
+ {
+ result.resultCode = 1;
+ result.resultMsg += $"浠诲姟{locs.S_CODE}鏉ユ簮鍙穥locs.S_BS_NO}鎵句笉鍒伴厤鐩樹俊鎭�;
+ return result;
+ }
+ //var location = db.Queryable<Location>().Where(a => a.S_CODE == locs.S_LOC_CODE).First();
+ var wmsTask = new WMSTask
+ {
+ S_CNTR_CODE = cntr_code,
+ S_CODE = WMSHelper.GenerateTaskNo(),
+ S_START_LOC = start,
+ S_START_AREA = startinfo.S_AREA_CODE,
+ S_START_WH = startinfo.S_WH_CODE,
+ S_END_LOC = locs?.S_START_LOC,
+ S_END_AREA = locs?.S_START_AREA,
+ S_END_WH = locs?.S_START_WH,
+ N_TYPE = 1,
+ // S_TYPE = WMSTask.GetTypeStr(1),
+ S_TYPE = "鍥炲簱",
+ S_OP_DEF_CODE = "",
+ S_OP_DEF_NAME = "pda鍏ュ簱"
+ };
+ if (WMSHelper.CreateWmsTask(wmsTask))
+ {
+ LocationHelper.LockLoc(start, 1);
+ result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
+ }
+ }
+ else
+ {
+ result.resultCode = 1;
+ result.resultMsg += $"鎵句笉鍒板鍣ㄥ搴斾换鍔′俊鎭瘂cntr_code}";
+ return result;
+ }
+
+ }
+ var sss= db.Insertable<OutboundRecord>(records).ExecuteCommand();
+
//db.CommitTran();
}
catch (Exception ex)
{
//db.RollbackTran();
LogHelper.Info("鐗╂枡淇℃伅缁戝畾鍒版弧瀹瑰櫒涓� + ex.Message);
+ result.resultCode = 1;
+ result.resultMsg += ex.Message;
Console.WriteLine(ex.Message);
throw;
@@ -3055,9 +3186,9 @@
/// <param name="cntr_code"></param>
/// <returns></returns>
[ApiExplorerSettings(IgnoreApi = true)]
- public static SimpleResult AddInboundOrder(List<Mater> MaterList, string cntr_code)
+ public static SimpleResult AddInboundOrder(List<Mater> MaterList, string cntr_code,string S_CNTR_TYPE)
{
- var result = new SimpleResult();
+ var result = new SimpleResult();
// var db = new SqlHelper<object>().GetInstance();
using (var db = new SqlHelper<object>().GetInstance())
{
@@ -3100,12 +3231,13 @@
if (cir != null)
{
cir.F_QTY += item.qty;
- db.Updateable(cir).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+ cir.S_CNTR_TYPE = S_CNTR_TYPE;
+ db.Updateable(cir).UpdateColumns(it => new { it.F_QTY,it.S_CNTR_TYPE }).ExecuteCommand();
}
else
{
//2.鎻掑叆鏂扮殑瀹瑰櫒鐗╂枡淇℃伅锛堝鍣ㄥ彿涓嶅彉S_SERIAL_NO = item.S_SERIAL_NO,锛�- cir = new CntrItemRel { S_CNTR_CODE = cntr.S_CODE.Trim(), S_UOM = info.S_UOM, S_BATCH_NO = item.S_BATCH_NO, N_BS_ROW_NO = item.N_ROW_NO, F_QTY = item.qty, S_ITEM_CODE = item.item_code, S_BS_NO = item.arrival_no };
+ cir = new CntrItemRel { S_CNTR_TYPE= S_CNTR_TYPE, S_CNTR_CODE = cntr.S_CODE.Trim(), S_UOM = info.S_UOM, S_BATCH_NO = item.S_BATCH_NO, N_BS_ROW_NO = item.N_ROW_NO, F_QTY = item.qty, S_ITEM_CODE = item.item_code, S_BS_NO = item.arrival_no };
db.Insertable<CntrItemRel>(cir).ExecuteCommand();
}
var count = db.Queryable<CntrItemRel>().Count(a => a.S_CNTR_CODE == cntr.S_CODE);
@@ -4071,7 +4203,7 @@
// 鍑嗗璇锋眰鍙傛暟
ZscmNc request = new ZscmNc();
request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
- LogHelper.Info($"鍐呴噰SAP鍥炶皟");
+ LogHelper.Info($"鍐呴噰SAP鍥炶皟{service.Url}");
// 璋冪敤Web Service
ZscmNcResponse responses = service.ZscmNc(request);
--
Gitblit v1.9.1