From f3ad86fe50a0d2ba81b203517184264eea7bf0c0 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期四, 05 六月 2025 17:04:44 +0800
Subject: [PATCH] 入库审核逻辑更改 代码修改
---
models/TN_DPRECORD.cs | 1
Program.cs | 1
api/WmsSpaHelper.cs | 158 +++++++++++++++++++++++++++++----------
models/DAPING.cs | 1
api/ApiModel.cs | 6 +
process/TaskProcess.cs | 20 +++++
core/WCSCore.cs | 19 ++++
core/WMSCore.cs | 1
api/WmsSapController.cs | 1
9 files changed, 168 insertions(+), 40 deletions(-)
diff --git a/Program.cs b/Program.cs
index 29cd936..01502e7 100644
--- a/Program.cs
+++ b/Program.cs
@@ -111,6 +111,7 @@
public void Start() {
List<Task> tasks = new List<Task>();
//娣诲姞浠诲姟鎺ㄩ�绾跨▼
+ //tasks.Add(GetTask(() => RunAtSpecificTime(WMSCore.Start, "14:00")));
tasks.Add(GetTask(WMSCore.Start));
tasks.Add(GetTask(WMSCore.CheckDistributionCNTROrder));
//tasks.Add(GetTask(WMSCore.TransportTask));
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 6617e7e..0c80903 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -659,8 +659,14 @@
public class WcRkDto {
public string GZRY { get;set;}
public string S_NO { get;set;}
+ public List<Wl> Wlist { get; set; }
}
+ public class Wl {
+ public string S_ITEM_CODE{ get; set; }
+ public string N_ROW_NO{ get; set; }
+
+ }
#endregion
}
diff --git a/api/WmsSapController.cs b/api/WmsSapController.cs
index 36d464b..b2cd950 100644
--- a/api/WmsSapController.cs
+++ b/api/WmsSapController.cs
@@ -46,6 +46,7 @@
{
S_NO = t.S_NO,
S_WLBM = t.S_WLBM,
+ S_WLMC = t.S_WLMC,
N_COUNT = t.N_COUNT,
S_LOCATION = t.S_LOCATION
}).ToList();
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index db48e3c..ca8958c 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -3292,7 +3292,7 @@
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- break ;
+ continue;
}
po.Details.Add(new TN_Ll_detail
{
@@ -3300,7 +3300,7 @@
S_AREA_CODE = "HJQ",
N_ROW_NO = "",
S_ITEM_CODE = a.WLBM,
- S_ITEM_NAME = item.S_ITEM_NAME,
+ S_ITEM_NAME = item?.S_ITEM_NAME,
F_QTY = a.XQSL,
S_ZJBM = a.ZJBM,
S_YLBH = a.YLBH,
@@ -3320,8 +3320,23 @@
}
if (po.Details.Count()>0)
{
+ LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM();
+ lLDReturnRoot1.GC = itemscddll.GC;
+ lLDReturnRoot1.LLDH = itemscddll.LLDH;
+ lLDReturnRoot1.MSGCODE = 0;
+ lLDReturnRoot1.MSGDESP = $"鎴愬姛";
+ iTEMs.Add(lLDReturnRoot1);
var result1 = db.Insertable<TN_Ll_Order>(po).ExecuteCommand() > 0;
db.Insertable<TN_Ll_detail>(po.Details).ExecuteCommand();
+ }
+ else
+ {
+ LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM();
+ lLDReturnRoot1.GC = itemscddll.GC;
+ lLDReturnRoot1.LLDH = itemscddll.LLDH;
+ lLDReturnRoot1.MSGCODE = 0;
+ lLDReturnRoot1.MSGDESP = $"鎴愬姛,鏃犳暟鎹坊鍔�;
+ iTEMs.Add(lLDReturnRoot1);
}
}
@@ -3344,7 +3359,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鎵ц涓鏂欏崟锛岀墿鏂檣a.WLBM}鐗╂枡涓嶅厑璁稿垹闄�;
iTEMs.Add(lLDReturnRoots);
- break;
+ continue;
}
var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
if (po1.Count() == 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
@@ -3360,7 +3375,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- break;
+ continue;
}
TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail
{
@@ -3404,7 +3419,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鏇存柊澶辫触锛屾洿鏂版暟閲忓繀椤诲ぇ浜庡綋鍓嶇墿鏂欐暟閲弡a.WLBM}";
iTEMs.Add(lLDReturnRoots);
- break;
+ continue;
}
}
}
@@ -3489,16 +3504,26 @@
//娣诲姞鏁版嵁
if (listtn.Count() > 0)
{
+ LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM();
+ lLDReturnRoot1.GC = itemscddll.GC;
+ lLDReturnRoot1.LLDH = itemscddll.LLDH;
+ lLDReturnRoot1.MSGCODE = 0;
+ lLDReturnRoot1.MSGDESP = $"鎴愬姛";
+ iTEMs.Add(lLDReturnRoot1);
db.Insertable<TN_Ll_detail>(listtn).ExecuteCommand();
+ }
+ else
+ {
+ LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM();
+ lLDReturnRoot1.GC = itemscddll.GC;
+ lLDReturnRoot1.LLDH = itemscddll.LLDH;
+ lLDReturnRoot1.MSGCODE = 0;
+ lLDReturnRoot1.MSGDESP = $"鎴愬姛,鏃犳暟鎹坊鍔�;
+ iTEMs.Add(lLDReturnRoot1);
}
}
-
- lLDReturnRoots.GC = itemscddll.GC;
- lLDReturnRoots.LLDH = itemscddll.LLDH;
- lLDReturnRoots.MSGCODE = 0;
- lLDReturnRoots.MSGDESP = $"鎴愬姛";
- iTEMs.Add(lLDReturnRoots);
+
db.CommitTran();
}
@@ -4056,6 +4081,10 @@
result.resultMsg = "鏁版嵁涓嶅瓨鍦�;
return result;
}
+ 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))
+ .ToList();
if (po.S_IN_TYPE == "鍐呴噰鍏ュ簱")
{
List<NcRkDto.ITEM> listitem = new List<NcRkDto.ITEM>();
@@ -4177,22 +4206,39 @@
//娣诲姞鍑瘉璁板綍琛� result.resultMsg = data.ROOT.ITEM.MSGDESP;
result.resultCode = data.ROOT.ITEM.MSGCODE;
- MaterialVoucher materialVoucher = new MaterialVoucher();
+ //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();
+ //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)
+ {
+ MaterialVoucher materialVoucher = new MaterialVoucher();
+ materialVoucher.S_NO = po.S_NO;
+ materialVoucher.S_WLBM = item.S_ITEM_CODE;
+ materialVoucher.S_WLH = item.N_ROW_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;
+ materials.Add(materialVoucher);
+ }
+
+ if (materials.Count() > 0)
+ {
+
+ db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
+ }
}
}
- else
-
- if (po.S_IN_TYPE == "璁″垝澶栭�鏂欏叆搴�)
+ else if (po.S_IN_TYPE == "璁″垝澶栭�鏂欏叆搴�)
{
DateTime dateTime;
DateTime dateTime1;
@@ -4317,13 +4363,25 @@
result.resultCode = data.ROOT.ITEM.MSGCODE;
if (data.ROOT.ITEM.MSGCODE == 0)
{
- MaterialVoucher materialVoucher = new MaterialVoucher();
- materialVoucher.S_NO = po.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)
+ {
+ MaterialVoucher materialVoucher = new MaterialVoucher();
+ materialVoucher.S_NO = po.S_NO;
+ materialVoucher.S_WLBM = item.S_ITEM_CODE;
+ materialVoucher.S_WLH = item.N_ROW_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;
+ materials.Add( materialVoucher );
+ }
+
+ if (materials.Count() > 0)
+ {
+
+ db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
+ }
}
#endregion
@@ -4448,15 +4506,34 @@
result.resultCode = data.ROOT.ITEM.MSGCODE;
if (data.ROOT.ITEM.MSGCODE == 0)
{
- MaterialVoucher materialVoucher = new MaterialVoucher();
- materialVoucher.S_NO = model.S_NO;
- materialVoucher.S_TYPE = po.S_IN_TYPE;
- materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZH;
- LogHelper.Info("鍊�: " + data.ROOT.ITEM?.WLPZH);
- LogHelper.Info("鍊�: " + materialVoucher.S_WLPZBH);
- materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
- materialVoucher.STATUS = 0;
- db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ //MaterialVoucher materialVoucher = new MaterialVoucher();
+ //materialVoucher.S_NO = model.S_NO;
+ //materialVoucher.S_TYPE = po.S_IN_TYPE;
+ //materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZH;
+ //LogHelper.Info("鍊�: " + data.ROOT.ITEM?.WLPZH);
+ //LogHelper.Info("鍊�: " + materialVoucher.S_WLPZBH);
+ //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)
+ {
+ MaterialVoucher materialVoucher = new MaterialVoucher();
+ materialVoucher.S_NO = po.S_NO;
+ materialVoucher.S_WLBM = item.S_ITEM_CODE;
+ materialVoucher.S_WLH = item.N_ROW_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;
+ materials.Add(materialVoucher);
+ }
+ if (materials.Count() > 0)
+ {
+
+ db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
+ }
+
}
//else
//{
@@ -4669,17 +4746,18 @@
var po = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == S_CNTR_CODE && a.S_BS_NO == taskno).ToList();
LogHelper.Info("娣诲姞鍏ュ簱璁板綍琛╬o" + po.Count());
- var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == taskno).First();
- var ass = pz == null;
+ var pzs = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == taskno).ToList();
+ var ass = pzs == null;
LogHelper.Info("娣诲姞鍏ュ簱璁板綍琛╬z" + ass);
List<OutboundRecord> records = new List<OutboundRecord>();
foreach (var item in po)
{
+ var pz= pzs.Where(s=>s.S_WLBM==item.S_ITEM_CODE&&s.S_WLH==item.N_BS_ROW_NO).First();
OutboundRecord outboundRecord = new OutboundRecord();
outboundRecord.S_NO = item.S_BS_NO;
outboundRecord.S_TYPE = pz?.S_TYPE;
- outboundRecord.S_WLPZBH = pz?.S_WLPZBH;
+ outboundRecord.S_WLPZBH = pz?.S_WLBM;
outboundRecord.S_WLPZND = pz?.S_WLPZND;
outboundRecord.S_WLBM = item.S_ITEM_CODE;
outboundRecord.S_SL = item.F_QTY;
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 4bcd182..40004fc 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -101,7 +101,26 @@
WMSHelper.UpdateTaskState(optask);
}
}
+ //public static bool SendCd()
+ //{
+
+
+ // var result = false;
+
+ // var dic = new Dictionary<string, string>();
+ // var dic1 = new Dictionary<string, string>();
+
+ // dic.Add("ExtDeviceNo", "1");
+
+ // //鍒ゆ柇
+ // var res = NDC.OrderAdd(99, dic, dic1);
+ // if (res != null && (res.Res.ErrCode == 0 || res.Res.ErrCode == 50009))
+ // {
+ // result = true;
+ // }
+ // return result;
+ //}
/// <summary>
/// 浠诲姟鍒嗗彂锛屾牴鎹皟搴︾被鍨嬪彂缁欎笉鍚岀殑璋冨害绯荤粺
/// </summary>
diff --git a/core/WMSCore.cs b/core/WMSCore.cs
index ecb6685..0b855db 100644
--- a/core/WMSCore.cs
+++ b/core/WMSCore.cs
@@ -517,6 +517,7 @@
{
TN_DPRECORD tN_DPRECORD = new TN_DPRECORD();
tN_DPRECORD.S_WLBM=item.S_ITEM_CODE;
+ tN_DPRECORD.S_WLMC = item.S_ITEM_NAME;
tN_DPRECORD.S_NO= wcsTask.S_CODE;
tN_DPRECORD.N_COUNT= item.F_QTY;
tN_DPRECORD.S_LOCATION= end.S_CODE;
diff --git a/models/DAPING.cs b/models/DAPING.cs
index 9b8e5f6..7b6894d 100644
--- a/models/DAPING.cs
+++ b/models/DAPING.cs
@@ -18,6 +18,7 @@
public string S_NO { get; set; }
public string S_WLBM { get; set; }
+ public string S_WLMC { get; set; }
public double N_COUNT { get; set; }
public string S_LOCATION { get; set; }
}
diff --git a/models/TN_DPRECORD.cs b/models/TN_DPRECORD.cs
index 6b6f466..a79d258 100644
--- a/models/TN_DPRECORD.cs
+++ b/models/TN_DPRECORD.cs
@@ -12,6 +12,7 @@
{
public string S_NO { get; set; }
+ public string S_WLMC { get; set; }
public string S_WLBM { get; set; }
public double N_COUNT { get; set; }
public string S_LOCATION { get; set; }
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 6307977..a777b0d 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -567,6 +567,26 @@
}
+
+ public static bool SendCd() {
+
+
+
+ var result=false;
+
+ var dic = new Dictionary<string, string>();
+ var dic1 = new Dictionary<string, string>();
+
+ dic.Add("ExtDeviceNo", "1");
+
+ //鍒ゆ柇
+ var res = NDC.OrderAdd(99, dic, dic1);
+ if (res != null && (res.Res.ErrCode == 0 || res.Res.ErrCode == 50009))
+ {
+ result = true;
+ }
+ return result;
+ }
/// <summary>
/// 鎺ㄩ�浠诲姟
/// </summary>
--
Gitblit v1.9.1