From f68218d98591c1238d6f299152545b018cc31257 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期五, 06 六月 2025 13:54:45 +0800
Subject: [PATCH] 代码超时优化
---
api/WmsSpaHelper.cs | 469 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 337 insertions(+), 132 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index fbd8f0f..1c2fdad 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>
@@ -771,10 +798,10 @@
try
{
db.BeginTran();
+ List<TN_GENERATE_ORDER> tN_GENERATE_ORDERs = new List<TN_GENERATE_ORDER>();
foreach (var item in model.ROOT.SCDD)
{
Orderback.ITEM iTEM = new Orderback.ITEM();
-
var materlist = db.Queryable<TN_GENERATE_ORDER>().Where(it => it.S_SCDDH == item.SCDDH).First();
if (materlist == null)
{
@@ -794,8 +821,9 @@
tnorder.S_WBS = item.WBS;
tnorder.S_SHF = item.SHF;
tnorder.GZLH = item.GZLH;
+ tN_GENERATE_ORDERs.Add(tnorder);
//tnorder.S_XLH = string.Join(",", item.ITEM.Select(items => items.XLH));
- db.Insertable<TN_GENERATE_ORDER>(tnorder).ExecuteCommand();
+
}
else
{
@@ -811,6 +839,7 @@
iTEM.MSGDESP = $"鎴愬姛";
tEMs.Add(iTEM);
}
+ db.Insertable<TN_GENERATE_ORDER>(tN_GENERATE_ORDERs).ExecuteCommand();
orderResponse.ROOT.ITEM = tEMs;
db.CommitTran();
}
@@ -1134,9 +1163,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 +1215,10 @@
po.Details = new List<TN_Inbound_Detail>();
if (itemwlpz.ITEM.Count > 0)
{
- itemwlpz.ITEM.ForEach(a =>
+ foreach (var a in itemwlpz.ITEM)
+
{
-
+
po.Details.Add(new TN_Inbound_Detail
{
S_IO_NO = itemwlpz.HEAD.WLPZH,
@@ -1210,7 +1240,7 @@
});
//}
- });
+ }
db.Insertable<TN_Inbound_Order>(po).ExecuteCommand();
db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand();
db.CommitTran();
@@ -1224,7 +1254,7 @@
var Details = new List<TN_Inbound_Detail>();
if (itemwlpz.ITEM.Count > 0)
{
- itemwlpz.ITEM.ForEach(a =>
+ foreach (var a in itemwlpz.ITEM)
{
if (po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).Count() > 0)
{
@@ -1254,19 +1284,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();
}
}
@@ -1305,6 +1336,9 @@
try
{
+ var itemlist = db.Queryable<TN_Material>().ToList();
+ List<TN_Inbound_Detail> tN_Inbound_Details = new List<TN_Inbound_Detail>();
+ List<TN_Ll_detail> tN_Ll_Details = new List<TN_Ll_detail>();
foreach (var itemwlpz in model.ROOT.WLPZ)
{
@@ -1332,8 +1366,10 @@
po.Details = new List<TN_Inbound_Detail>();
if (itemwlpz.ITEM.Count > 0)
{
- itemwlpz.ITEM.ForEach(a =>
+ foreach (var a in itemwlpz.ITEM)
+
{
+
#region 涓嶉渶瑕� //if (a.ITEM1.Select(s => s.XLH).Count() > 0)//鍒ゆ柇搴忓垪鍙锋槸鍚︿负澶氫釜
//{
@@ -1385,7 +1421,7 @@
});
//}
- });
+ }
db.Insertable<TN_Inbound_Order>(po).ExecuteCommand();
db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand();
db.CommitTran();
@@ -1397,14 +1433,15 @@
var Details = new List<TN_Inbound_Detail>();
if (itemwlpz.ITEM.Count > 0)
{
- itemwlpz.ITEM.ForEach(a =>
+ foreach (var a in itemwlpz.ITEM)
+
{
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();
poq.F_QTY = a.SL;
-
- db.Updateable(poq).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+ tN_Inbound_Details.Add(poq);
+ // db.Updateable(poq).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
}
else
{
@@ -1432,7 +1469,7 @@
});
}
- });
+ }
db.Insertable<TN_Inbound_Detail>(Details).ExecuteCommand();
db.CommitTran();
@@ -1527,7 +1564,7 @@
po.S_FACTORY = itemwlpz.ITEM[0].GC;
foreach (var a in itemwlpz.ITEM)
{
- var item = db.Queryable<TN_Material>().Where(it => it.S_ITEM_CODE == a.WLBH).First();
+ var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBH).FirstOrDefault();
if (item == null)
{
var result12 = new SimpleResult();
@@ -1578,7 +1615,7 @@
var po1 = po.Details.Where(s => a.WLBH == s.S_ITEM_CODE).ToList();
if (po1.Count() == 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
{
- var item = db.Queryable<TN_Material>().Where(it => it.S_ITEM_CODE == a.WLBH).First();
+ var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBH).FirstOrDefault();
if (item == null)
{
var result12 = new SimpleResult();
@@ -1610,7 +1647,8 @@
if (po1.Where(s => s.F_ACC_D_QTY < a.SL).Count() > 0)//鏇存柊鏁伴噺澶т簬褰撳墠鐗╂枡 鏁伴噺 鏇存柊鍑哄簱鍗� {
po1.First().F_QTY = a.SL;
- db.Updateable(po1).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+ tN_Ll_Details.Add(po1.First());
+ //db.Updateable(po1).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
}
else //杩斿洖澶辫触
{
@@ -1651,7 +1689,7 @@
var po1 = po.Details.Where(s => a.WLBH == s.S_ITEM_CODE).ToList();
if (po1.Count() == 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
{
- var item = db.Queryable<TN_Material>().Where(it => it.S_ITEM_CODE == a.WLBH).First();
+ var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBH).FirstOrDefault();
if (item == null)
{
var result12 = new SimpleResult();
@@ -1681,7 +1719,8 @@
else
{//鏇存柊鏁伴噺 鏈墽琛屾椂 鐩存帴鏇存柊鏁伴噺
po1.First().F_QTY = a.SL;
- db.Updateable(po1).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+ tN_Ll_Details.Add(po1.First());
+ //db.Updateable(po1).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
}
//}
}
@@ -1702,8 +1741,15 @@
result.resultCode = 0;
simples.Add(result);
}
+ if (tN_Ll_Details.Count()>0)
+ {
-
+ db.Updateable(tN_Ll_Details).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+ }
+ if (tN_Inbound_Details.Count()>0)
+ {
+ db.Updateable(tN_Inbound_Details).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+ }
db.CommitTran();
}
@@ -1732,6 +1778,15 @@
internal static SimpleResult InboundOrderSorting(MPSorting model)
{
var result = new SimpleResult();
+ foreach (var a in model.MaterList)
+ {
+ bool v = MaterPanduan(a.item_code, a.qty);
+ if (v)
+ {
+ result.resultMsg = $"鐗╂枡{a.item_code}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
+ return result;
+ }
+ }
//鍒ゆ柇璧峰搴撲綅鏄惁閿佸畾
// var db = new SqlHelper<object>().GetInstance();
using (var db = new SqlHelper<object>().GetInstance())
@@ -1756,7 +1811,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 +1909,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 +1940,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 +1977,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 +2010,7 @@
};
if (WMSHelper.CreateWmsTask(wmsTask))
{
- LocationHelper.LockLoc(start.S_CODE, 1);
+ LocationHelper.LockLoc(start.S_CODE, 2);
result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
}
@@ -1952,6 +2021,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 +2157,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 +2258,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 +2269,7 @@
}
catch (Exception e)
{
+ LogHelper.Info($"鎶ラ敊{e.Message}");
result.resultMsg = e.Message;
db.RollbackTran();
return result;
@@ -2203,7 +2278,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 +2309,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 +2318,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 +2330,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 +2350,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 +3156,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 +3201,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);
@@ -3164,7 +3266,7 @@
}
};
List<LLDReturnRoot.ITEM> iTEMs = new List<LLDReturnRoot.ITEM>();
-
+
var result = new WeiLiResult();
using (var db = new SqlHelper<object>().GetInstance())
@@ -3173,15 +3275,25 @@
//鍒涘缓棰嗘枡鍗� try
{
+ var itemlist = db.Queryable<TN_Material>().ToList();
+
+ //鍒犻櫎鐨勯泦鍚�+ List<TN_Ll_detail> tN_Ll_Details = new List<TN_Ll_detail>();
+ List<TN_Ll_detail> iuptN_Ll_Details = new List<TN_Ll_detail>();
foreach (var itemscddll in model.ROOT.SCDDLL)
{
LLDReturnRoot.ITEM lLDReturnRoots = new LLDReturnRoot.ITEM();
db.BeginTran();
-
+ // 棰勫厛缂撳瓨鐗╂枡鏁版嵁锛堜紭鍖栫偣1锛氭壒閲忔煡璇㈠噺灏戞暟鎹簱璁块棶锛�+
+ var materialCache = new Dictionary<string, TN_Material>();
#region 鍒涘缓棰嗘枡鍗�- var po = db.Queryable<TN_Ll_Order>().Includes(a => a.Details).Where(s => s.S_NO == itemscddll.LLDH).First();
-
+ //var po = db.Queryable<TN_Ll_Order>().Includes(a => a.Details).Where(s => s.S_NO == itemscddll.LLDH).First();
+ var po = db.Queryable<TN_Ll_Order>()
+ .Includes(a => a.Details)
+ .Where(s => s.S_NO == itemscddll.LLDH)
+ .First();
#endregion
//var po = WMSHelper.GetOutboundOrder(model.ROOT.SCDDLL.LLDH);
if (po == null)
@@ -3192,19 +3304,16 @@
{
foreach (var a in itemscddll.ITEM)
{
- var item = db.Queryable<TN_Material>().Where(it => it.S_ITEM_CODE == a.WLBM).First();
+ var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
if (item == null)
{
- //result.code = 1;
- //result.msg = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
- //throw new Exception($"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�);
lLDReturnRoots.GC = itemscddll.GC;
lLDReturnRoots.LLDH = itemscddll.LLDH;
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- break ;
+ continue;
}
po.Details.Add(new TN_Ll_detail
{
@@ -3212,7 +3321,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,
@@ -3230,10 +3339,25 @@
N_ITEM_STATE = 1
});
}
- if (po.Details.Count()>0)
+ 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);
}
}
@@ -3256,12 +3380,12 @@
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) //鏃犲垯鏂板鐗╂枡鏄庣粏
{
- var item = db.Queryable<TN_Material>().Where(it => it.S_ITEM_CODE == a.WLBM).First();
+ var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
if (item == null)
{
//result.code = 1;
@@ -3272,7 +3396,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- break;
+ continue;
}
TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail
{
@@ -3304,7 +3428,8 @@
if (po1.Where(s => s.F_ACC_D_QTY < a.XQSL).Count() > 0)//鏇存柊鏁伴噺澶т簬褰撳墠鐗╂枡 鏁伴噺 鏇存柊鍑哄簱鍗� {
po1.First().F_QTY = a.XQSL;
- db.Updateable(po1).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+ iuptN_Ll_Details.Add(po1.First());
+ //db.Updateable(po1).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
}
else //杩斿洖澶辫触
{
@@ -3316,7 +3441,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鏇存柊澶辫触锛屾洿鏂版暟閲忓繀椤诲ぇ浜庡綋鍓嶇墿鏂欐暟閲弡a.WLBM}";
iTEMs.Add(lLDReturnRoots);
- break;
+ continue;
}
}
}
@@ -3331,7 +3456,8 @@
var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
if (po1.Count() > 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
{
- db.Deleteable<TN_Ll_detail>().Where(it => it.S_ITEM_CODE == a.WLBM && it.S_DO_NO == po1.First().S_DO_NO).ExecuteCommand();
+ tN_Ll_Details.AddRange(po1);
+ // db.Deleteable<TN_Ll_detail>().Where(it => it.S_ITEM_CODE == a.WLBM && it.S_DO_NO == po1.First().S_DO_NO).ExecuteCommand();
}
else
{
@@ -3341,9 +3467,9 @@
lLDReturnRoots.GC = itemscddll.GC;
lLDReturnRoots.LLDH = itemscddll.LLDH;
lLDReturnRoots.MSGCODE = 1;
- lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎";
+ lLDReturnRoots.MSGDESP = $"鍒犻櫎鐨勭墿鏂檣a.WLBM}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎";
iTEMs.Add(lLDReturnRoots);
- break;
+ continue;
}
}
else
@@ -3351,7 +3477,7 @@
var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
if (po1.Count() == 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
{
- var item = db.Queryable<TN_Material>().Where(it => it.S_ITEM_CODE == a.WLBM).First();
+ var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
if (item == null)
{
//result.code = 1;
@@ -3362,7 +3488,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- break;
+ continue;
}
TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail
{
@@ -3392,25 +3518,47 @@
else
{//鏇存柊鏁伴噺 鏈墽琛屾椂 鐩存帴鏇存柊鏁伴噺
po1.First().F_QTY = a.XQSL;
- db.Updateable(po1).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+ iuptN_Ll_Details.Add(po1.First());
+ //db.Updateable(po1).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
}
}
}
+ if (tN_Ll_Details.Count()>0)
+ {
+ db.Deleteable<TN_Ll_detail>(tN_Ll_Details).ExecuteCommand();
+
+ }
+ if (iuptN_Ll_Details.Count() > 0)
+ {
+ db.Updateable(iuptN_Ll_Details).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+
+ }
+
;
}
//娣诲姞鏁版嵁
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();
}
@@ -3477,7 +3625,7 @@
{
//var az = db.Queryable<AZInventory>().ToList();
var po1 = new TN_Outbound_Order { S_NO = WMSHelper.GenerateShippNo(), UNAME = po.UNAME, S_FACTORY = po.S_FACTORY, S_CBZX = po.S_CBZX, S_ZZKM = po.S_ZZKM, S_LRZX = po.S_LRZX, BLDAT = po.BLDAT, BUDAT = po.BUDAT, S_OUT_TYPE = po.S_OUT_TYPE, S_BS_TYPE = po.S_BS_TYPE, S_AREA_CODE = po.S_AREA_CODE, S_BS_NO = po.S_NO };
-
+ List<TN_Ll_detail> tN_Ll_Details= new List<TN_Ll_detail>();
po1.Details = new List<TN_Outbound_Detail>();
if (po.Details.Count() > 0)
{
@@ -3513,8 +3661,9 @@
S_ERP_WH_CODE = a.S_ERP_WH_CODE,
N_ITEM_STATE = a.N_ITEM_STATE
});
- a.F_ACC_D_QTY += a.F_QTY - a.F_ACC_D_QTY;
- db.Updateable(a).UpdateColumns(it => new { it.F_ACC_D_QTY }).ExecuteCommand();
+ double difference = a.F_QTY - a.F_ACC_D_QTY;
+ a.F_ACC_D_QTY += difference;
+ tN_Ll_Details.Add(a);
}
else
{
@@ -3524,6 +3673,9 @@
}
}
+
+
+ db.Updateable(tN_Ll_Details).UpdateColumns(it => new { it.F_ACC_D_QTY }).ExecuteCommand();
if (po1.Details.Count() > 0)
{
var result1 = db.Insertable<TN_Outbound_Order>(po1).ExecuteCommand() > 0;
@@ -3968,6 +4120,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>();
@@ -4071,7 +4227,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);
@@ -4089,22 +4245,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;
@@ -4229,13 +4402,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
@@ -4360,15 +4545,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
//{
@@ -4581,17 +4785,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;
--
Gitblit v1.9.1