From 17c1c9bb4537f3915e5b53e1a26a1a0b9c8e7c85 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 16 六月 2025 08:37:58 +0800
Subject: [PATCH] 1.定时充电问题排查，增加状态字段增加定时更新状态2.删除webservice所有日志 api接口日志（超时问题优化）
---
api/WmsSpaHelper.cs | 1085 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 698 insertions(+), 387 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index b054b44..cf42f12 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -30,12 +30,17 @@
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;
using System.Web.Services.Protocols;
using System.Web.Http.ValueProviders;
+using System.Diagnostics;
+using System.Data.SqlClient;
+using System.Data.Common;
+using System.Data;
+using System.Runtime.ConstrainedExecution;
+using HH.WCS.Mobox3.pinggao.core;
namespace HH.WCS.Mobox3.pinggao.api
{
@@ -46,6 +51,35 @@
}
+ 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>
@@ -569,7 +603,8 @@
}
}
- }else
+ }
+ else
{
//鍐查攢鍑瘉鍗曞彿
@@ -638,7 +673,6 @@
result.WLPZBH = items.HEAD.WLPZH;
result.WLPZND = items.HEAD.WLPZND;
result.resultCode = 0;
- result.resultMsg = "";
db.CommitTran();
simpleResults.Add(result);
}
@@ -686,15 +720,21 @@
//鍒涘缓鍏ュ簱鍗曚富瀛愯〃
- // var po = WMSHelper.GetGYSBMOrder(item.JBXX.GYSBM);
- var po= db.Queryable<TN_Supplier>().Includes(a => a.Details).Where(a => a.S_GYSBM == item.JBXX.GYSBM).First();
+ // var po = WMSHelper.GetGYSBMOrder(item.JBXX.GYSBM);
+ var po = db.Queryable<TN_Supplier>().Includes(a => a.Details).Where(a => a.S_GYSBM == item.JBXX.GYSBM).First();
if (po != null)
{
db.Deleteable<TN_Supplier>().Where(it => it.S_GYSBM == po.S_GYSBM).ExecuteCommand();
db.Deleteable<TN_Supplier_detial>().Where(it => it.S_DO_GYSBM == po.S_GYSBM).ExecuteCommand();
}
- po = new TN_Supplier { S_GYSBM = item.JBXX.GYSBM, S_MDMBM = item.JBXX.MDMBM, S_GYSMC=item.JBXX.GYSMC, S_YHGJ=item.JBXX.YHGJ, S_YHDM = item.JBXX.YHDM ,
+ po = new TN_Supplier
+ {
+ S_GYSBM = item.JBXX.GYSBM,
+ S_MDMBM = item.JBXX.MDMBM,
+ S_GYSMC = item.JBXX.GYSMC,
+ S_YHGJ = item.JBXX.YHGJ,
+ S_YHDM = item.JBXX.YHDM,
S_KHH = item.JBXX.KHH,
S_YHJD = item.JBXX.YHJD,
S_YHCS = item.JBXX.YHCS,
@@ -771,10 +811,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 +834,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 +852,7 @@
iTEM.MSGDESP = $"鎴愬姛";
tEMs.Add(iTEM);
}
+ db.Insertable<TN_GENERATE_ORDER>(tN_GENERATE_ORDERs).ExecuteCommand();
orderResponse.ROOT.ITEM = tEMs;
db.CommitTran();
}
@@ -850,14 +892,19 @@
};
db.BeginTran();
List<WLReturnRoot.ITEM> list = new List<WLReturnRoot.ITEM>();
+
+ List<TN_Material> tN_Materials = new List<TN_Material>();
+ var itemCodes = model.ROOT.ITEM.Select(item => item.WLBM).Distinct().ToList();
+ var itemlist = db.Queryable<TN_Material>()
+ .Where(it => itemCodes.Contains(it.S_ITEM_CODE))
+ .ToList();
+
foreach (var item in model.ROOT.ITEM)
{
try
{
-
var result = new WLReturnRoot.ITEM();
-
- var materlist = db.Queryable<TN_Material>().Where(it => it.S_ITEM_CODE == item.WLBM).First();
+ var materlist = itemlist.Where(it => it.S_ITEM_CODE == item.WLBM).FirstOrDefault();
if (materlist == null)
{
TN_Material tN_Material = new TN_Material();
@@ -874,7 +921,8 @@
tN_Material.S_CPZ = item.CPZ;
tN_Material.S_CPZMS = item.CPZMS;
tN_Material.S_ITEM_NAME = item.VTEXT;
- db.Insertable<TN_Material>(tN_Material).ExecuteCommand();
+ tN_Materials.Add(tN_Material);
+ //db.Insertable<TN_Material>(tN_Material).ExecuteCommand();
result.MSGDESP = "鎴愬姛";
result.MSGCODE = 0;
result.GCBM = item.GCBM;
@@ -917,6 +965,24 @@
}
}
response.ROOT.ITEM = list;
+ if (tN_Materials.Count()>0)
+ {
+ db.Insertable<TN_Material>(tN_Materials).ExecuteCommand();
+ //using (var bulkCopy = new SqlBulkCopy(util.Settings.SqlServer))
+ //{
+ // bulkCopy.DestinationTableName = "TN_Material";
+ // bulkCopy.BatchSize = 500;
+ // var dataTable = new DataTable();
+ // dataTable = list.ToDataTable();
+ // // 娣诲姞鍒楁槧灏勶紙纭繚鍚嶇О鍖归厤锛�+ // foreach (DataColumn col in dataTable.Columns)
+ // {
+ // bulkCopy.ColumnMappings.Add(col.ColumnName, col.ColumnName);
+ // }
+ // bulkCopy.WriteToServer(tN_Materials.ToDataTable());
+ //}
+ }
+
//db.Insertable<TN_Material>(list).ExecuteCommand();
db.CommitTran();
@@ -991,14 +1057,21 @@
#region 鍒涘缓棰嗘枡鍗�
if (po == null)
- {
+ {
po = new TN_Ll_Order { S_NO = itemwlpz.HEAD.WLPZH, S_FACTORY = itemwlpz.ITEM[0].FHGC, S_OUT_TYPE = "鍐呴噰鍑哄簱", S_BS_TYPE = itemwlpz.HEAD.YDLX, S_AREA_CODE = "HJQ", S_BS_NO = itemwlpz.HEAD.WLPZH };
po.Details = new List<TN_Ll_detail>();
if (itemwlpz.ITEM.Count() > 0)
{
+ var itemCodes = itemwlpz.ITEM.Select(items => items.WLBM).ToList();
+ var itemlist = db.Queryable<TN_Material>()
+ .Where(it => itemCodes.Contains(it.S_ITEM_CODE))
+ .ToList();
foreach (var a in itemwlpz.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).First();
if (item == null)
{
@@ -1040,8 +1113,15 @@
List<TN_Ll_detail> listtn = new List<TN_Ll_detail>();
if (po.N_B_STATE != 0)
{
+ var itemCodes = itemwlpz.ITEM.Select(items => items.WLBM).ToList();
+ var itemlist = db.Queryable<TN_Material>()
+ .Where(it => itemCodes.Contains(it.S_ITEM_CODE))
+ .ToList();
foreach (var a in itemwlpz.ITEM)
{
+
+
+
//if (a.LLDSCBS == "Y")//濡傛灉鏄垹闄ゆ爣璇嗗垯鍒犻櫎褰撳墠鎵�睘鍑哄簱鍗曟槑缁�涓嶆槸鍒犻櫎鏍囪 鍒欒繘琛屽鏀瑰垽鏂� //{
// result.resultCode = 1;
@@ -1051,7 +1131,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).First();
if (item == null)
{
@@ -1107,36 +1187,24 @@
}//鎵ц涓鍗� else if (po.N_B_STATE == 0)//鏈墽琛�鎵ц澧炲垹鏀规搷浣� {
+ var itemCodes = itemwlpz.ITEM.Select(items => items.WLBM).ToList();
+ var itemlist = db.Queryable<TN_Material>()
+ .Where(it => itemCodes.Contains(it.S_ITEM_CODE))
+ .ToList();
foreach (var a in itemwlpz.ITEM)
{
- //if (a.LLDSCBS == "Y")//濡傛灉鏄垹闄ゆ爣璇嗗垯鍒犻櫎褰撳墠鎵�睘鍑哄簱鍗曟槑缁�涓嶆槸鍒犻櫎鏍囪 鍒欒繘琛屽鏀瑰垽鏂�- //{
- // var po1 = po.Details.Where(s => a.WLH == s.S_ITEM_CODE).ToList();
- // if (po1.Count() > 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
- // {
- // db.Deleteable<TN_Ll_detail>().Where(it => it.S_ITEM_CODE == a.WLH && it.S_DO_NO == po1.First().S_DO_NO).ExecuteCommand();
- // }
- // else
- // {
- // result.resultCode = 1;
- // result.resultMsg = $"鐗╂枡{a.WLH}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎";
- // throw new Exception($"鐗╂枡{a.WLH}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎");
- // }
- //}
- //else
- //{
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).First();
if (item == null)
{
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,7 +1254,8 @@
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
@@ -1210,7 +1279,7 @@
});
//}
- });
+ }
db.Insertable<TN_Inbound_Order>(po).ExecuteCommand();
db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand();
db.CommitTran();
@@ -1224,7 +1293,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 +1323,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();
}
}
@@ -1298,6 +1368,8 @@
/// <returns></returns>
internal static List<SimpleResult> Otherbound_Order_In(otherDto.Root model)
{
+ Stopwatch sw = new Stopwatch();
+ sw.Start();
LogHelper.Info($"鍏朵粬鍑哄叆搴撹皟璇�);
List<SimpleResult> simples = new List<SimpleResult>();
using (var db = new SqlHelper<object>().GetInstance())
@@ -1305,9 +1377,15 @@
try
{
+ 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)
{
-
+ var itemCodes = itemwlpz.ITEM.Select(item => item.WLBH).ToList();
+ var itemlist = db.Queryable<TN_Material>()
+ .Where(it => itemCodes.Contains(it.S_ITEM_CODE))
+ .ToList();
var result = new SimpleResult();
db.BeginTran();
@@ -1332,32 +1410,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)//鍒ゆ柇搴忓垪鍙锋槸鍚︿负澶氫釜
- //{
- // foreach (var item in a.ITEM1.Select(s => s.XLH))
- // {
- // po.Details.Add(new TN_Inbound_Detail
- // {
- // S_IO_NO = model.ROOT.WLPZ.HEAD.WLPZBH,
- // N_ROW_NO = po.Details.Count + 1,
- // S_ITEM_CODE = a.WLH,
- // F_QTY = a.SL,
- // S_ITEM_STATE = "鐗╂枡",
- // S_ITEM_NAME = "鐗╂枡",
- // F_ACC_B_QTY = 0,
- // S_KCDD = a.KCDD,
- // S_UOM = a.JBJLDW,//璁￠噺鍗曚綅
- // S_SERIAL_NO = item,
- // S_BATCH_NO = a.PC,
- // });
- // }
- //}
- //else
- //{
- #endregion
+
LogHelper.Info($"鏁堥獙{a.ITEM1}");
po.Details.Add(new TN_Inbound_Detail
{
@@ -1385,7 +1441,7 @@
});
//}
- });
+ }
db.Insertable<TN_Inbound_Order>(po).ExecuteCommand();
db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand();
db.CommitTran();
@@ -1397,14 +1453,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 +1489,7 @@
});
}
- });
+ }
db.Insertable<TN_Inbound_Detail>(Details).ExecuteCommand();
db.CommitTran();
@@ -1449,72 +1506,9 @@
}
else
{
-
- #region
- ////鍒涘缓鍏ュ簱鍗曚富瀛愯〃
- //var po = WMSHelper.GetOutboundOrder(model.ROOT.WLPZ.HEAD.WLPZBH);
- //if (po == null)
- //{
- // po = new TN_Outbound_Order { S_NO = model.ROOT.WLPZ.HEAD.WLPZBH, S_AREA_CODE = "HJQ", S_BS_NO = model.ROOT.WLPZ.HEAD.WLPZBH, S_WLPZNF = model.ROOT.WLPZ.HEAD.WLPZNF, S_FACTORY = model.ROOT.WLPZ.ITEM[0].GC, S_OUT_TYPE = "鍏朵粬鍑哄簱", S_BS_TYPE = model.ROOT.WLPZ.ITEM[0].YDLX };
- // po.Details = new List<TN_Outbound_Detail>();
- // if (model.ROOT.WLPZ.ITEM.Count > 0)
- // {
- // model.ROOT.WLPZ.ITEM.ForEach(a =>
- // {
- // //if (a.ITEM1.Select(s => s.XLH).Count() > 0)//鍒ゆ柇搴忓垪鍙锋槸鍚︿负澶氫釜
- // //{
- // // foreach (var item in a.ITEM1.Select(s => s.XLH))
- // // {
- // // po.Details.Add(new TN_Inbound_Detail
- // // {
- // // S_IO_NO = model.ROOT.WLPZ.HEAD.WLPZBH,
- // // N_ROW_NO = po.Details.Count + 1,
- // // S_ITEM_CODE = a.WLH,
- // // F_QTY = a.SL,
- // // S_ITEM_STATE = "鐗╂枡",
- // // S_ITEM_NAME = "鐗╂枡",
- // // F_ACC_B_QTY = 0,
- // // S_KCDD = a.KCDD,
- // // S_UOM = a.JBJLDW,//璁￠噺鍗曚綅
- // // S_SERIAL_NO = item,
- // // S_BATCH_NO = a.PC,
- // // });
- // // }
- // //}
- // //else
- // //{
- // po.Details.Add(new TN_Outbound_Detail
- // {
- // S_DO_NO = model.ROOT.WLPZ.HEAD.WLPZBH,
- // N_ROW_NO = a.WLPZHXM,
- // S_ITEM_CODE = a.WLBH,
- // F_QTY = a.SL,
- // S_AREA_CODE = "娴嬭瘯",
- // S_ITEM_NAME = "鐗╂枡",
- // S_KCDD = a.KCDD,
- // S_UOM = a.JLDW,//璁￠噺鍗曚綅
- // S_SERIAL_NO = string.Join(",", a.ITEM1.Select(item => item.XLH)),
- // S_BATCH_NO = a.PC,
-
- // S_ERP_WH_CODE = a.KCDD,
- // N_ITEM_STATE = 1
- // });
- // //}
-
- // });
- // db.Insertable<TN_Outbound_Order>(po).ExecuteCommand();
- // db.Insertable<TN_Outbound_Detail>(po.Details).ExecuteCommand();
- // db.CommitTran();
-
- // }
- //}
- //else
- //{
- // result.resultCode = 1;
- // result.resultMsg = "宸茬粡鏈夐噸澶嶅崟鍙凤紝涓嶅彲閲嶅浼犺緭";
- // return result;
- //}
- #endregion
+
+ sw.Stop();
+ LogHelper.Info("绗竴娆� + sw.ElapsedMilliseconds);
#region 鍒涘缓棰嗘枡鍗� var po = db.Queryable<TN_Ll_Order>().Includes(a => a.Details).Where(s => s.S_NO == itemwlpz.HEAD.WLPZBH).First();
@@ -1527,7 +1521,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();
@@ -1546,7 +1540,7 @@
N_ROW_NO = a.WLPZHXM,
S_JDBS = a.JDBS,
S_ITEM_CODE = a.WLBH,
- S_ITEM_NAME = item.S_ITEM_NAME,
+ S_ITEM_NAME = item?.S_ITEM_NAME,
F_QTY = a.SL,
S_BATCH_NO = a.PC,
S_ERP_WH_CODE = a.KCDD,
@@ -1557,7 +1551,20 @@
}
var result1 = db.Insertable<TN_Ll_Order>(po).ExecuteCommand() > 0;
- db.Insertable<TN_Ll_detail>(po.Details).ExecuteCommand();
+ using (var bulkCopy = new SqlBulkCopy(util.Settings.SqlServer))
+ {
+ bulkCopy.DestinationTableName = "TN_Picking_Detail";
+ bulkCopy.BatchSize = 500;
+ var dataTable = new DataTable();
+ dataTable = po.Details.ToDataTable();
+ // 娣诲姞鍒楁槧灏勶紙纭繚鍚嶇О鍖归厤锛�+ foreach (DataColumn col in dataTable.Columns)
+ {
+ bulkCopy.ColumnMappings.Add(col.ColumnName, col.ColumnName);
+ }
+ bulkCopy.WriteToServer(po.Details.ToDataTable());
+ }
+ //db.Insertable<TN_Ll_detail>(po.Details).ExecuteCommand();
}
}
@@ -1569,16 +1576,11 @@
{
foreach (var a in itemwlpz.ITEM)
{
- //if (a.LLDSCBS == "Y")//濡傛灉鏄垹闄ゆ爣璇嗗垯鍒犻櫎褰撳墠鎵�睘鍑哄簱鍗曟槑缁�涓嶆槸鍒犻櫎鏍囪 鍒欒繘琛屽鏀瑰垽鏂�- //{
- // result.resultCode = 1;
- // result.resultMsg = $"鎵ц涓鏂欏崟锛岀墿鏂檣a.WLH}鐗╂枡涓嶅厑璁稿垹闄�;
- // throw new Exception($"鎵ц涓鏂欏崟锛岀墿鏂檣a.WLH}鐗╂枡涓嶅厑璁稿垹闄�);
- //}
+
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 +1612,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 //杩斿洖澶辫触
{
@@ -1632,26 +1635,11 @@
{
foreach (var a in itemwlpz.ITEM)
{
- //if (a.LLDSCBS == "Y")//濡傛灉鏄垹闄ゆ爣璇嗗垯鍒犻櫎褰撳墠鎵�睘鍑哄簱鍗曟槑缁�涓嶆槸鍒犻櫎鏍囪 鍒欒繘琛屽鏀瑰垽鏂�- //{
- // var po1 = po.Details.Where(s => a.WLH == s.S_ITEM_CODE).ToList();
- // if (po1.Count() > 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
- // {
- // db.Deleteable<TN_Ll_detail>().Where(it => it.S_ITEM_CODE == a.WLH && it.S_DO_NO == po1.First().S_DO_NO).ExecuteCommand();
- // }
- // else
- // {
- // result.resultCode = 1;
- // result.resultMsg = $"鐗╂枡{a.WLH}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎";
- // throw new Exception($"鐗╂枡{a.WLH}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎");
- // }
- //}
- //else
- //{
+
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 +1669,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();
}
//}
}
@@ -1693,7 +1682,9 @@
db.Insertable<TN_Ll_detail>(listtn).ExecuteCommand();
}
}
-
+ sw.Restart();
+ sw.Stop();
+ LogHelper.Info("绗簩娆� + sw.ElapsedMilliseconds);
#endregion
}
result.WLPZBH = itemwlpz.HEAD.WLPZBH;
@@ -1702,10 +1693,19 @@
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();
-
+ sw.Restart();
+ sw.Stop();
+ LogHelper.Info("绗笁娆� + sw.ElapsedMilliseconds);
}
catch (Exception e)
{
@@ -1732,6 +1732,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 +1765,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,23 +1863,25 @@
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)
+ if (model.Type == 2)
{
Location start = new Location();
if (!string.IsNullOrEmpty(model.cntr_code))
{
- var loc= db.Queryable<LocCntrRel>().Where(it => it.S_CNTR_CODE == model.cntr_code).First();
-
-
- if (loc==null)
+ var loc = db.Queryable<LocCntrRel>().Where(it => it.S_CNTR_CODE == model.cntr_code).First();
+ if (loc == null)
{
LogHelper.Info($"瀹瑰櫒{model.cntr_code}鎵句笉鍒板搴旇揣浣�);
result.resultMsg = $"瀹瑰櫒{model.cntr_code}鎵句笉鍒板搴旇揣浣�;
@@ -1879,40 +1890,45 @@
}
else
{
- start= db.Queryable<Location>().Where(it => it.S_CODE == loc.S_LOC_CODE).First();
+ start = db.Queryable<Location>().Where(it => it.S_CODE == loc.S_LOC_CODE).First();
}
+ }
+ else if (!string.IsNullOrEmpty(model.item_code))
+ {
+ var starts = db.Queryable<CntrItemRel>().Where(cir => cir.S_CNTR_TYPE == "鍗婃墭" && cir.S_ITEM_CODE == model.item_code).OrderBy(cir => cir.T_CREATE).ToList().FirstOrDefault();
+ if (starts!=null)
+ {
+ LogHelper.Info($"starts{starts}");
+ var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == starts.S_CNTR_CODE).ToList().FirstOrDefault();
+ LogHelper.Info($"starts1{starts12}");
+ start = db.Queryable<Location>().Where(loc => loc.S_AREA_CODE == "HJQ" && loc.S_CODE == starts12.S_LOC_CODE).ToList().FirstOrDefault();
+ LogHelper.Info($"starts2{start}");
+
+ model.cntr_code = starts12?.S_CNTR_CODE;
+ }
+ else
+ {
+ 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();
+ start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).ToList().FirstOrDefault();
+
+
+
+
+ var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == start.S_CODE).ToList().FirstOrDefault();
+
+
+ model.cntr_code = starts12?.S_CNTR_CODE;
+ }
+
}
else
{
#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();
- //start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).First();
-
- //// 鑾峰彇鎵�湁琚崰鐢ㄧ殑瀹瑰櫒缂栫爜
- //var usedContainerCodes = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToList();
-
- //// 鑾峰彇鏈鍗犵敤鐨勫鍣ㄥ搴旂殑璐т綅缂栫爜
- //var availableLocationCodes = db.Queryable<LocCntrRel>()
- // .Where(s => !usedContainerCodes.Contains(s.S_CNTR_CODE))
- // .Select(s => s.S_LOC_CODE)
- // .ToList();
-
- //// 鑾峰彇绗竴涓彲鐢ㄨ揣浣嶏紙濡傛灉娌℃湁鍒欒繑鍥瀗ull锛�- //var startLocation = db.Queryable<Location>()
- // .Where(it => availableLocationCodes.Contains(it.S_CODE))
- // .ToList().FirstOrDefault();
-
-
+
#endregion
- 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")
- .Select((lcr, cir, loc) => loc).ToList() // 杩斿洖 Location 瀵硅薄
- .FirstOrDefault(); // 鎴栬� Take(1).ToList()[0]
}
- if (start==null)
+ if (start == null)
{
LogHelper.Info($"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�);
result.resultMsg = $"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�;
@@ -1952,6 +1968,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();
@@ -1967,7 +1984,7 @@
// 鑾峰彇绗竴涓彲鐢ㄨ揣浣嶏紙濡傛灉娌℃湁鍒欒繑鍥瀗ull锛� end = db.Queryable<Location>()
- .Where(it => !availableLocationCodes.Contains(it.S_CODE)&&it.S_AREA_CODE== "HJQ")
+ .Where(it => !availableLocationCodes.Contains(it.S_CODE) && it.S_AREA_CODE == "HJQ")
.ToList().FirstOrDefault();
@@ -1981,7 +1998,7 @@
return result;
}
- if (end==null)
+ if (end == null)
{
LogHelper.Info($"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�);
result.resultMsg = $"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�;
@@ -2035,7 +2052,7 @@
/// <returns></returns>
internal static async Task<SimpleResult> OutboundOrderSorting(FJSorting model)
{
-
+
var result = new SimpleResult();
// var db = new SqlHelper<object>().GetInstance();
@@ -2087,7 +2104,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;
@@ -2118,27 +2139,27 @@
{
S_AREA_CODE = po.S_AREA_CODE;
}
- model.MaterList.ForEach(a =>
+ model.MaterList.ForEach(a =>
+ {
+ LogHelper.Info($"濉厖鏁版嵁{util.Settings.WHCode}");
+ LogHelper.Info($"鍑忎粨搴撻噺{util.Settings.AREACode}琛ㄦ暟鎹�浠撳簱{po.S_WH_CODE} 鐗╂枡缂栫爜{a.item_code} 鐗╂枡鍚嶇О 鏁伴噺{a.qty}");
+ req.item_info.Add(new AddChangeModel.itemModel
{
- LogHelper.Info($"濉厖鏁版嵁{util.Settings.WHCode}");
- LogHelper.Info($"鍑忎粨搴撻噺{util.Settings.AREACode}琛ㄦ暟鎹�浠撳簱{po.S_WH_CODE} 鐗╂枡缂栫爜{a.item_code} 鐗╂枡鍚嶇О 鏁伴噺{a.qty}");
- req.item_info.Add(new AddChangeModel.itemModel
- {
- wh_code = S_WH_CODE,
- item_code = a.item_code,
- item_name = "",
- qty = a.qty
- });
- LogHelper.Info($"鍑忓簱鍖洪噺琛ㄦ暟鎹�搴撳尯{po.S_AREA_CODE} 鐗╂枡缂栫爜{a.item_code} 鐗╂枡鍚嶇О 鏁伴噺{a.qty}");
- req2.item_info.Add(new AddChangeModel.itemModel
- {
- wh_code = S_WH_CODE,
- area_code = S_AREA_CODE,
- item_code = a.item_code,
- item_name = "",
- qty = a.qty
- });
+ wh_code = S_WH_CODE,
+ item_code = a.item_code,
+ item_name = "",
+ qty = a.qty
});
+ LogHelper.Info($"鍑忓簱鍖洪噺琛ㄦ暟鎹�搴撳尯{po.S_AREA_CODE} 鐗╂枡缂栫爜{a.item_code} 鐗╂枡鍚嶇О 鏁伴噺{a.qty}");
+ req2.item_info.Add(new AddChangeModel.itemModel
+ {
+ wh_code = S_WH_CODE,
+ area_code = S_AREA_CODE,
+ item_code = a.item_code,
+ item_name = "",
+ qty = a.qty
+ });
+ });
var reqData = JsonConvert.SerializeObject(req);
var AppKey = Settings.AppKey;
var AppSecret = Settings.AppSecret;
@@ -2184,7 +2205,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 +2216,7 @@
}
catch (Exception e)
{
+ LogHelper.Info($"鎶ラ敊{e.Message}");
result.resultMsg = e.Message;
db.RollbackTran();
return result;
@@ -2203,7 +2225,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 +2256,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 +2265,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 +2277,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,7 +2297,56 @@
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();
}
@@ -2308,6 +2354,8 @@
{
//db.RollbackTran();
LogHelper.Info("鐗╂枡淇℃伅缁戝畾鍒版弧瀹瑰櫒涓� + ex.Message);
+ result.resultCode = 1;
+ result.resultMsg += ex.Message;
Console.WriteLine(ex.Message);
throw;
@@ -2742,7 +2790,7 @@
};
List<CXCkBackDto.HEAD> listhead = new List<CXCkBackDto.HEAD>();
//鍑哄簱鍗曡鎯�- var porecord = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == po.S_BS_NO&&a.STATUS==0).ToList();
+ var porecord = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == po.S_BS_NO && a.STATUS == 0).ToList();
foreach (var item in MaterList)
{
CXCkBackDto.HEAD hEAD = new CXCkBackDto.HEAD();
@@ -2821,7 +2869,7 @@
materialVoucher.S_GZRQ = po.BUDAT;
materialVoucher.UNAME = po.UNAME;
materialVoucher.S_AREA_CODE = po.S_AREA_CODE;
-
+
materialVoucher.F_QTY = onr == null ? 0 : onr.qty;
//materialVoucher.STATUS = 0;
resmeg += item?.MSGDESP;
@@ -2907,7 +2955,7 @@
KEY = po.S_NO,
ZYWLX = "2",
PZRQ = DateTime.Now.ToString("yyyyMMdd"),
- GZRQ =DateTime.Now.ToString("yyyyMMdd"), // 鍋囪鏃ユ湡鏍煎紡涓�骞�鏈�鏃�
+ GZRQ = DateTime.Now.ToString("yyyyMMdd"), // 鍋囪鏃ユ湡鏍煎紡涓�骞�鏈�鏃�
GZRY = po.S_CREATOR_NAME,
ITEM = new List<CkBcakDto.ITEM>
{
@@ -2942,7 +2990,7 @@
//var serialNos = string.Join(",", CntrItemRels
// .Where(s => s.S_ITEM_CODE == item.item_code)
// .Select(s => s.S_SERIAL_NO));
- listitem1.XLH = podetail?.S_SERIAL_NO==null?null: podetail?.S_SERIAL_NO.Split(',').ToList();
+ listitem1.XLH = podetail?.S_SERIAL_NO == null ? null : podetail?.S_SERIAL_NO.Split(',').ToList();
//foreach (var xlhValue in xlhValues)
//{
// CkBcakDto.ITEM1 newItem = new CkBcakDto.ITEM1 { XLH = xlhValue };
@@ -2952,7 +3000,7 @@
iTEMs.Add(ckbitem);
}
myRoot.ROOT.WLPZ.ITEM = iTEMs;
- if (myRoot.ROOT.WLPZ.ITEM.Where(s=>!string.IsNullOrEmpty(s.SCDD) && !string.IsNullOrEmpty(s.YLBH) && !string.IsNullOrEmpty(s.YLXMH)).Count()==0)
+ if (myRoot.ROOT.WLPZ.ITEM.Where(s => !string.IsNullOrEmpty(s.SCDD) && !string.IsNullOrEmpty(s.YLBH) && !string.IsNullOrEmpty(s.YLXMH)).Count() == 0)
{
myRoot.ROOT.WLPZ.ZYWLX = "2";
}
@@ -3009,7 +3057,7 @@
materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
materialVoucher.S_WH_CODE = po.S_WH_CODE;
materialVoucher.S_AREA_CODE = po.S_AREA_CODE;
- materialVoucher.F_QTY = item.qty;
+ materialVoucher.F_QTY = item.qty;
materialVoucher.S_GZRQ = po.BUDAT;
materialVoucher.UNAME = po.UNAME;
materialVoucher.STATUS = 0;
@@ -3055,7 +3103,7 @@
/// <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 db = new SqlHelper<object>().GetInstance();
@@ -3100,12 +3148,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);
@@ -3146,6 +3195,130 @@
return result;
}
}
+
+ /// <summary>
+ /// 鍒涘缓棰嗘枡鍗�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public static LLDReturnRoot.Root Out_Order_In1s(CKDdto.Root model)
+ {
+ LLDReturnRoot.Root finalRoot = new LLDReturnRoot.Root
+ {
+ ROOT = new LLDReturnRoot.ROOT
+ {
+ ITEM = new List<LLDReturnRoot.ITEM>
+ {
+
+ }
+ }
+ };
+ List<LLDReturnRoot.ITEM> iTEMs = new List<LLDReturnRoot.ITEM>();
+ var result = new WeiLiResult();
+ using (var db = new SqlHelper<object>().GetInstance())
+ {
+ //鍒涘缓棰嗘枡鍗�+ try
+ {
+ List<WcReturnRoot.ITEM> wcReturnRoots = new List<WcReturnRoot.ITEM>();
+ //鍒犻櫎鐨勯泦鍚�+ List<TN_Ll_detail> tN_Ll_Details = new List<TN_Ll_detail>();
+ List<TN_Ll_detail> iuptN_Ll_Details = new List<TN_Ll_detail>();
+ //db.BeginTran();
+ foreach (var itemscddll in model.ROOT.SCDDLL)
+ {
+
+ LLDReturnRoot.ITEM lLDReturnRoots = new LLDReturnRoot.ITEM();
+
+ #region
+ var po = db.Queryable<TN_Ll_Order>()
+ .Includes(a => a.Details)
+ .Where(s => s.S_NO == itemscddll.LLDH)
+ .First();
+
+ #endregion
+ if (po == null)
+ {
+ po = new TN_Ll_Order { S_NO = itemscddll.LLDH, S_FACTORY = itemscddll.GC, S_OUT_TYPE = "鍑哄簱", S_BS_TYPE = "鍑哄簱", S_AREA_CODE = "HJQ", S_BS_NO = itemscddll.LLDH };
+ po.Details = new List<TN_Ll_detail>();
+ if (itemscddll.ITEM.Count() > 0)
+ {
+ Stopwatch sw = new Stopwatch();
+ sw.Start();
+ foreach (var a in itemscddll.ITEM)
+ {
+ po.Details.Add(new TN_Ll_detail
+ {
+ S_DO_NO = itemscddll.LLDH,
+ S_AREA_CODE = "HJQ",
+ N_ROW_NO = "",
+ S_ITEM_CODE = a.WLBM,
+ S_ITEM_NAME = "",
+ F_QTY = a.XQSL,
+ S_ZJBM = a.ZJBM,
+ S_YLBH = a.YLBH,
+ S_YLXMH = a.YLHXM,
+ S_BATCH_NO = "",
+ S_ERP_WH_CODE = a.KCDD,
+ S_ZJWLTH = a.ZJWLTH,
+ S_ZJWLMS = a.ZJWLMS,
+ S_ZHFHBS = a.ZHFHBS,
+ S_CJRQ = a.CJRQ,
+ S_LLDSCBS = a.LLDSCBS,
+ S_SCGLY = a.SCGLY,
+ S_GXH = a.GXH,
+ S_XQRQ = a.XQRQ,
+ N_ITEM_STATE = 1
+ });
+ }
+
+
+ var result1 = db.Insertable<TN_Ll_Order>(po).ExecuteCommand() > 0;
+ if (po.Details.Count() > 0)
+ {
+ using (var bulkCopy = new SqlBulkCopy(util.Settings.SqlServer))
+ {
+ bulkCopy.DestinationTableName = "TN_Picking_Detail";
+ bulkCopy.BatchSize = 500;
+ var dataTable = new DataTable();
+ dataTable = po.Details.ToDataTable();
+ // 娣诲姞鍒楁槧灏勶紙纭繚鍚嶇О鍖归厤锛�+ foreach (DataColumn col in dataTable.Columns)
+ {
+ bulkCopy.ColumnMappings.Add(col.ColumnName, col.ColumnName);
+ }
+ bulkCopy.WriteToServer(po.Details.ToDataTable());
+ }
+ }
+ sw.Stop();
+ long elapsedMilliseconds = sw.ElapsedMilliseconds;
+ LogHelper.Info($"鐢熶骇璁㈠崟棰嗘枡鍗曟棤鏁版嵁{po.Details.Count()}(鐢熸垚棰嗘枡鍗�娣诲姞鏁版嵁杩斿洖鏃堕暱锛� + elapsedMilliseconds);
+ }
+ }
+ }
+
+ //db.CommitTran();
+
+ return finalRoot;
+
+ }
+ catch (Exception ex)
+ {
+ LLDReturnRoot.ITEM lLDReturnRoots = new LLDReturnRoot.ITEM();
+ lLDReturnRoots.GC = "";
+ lLDReturnRoots.LLDH = "";
+ lLDReturnRoots.MSGCODE = 1;
+ lLDReturnRoots.MSGDESP = ex.Message;
+ iTEMs.Add(lLDReturnRoots);
+ finalRoot.ROOT.ITEM = iTEMs;
+ db.RollbackTran();
+
+ return finalRoot;
+ }
+ }
+
+ }
+
/// <summary>
/// 鍒涘缓棰嗘枡鍗� /// </summary>
@@ -3164,23 +3337,35 @@
}
};
List<LLDReturnRoot.ITEM> iTEMs = new List<LLDReturnRoot.ITEM>();
-
var result = new WeiLiResult();
-
using (var db = new SqlHelper<object>().GetInstance())
{
-
//鍒涘缓棰嗘枡鍗� try
{
+ Stopwatch s1w = new Stopwatch();
+ s1w.Start();
+ List<WcReturnRoot.ITEM> wcReturnRoots = new List<WcReturnRoot.ITEM>();
+
+ //鍒犻櫎鐨勯泦鍚�+ List<TN_Ll_detail> tN_Ll_Details = new List<TN_Ll_detail>();
+ List<TN_Ll_detail> iuptN_Ll_Details = new List<TN_Ll_detail>();
+
+ db.BeginTran();
foreach (var itemscddll in model.ROOT.SCDDLL)
{
+ var wlbmList = itemscddll.ITEM.Select(x => x.WLBM).Distinct().ToList();
+ var itemlist = db.Queryable<TN_Material>()
+ .Where(it => wlbmList.Contains(it.S_ITEM_CODE)) // 浣跨敤 IN 鏌ヨ
+ .ToList();
LLDReturnRoot.ITEM lLDReturnRoots = new LLDReturnRoot.ITEM();
- db.BeginTran();
-
+ 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();
#endregion
//var po = WMSHelper.GetOutboundOrder(model.ROOT.SCDDLL.LLDH);
@@ -3192,19 +3377,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 +3394,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,
@@ -3229,13 +3411,48 @@
S_XQRQ = a.XQRQ,
N_ITEM_STATE = 1
});
- }
- if (po.Details.Count()>0)
- {
- var result1 = db.Insertable<TN_Ll_Order>(po).ExecuteCommand() > 0;
- db.Insertable<TN_Ll_detail>(po.Details).ExecuteCommand();
+
}
+ Stopwatch sw = new Stopwatch();
+ sw.Start();
+
+ 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();
+ using (var bulkCopy = new SqlBulkCopy(util.Settings.SqlServer))
+ {
+ bulkCopy.DestinationTableName = "TN_Picking_Detail";
+ bulkCopy.BatchSize = 500;
+ var dataTable = new DataTable();
+ dataTable = po.Details.ToDataTable();
+ // 娣诲姞鍒楁槧灏勶紙纭繚鍚嶇О鍖归厤锛�+ foreach (DataColumn col in dataTable.Columns)
+ {
+ bulkCopy.ColumnMappings.Add(col.ColumnName, col.ColumnName);
+ }
+ bulkCopy.WriteToServer(po.Details.ToDataTable());
+ }
+ }
+ else
+ {
+ LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM();
+ lLDReturnRoot1.GC = itemscddll.GC;
+ lLDReturnRoot1.LLDH = itemscddll.LLDH;
+ lLDReturnRoot1.MSGCODE = 0;
+ lLDReturnRoot1.MSGDESP = $"鎴愬姛,鏃犳暟鎹坊鍔�;
+ iTEMs.Add(lLDReturnRoot1);
+ }
+ sw.Stop();
+ long elapsedMilliseconds = sw.ElapsedMilliseconds;
+ LogHelper.Info($"鐢熶骇璁㈠崟棰嗘枡鍗曟棤鏁版嵁{po.Details.Count()}(鐢熸垚棰嗘枡鍗�娣诲姞鏁版嵁杩斿洖鏃堕暱锛� + elapsedMilliseconds);
}
}
else
@@ -3248,31 +3465,26 @@
{
if (a.LLDSCBS == "Y")//濡傛灉鏄垹闄ゆ爣璇嗗垯鍒犻櫎褰撳墠鎵�睘鍑哄簱鍗曟槑缁�涓嶆槸鍒犻櫎鏍囪 鍒欒繘琛屽鏀瑰垽鏂� {
- //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;
}
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;
- //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;
}
TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail
{
@@ -3304,19 +3516,17 @@
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 //杩斿洖澶辫触
{
- //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;
}
}
}
@@ -3328,10 +3538,11 @@
{
if (a.LLDSCBS == "Y")//濡傛灉鏄垹闄ゆ爣璇嗗垯鍒犻櫎褰撳墠鎵�睘鍑哄簱鍗曟槑缁�涓嶆槸鍒犻櫎鏍囪 鍒欒繘琛屽鏀瑰垽鏂� {
- var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
- if (po1.Count() > 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
+ var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).FirstOrDefault();
+ if (po1 != null) //鏃犲垯鏂板鐗╂枡鏄庣粏
{
- 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.Add(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 +3552,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 +3562,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 +3573,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- break;
+ continue;
}
TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail
{
@@ -3392,30 +3603,62 @@
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();
+ }
}
+ Stopwatch sw1 = new Stopwatch();
+ sw1.Start();
//娣诲姞鏁版嵁
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);
+ }
+
+ sw1.Stop();
+ long elapsedMilliseconds2 = sw1.ElapsedMilliseconds;
+ LogHelper.Info("鐢熶骇璁㈠崟棰嗘枡鍗曟湁鏁版嵁(鐢熸垚棰嗘枡鍗�娣诲姞鏁版嵁杩斿洖鏃堕暱锛� + elapsedMilliseconds2);
}
-
- lLDReturnRoots.GC = itemscddll.GC;
- lLDReturnRoots.LLDH = itemscddll.LLDH;
- lLDReturnRoots.MSGCODE = 0;
- lLDReturnRoots.MSGDESP = $"鎴愬姛";
- iTEMs.Add(lLDReturnRoots);
- db.CommitTran();
}
+ db.CommitTran();
finalRoot.ROOT.ITEM = iTEMs;
+
+
+ s1w.Stop();
+ long elapsedMillisecond1s = s1w.ElapsedMilliseconds;
+ LogHelper.Info("鐢熶骇璁㈠崟finalRoot.ROOT.ITEM" + elapsedMillisecond1s);
+
+
+
}
catch (Exception ex)
{
@@ -3428,21 +3671,10 @@
finalRoot.ROOT.ITEM = iTEMs;
db.RollbackTran();
- //result.msg = $"鍑哄簱鍗曟帴鍙ｅ紓甯革紝寮傚父淇℃伅={ex.Message}";
- //var jsons = CkGetJsonResult(model.ROOT.SCDDLL.LLDH, model.ROOT.SCDDLL.GC, result.code.ToString(), result.msg);
return finalRoot;
}
- //LLDReturnRoot.ITEM lLDReturnRoots = new LLDReturnRoot.ITEM();
- //lLDReturnRoots.GC = model.ROOT.SCDDLL.GC;
- //lLDReturnRoots.LLDH = model.ROOT.SCDDLL.LLDH;
- //lLDReturnRoots.MSGCODE = 0;
- //lLDReturnRoots.MSGDESP = "娣诲姞鎴愬姛";
- //finalRoot.ROOT.ITEM = lLDReturnRoots;
-
- //var json = CkGetJsonResult(model.ROOT.SCDDLL.LLDH, model.ROOT.SCDDLL.GC, result.code.ToString(), result.msg);
-
- return finalRoot;
}
+ return finalRoot;
}
/// <summary>
@@ -3457,12 +3689,12 @@
using (var db = new SqlHelper<object>().GetInstance())
{
- //鍒涘缓棰嗘枡鍗�+ //mobox鍒涘缓鍑哄簱鍗� try
{
db.BeginTran();
- #region 鍒涘缓棰嗘枡鍗�+ #region mobox鍒涘缓鍑哄簱鍗� var po = db.Queryable<TN_Ll_Order>().Includes(a => a.Details).Where(s => s.S_NO == S_NO).First();
#endregion
@@ -3477,10 +3709,16 @@
{
//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>();
+ var list = po.Details.Where(s => s.F_QTY > s.F_ACC_D_QTY&&s.S_ERP_WH_CODE=="4004").Select(s => s.S_ITEM_CODE).Distinct().ToArray();
+
+ var Sitemlist = db.Queryable<CntrItemRel>().Where(s => list.Contains(s.S_ITEM_CODE)).Select(s => s.S_ITEM_CODE).ToArray().Select(x => x.Trim()).ToArray(); ;
+
+ po.Details = po.Details.Where(s => Sitemlist.Contains(s.S_ITEM_CODE)).ToList();
if (po.Details.Count() > 0)
{
+
foreach (var a in po.Details)
{
if (a.F_QTY > a.F_ACC_D_QTY)
@@ -3513,8 +3751,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,10 +3763,14 @@
}
}
+
+
+ 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;
db.Insertable<TN_Outbound_Detail>(po1.Details).ExecuteCommand();
+ po1.Details.Clear();
}
else
{
@@ -3536,7 +3779,12 @@
return result;
}
}
-
+ else
+ {
+ result.code = 1;
+ result.msg = $"棰嗘枡鍗晎po.S_NO}鎵句笉鍒板搴斿簱瀛樼墿鏂欎俊鎭�;
+ return result;
+ }
}
db.CommitTran();
}
@@ -3968,6 +4216,12 @@
result.resultMsg = "鏁版嵁涓嶅瓨鍦�;
return result;
}
+
+ 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))
+ .ToList();
if (po.S_IN_TYPE == "鍐呴噰鍏ュ簱")
{
List<NcRkDto.ITEM> listitem = new List<NcRkDto.ITEM>();
@@ -4002,6 +4256,8 @@
//}
//wcbkbcitem.ITEM1 = listitem1;
listitem.Add(wcbkbcitem);
+ item.N_B_STATE = 1;
+ tN_Inbound_Details.Add(item);
}
NcRkDto.Root roots = new NcRkDto.Root
@@ -4071,7 +4327,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 +4345,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;
@@ -4144,25 +4417,25 @@
List<JHWBackDto.ITEM> iTEMs = new List<JHWBackDto.ITEM>();
foreach (var item in po.Details)
{
- var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.S_ITEM_CODE).FirstOrDefault();
+ // var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.S_ITEM_CODE).FirstOrDefault();
JHWBackDto.ITEM ckbitem = new JHWBackDto.ITEM();
ckbitem.WLBH = item.S_ITEM_CODE;
ckbitem.GC = po.S_FACTORY;
- ckbitem.XSDD = podetail?.S_XSDD;
- ckbitem.XSDDHXM = podetail?.S_XSDDXMBH;
+ ckbitem.XSDD = item?.S_XSDD;
+ ckbitem.XSDDHXM = item?.S_XSDDXMBH;
ckbitem.SL = item.F_QTY;
- ckbitem.DW = podetail?.S_UOM;
- ckbitem.DDH = podetail?.S_DDH;
+ ckbitem.DW = item?.S_UOM;
+ ckbitem.DDH = item?.S_DDH;
//ckbitem.PH = podetail?.S_PH;
// ckbitem.TSKCBS = podetail?.S_TSKCBS;
//ckbitem.DDHXM = (podetail?.N_ROW_NO);
- ckbitem.WBS = podetail?.S_WBS;
- ckbitem.KCDD = podetail?.S_KCDD;
- ckbitem.PC = podetail?.S_BATCH_NO;
+ ckbitem.WBS = item?.S_WBS;
+ ckbitem.KCDD = item?.S_KCDD;
+ ckbitem.PC = item?.S_BATCH_NO;
#region MyRegion
// List<JHWBackDto.ITEM1> listitem1 = new List<JHWBackDto.ITEM1>();
JHWBackDto.ITEM1 listitem1 = new JHWBackDto.ITEM1();
- listitem1.XLH = podetail?.S_SERIAL_NO.Split(',').ToList();
+ listitem1.XLH = item?.S_SERIAL_NO.Split(',').ToList();
////string[] xlhValues = item.S_SERIAL_NO.Split(',');
//var serialNos = string.Join(",", CntrItemRels
// .Where(s => s.S_ITEM_CODE == item.S_ITEM_CODE)
@@ -4178,7 +4451,8 @@
iTEMs.Add(ckbitem);
-
+ item.N_B_STATE = 1;
+ tN_Inbound_Details.Add(item);
}
myRoot.ROOT.HEAD.ITEM = iTEMs;
#region wms-sap鍥炶皟
@@ -4229,13 +4503,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
@@ -4274,6 +4560,8 @@
}
wcbkbcitem.ITEM1 = listitem1;
listitem.Add(wcbkbcitem);
+ item.N_B_STATE = 1;
+ tN_Inbound_Details.Add(item);
}
WcRkBc.Root roots = new WcRkBc.Root
@@ -4360,25 +4648,27 @@
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();
+ ;
+ 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
- //{
- // SapReturn sapReturn = new SapReturn();
- // sapReturn.N_STATUS = 0;
- // sapReturn.S_NO = model.S_NO;
- // sapReturn.S_TYPE = po.S_IN_TYPE;
- // sapReturn.S_JSON = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"+ xml;
- // db.Insertable<SapReturn>(sapReturn).ExecuteCommand();
- //}
}
@@ -4428,6 +4718,8 @@
hEAD.WLPZXM = item.N_ROW_NO;
hEAD.GZRY = po.UNAME;
listhead.Add(hEAD);
+ item.N_B_STATE = 1;
+ tN_Inbound_Details.Add(item);
}
roots.ROOT.HEAD = listhead;
@@ -4547,6 +4839,18 @@
//db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
}
+ if (tN_Inbound_Details.Count() > 0)
+ {
+ db.Updateable(tN_Inbound_Details).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
+ }
+ var newpodetai= db.Queryable<TN_Inbound_Detail>().Where(a => a.S_IO_NO == model.S_NO).ToList();
+ int cout = newpodetai.Where(s => s.N_B_STATE != 1).Count();
+ if (cout==0)
+ {
+ po.N_B_STATE = 1;
+ db.Updateable(po).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
+ }
+
db.CommitTran();
}
catch (Exception ex)
@@ -4581,17 +4885,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).ToList().FirstOrDefault();
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;
@@ -5325,9 +5630,15 @@
{
db.BeginTran();
List<TN_Material> list = new List<TN_Material>();
+
+
+ var itemCodes = model.ITEM.Select(item => item.WLBM).ToList();
+ var itemlist = db.Queryable<TN_Material>()
+ .Where(it => itemCodes.Contains(it.S_ITEM_CODE))
+ .ToList();
foreach (var item in model.ITEM)
{
- var materlist = db.Queryable<TN_Material>().Where(it => it.S_ITEM_CODE == item.WLBM).First();
+ var materlist = itemlist.Where(it => it.S_ITEM_CODE == item.WLBM).First();
if (materlist == null)
{
TN_Material tN_Material = new TN_Material();
--
Gitblit v1.9.1