From df0736e720152dcefdb13d8ead30311709cf0123 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 23 六月 2025 17:03:40 +0800
Subject: [PATCH] 增加货位绑定表 审核逻辑表
---
wms/WCSHelper.cs | 13 ++++
Program.cs | 1
wms/LocationHelper.cs | 5 +
api/WmsSpaHelper.cs | 112 +++++++++++++++++++++++++++++++-----
models/TN_Container_Code.cs | 18 ++++++
models/TN_InBounder_Sh.cs | 19 ++++++
HH.WCS.Mobox3.pinggao.csproj | 2
7 files changed, 151 insertions(+), 19 deletions(-)
diff --git a/HH.WCS.Mobox3.pinggao.csproj b/HH.WCS.Mobox3.pinggao.csproj
index 0e4a772..81227e2 100644
--- a/HH.WCS.Mobox3.pinggao.csproj
+++ b/HH.WCS.Mobox3.pinggao.csproj
@@ -197,8 +197,10 @@
<Compile Include="models\SapReturn.cs" />
<Compile Include="models\SapRoot.cs" />
<Compile Include="models\TN_CD.cs" />
+ <Compile Include="models\TN_Container_Code.cs" />
<Compile Include="models\TN_DPRECORD.cs" />
<Compile Include="models\TN_GENERATE_ORDER.cs" />
+ <Compile Include="models\TN_InBounder_Sh.cs" />
<Compile Include="models\TN_Location_Ext.cs" />
<Compile Include="models\TN_Ll_detail.cs" />
<Compile Include="models\TN_Ll_Order.cs" />
diff --git a/Program.cs b/Program.cs
index 7f9984b..05d8b85 100644
--- a/Program.cs
+++ b/Program.cs
@@ -118,6 +118,7 @@
tasks.Add(GetTask(WCSCore.Dispatch));
//瀹氭椂閲嶇疆
tasks.Add(GetTask(WCSCore.DSCZ));
+ //鍏呯數
tasks.Add(GetTask(WCSCore.Dispatch1));
//娣诲姞鑷畾涔夌嚎绋�
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index 616cc30..5087be3 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -1009,7 +1009,7 @@
{
var result = new SimpleResult();
//鍒ゆ柇鍐查攢鍑瘉缂栧彿 鏄惁涓虹┖ 濡傛灉涓虹┖ 鍒欎负鍐查攢(瀹℃牳鍓嶆墠鑳藉啿閿�紝闈炲緟鎵ц鐘舵�鎻愮ず鎵ц涓笉鍙啿閿� 涓嶄负绌�鍒欎负澶栭噰鍏ュ簱
- if ((itemwlpz.HEAD.YDLX == "351" || itemwlpz.HEAD.YDLX == "Z89") && itemwlpz.ITEM[0].FHGC == "3040")
+ if (itemwlpz.ITEM[0].JDBS=="H" && itemwlpz.ITEM[0].GC == "3040")
{
var po = db.Queryable<TN_Ll_Order>().Includes(a => a.Details).Where(s => s.S_NO == itemwlpz.HEAD.WLPZH).First();
//鍒涘缓鍑哄簱鍗曚富瀛愯〃
@@ -1245,7 +1245,7 @@
}
#endregion
}
- else if ((itemwlpz.HEAD.YDLX == "351" || itemwlpz.HEAD.YDLX == "Z89") && itemwlpz.ITEM[0].GC == "3040")
+ else if (itemwlpz.ITEM[0].JDBS == "S" && itemwlpz.ITEM[0].GC == "3040")
{
//鍒涘缓鍏ュ簱鍗曚富瀛愯〃
var po = WMSHelper.GetInboundOrder(itemwlpz.HEAD.WLPZH);
@@ -1733,6 +1733,8 @@
/// <returns></returns>
internal static SimpleResult InboundOrderSorting(MPSorting model)
{
+
+
var result = new SimpleResult();
foreach (var a in model.MaterList)
{
@@ -1747,6 +1749,21 @@
// var db = new SqlHelper<object>().GetInstance();
using (var db = new SqlHelper<object>().GetInstance())
{
+ Location endloc = new Location();
+ var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE == model.start).First();
+ if (hwbd!=null)
+ {
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE).First();
+ }
+ else
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"鎵樼洏鎵句笉鍒拌揣浣�;
+ return result;
+ }
+
+
+
var locinfo = db.Queryable<Location>().Where(a => a.S_CODE == model.start).First();
if (locinfo?.N_LOCK_STATE != 0)
@@ -1819,7 +1836,9 @@
S_START_LOC = model.start,
S_START_AREA = locinfo.S_AREA_CODE,
S_START_WH = locinfo.S_WH_CODE,
- S_END_LOC = model.start,
+ S_END_LOC = endloc.S_CODE,
+ S_END_AREA = endloc.S_AREA_CODE,
+ S_END_WH = endloc.S_WH_CODE,
S_BS_NO = model.MaterList[0].arrival_no,
N_TYPE = 1,
S_TYPE = WMSTask.GetTypeStr(1),
@@ -2346,6 +2365,19 @@
result.resultMsg += $"浠诲姟{locs.S_CODE}鏉ユ簮鍙穥locs.S_BS_NO}鎵句笉鍒伴厤鐩樹俊鎭�;
return result;
}
+ Location endloc = new Location();
+ var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE == cntr_code).First();
+ if (hwbd != null)
+ {
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE).First();
+ }
+ else
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"鎵樼洏鎵句笉鍒拌揣浣�;
+ return result;
+ }
+
//var location = db.Queryable<Location>().Where(a => a.S_CODE == locs.S_LOC_CODE).First();
var wmsTask = new WMSTask
{
@@ -4324,7 +4356,7 @@
List<TN_Inbound_Detail> tN_Inbound_Details = new List<TN_Inbound_Detail>();
po.Details = po.Details.Where(d => model.Wlist.Any(w =>
w.S_ITEM_CODE == d.S_ITEM_CODE &&
- w.N_ROW_NO == d.N_ROW_NO))
+ w.N_ROW_NO == d.N_ROW_NO)).OrderBy(s => s.N_ROW_NO)
.ToList();
if (po.S_IN_TYPE == "鍐呴噰鍏ュ簱")
{
@@ -4364,6 +4396,13 @@
tN_Inbound_Details.Add(item);
}
+ string combinedIds= string.Join(",", po.Details.Select(x => x.N_ROW_NO));
+ var KEY = WCSHelper.Generate13DigitIds();
+ var s_key= db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO&&a.N_ROW_NO == combinedIds).First();
+ if (s_key!=null)
+ {
+ KEY = s_key.S_KEY;
+ }
NcRkDto.Root roots = new NcRkDto.Root
{
ROOT = new NcRkDto.ROOT
@@ -4373,9 +4412,9 @@
HEAD = new NcRkDto.HEAD
{
- KEY = po.S_NO,
+ KEY = KEY,
GZRQ = DateTime.Now.ToString("yyyyMMdd"),
- GZRY = model.GZRY,
+ GZRY = model.GZRY,//GenerateTaskNo
WLPZBH = po.S_NO,
WLPZND = po.S_WLPZND
},
@@ -4390,8 +4429,7 @@
var json = JsonConvert.SerializeObject(roots.ROOT);
string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
- // 鐜板湪 root 瀵硅薄鍖呭惈浜嗘偍瀹氫箟鐨勫亣鏁版嵁
- // 鍙戦�POST璇锋眰
+
LogHelper.Info($"鍐呴噰鏀惰揣xml鏁版嵁{xml}");
#region MyRegion
@@ -4449,15 +4487,9 @@
//娣诲姞鍑瘉璁板綍琛� result.resultMsg = data.ROOT.ITEM.MSGDESP;
result.resultCode = data.ROOT.ITEM.MSGCODE;
- //MaterialVoucher materialVoucher = new MaterialVoucher();
if (data.ROOT.ITEM.MSGCODE == 0)
{
- //materialVoucher.S_NO = model.S_NO;
- //materialVoucher.S_TYPE = po.S_IN_TYPE;
- //materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
- //materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
- //materialVoucher.STATUS = 0;
- //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+
List<MaterialVoucher> materials = new List<MaterialVoucher>();
foreach (var item in model.Wlist)
{
@@ -4478,6 +4510,16 @@
db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
}
}
+ else
+ {
+
+ TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
+ tN_InBounder_Sh.S_KEY = KEY;
+ tN_InBounder_Sh.N_ROW_NO = combinedIds;
+ tN_InBounder_Sh.S_NO = po.S_NO;
+ db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();
+
+ }
}
@@ -4496,13 +4538,20 @@
PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");
}
+ string combinedIds = string.Join(",", po.Details.Select(x => x.N_ROW_NO));
+ var KEY = WCSHelper.Generate13DigitIds();
+ var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).First();
+ if (s_key != null)
+ {
+ KEY = s_key.S_KEY;
+ }
JHWBackDto.Root myRoot = new JHWBackDto.Root
{
ROOT = new JHWBackDto.ROOT
{
HEAD = new JHWBackDto.HEAD
{
- KEY = po.S_NO,
+ KEY = KEY,
GZRQ = GZRQ,
PZZDRQ = PZZDRQ,
YHM = po.UNAME,
@@ -4517,6 +4566,7 @@
}
};
+
//鍥炲弬鐗╂枡淇℃伅
List<JHWBackDto.ITEM> iTEMs = new List<JHWBackDto.ITEM>();
foreach (var item in po.Details)
@@ -4627,6 +4677,17 @@
db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
}
}
+ else
+ {
+
+ TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
+ tN_InBounder_Sh.S_KEY = KEY;
+ tN_InBounder_Sh.N_ROW_NO = combinedIds;
+ tN_InBounder_Sh.S_NO = po.S_NO;
+ db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();
+
+ }
+
#endregion
}
@@ -4668,6 +4729,13 @@
tN_Inbound_Details.Add(item);
}
+ string combinedIds = string.Join(",", po.Details.Select(x => x.N_ROW_NO));
+ var KEY = WCSHelper.Generate13DigitIds();
+ var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).First();
+ if (s_key != null)
+ {
+ KEY = s_key.S_KEY;
+ }
WcRkBc.Root roots = new WcRkBc.Root
{
ROOT = new WcRkBc.ROOT
@@ -4676,7 +4744,7 @@
{
HEAD = new WcRkBc.HEAD
{
- KEY = po.S_NO,
+ KEY = KEY,
GZRQ = DateTime.Now.ToString("yyyyMMdd"),
GZRY = model.GZRY,
GC = po.S_FACTORY
@@ -4773,6 +4841,16 @@
}
}
+ else
+ {
+
+ TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
+ tN_InBounder_Sh.S_KEY = KEY;
+ tN_InBounder_Sh.N_ROW_NO = combinedIds;
+ tN_InBounder_Sh.S_NO = po.S_NO;
+ db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();
+
+ }
}
diff --git a/models/TN_Container_Code.cs b/models/TN_Container_Code.cs
new file mode 100644
index 0000000..1723386
--- /dev/null
+++ b/models/TN_Container_Code.cs
@@ -0,0 +1,18 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HH.WCS.Mobox3.pinggao.models
+{
+ [SugarTable("TN_Container_Code")]
+ public class TN_Container_Code : BaseModel
+ {
+
+ public string S_LOC_CODE { get; set; }
+ public string S_CNTR_CODE { get; set; }
+
+ }
+}
diff --git a/models/TN_InBounder_Sh.cs b/models/TN_InBounder_Sh.cs
new file mode 100644
index 0000000..16d904a
--- /dev/null
+++ b/models/TN_InBounder_Sh.cs
@@ -0,0 +1,19 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HH.WCS.Mobox3.pinggao.models
+{
+ [SugarTable("TN_InBounder_Sh")]
+ public class TN_InBounder_Sh : BaseModel
+ {
+
+ public string S_NO { get; set; }
+ public string S_KEY { get; set; }
+ public string N_ROW_NO { get; set; }
+
+ }
+}
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index bbe4a15..03c6796 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -374,13 +374,14 @@
{
if (lcrList.Count(b => b.S_CNTR_CODE.Trim() == a) == 0)
{
+
db.Insertable<LocCntrRel>(new LocCntrRel { S_LOC_CODE = loc, S_CNTR_CODE = a }).ExecuteCommand();
count++;
}
+
+
});
location.N_CURRENT_NUM = lcrList.Count + count;
-
-
location.N_LOCK_STATE = 0;
diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index bfb072e..3a7a53c 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -12,7 +12,20 @@
var date = DateTime.Now.ToString("yyMMdd");
return $"TN{date}{id.ToString().PadLeft(4, '0')}";
}
+ public static string Generate13DigitIds()
+ {
+
+ // 2. 骞存湀鏃ワ紙6浣嶏紝yMMdd鏍煎紡锛屽231215锛�+ string datePart = DateTime.Now.ToString("yyMMdd");
+
+ // 3. 6浣嶉珮寮哄害闅忔満鏁帮紙閬垮厤閲嶅锛�+ Random random = new Random(Guid.NewGuid().GetHashCode());
+ string randomPart = random.Next(10000, 99999).ToString();
+
+ // 4. 缁勫悎鎴�3浣岻D
+ return datePart + randomPart;
+ }
public static string Generate13DigitId()
{
// 1. 涓氬姟鏍囪瘑锛�浣嶏紝濡侶=浣忓缓锛�
--
Gitblit v1.9.1