From 1e20867615150dce50f2a834cfe277bfa4749dbb Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 30 六月 2025 17:25:04 +0800
Subject: [PATCH] 1.分拣接口拆分出回库接口 2.自动回库接口逻辑完成
---
api/WmsSpaHelper.cs | 580 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 433 insertions(+), 147 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index cf42f12..bb2979d 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -41,6 +41,8 @@
using System.Data;
using System.Runtime.ConstrainedExecution;
using HH.WCS.Mobox3.pinggao.core;
+using static HH.WCS.Mobox3.pinggao.api.OtherModel.Putaway_Order_In;
+using System.Web.Http.Results;
namespace HH.WCS.Mobox3.pinggao.api
{
@@ -1007,7 +1009,7 @@
{
var result = new SimpleResult();
//鍒ゆ柇鍐查攢鍑瘉缂栧彿 鏄惁涓虹┖ 濡傛灉涓虹┖ 鍒欎负鍐查攢(瀹℃牳鍓嶆墠鑳藉啿閿�紝闈炲緟鎵ц鐘舵�鎻愮ず鎵ц涓笉鍙啿閿� 涓嶄负绌�鍒欎负澶栭噰鍏ュ簱
- if ((itemwlpz.HEAD.YDLX != "351" || itemwlpz.HEAD.YDLX != "Z89") && itemwlpz.ITEM[0].FHGC == "3040")
+ if (itemwlpz.ITEM[0].JDBS=="H" && itemwlpz.ITEM[0].GC == "3040")
{
var po = db.Queryable<TN_Ll_Order>().Includes(a => a.Details).Where(s => s.S_NO == itemwlpz.HEAD.WLPZH).First();
//鍒涘缓鍑哄簱鍗曚富瀛愯〃
@@ -1243,7 +1245,7 @@
}
#endregion
}
- else if ((itemwlpz.HEAD.YDLX == "351" || itemwlpz.HEAD.YDLX == "Z89") && itemwlpz.ITEM[0].GC == "3040")
+ else if (itemwlpz.ITEM[0].JDBS == "S" && itemwlpz.ITEM[0].GC == "3040")
{
//鍒涘缓鍏ュ簱鍗曚富瀛愯〃
var po = WMSHelper.GetInboundOrder(itemwlpz.HEAD.WLPZH);
@@ -1731,6 +1733,8 @@
/// <returns></returns>
internal static SimpleResult InboundOrderSorting(MPSorting model)
{
+
+
var result = new SimpleResult();
foreach (var a in model.MaterList)
{
@@ -1745,6 +1749,27 @@
// var db = new SqlHelper<object>().GetInstance();
using (var db = new SqlHelper<object>().GetInstance())
{
+ Location endloc = new Location();
+ var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == model.cntr_code).First();
+ if (hwbd!=null)
+ {
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
+ if (endloc?.N_LOCK_STATE != 0)
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"缁堢偣搴撲綅宸查攣/涓嶅瓨鍦�;
+ return result;
+ }
+ }
+ else
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"{model.cntr_code}鎵樼洏鎵句笉鍒拌揣浣�;
+ return result;
+ }
+
+
+
var locinfo = db.Queryable<Location>().Where(a => a.S_CODE == model.start).First();
if (locinfo?.N_LOCK_STATE != 0)
@@ -1817,7 +1842,9 @@
S_START_LOC = model.start,
S_START_AREA = locinfo.S_AREA_CODE,
S_START_WH = locinfo.S_WH_CODE,
- S_END_LOC = model.start,
+ S_END_LOC = endloc.S_CODE,
+ S_END_AREA = endloc.S_AREA_CODE,
+ S_END_WH = endloc.S_WH_CODE,
S_BS_NO = model.MaterList[0].arrival_no,
N_TYPE = 1,
S_TYPE = WMSTask.GetTypeStr(1),
@@ -1895,30 +1922,59 @@
}
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}");
+ LogHelper.Info($"杩涙潵浜�);
+ var khsta= db.Queryable<CGRels>().Where(cir => cir.S_CNTR_TYPE == "鍗婃墭" && cir.S_ITEM_CODE == model.item_code).OrderBy(cir => cir.T_CREATE).ToList().FirstOrDefault();
- model.cntr_code = starts12?.S_CNTR_CODE;
+
+
+ if (khsta != null)
+ {
+ LogHelper.Info($"starts{khsta?.S_CNTR_CODE}");
+ var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == khsta.S_CNTR_CODE).First();
+ if (starts12==null)
+ {
+ LogHelper.Info($"{khsta.S_CNTR_CODE}瀹瑰櫒璐т綅涓嶅瓨鍦�);
+ result.resultMsg = $"{khsta.S_CNTR_CODE}瀹瑰櫒璐т綅涓嶅瓨鍦�;
+ result.resultCode = 1;
+ return result;
+ }
+ else
+ {
+
+ LogHelper.Info($"starts1{starts12.S_LOC_CODE}");
+ start = db.Queryable<Location>().Where(loc => loc.S_AREA_CODE == "HJQ" && loc.S_CODE == starts12.S_LOC_CODE).ToList().FirstOrDefault();
+ LogHelper.Info($"starts2{start?.S_CODE}");
+
+ 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 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($"{model.cntr_code}瀹瑰櫒璐у搧瀛樺湪璇ョ墿鏂欙紝璇烽厤缃墿鏂欏鍣�);
+ result.resultMsg = $"瀹瑰櫒璐у搧瀛樺湪璇ョ墿鏂欙紝璇烽厤缃墿鏂欏鍣�;
+ result.resultCode = 1;
+ return result;
+
+ }
+ 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();
+ if (start!=null)
+ {
+ var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == start.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;
+ model.cntr_code = starts12?.S_CNTR_CODE;
+ }
+
+ }
+
}
}
@@ -1930,8 +1986,8 @@
}
if (start == null)
{
- LogHelper.Info($"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�);
- result.resultMsg = $"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�;
+ LogHelper.Info($"{model.item_code}鏈壘鍒板彲鐢ㄨ揣浣�);
+ result.resultMsg = $"{model.item_code}鏈壘鍒板彲鐢ㄨ揣浣�;
result.resultCode = 1;
return result;
}
@@ -1969,26 +2025,42 @@
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();
- //start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).First();
+ var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == model.cntr_code).First();
+ if (hwbd!=null)
+ {
+ end = db.Queryable<Location>().Where(s => s.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
+ }
+ else
+ {
- //// 鑾峰彇鎵�湁琚崰鐢ㄧ殑瀹瑰櫒缂栫爜
- //var usedContainerCodes = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToList();
+ #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 availableLocationCodes = db.Queryable<LocCntrRel>()
- .Select(s => s.S_LOC_CODE)
- .ToList();
+ //// 鑾峰彇鎵�湁琚崰鐢ㄧ殑瀹瑰櫒缂栫爜
+ //var usedContainerCodes = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToList();
+ #endregion
+ // 鑾峰彇鏈鍗犵敤鐨勫鍣ㄥ搴旂殑璐т綅缂栫爜
+ var availableLocationCodes = db.Queryable<LocCntrRel>()
+ .Select(s => s.S_LOC_CODE)
+ .ToList();
// 鑾峰彇绗竴涓彲鐢ㄨ揣浣嶏紙濡傛灉娌℃湁鍒欒繑鍥瀗ull锛� end = db.Queryable<Location>()
.Where(it => !availableLocationCodes.Contains(it.S_CODE) && it.S_AREA_CODE == "HJQ")
.ToList().FirstOrDefault();
+ if (end!=null)
+ {
+ TN_Container_Code tN_Container_Code = new TN_Container_Code();
+ tN_Container_Code.S_CNTR_CODE= model.cntr_code;
+ tN_Container_Code.S_LOC_CODE = end.S_CODE;
+ var sss = db.Insertable<TN_Container_Code>(tN_Container_Code).ExecuteCommand();
+ }
- #endregion
+ }
+
}
else
{
@@ -2038,6 +2110,7 @@
catch (Exception e)
{
result.resultMsg = e.Message;
+ result.resultCode = 1;
db.RollbackTran();
return result;
throw;
@@ -2054,16 +2127,25 @@
{
var result = new SimpleResult();
-
// var db = new SqlHelper<object>().GetInstance();
using (var db = new SqlHelper<object>().GetInstance())
{
try
{
-
-
- result.resultMsg = "鎴愬姛";
+ var start = "";
+ var startloc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == model.cntr_code).First();
+ if (startloc!=null)
+ {
+ start = startloc.S_LOC_CODE;
+ }
+ else
+ {
+ result.resultMsg = $"{model.cntr_code}瀹瑰櫒鏈壘鍒拌揣浣嶄俊鎭�;
+ result.resultCode = 1;
+ return result;
+ }
+ result.resultMsg = "鎴愬姛";
result.resultCode = 0;
if (string.IsNullOrEmpty(model.arrival_no))
{
@@ -2086,27 +2168,27 @@
//鏍规嵁涓嶅悓鍑哄簱绫诲瀷 鍥炶皟sap
if (po.S_OUT_TYPE == "鍐查攢鍑哄簱")
{
- result = await CXAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ result = await CXAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
}
else
if (po.S_OUT_TYPE == "鍑哄簱")//鏅�鍑哄簱
{
LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
- result = await AddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ result = await AddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
}
else if (po.S_OUT_TYPE == "璁″垝澶栧彂鏂欏嚭搴�)
{
- result = await jhwtlAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ result = await jhwtlAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
}
else if (po.S_OUT_TYPE == "鎴愭湰涓績鍑哄簱")
{
- result = await CBAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ result = await CBAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
}
//閫氱敤鎺ュ彛 瀵瑰鍣ㄨ揣鍝佺殑鍒犲噺 鍜岀敓鎴愬洖搴撳崟 閮借鐢ㄧ殑鎺ュ彛
- result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE, model.cntr_type);
+ result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, start, po.S_OUT_TYPE, model.cntr_type);
if (result.resultCode == 1)
- {
+ {
return result;
}
#region 鍗囬檷閲�@@ -2243,9 +2325,10 @@
//鍥炲弬鐗╂枡淇℃伅
List<OutboundRecord> records = new List<OutboundRecord>();
- var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
+ var pzlist = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).ToList();
foreach (var item in MaterList)
{
+ var pz=pzlist.Where(s=>s.S_WLBM== item.item_code).FirstOrDefault();
// 鎻掑叆鍒版墭鐩樻槑缁嗚〃
var cntr = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code).ToList();
if (cntr.Count() > 0)
@@ -2266,7 +2349,7 @@
else
{
db.Updateable(cir).UpdateColumns(it => new { it.F_QTY, it.S_CNTR_TYPE, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();
- //娣诲姞鍥炲簱浣滀笟
+
}
}
else
@@ -2314,6 +2397,28 @@
result.resultMsg += $"浠诲姟{locs.S_CODE}鏉ユ簮鍙穥locs.S_BS_NO}鎵句笉鍒伴厤鐩樹俊鎭�;
return result;
}
+ Location endloc = new Location();
+
+ LogHelper.Info($"鑾峰彇鎵樼洏淇℃伅{cntr_code}瀹瑰櫒");
+ var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == cntr_code).First();
+ if (hwbd != null)
+ {
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
+ if (endloc?.N_LOCK_STATE != 0)
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"缁堢偣搴撲綅宸查攣/涓嶅瓨鍦�;
+ return result;
+ }
+
+ }
+ else
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"{cntr_code}鎵樼洏鎵句笉鍒拌揣浣�;
+ return result;
+ }
+
//var location = db.Queryable<Location>().Where(a => a.S_CODE == locs.S_LOC_CODE).First();
var wmsTask = new WMSTask
{
@@ -2322,9 +2427,13 @@
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,
+
+ //S_END_LOC = start,
+ //S_END_AREA = startinfo.S_AREA_CODE,
+ //S_END_WH = startinfo.S_AREA_CODE,
+ S_END_LOC = endloc?.S_CODE,
+ S_END_AREA = endloc?.S_AREA_CODE,
+ S_END_WH = endloc?.S_WH_CODE,
N_TYPE = 1,
// S_TYPE = WMSTask.GetTypeStr(1),
@@ -2364,7 +2473,85 @@
}
//}
+ public static async Task<SimpleResult> HkGets(HuiK model) {
+ var db = new SqlHelper<object>().GetInstance();
+
+ SimpleResult result = new SimpleResult();
+ var locs = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("鍑哄簱") && a.S_CNTR_CODE == model.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;
+ }
+ Location endloc = new Location();
+
+ LogHelper.Info($"鑾峰彇鎵樼洏淇℃伅{model.cntr_code}瀹瑰櫒");
+ var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == model.cntr_code).First();
+ if (hwbd != null)
+ {
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
+ if (endloc?.N_LOCK_STATE != 0)
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"缁堢偣搴撲綅宸查攣/涓嶅瓨鍦�;
+ return result;
+ }
+
+ }
+ else
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"{model.cntr_code}鎵樼洏鎵句笉鍒拌揣浣�;
+ return result;
+ }
+ var startloc = db.Queryable<Location>().Where(a => a.S_CODE == model.start).First();
+ //var location = db.Queryable<Location>().Where(a => a.S_CODE == locs.S_LOC_CODE).First();
+ var wmsTask = new WMSTask
+ {
+ S_CNTR_CODE = model.cntr_code,
+ S_CODE = WMSHelper.GenerateTaskNo(),
+ S_START_LOC = model.start,
+ S_START_AREA = startloc.S_AREA_CODE,
+ S_START_WH = startloc.S_WH_CODE,
+
+ //S_END_LOC = start,
+ //S_END_AREA = startinfo.S_AREA_CODE,
+ //S_END_WH = startinfo.S_AREA_CODE,
+ S_END_LOC = endloc?.S_CODE,
+ S_END_AREA = endloc?.S_AREA_CODE,
+ S_END_WH = endloc?.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(model.start, 1);
+ result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
+ }
+ }
+ else
+ {
+ result.resultCode = 1;
+ result.resultMsg += $"鎵句笉鍒板鍣ㄥ搴斾换鍔′俊鎭瘂model.cntr_code}";
+ return result;
+ }
+ return result;
+
+ }
/// <summary>
@@ -2423,7 +2610,7 @@
ckbitem.CBZX = po.S_CBZX;
ckbitem.WLBH = item.item_code;
ckbitem.SL = item.qty;
- ckbitem.KCDD = podetail?.S_KCDD;
+ ckbitem.KCDD = podetail?.S_ERP_WH_CODE;
ckbitem.LRZX = po.S_LRZX;
ckbitem.ZZKM = po.S_ZZKM;
ckbitem.GC = po.S_FACTORY;
@@ -2463,17 +2650,7 @@
string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
LogHelper.Info($"鎴愭湰涓績鍑哄簱xml鏁版嵁{xml}");
- //// 鍒涘缓 StringContent 骞舵寚瀹氬獟浣撶被鍨嬩负 "text/xml"
- //HttpContent content = new StringContent(xml, Encoding.UTF8, "application/xml");
- //string url = Settings.WCSSeverUrl + "/api/WmsSap/cesReceiveXmlData";
- //string responseXml = "";
- //using (HttpClient client = new HttpClient())
- //{
- // // 鍙戦� POST 璇锋眰骞舵帴鏀跺搷搴�- // HttpResponseMessage responsess = await client.PostAsync(url, content);
- // responseXml = await responsess.Content.ReadAsStringAsync();
-
- //}
+
#region sap鍥炶皟
// 鍒涘缓Web Service浠ｇ悊绫诲疄渚�@@ -2497,12 +2674,13 @@
XmlDocument xmlDoc = new XmlDocument();
xmlDoc.LoadXml(responses.Output.ToString());
JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
- var data = JsonConvert.DeserializeObject<ReturnWcBcak.Root>(jsonObject.ToString());
+ EnsureArrayFormat(jsonObject, "ITEM", "");
+ var data = JsonConvert.DeserializeObject<CbbReturnWcBcak.Root>(jsonObject.ToString());
//娣诲姞鍑瘉璁板綍琛�- result.resultMsg = data.ROOT.ITEM.MSGDESP;
- result.resultCode = data.ROOT.ITEM.MSGCODE;
- if (data.ROOT.ITEM.MSGCODE == 0)
+ result.resultMsg = data.ROOT.ITEM[0].MSGDESP;
+ result.resultCode = data.ROOT.ITEM[0].MSGCODE;
+ if (data.ROOT.ITEM[0].MSGCODE == 0)
{
foreach (var item in MaterList)
@@ -2512,8 +2690,8 @@
materialVoucher.S_TYPE = po.S_OUT_TYPE;
materialVoucher.S_WLBM = item.item_code;
materialVoucher.S_WLH = item.N_ROW_NO;
- materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZH;
- materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
+ materialVoucher.S_WLPZBH = data.ROOT.ITEM?[0].WLPZBH;
+ //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;
@@ -2522,13 +2700,6 @@
materialVoucher.UNAME = po.UNAME;
db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
}
- //MaterialVoucher materialVoucher = new MaterialVoucher();
- //materialVoucher.S_NO = po.S_NO;
- //materialVoucher.S_TYPE = po.S_OUT_TYPE;
- //materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZBH;
- //materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
- //materialVoucher.STATUS = 0;
- //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
}
#endregion
@@ -2622,7 +2793,7 @@
ckbitem.DDH = podetail?.S_DDH;
//ckbitem.DDHXM = (podetail?.N_ROW_NO);
ckbitem.WBS = podetail?.S_WBS;
- ckbitem.KCDD = podetail?.S_KCDD;
+ ckbitem.KCDD = podetail?.S_ERP_WH_CODE;
ckbitem.PC = podetail?.S_BATCH_NO;
JHWBackDto.ITEM1 listitem1 = new JHWBackDto.ITEM1();
//string[] xlhValues = item.S_SERIAL_NO.Split(',');
@@ -2982,7 +3153,7 @@
ckbitem.YLBH = podetail?.S_YLBH;
ckbitem.YLXMH = podetail?.S_YLXMH;
ckbitem.GC = po.S_FACTORY;
- ckbitem.KCDD = podetail?.S_KCDD;
+ ckbitem.KCDD = podetail?.S_ERP_WH_CODE;
CkBcakDto.ITEM1 listitem1 = new CkBcakDto.ITEM1();
//var CntrItemRels = db.Queryable<CntrItemRel>().Where(a => a.S_ITEM_CODE == item.item_code&&a.N_ROW_NO==item.N_ROW_NO).ToList();
@@ -3143,6 +3314,23 @@
#endregion
if (cntr != null)
{
+ #region 瀹㈡埛鎸囧畾瀹瑰櫒琛�+ var cir2 = db.Queryable<CGRels>().Where(a => a.S_CNTR_CODE == cntr.S_CODE && a.S_ITEM_CODE == item.item_code ).First();
+
+ if (cir2 != null)
+ {
+ cir2.S_CNTR_TYPE = S_CNTR_TYPE;
+ db.Updateable(cir2).UpdateColumns(it => new { it.S_CNTR_TYPE }).ExecuteCommand();
+ }
+ else
+ {
+ //2.鎻掑叆鏂扮殑瀹瑰櫒鐗╂枡淇℃伅锛堝鍣ㄥ彿涓嶅彉S_SERIAL_NO = item.S_SERIAL_NO,锛�+ cir2 = new CGRels { S_CNTR_TYPE = S_CNTR_TYPE, S_CNTR_CODE = cntr.S_CODE.Trim(), N_BS_ROW_NO = item.N_ROW_NO, S_ITEM_CODE = item.item_code };
+ db.Insertable<CGRels>(cir2).ExecuteCommand();
+ }
+ #endregion
+
+
#region 1.鏌ョ湅鏄惁鏈夌浉鍚岀墿鏂欐壒娆＄殑淇℃伅锛屽鏋滄湁瑕佺疮鍔狅紝涓嶅悓鎵规鐨勫彲浠ュ垎寮� var cir = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr.S_CODE && a.S_ITEM_CODE == item.item_code && a.S_BATCH_NO == item.S_BATCH_NO && a.N_BS_ROW_NO == item.N_ROW_NO && a.S_BS_NO == item.arrival_no).First();
if (cir != null)
@@ -3252,7 +3440,7 @@
S_DO_NO = itemscddll.LLDH,
S_AREA_CODE = "HJQ",
N_ROW_NO = "",
- S_ITEM_CODE = a.WLBM,
+ S_ITEM_CODE = a.ZJBM,
S_ITEM_NAME = "",
F_QTY = a.XQSL,
S_ZJBM = a.ZJBM,
@@ -3354,7 +3542,7 @@
db.BeginTran();
foreach (var itemscddll in model.ROOT.SCDDLL)
{
- var wlbmList = itemscddll.ITEM.Select(x => x.WLBM).Distinct().ToList();
+ var wlbmList = itemscddll.ITEM.Select(x => x.ZJBM).Distinct().ToList();
var itemlist = db.Queryable<TN_Material>()
.Where(it => wlbmList.Contains(it.S_ITEM_CODE)) // 浣跨敤 IN 鏌ヨ
.ToList();
@@ -3377,13 +3565,13 @@
{
foreach (var a in itemscddll.ITEM)
{
- var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
+ var item = itemlist.Where(it => it.S_ITEM_CODE == a.ZJBM).FirstOrDefault();
if (item == null)
{
lLDReturnRoots.GC = itemscddll.GC;
lLDReturnRoots.LLDH = itemscddll.LLDH;
lLDReturnRoots.MSGCODE = 1;
- lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
+ lLDReturnRoots.MSGDESP = $"鐗╂枡{a.ZJBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
continue;
@@ -3393,7 +3581,7 @@
S_DO_NO = itemscddll.LLDH,
S_AREA_CODE = "HJQ",
N_ROW_NO = "",
- S_ITEM_CODE = a.WLBM,
+ S_ITEM_CODE = a.ZJBM,
S_ITEM_NAME = item?.S_ITEM_NAME,
F_QTY = a.XQSL,
S_ZJBM = a.ZJBM,
@@ -3401,6 +3589,7 @@
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,
@@ -3468,21 +3657,21 @@
lLDReturnRoots.GC = itemscddll.GC;
lLDReturnRoots.LLDH = itemscddll.LLDH;
lLDReturnRoots.MSGCODE = 1;
- lLDReturnRoots.MSGDESP = $"鎵ц涓鏂欏崟锛岀墿鏂檣a.WLBM}鐗╂枡涓嶅厑璁稿垹闄�;
+ lLDReturnRoots.MSGDESP = $"鎵ц涓鏂欏崟锛岀墿鏂檣a.ZJBM}鐗╂枡涓嶅厑璁稿垹闄�;
iTEMs.Add(lLDReturnRoots);
continue;
}
- var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
+ var po1 = po.Details.Where(s => a.ZJBM == s.S_ITEM_CODE).ToList();
if (po1.Count() == 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
{
- var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
+ var item = itemlist.Where(it => it.S_ITEM_CODE == a.ZJBM).FirstOrDefault();
if (item == null)
{
;
lLDReturnRoots.GC = itemscddll.GC;
lLDReturnRoots.LLDH = itemscddll.LLDH;
lLDReturnRoots.MSGCODE = 1;
- lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
+ lLDReturnRoots.MSGDESP = $"鐗╂枡{a.ZJBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
continue;
}
@@ -3491,7 +3680,7 @@
S_DO_NO = itemscddll.LLDH,
S_AREA_CODE = "HJQ",
N_ROW_NO = "",
- S_ITEM_CODE = a.WLBM,
+ S_ITEM_CODE = a.ZJBM,
S_ITEM_NAME = item.S_ITEM_NAME,
F_QTY = a.XQSL,
S_ZJBM = a.ZJBM,
@@ -3524,7 +3713,7 @@
lLDReturnRoots.GC = itemscddll.GC;
lLDReturnRoots.LLDH = itemscddll.LLDH;
lLDReturnRoots.MSGCODE = 1;
- lLDReturnRoots.MSGDESP = $"鏇存柊澶辫触锛屾洿鏂版暟閲忓繀椤诲ぇ浜庡綋鍓嶇墿鏂欐暟閲弡a.WLBM}";
+ lLDReturnRoots.MSGDESP = $"鏇存柊澶辫触锛屾洿鏂版暟閲忓繀椤诲ぇ浜庡綋鍓嶇墿鏂欐暟閲弡a.ZJBM}";
iTEMs.Add(lLDReturnRoots);
continue;
}
@@ -3538,40 +3727,40 @@
{
if (a.LLDSCBS == "Y")//濡傛灉鏄垹闄ゆ爣璇嗗垯鍒犻櫎褰撳墠鎵�睘鍑哄簱鍗曟槑缁�涓嶆槸鍒犻櫎鏍囪 鍒欒繘琛屽鏀瑰垽鏂� {
- var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).FirstOrDefault();
+ var po1 = po.Details.Where(s => a.ZJBM == s.S_ITEM_CODE).FirstOrDefault();
if (po1 != null) //鏃犲垯鏂板鐗╂枡鏄庣粏
{
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();
+ // db.Deleteable<TN_Ll_detail>().Where(it => it.S_ITEM_CODE == a.ZJBM && it.S_DO_NO == po1.First().S_DO_NO).ExecuteCommand();
}
else
{
//result.code = 1;
- //result.msg = $"鐗╂枡{a.WLBM}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎";
- //throw new Exception($"鐗╂枡{a.WLBM}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎");
+ //result.msg = $"鐗╂枡{a.ZJBM}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎";
+ //throw new Exception($"鐗╂枡{a.ZJBM}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎");
lLDReturnRoots.GC = itemscddll.GC;
lLDReturnRoots.LLDH = itemscddll.LLDH;
lLDReturnRoots.MSGCODE = 1;
- lLDReturnRoots.MSGDESP = $"鍒犻櫎鐨勭墿鏂檣a.WLBM}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎";
+ lLDReturnRoots.MSGDESP = $"鍒犻櫎鐨勭墿鏂檣a.ZJBM}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎";
iTEMs.Add(lLDReturnRoots);
continue;
}
}
else
{
- var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
+ var po1 = po.Details.Where(s => a.ZJBM == s.S_ITEM_CODE).ToList();
if (po1.Count() == 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
{
- var item = itemlist.Where(it => it.S_ITEM_CODE == a.WLBM).FirstOrDefault();
+ var item = itemlist.Where(it => it.S_ITEM_CODE == a.ZJBM).FirstOrDefault();
if (item == null)
{
//result.code = 1;
- //result.msg = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
- //throw new Exception($"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�);
+ //result.msg = $"鐗╂枡{a.ZJBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
+ //throw new Exception($"鐗╂枡{a.ZJBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�);
lLDReturnRoots.GC = itemscddll.GC;
lLDReturnRoots.LLDH = itemscddll.LLDH;
lLDReturnRoots.MSGCODE = 1;
- lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
+ lLDReturnRoots.MSGDESP = $"鐗╂枡{a.ZJBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
continue;
}
@@ -3580,7 +3769,7 @@
S_DO_NO = itemscddll.LLDH,
S_AREA_CODE = "HJQ",
N_ROW_NO = "",
- S_ITEM_CODE = a.WLBM,
+ S_ITEM_CODE = a.ZJBM,
S_ITEM_NAME = item.S_ITEM_NAME,
F_QTY = a.XQSL,
S_ZJBM = a.ZJBM,
@@ -3712,9 +3901,44 @@
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(); ;
-
+ var itemfirs = db.Queryable<CntrItemRel>().Where(s => list.Contains(s.S_ITEM_CODE)).ToList() ;
+ var Sitemlist = itemfirs.Select(s => s.S_ITEM_CODE).ToArray().Select(x => x.Trim()).ToArray();
+
+
+
+ #region list闆嗗悎鏁伴噺
+ var extractedArrays = itemfirs.Select(s => new CustomItem
+ {
+ SITEMCODE = s.S_ITEM_CODE?.Trim() ?? string.Empty,
+ FQTY = s.F_QTY,
+ FALLOCQTY = s.F_ALLOC_QTY
+ }).ToList();
+
+ var extractedArray = extractedArrays
+ .GroupBy(x => x.SITEMCODE)
+ .Select(g => new CustomItem
+ {
+ SITEMCODE = g.Key,
+ FQTY = g.Sum(x => x.FQTY),
+ FALLOCQTY = g.Sum(x => x.FALLOCQTY)
+ })
+ .ToList();
+
+ var cklist= db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.N_B_STATE==0).ToList();
+ foreach (var ckdetail in cklist)
+ {
+ foreach (var item in itemfirs)
+ {
+ var itemfi = ckdetail.Details.Where(s => s.S_ITEM_CODE == item.S_ITEM_CODE).FirstOrDefault();
+ if (itemfi!=null)
+ {
+ var extractedArrayone = extractedArray.Where(s => s.SITEMCODE == item.S_ITEM_CODE).FirstOrDefault();
+ extractedArrayone.FQTY = (float)(extractedArrayone.FQTY - itemfi.F_QTY);
+ }
+ }
+ }
+ #endregion
+
po.Details = po.Details.Where(s => Sitemlist.Contains(s.S_ITEM_CODE)).ToList();
if (po.Details.Count() > 0)
{
@@ -3723,37 +3947,54 @@
{
if (a.F_QTY > a.F_ACC_D_QTY)
{
- po1.Details.Add(new TN_Outbound_Detail
- {
- S_DO_NO = po1.S_NO,
- S_AREA_CODE = "HJQ",
- N_ROW_NO = a.N_ROW_NO,
- S_KCDD = a.S_KCDD,
- S_ITEM_CODE = a.S_ITEM_CODE,
- S_ITEM_NAME = a.S_ITEM_NAME,
- S_UOM = a.S_UOM,
- F_QTY = a.F_QTY - a.F_ACC_D_QTY,
- S_BATCH_NO = a.S_BATCH_NO,
- S_SERIAL_NO = a.S_SERIAL_NO,
- S_CGPZH = a.S_CGPZH,
- S_ZJBM = a.S_ZJBM,
- S_YLBH = a.S_YLBH,
- S_ZJWLTH = a.S_ZJWLTH,
- S_ZJWLMS = a.S_ZJWLMS,
- S_ZHFHBS = a.S_ZHFHBS,
- S_CJRQ = a.S_CJRQ,
- S_LLDSCBS = a.S_LLDSCBS,
- S_SCGLY = a.S_SCGLY,
- S_GXH = a.S_GXH,
- S_XQRQ = a.S_XQRQ,
- S_YLXMH = a.S_YLXMH,
- S_CGPZXMBH = a.S_CGPZXMBH,
- S_ERP_WH_CODE = a.S_ERP_WH_CODE,
- N_ITEM_STATE = a.N_ITEM_STATE
- });
- double difference = a.F_QTY - a.F_ACC_D_QTY;
- a.F_ACC_D_QTY += difference;
- tN_Ll_Details.Add(a);
+ var ones = extractedArray.Where(s => s.SITEMCODE == a.S_ITEM_CODE).FirstOrDefault();
+ ///搴撳瓨鏁伴噺
+ ones.FQTY = ones.FQTY - ones.FALLOCQTY;
+ ///鍑哄簱鏁伴噺
+ double shul = a.F_QTY - a.F_ACC_D_QTY;
+ if (ones.FQTY !=0) {
+ if (ones.FQTY - shul>=0)
+ {
+ ones.FQTY = (float)(ones.FQTY - shul);
+ }
+ else
+ {
+ shul = ones.FQTY;
+ ones.FQTY = 0;
+ }
+ po1.Details.Add(new TN_Outbound_Detail
+ {
+ S_DO_NO = po1.S_NO,
+ S_AREA_CODE = "HJQ",
+ N_ROW_NO = a.N_ROW_NO,
+ S_KCDD = a.S_KCDD,
+ S_ITEM_CODE = a.S_ITEM_CODE,
+ S_ITEM_NAME = a.S_ITEM_NAME,
+ S_UOM = a.S_UOM,
+ F_QTY = shul,
+ S_BATCH_NO = a.S_BATCH_NO,
+ S_SERIAL_NO = a.S_SERIAL_NO,
+ S_CGPZH = a.S_CGPZH,
+ S_ZJBM = a.S_ZJBM,
+ S_YLBH = a.S_YLBH,
+ S_ZJWLTH = a.S_ZJWLTH,
+ S_ZJWLMS = a.S_ZJWLMS,
+ S_ZHFHBS = a.S_ZHFHBS,
+ S_CJRQ = a.S_CJRQ,
+ S_LLDSCBS = a.S_LLDSCBS,
+ S_SCGLY = a.S_SCGLY,
+ S_GXH = a.S_GXH,
+ S_XQRQ = a.S_XQRQ,
+ S_YLXMH = a.S_YLXMH,
+ S_CGPZXMBH = a.S_CGPZXMBH,
+ S_ERP_WH_CODE = a.S_ERP_WH_CODE,
+ N_ITEM_STATE = a.N_ITEM_STATE
+ });
+ double difference = shul;
+ a.F_ACC_D_QTY += difference;
+ tN_Ll_Details.Add(a);
+
+ }
}
else
{
@@ -3763,7 +4004,6 @@
}
}
-
db.Updateable(tN_Ll_Details).UpdateColumns(it => new { it.F_ACC_D_QTY }).ExecuteCommand();
if (po1.Details.Count() > 0)
@@ -4220,7 +4460,7 @@
List<TN_Inbound_Detail> tN_Inbound_Details = new List<TN_Inbound_Detail>();
po.Details = po.Details.Where(d => model.Wlist.Any(w =>
w.S_ITEM_CODE == d.S_ITEM_CODE &&
- w.N_ROW_NO == d.N_ROW_NO))
+ w.N_ROW_NO == d.N_ROW_NO)).OrderBy(s => s.N_ROW_NO)
.ToList();
if (po.S_IN_TYPE == "鍐呴噰鍏ュ簱")
{
@@ -4260,6 +4500,13 @@
tN_Inbound_Details.Add(item);
}
+ string combinedIds= string.Join(",", po.Details.Select(x => x.N_ROW_NO));
+ var KEY = WCSHelper.Generate13DigitIds();
+ var s_key= db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO&&a.N_ROW_NO == combinedIds).First();
+ if (s_key!=null)
+ {
+ KEY = s_key.S_KEY;
+ }
NcRkDto.Root roots = new NcRkDto.Root
{
ROOT = new NcRkDto.ROOT
@@ -4269,9 +4516,9 @@
HEAD = new NcRkDto.HEAD
{
- KEY = po.S_NO,
+ KEY = KEY,
GZRQ = DateTime.Now.ToString("yyyyMMdd"),
- GZRY = model.GZRY,
+ GZRY = model.GZRY,//GenerateTaskNo
WLPZBH = po.S_NO,
WLPZND = po.S_WLPZND
},
@@ -4286,8 +4533,7 @@
var json = JsonConvert.SerializeObject(roots.ROOT);
string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
- // 鐜板湪 root 瀵硅薄鍖呭惈浜嗘偍瀹氫箟鐨勫亣鏁版嵁
- // 鍙戦�POST璇锋眰
+
LogHelper.Info($"鍐呴噰鏀惰揣xml鏁版嵁{xml}");
#region MyRegion
@@ -4345,15 +4591,9 @@
//娣诲姞鍑瘉璁板綍琛� result.resultMsg = data.ROOT.ITEM.MSGDESP;
result.resultCode = data.ROOT.ITEM.MSGCODE;
- //MaterialVoucher materialVoucher = new MaterialVoucher();
if (data.ROOT.ITEM.MSGCODE == 0)
{
- //materialVoucher.S_NO = model.S_NO;
- //materialVoucher.S_TYPE = po.S_IN_TYPE;
- //materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
- //materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
- //materialVoucher.STATUS = 0;
- //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+
List<MaterialVoucher> materials = new List<MaterialVoucher>();
foreach (var item in model.Wlist)
{
@@ -4374,6 +4614,16 @@
db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
}
}
+ else
+ {
+
+ TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
+ tN_InBounder_Sh.S_KEY = KEY;
+ tN_InBounder_Sh.N_ROW_NO = combinedIds;
+ tN_InBounder_Sh.S_NO = po.S_NO;
+ db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();
+
+ }
}
@@ -4392,13 +4642,20 @@
PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");
}
+ string combinedIds = string.Join(",", po.Details.Select(x => x.N_ROW_NO));
+ var KEY = WCSHelper.Generate13DigitIds();
+ var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).ToList().FirstOrDefault();
+ if (s_key != null)
+ {
+ KEY = s_key.S_KEY;
+ }
JHWBackDto.Root myRoot = new JHWBackDto.Root
{
ROOT = new JHWBackDto.ROOT
{
HEAD = new JHWBackDto.HEAD
{
- KEY = po.S_NO,
+ KEY = KEY,
GZRQ = GZRQ,
PZZDRQ = PZZDRQ,
YHM = po.UNAME,
@@ -4413,6 +4670,7 @@
}
};
+
//鍥炲弬鐗╂枡淇℃伅
List<JHWBackDto.ITEM> iTEMs = new List<JHWBackDto.ITEM>();
foreach (var item in po.Details)
@@ -4523,6 +4781,17 @@
db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
}
}
+ else
+ {
+
+ TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
+ tN_InBounder_Sh.S_KEY = KEY;
+ tN_InBounder_Sh.N_ROW_NO = combinedIds;
+ tN_InBounder_Sh.S_NO = po.S_NO;
+ db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();
+
+ }
+
#endregion
}
@@ -4564,6 +4833,13 @@
tN_Inbound_Details.Add(item);
}
+ string combinedIds = string.Join(",", po.Details.Select(x => x.N_ROW_NO));
+ var KEY = WCSHelper.Generate13DigitIds();
+ var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).First();
+ if (s_key != null)
+ {
+ KEY = s_key.S_KEY;
+ }
WcRkBc.Root roots = new WcRkBc.Root
{
ROOT = new WcRkBc.ROOT
@@ -4572,7 +4848,7 @@
{
HEAD = new WcRkBc.HEAD
{
- KEY = po.S_NO,
+ KEY = KEY,
GZRQ = DateTime.Now.ToString("yyyyMMdd"),
GZRY = model.GZRY,
GC = po.S_FACTORY
@@ -4669,6 +4945,16 @@
}
}
+ else
+ {
+
+ TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
+ tN_InBounder_Sh.S_KEY = KEY;
+ tN_InBounder_Sh.N_ROW_NO = combinedIds;
+ tN_InBounder_Sh.S_NO = po.S_NO;
+ db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();
+
+ }
}
--
Gitblit v1.9.1