From 1db2dcbec358ed43724e8621d7d99981ba4c1ad2 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期五, 30 五月 2025 17:00:22 +0800
Subject: [PATCH] 1.其他出入库返回参数优化 2.生产订单接收返回参数修改 3.空托出入库逻辑修改（可以选择半托的托盘进行入库）
---
api/WmsSpaHelper.cs | 2659 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 1,686 insertions(+), 973 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index 6a2b796..a884e93 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -30,10 +30,11 @@
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;
namespace HH.WCS.Mobox3.pinggao.api
{
@@ -44,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>
@@ -381,210 +410,113 @@
//else
//{
//鍒ゆ柇鍐查攢鍑瘉缂栧彿 鏄惁涓虹┖ 濡傛灉涓虹┖ 鍒欎负鍐查攢(瀹℃牳鍓嶆墠鑳藉啿閿�紝闈炲緟鎵ц鐘舵�鎻愮ず鎵ц涓笉鍙啿閿� 涓嶄负绌�鍒欎负澶栭噰鍏ュ簱
-
- if ((items.ITEM.Where(s => s.CXPZH != null && s.CXPZH != "").Count() > 0))
+ if (items.HEAD.YDLX != "124")
{
- //鍒ゆ柇鍐查攢鐗╂枡鏄惁涓哄悓涓�釜鍏ュ簱鍗�- if (items.ITEM.Select(s => s.CXPZH).Distinct().Count() > 1)
+ if ((items.ITEM.Where(s => s.CXPZH != null && s.CXPZH != "").Count() > 0))
{
- result.WLPZBH = items.HEAD.WLPZH;
- result.WLPZND = items.HEAD.WLPZND;
- result.resultCode = 1;
- result.resultMsg = "鍐查攢鐗╂枡涓嶅睘浜庡悓涓�鍗�;
- result.resultMsg = "澶辫触";
- simpleResults.Add(result);
- continue;
- }
- //鍐查攢鍑瘉鍗曞彿
- var cxpzbh = items.ITEM[0].CXPZH;
- var po = WMSHelper.GetInboundOrder(cxpzbh);
- //鍒ゆ柇鏄惁鎵ц 鎵ц涓鍗曞厑璁稿啿閿�- if (po == null)
- {
- result.resultMsg = "澶辫触";
- result.WLPZBH = items.HEAD.WLPZH;
- result.WLPZND = items.HEAD.WLPZND;
- result.resultCode = 1;
- result.resultMsg = "鏈壘鍒版璁㈠崟";
- simpleResults.Add(result);
- continue;
- }
- if (po.N_B_STATE != 0 && po.N_B_STATE != 7)
- {
- result.resultMsg = "澶辫触";
- result.WLPZBH = items.HEAD.WLPZH;
- result.resultCode = 1;
- result.WLPZND = items.HEAD.WLPZND;
- result.resultMsg = "鎵ц涓鍗曚笉鍏佽鎿嶄綔";
- simpleResults.Add(result);
- continue;
- }
- foreach (var item in items.ITEM)
- {
- ///鍒ゆ柇鏄惁閮芥湁鍐查攢鍑瘉缂栧彿
- if (string.IsNullOrEmpty(item.CXPZH))
+ //鍒ゆ柇鍐查攢鐗╂枡鏄惁涓哄悓涓�釜鍏ュ簱鍗�+ if (items.ITEM.Select(s => s.CXPZH).Distinct().Count() > 1)
+ {
+ result.WLPZBH = items.HEAD.WLPZH;
+ result.WLPZND = items.HEAD.WLPZND;
+ result.resultCode = 1;
+ result.resultMsg = "鍐查攢鐗╂枡涓嶅睘浜庡悓涓�鍗�;
+ result.resultMsg = "澶辫触";
+ simpleResults.Add(result);
+ continue;
+ }
+ //鍐查攢鍑瘉鍗曞彿
+ var cxpzbh = items.ITEM[0].CXPZH;
+ var po = WMSHelper.GetInboundOrder(cxpzbh);
+ //鍒ゆ柇鏄惁鎵ц 鎵ц涓鍗曞厑璁稿啿閿�+ if (po == null)
+ {
+ result.resultMsg = "澶辫触";
+ result.WLPZBH = items.HEAD.WLPZH;
+ result.WLPZND = items.HEAD.WLPZND;
+ result.resultCode = 1;
+ result.resultMsg = "鏈壘鍒版璁㈠崟";
+ simpleResults.Add(result);
+ continue;
+ }
+ if (po.N_B_STATE != 0 && po.N_B_STATE != 7)
{
result.resultMsg = "澶辫触";
result.WLPZBH = items.HEAD.WLPZH;
result.resultCode = 1;
result.WLPZND = items.HEAD.WLPZND;
- result.resultMsg = "鍐查攢鍗曟湁鐗╂枡鍐查攢缂栧彿涓虹┖";
+ result.resultMsg = "鎵ц涓鍗曚笉鍏佽鎿嶄綔";
simpleResults.Add(result);
continue;
}
- var rkdmx = po.Details.Where(s => s.S_ITEM_CODE == item.WLBM).ToList();
- if (rkdmx.Where(s => s.F_QTY < item.SL).Count() > 0)//鏁伴噺澶т簬鏄庣粏
+ foreach (var item in items.ITEM)
{
- result.resultMsg = "澶辫触";
- result.WLPZBH = items.HEAD.WLPZH;
- result.WLPZND = items.HEAD.WLPZND;
- result.resultMsg = $"鍐查攢鐗╂枡{item.WLBM}鏁伴噺{item.SL}澶т簬瀛樺叆鏁伴噺";
- simpleResults.Add(result);
- continue;
- }
- else if (rkdmx.Where(s => s.F_QTY == item.SL).Count() == 1)//鏁伴噺==鏄庣粏 鍒犻櫎褰撲笅鍏ュ簱鍗曠墿鏂欐暟鎹�- {
- db.Deleteable<TN_Inbound_Detail>().Where(it => it.S_ITEM_CODE == item.WLBM && it.S_IO_NO == cxpzbh).ExecuteCommand();
- }
- else if (rkdmx.Where(s => s.F_QTY > item.SL).Count() > 0)//鏁伴噺灏忎簬鏄庣粏
- {
- //褰撳墠鐗╂枡鏄庣粏
- var rkd = rkdmx.Where(s => s.F_QTY > item.SL).FirstOrDefault();
- rkd.F_QTY = rkd.F_QTY - item.SL;
- db.Updateable(rkd).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
- }
- var po1 = db.Queryable<TN_Inbound_Order>().Includes(a => a.Details).Where(a => a.S_NO == cxpzbh).First();
- int ssss = po1.Details.Count();
- if (po1.Details.Count() == 0)
- {
- po1.N_B_STATE = 7;
- db.Updateable(po1).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
- }
- }
- db.CommitTran();
- }
- else if ( items.HEAD.YDLX == "124")
- {
-
- //鍐查攢鍑瘉鍗曞彿
- var cxpzbh = items.HEAD.WLPZH;
- var po = WMSHelper.GetInboundOrder(cxpzbh);
- //鍒ゆ柇鏄惁鎵ц 鎵ц涓鍗曞厑璁稿啿閿�- if (po == null)
- {
- result.resultMsg = "澶辫触";
- result.WLPZBH = items.HEAD.WLPZH;
- result.WLPZND = items.HEAD.WLPZND;
- result.resultCode = 1;
- result.resultMsg = "鏈壘鍒版璁㈠崟";
- simpleResults.Add(result);
- continue;
- }
- if (po.N_B_STATE != 0 && po.N_B_STATE != 7)
- {
- result.resultMsg = "澶辫触";
- result.WLPZBH = items.HEAD.WLPZH;
- result.resultCode = 1;
- result.WLPZND = items.HEAD.WLPZND;
- result.resultMsg = "鎵ц涓鍗曚笉鍏佽鎿嶄綔";
- simpleResults.Add(result);
- continue;
- }
- foreach (var item in items.ITEM)
- {
- var rkdmx = po.Details.Where(s => s.S_ITEM_CODE == item.WLBM).ToList();
- if (rkdmx.Where(s => s.F_QTY < item.SL).Count() > 0)//鏁伴噺澶т簬鏄庣粏
- {
- result.resultMsg = "澶辫触";
- result.WLPZBH = items.HEAD.WLPZH;
- result.WLPZND = items.HEAD.WLPZND;
- result.resultMsg = $"閫�揣鐗╂枡{item.WLBM}鏁伴噺{item.SL}澶т簬瀛樺叆鏁伴噺";
- simpleResults.Add(result);
- continue;
- }
- else if (rkdmx.Where(s => s.F_QTY == item.SL).Count() == 1)//鏁伴噺==鏄庣粏 鍒犻櫎褰撲笅鍏ュ簱鍗曠墿鏂欐暟鎹�- {
- db.Deleteable<TN_Inbound_Detail>().Where(it => it.S_ITEM_CODE == item.WLBM && it.S_IO_NO == cxpzbh).ExecuteCommand();
- }
- else if (rkdmx.Where(s => s.F_QTY > item.SL).Count() > 0)//鏁伴噺灏忎簬鏄庣粏
- {
- //褰撳墠鐗╂枡鏄庣粏
- var rkd = rkdmx.Where(s => s.F_QTY > item.SL).FirstOrDefault();
- rkd.F_QTY = rkd.F_QTY - item.SL;
- db.Updateable(rkd).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
- }
- var po1 = db.Queryable<TN_Inbound_Order>().Includes(a => a.Details).Where(a => a.S_NO == cxpzbh).First();
- int ssss = po1.Details.Count();
- if (po1.Details.Count() == 0)
- {
- po1.N_B_STATE = 7;
- db.Updateable(po1).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
- }
- }
- db.CommitTran();
- }
- else
- {
- //鍒涘缓鍏ュ簱鍗曚富瀛愯〃
- var po = WMSHelper.GetInboundOrder(items.HEAD.WLPZH);
- if (po == null)
- {
- po = new TN_Inbound_Order { S_NO = items.HEAD.WLPZH, S_WLPZND = items.HEAD.WLPZND, S_FACTORY = items.HEAD.GC, S_IN_TYPE = "澶栭噰鍏ュ簱", S_BS_TYPE = items.HEAD.YDLX };
- po.Details = new List<TN_Inbound_Detail>();
- if (items.ITEM.Count > 0)
- {
- items.ITEM.ForEach(a =>
+ //bool v= MaterPanduan(item.WLBM, item.SL);
+ // if (!v)
+ // {
+ // result.resultMsg = "澶辫触";
+ // result.WLPZBH = items.HEAD.WLPZH;
+ // result.resultCode = 1;
+ // result.WLPZND = items.HEAD.WLPZND;
+ // result.resultMsg = $"鐗╂枡{item.WLBM}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
+ // simpleResults.Add(result);
+ // continue;
+ // }
+ ///鍒ゆ柇鏄惁閮芥湁鍐查攢鍑瘉缂栧彿
+ if (string.IsNullOrEmpty(item.CXPZH))
{
- po.Details.Add(new TN_Inbound_Detail
- {
- S_IO_NO = items.HEAD.WLPZH,
- N_ROW_NO = a.WLPZHXM,
- S_ITEM_CODE = a.WLBM,
- F_QTY = a.SL,
- S_ITEM_STATE = "鐗╂枡",
- S_ITEM_NAME = "鐗╂枡",
- F_ACC_B_QTY = 0,
- S_KCDD = a.KCDD,
- S_UOM = a.DW,//璁￠噺鍗曚綅
- //S_SERIAL_NO = string.Join(",", a.ITEM1.Select(item => item.XLH)),
- S_BATCH_NO = a.PC == null ? "" : a.PC,
- S_CGPZH = a.CGPZH,
- S_CGPZXMBH = a.CGPZXMBH,
- S_CKPZKJND = a.CKPZKJND,
- S_CKPZXM = a.CKPZHXM,
- S_CXWLPZBH = a.CKPZH,
- S_HWSJJYZT = a.HWSJJYZT,
- S_GYSZHH = a.GYSZHH,
- S_JYPBH = a.JYPBH,
- S_KJPZSSRQ = a.KJPZSSRQ,
- S_KJPZSRSJ = a.KJPZSRSJ,
- });
- //}
-
- });
- db.Insertable<TN_Inbound_Order>(po).ExecuteCommand();
- db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand();
- db.CommitTran();
-
+ result.resultMsg = "澶辫触";
+ result.WLPZBH = items.HEAD.WLPZH;
+ result.resultCode = 1;
+ result.WLPZND = items.HEAD.WLPZND;
+ result.resultMsg = "鍐查攢鍗曟湁鐗╂枡鍐查攢缂栧彿涓虹┖";
+ simpleResults.Add(result);
+ continue;
+ }
+ var rkdmx = po.Details.Where(s => s.S_ITEM_CODE == item.WLBM).ToList();
+ if (rkdmx.Where(s => s.F_QTY < item.SL).Count() > 0)//鏁伴噺澶т簬鏄庣粏
+ {
+ result.resultMsg = "澶辫触";
+ result.WLPZBH = items.HEAD.WLPZH;
+ result.WLPZND = items.HEAD.WLPZND;
+ result.resultMsg = $"鍐查攢鐗╂枡{item.WLBM}鏁伴噺{item.SL}澶т簬瀛樺叆鏁伴噺";
+ simpleResults.Add(result);
+ continue;
+ }
+ else if (rkdmx.Where(s => s.F_QTY == item.SL).Count() == 1)//鏁伴噺==鏄庣粏 鍒犻櫎褰撲笅鍏ュ簱鍗曠墿鏂欐暟鎹�+ {
+ db.Deleteable<TN_Inbound_Detail>().Where(it => it.S_ITEM_CODE == item.WLBM && it.S_IO_NO == cxpzbh).ExecuteCommand();
+ }
+ else if (rkdmx.Where(s => s.F_QTY > item.SL).Count() > 0)//鏁伴噺灏忎簬鏄庣粏
+ {
+ //褰撳墠鐗╂枡鏄庣粏
+ var rkd = rkdmx.Where(s => s.F_QTY > item.SL).FirstOrDefault();
+ rkd.F_QTY = rkd.F_QTY - item.SL;
+ db.Updateable(rkd).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+ }
+ var po1 = db.Queryable<TN_Inbound_Order>().Includes(a => a.Details).Where(a => a.S_NO == cxpzbh).First();
+ int ssss = po1.Details.Count();
+ if (po1.Details.Count() == 0)
+ {
+ po1.N_B_STATE = 7;
+ db.Updateable(po1).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
+ }
}
}
+
else
{
- var Details = new List<TN_Inbound_Detail>();
- if (items.ITEM.Count > 0)
+ //鍒涘缓鍏ュ簱鍗曚富瀛愯〃
+ var po = WMSHelper.GetInboundOrder(items.HEAD.WLPZH);
+ if (po == null)
{
- items.ITEM.ForEach(a =>
+ po = new TN_Inbound_Order { S_NO = items.HEAD.WLPZH, S_WLPZND = items.HEAD.WLPZND, S_FACTORY = items.HEAD.GC, S_IN_TYPE = "澶栭噰鍏ュ簱", S_BS_TYPE = items.HEAD.YDLX };
+ po.Details = new List<TN_Inbound_Detail>();
+ if (items.ITEM.Count > 0)
{
- if (po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).Count() > 0)
+ items.ITEM.ForEach(a =>
{
- var poq = po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).FirstOrDefault();
- poq.F_QTY = a.SL;
-
- db.Updateable(poq).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
- }
- else
- {
- Details.Add(new TN_Inbound_Detail
+ po.Details.Add(new TN_Inbound_Detail
{
S_IO_NO = items.HEAD.WLPZH,
N_ROW_NO = a.WLPZHXM,
@@ -595,7 +527,6 @@
F_ACC_B_QTY = 0,
S_KCDD = a.KCDD,
S_UOM = a.DW,//璁￠噺鍗曚綅
- //S_UOM = a.JBJLDW,//璁￠噺鍗曚綅
//S_SERIAL_NO = string.Join(",", a.ITEM1.Select(item => item.XLH)),
S_BATCH_NO = a.PC == null ? "" : a.PC,
S_CGPZH = a.CGPZH,
@@ -609,32 +540,144 @@
S_KJPZSSRQ = a.KJPZSSRQ,
S_KJPZSRSJ = a.KJPZSRSJ,
});
- }
+ //}
- });
- db.Insertable<TN_Inbound_Detail>(Details).ExecuteCommand();
- db.CommitTran();
+ });
+ db.Insertable<TN_Inbound_Order>(po).ExecuteCommand();
+ db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand();
+
+ }
}
- //result.resultMsg = "鎴愬姛";
- //result.WLPZBH = items.HEAD.WLPZH;
- //result.WLPZND = items.HEAD.WLPZND;
- //result.resultCode = 0;
- //result.resultMsg = "";
- //simpleResults.Add(result);
- //continue;
+ else
+ {
+ var Details = new List<TN_Inbound_Detail>();
+ if (items.ITEM.Count > 0)
+ {
+ items.ITEM.ForEach(a =>
+ {
+ if (po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).Count() > 0)
+ {
+ var poq = po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).FirstOrDefault();
+ poq.F_QTY = a.SL;
+
+ db.Updateable(poq).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+ }
+ else
+ {
+ Details.Add(new TN_Inbound_Detail
+ {
+ S_IO_NO = items.HEAD.WLPZH,
+ N_ROW_NO = a.WLPZHXM,
+ S_ITEM_CODE = a.WLBM,
+ F_QTY = a.SL,
+ S_ITEM_STATE = "鐗╂枡",
+ S_ITEM_NAME = "鐗╂枡",
+ F_ACC_B_QTY = 0,
+ S_KCDD = a.KCDD,
+ S_UOM = a.DW,//璁￠噺鍗曚綅
+ //S_UOM = a.JBJLDW,//璁￠噺鍗曚綅
+ //S_SERIAL_NO = string.Join(",", a.ITEM1.Select(item => item.XLH)),
+ S_BATCH_NO = a.PC == null ? "" : a.PC,
+ S_CGPZH = a.CGPZH,
+ S_CGPZXMBH = a.CGPZXMBH,
+ S_CKPZKJND = a.CKPZKJND,
+ S_CKPZXM = a.CKPZHXM,
+ S_CXWLPZBH = a.CKPZH,
+ S_HWSJJYZT = a.HWSJJYZT,
+ S_GYSZHH = a.GYSZHH,
+ S_JYPBH = a.JYPBH,
+ S_KJPZSSRQ = a.KJPZSSRQ,
+ S_KJPZSRSJ = a.KJPZSRSJ,
+ });
+ }
+
+ });
+ db.Insertable<TN_Inbound_Detail>(Details).ExecuteCommand();
+
+
+ }
+ //result.resultMsg = "鎴愬姛";
+ //result.WLPZBH = items.HEAD.WLPZH;
+ //result.WLPZND = items.HEAD.WLPZND;
+ //result.resultCode = 0;
+ //result.resultMsg = "";
+ //simpleResults.Add(result);
+ //continue;
+ }
+
}
+ }else
+ {
+ //鍐查攢鍑瘉鍗曞彿
+ foreach (var item1 in items.ITEM)
+ {
+ var cxpzbh = item1.CKPZH;
+ var po = WMSHelper.GetInboundOrder(cxpzbh);
+ //鍒ゆ柇鏄惁鎵ц 鎵ц涓鍗曞厑璁稿啿閿�+ if (po == null)
+ {
+ result.resultMsg = "澶辫触";
+ result.WLPZBH = items.HEAD.WLPZH;
+ result.WLPZND = items.HEAD.WLPZND;
+ result.resultCode = 1;
+ result.resultMsg = "鏈壘鍒版璁㈠崟";
+ simpleResults.Add(result);
+ continue;
+ }
+ if (po.N_B_STATE != 0 && po.N_B_STATE != 7)
+ {
+ result.resultMsg = "澶辫触";
+ result.WLPZBH = items.HEAD.WLPZH;
+ result.resultCode = 1;
+ result.WLPZND = items.HEAD.WLPZND;
+ result.resultMsg = "鎵ц涓鍗曚笉鍏佽鎿嶄綔";
+ simpleResults.Add(result);
+ continue;
+ }
+
+ foreach (var item in items.ITEM)
+ {
+ //s.S_ITEM_CODE == item.WLBM&&
+ var rkdmx = po.Details.Where(s => s.S_CKPZXM == item.CKPZHXM).ToList();
+ if (rkdmx.Where(s => s.F_QTY < item.SL).Count() > 0)//鏁伴噺澶т簬鏄庣粏
+ {
+ result.resultMsg = "澶辫触";
+ result.WLPZBH = items.HEAD.WLPZH;
+ result.WLPZND = items.HEAD.WLPZND;
+ result.resultMsg = $"閫�揣鐗╂枡{item.WLBM}鏁伴噺{item.SL}澶т簬瀛樺叆鏁伴噺";
+ simpleResults.Add(result);
+ continue;
+ }
+ else if (rkdmx.Where(s => s.F_QTY == item.SL).Count() == 1)//鏁伴噺==鏄庣粏 鍒犻櫎褰撲笅鍏ュ簱鍗曠墿鏂欐暟鎹�+ {
+ db.Deleteable<TN_Inbound_Detail>().Where(it => it.S_ITEM_CODE == item.WLBM && it.S_IO_NO == cxpzbh).ExecuteCommand();
+ }
+ else if (rkdmx.Where(s => s.F_QTY > item.SL).Count() > 0)//鏁伴噺灏忎簬鏄庣粏
+ {
+ //褰撳墠鐗╂枡鏄庣粏
+ var rkd = rkdmx.Where(s => s.F_QTY > item.SL).FirstOrDefault();
+ rkd.F_QTY = rkd.F_QTY - item.SL;
+ db.Updateable(rkd).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
+ }
+ var po1 = db.Queryable<TN_Inbound_Order>().Includes(a => a.Details).Where(a => a.S_NO == cxpzbh).First();
+ int ssss = po1.Details.Count();
+ if (po1.Details.Count() == 0)
+ {
+ po1.N_B_STATE = 7;
+ db.Updateable(po1).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
+ }
+ }
+ }
}
-
- //}
-
result.resultMsg = "鎴愬姛";
result.WLPZBH = items.HEAD.WLPZH;
result.WLPZND = items.HEAD.WLPZND;
result.resultCode = 0;
result.resultMsg = "";
+ db.CommitTran();
simpleResults.Add(result);
}
@@ -659,61 +702,70 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- internal static Orderback.Root GYS_In(GYSDto.Root model)
+ internal static GYSReturnRoot.Root GYS_In(GYSDto.Root model)
{
- var orderResponse = new Orderback.Root
+ var orderResponse = new GYSReturnRoot.Root
{
- ROOT = new Orderback.ROOT
+ ROOT = new GYSReturnRoot.ROOT
{
- ITEM = new List<Orderback.ITEM> { }
+ ITEM = new List<GYSReturnRoot.ITEM> { }
}
};
- List<Orderback.ITEM> tEMs = new List<Orderback.ITEM>();
+ List<GYSReturnRoot.ITEM> tEMs = new List<GYSReturnRoot.ITEM>();
var db = new SqlHelper<object>().GetInstance();
try
{
db.BeginTran();
foreach (var item in model.ROOT.GYSXX)
{
- Orderback.ITEM iTEM = new Orderback.ITEM();
+ GYSReturnRoot.ITEM iTEM = new GYSReturnRoot.ITEM();
-
+
//鍒涘缓鍏ュ簱鍗曚富瀛愯〃
- var po = WMSHelper.GetGYSBMOrder(item.JBXX.GYSBM);
- if (po == null)
- {
- po = new TN_Supplier { S_GYSBM= item.JBXX.GYSBM , S_MDMBM = item.JBXX.MDMBM, };
- po.Details = new List<TN_Supplier_detial>();
- if (item.GYSHB.Count > 0)
- {
- item.GYSHB.ForEach(a =>
- {
- po.Details.Add(new TN_Supplier_detial
- {
- S_DO_GYSBM = a.GYSBM,
- S_CGZZ = a.CGZZ,
- S_HB = a.HB,
-
- });
- //}
- });
- db.Insertable<TN_Supplier>(po).ExecuteCommand();
- db.Insertable<TN_Supplier_detial>(po.Details).ExecuteCommand();
- }
- }
- else
+ // 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();
- //iTEM.SCDDH = item.JBXX.GYSBM;
- //iTEM.MSGCODE = "1";
- //iTEM.MSGDESP = $"{item.JBXX.GYSBM}宸插瓨鍦�;
- //tEMs.Add(iTEM);
+
}
- iTEM.SCDDH = item.JBXX.GYSBM;
- iTEM.MSGCODE = "0";
+ 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,
+ S_KHHZH = item.JBXX.KHHZH,
+ S_DZ = item.JBXX.DZ,
+ S_YZBM = item.JBXX.YZBM,
+ S_CS = item.JBXX.CS,
+ S_GJDM = item.JBXX.GJDM,
+ S_GJ = item.JBXX.GJ,
+ S_DQDM = item.JBXX.DQDM,
+ S_DQMC = item.JBXX.DQMC,
+ S_SH = item.JBXX.SH,
+ S_ZZSDJH = item.JBXX.ZZSDJH,
+ };
+ po.Details = new List<TN_Supplier_detial>();
+ if (item.GYSHB.Count > 0)
+ {
+ item.GYSHB.ForEach(a =>
+ {
+ po.Details.Add(new TN_Supplier_detial
+ {
+ S_DO_GYSBM = a.GYSBM,
+ S_CGZZ = a.CGZZ,
+ S_HB = a.HB,
+
+ });
+ //}
+ });
+ db.Insertable<TN_Supplier>(po).ExecuteCommand();
+ db.Insertable<TN_Supplier_detial>(po.Details).ExecuteCommand();
+ }
+ iTEM.GYSBM = item.JBXX.GYSBM;
+ iTEM.MSGCODE = 0;
iTEM.MSGDESP = $"鎴愬姛";
tEMs.Add(iTEM);
}
@@ -722,10 +774,9 @@
}
catch (Exception e)
{
- Orderback.ITEM iTEM = new Orderback.ITEM();
- iTEM.SCDDH = "";
- iTEM.GC = "";
- iTEM.MSGCODE = "1";
+ GYSReturnRoot.ITEM iTEM = new GYSReturnRoot.ITEM();
+ iTEM.GYSBM = "";
+ iTEM.MSGCODE = 1;
iTEM.MSGDESP = e.Message;
tEMs.Add(iTEM);
orderResponse.ROOT.ITEM = tEMs;
@@ -767,6 +818,7 @@
{
TN_GENERATE_ORDER tnorder = new TN_GENERATE_ORDER();
tnorder.S_GC = item.GC;
+ tnorder.S_SCDDH = item.SCDDH;
tnorder.S_SCDDH = item.SCDDH;
tnorder.S_DZMC = item.DZMC;
tnorder.S_SCDDCMS = item.SCDDCMS;
@@ -821,17 +873,28 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- internal static SimpleResult Mater_In(MaterDto.Root model)
+ internal static WLReturnRoot.Root Mater_In(MaterDto.Root model)
{
var db = new SqlHelper<object>().GetInstance();
- var result = new SimpleResult();
- result.resultMsg = "鎴愬姛";
- try
+ var response = new WLReturnRoot.Root
{
- db.BeginTran();
- List<TN_Material> list = new List<TN_Material>();
- foreach (var item in model.ROOT.ITEM)
+ ROOT = new WLReturnRoot.ROOT
{
+ ITEM = new List<WLReturnRoot.ITEM>
+ {
+
+ }
+ }
+ };
+ db.BeginTran();
+ List<WLReturnRoot.ITEM> list = new List<WLReturnRoot.ITEM>();
+ 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();
if (materlist == null)
{
@@ -849,20 +912,54 @@
tN_Material.S_CPZ = item.CPZ;
tN_Material.S_CPZMS = item.CPZMS;
tN_Material.S_ITEM_NAME = item.VTEXT;
- list.Add(tN_Material);
+ db.Insertable<TN_Material>(tN_Material).ExecuteCommand();
+ result.MSGDESP = "鎴愬姛";
+ result.MSGCODE = 0;
+ result.GCBM = item.GCBM;
+ result.WLBM = item.WLBM;
+ list.Add(result);
}
-
+ else
+ {
+ materlist.S_ITEM_CODE = item.WLBM;
+ materlist.S_GCBM = item.GCBM;
+ materlist.S_WLZBM = item.WLZBM;
+ materlist.S_WLZMS = item.WLZMS;
+ materlist.S_WLLX = item.WLLX;
+ materlist.S_WLMS = item.WLMS;
+ materlist.S_WLCMS = item.WLCMS;
+ materlist.S_DWBM = item.DWBM;
+ materlist.S_DWMS = item.DWMS;
+ materlist.S_JBM = item.JBM;
+ materlist.S_CPZ = item.CPZ;
+ materlist.S_CPZMS = item.CPZMS;
+ materlist.S_ITEM_NAME = item.VTEXT;
+ db.Updateable<TN_Material>(materlist).ExecuteCommand();
+ result.MSGDESP = "鎴愬姛";
+ result.MSGCODE = 0;
+ result.GCBM = item.GCBM;
+ result.WLBM = item.WLBM;
+ list.Add(result);
+ }
}
- db.Insertable<TN_Material>(list).ExecuteCommand();
- db.CommitTran();
+ catch (Exception e)
+ {
+ var result = new WLReturnRoot.ITEM();
+ result.MSGDESP = e.Message;
+ result.MSGCODE = 1;
+ result.GCBM = item.GCBM;
+ result.WLBM = item.WLBM;
+ list.Add(result);
+ db.RollbackTran();
+ throw;
+ }
+ }
+ response.ROOT.ITEM = list;
+ //db.Insertable<TN_Material>(list).ExecuteCommand();
+ db.CommitTran();
- }
- catch (Exception e)
- {
- db.RollbackTran();
- throw;
- }
- return result;
+
+ return response;
}
@@ -1075,9 +1172,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}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�)*/
;
@@ -1129,7 +1226,7 @@
{
itemwlpz.ITEM.ForEach(a =>
{
-
+
po.Details.Add(new TN_Inbound_Detail
{
S_IO_NO = itemwlpz.HEAD.WLPZH,
@@ -1202,12 +1299,13 @@
}
}
}
- 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();
}
}
@@ -1269,7 +1367,7 @@
var po = WMSHelper.GetInboundOrder(itemwlpz.HEAD.WLPZBH);
if (po == null)
{
- po = new TN_Inbound_Order { S_NO = itemwlpz.HEAD.WLPZBH, S_WLPZND=itemwlpz.HEAD.WLPZNF, S_WLPZNF = itemwlpz.HEAD.WLPZNF, S_FACTORY = itemwlpz.ITEM[0].GC, S_IN_TYPE = "鍏朵粬鍏ュ簱", S_BS_TYPE = itemwlpz.ITEM[0].YDLX };
+ po = new TN_Inbound_Order { S_NO = itemwlpz.HEAD.WLPZBH, S_WLPZND = itemwlpz.HEAD.WLPZNF, S_WLPZNF = itemwlpz.HEAD.WLPZNF, S_FACTORY = itemwlpz.ITEM[0].GC, S_IN_TYPE = "鍏朵粬鍏ュ簱", S_BS_TYPE = itemwlpz.ITEM[0].YDLX };
po.Details = new List<TN_Inbound_Detail>();
if (itemwlpz.ITEM.Count > 0)
{
@@ -1321,7 +1419,7 @@
S_CXWLPZHXM = a.CXPZHXM,
S_CXPZNF = a.CXPZNF,
- S_SERIAL_NO = a.ITEM1==null?"": string.Join(",", a.ITEM1.XLH),
+ S_SERIAL_NO = a.ITEM1 == null ? "" : string.Join(",", a.ITEM1.XLH),
});
//}
@@ -1602,7 +1700,7 @@
result12.resultMsg = $"鐗╂枡{a.WLBH}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
simples.Add(result12);
continue;
- // throw new Exception($"鐗╂枡{a.WLBH}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�);
+ // throw new Exception($"鐗╂枡{a.WLBH}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�);
}
TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail
{
@@ -1678,6 +1776,7 @@
using (var db = new SqlHelper<object>().GetInstance())
{
var locinfo = db.Queryable<Location>().Where(a => a.S_CODE == model.start).First();
+
if (locinfo?.N_LOCK_STATE != 0)
{
result.resultCode = 3;
@@ -1696,7 +1795,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
@@ -1749,7 +1848,7 @@
S_START_AREA = locinfo.S_AREA_CODE,
S_START_WH = locinfo.S_WH_CODE,
S_END_LOC = model.start,
- //S_BS_NO = model.arrival_no,
+ S_BS_NO = model.MaterList[0].arrival_no,
N_TYPE = 1,
S_TYPE = WMSTask.GetTypeStr(1),
S_OP_DEF_CODE = "",
@@ -1765,7 +1864,223 @@
}
}
+ /// <summary>
+ /// 鍒嗘嫞
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ internal static async Task<SimpleResult> KtSorting(KtSorting model)
+ {
+ var result = new SimpleResult();
+
+ // var db = new SqlHelper<object>().GetInstance();
+
+ using (var db = new SqlHelper<object>().GetInstance())
+ {
+ try
+ {
+
+
+ result.resultMsg = "鎴愬姛";
+ result.resultCode = 0;
+ var locinfo = db.Queryable<Location>().Where(a => a.S_CODE == model.start).First();
+
+ if (locinfo?.N_LOCK_STATE != 0)
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"璧峰搴撲綅宸查攣/涓嶅瓨鍦�;
+ return result;
+ }
+ //鍒ゆ柇鎵樼洏鏄惁宸茬粡鐢熸垚浠诲姟锛屽鏋滄病鏈夊垯鐢熸垚
+ if (!string.IsNullOrEmpty(model.cntr_code))
+ {
+ 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)
+ {
+ 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)
+ {
+ LogHelper.Info($"瀹瑰櫒{model.cntr_code}鎵句笉鍒板搴旇揣浣�);
+ result.resultMsg = $"瀹瑰櫒{model.cntr_code}鎵句笉鍒板搴旇揣浣�;
+ result.resultCode = 1;
+ return result;
+ }
+ else
+ {
+ 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")
+ .Select((lcr, cir, loc) => loc).ToList() // 杩斿洖 Location 瀵硅薄
+ .FirstOrDefault(); // 鎴栬� Take(1).ToList()[0]
+ }
+ 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)
+ {
+ LogHelper.Info($"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�);
+ result.resultMsg = $"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�;
+ result.resultCode = 1;
+ return result;
+ }
+ //搴撲綅淇℃伅
+
+ var endinfo = db.Queryable<Location>().Where(it => it.S_CODE == model.start).First();
+ var wmsTask = new WMSTask
+ {
+ S_CNTR_CODE = model.cntr_code,
+ S_CODE = WMSHelper.GenerateTaskNo(),
+ S_START_LOC = start.S_CODE,
+ S_START_AREA = start.S_AREA_CODE,
+ S_START_WH = start.S_WH_CODE,
+ S_END_LOC = endinfo.S_CODE,
+ S_END_AREA = endinfo.S_AREA_CODE,
+ S_END_WH = endinfo.S_WH_CODE,
+
+ N_TYPE = 2,
+ // S_TYPE = WMSTask.GetTypeStr(1),
+ S_TYPE = "鍑哄簱绌烘墭鐩�,
+ S_OP_DEF_CODE = "",
+ S_OP_DEF_NAME = "pda鍑哄簱"
+ };
+ if (WMSHelper.CreateWmsTask(wmsTask))
+ {
+ LocationHelper.LockLoc(start.S_CODE, 2);
+ result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
+ }
+
+
+ }
+ else //鍏ュ簱
+ {
+ 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();
+ //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>()
+ .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();
+
+
+ #endregion
+ }
+ else
+ {
+ LogHelper.Info($"鍏ュ簱 瀹瑰櫒{model.cntr_code}涓嶈兘涓虹┖");
+ result.resultMsg = $"鍏ュ簱 瀹瑰櫒{model.cntr_code}涓嶈兘涓虹┖";
+ result.resultCode = 1;
+ return result;
+
+ }
+ if (end==null)
+ {
+ LogHelper.Info($"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�);
+ result.resultMsg = $"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�;
+ result.resultCode = 1;
+ return result;
+ }
+ var sart = db.Queryable<Location>().Where(it => it.S_CODE == model.start).First();
+ var wmsTask = new WMSTask
+ {
+ S_CNTR_CODE = model.cntr_code,
+ S_CODE = WMSHelper.GenerateTaskNo(),
+ S_START_LOC = sart.S_CODE,
+ S_START_AREA = sart.S_AREA_CODE,
+ S_START_WH = sart.S_WH_CODE,
+ S_END_LOC = end.S_CODE,
+ S_END_AREA = end.S_AREA_CODE,
+ S_END_WH = end.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(end.S_CODE, 1);
+ result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
+ }
+
+ }
+ //閫氱敤鎺ュ彛 瀵瑰鍣ㄨ揣鍝佺殑鍒犲噺 鍜岀敓鎴愬洖搴撳崟 閮借鐢ㄧ殑鎺ュ彛
+
+ return result;
+
+ }
+ catch (Exception e)
+ {
+ result.resultMsg = e.Message;
+ db.RollbackTran();
+ return result;
+ throw;
+ }
+ }
+
+ }
/// <summary>
/// 鍒嗘嫞
/// </summary>
@@ -1773,170 +2088,318 @@
/// <returns></returns>
internal static async Task<SimpleResult> OutboundOrderSorting(FJSorting model)
{
+
var result = new SimpleResult();
// var db = new SqlHelper<object>().GetInstance();
using (var db = new SqlHelper<object>().GetInstance())
{
- result.resultMsg = "鎴愬姛";
- result.resultCode = 0;
- if (string.IsNullOrEmpty(model.arrival_no))
+ try
{
- result.resultMsg = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
- result.resultCode = 1;
- return result;
- }
-
- //浜哄伐鍒嗘嫞 瀹瑰櫒璐у搧琛ㄦ暟閲忋�鍒嗛厤閲忓崌闄�- //鍑哄簱鍗曡鎯�- var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == model.arrival_no).First();
- if (po == null)
- {
- result.resultMsg = "鏈壘鍒版鍑哄簱鍗�;
- result.resultCode = 1;
+
+
+ result.resultMsg = "鎴愬姛";
+ result.resultCode = 0;
+ if (string.IsNullOrEmpty(model.arrival_no))
+ {
+ result.resultMsg = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
+ result.resultCode = 1;
+ return result;
+ }
+
+ //浜哄伐鍒嗘嫞 瀹瑰櫒璐у搧琛ㄦ暟閲忋�鍒嗛厤閲忓崌闄�+ //鍑哄簱鍗曡鎯�+ var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == model.arrival_no).First();
+ if (po == null)
+ {
+ result.resultMsg = "鏈壘鍒版鍑哄簱鍗�;
+ result.resultCode = 1;
+ return result;
+
+ }
+ LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
+ //鏍规嵁涓嶅悓鍑哄簱绫诲瀷 鍥炶皟sap
+ if (po.S_OUT_TYPE == "鍐查攢鍑哄簱")
+ {
+ result = await CXAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.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);
+ }
+ else if (po.S_OUT_TYPE == "璁″垝澶栧彂鏂欏嚭搴�)
+ {
+ result = await jhwtlAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ }
+ else if (po.S_OUT_TYPE == "鎴愭湰涓績鍑哄簱")
+ {
+ result = await CBAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ }
+
+ //閫氱敤鎺ュ彛 瀵瑰鍣ㄨ揣鍝佺殑鍒犲噺 鍜岀敓鎴愬洖搴撳崟 閮借鐢ㄧ殑鎺ュ彛
+ 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;
+
+ //var itemlist = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == model.cntr_code).ToList();
+ if (model.MaterList.Count > 0)
+ {
+ var url = Settings.MoboxSeverUrl + "inventory/AddChange";
+ //浠撳簱閲忚〃鍗囬噺
+ var req = new AddChangeModel { op_type = 4 };
+ //搴撳尯閲忚〃鍗囬噺
+ var req2 = new AddChangeModel { op_type = 7 };
+ var S_WH_CODE = "";
+ var S_AREA_CODE = "";
+ if (string.IsNullOrEmpty(po.S_WH_CODE))
+ {
+ S_WH_CODE = util.Settings.WHCode;
+ }
+ else
+ {
+ S_WH_CODE = po.S_WH_CODE;
+ }
+ if (string.IsNullOrEmpty(po.S_AREA_CODE))
+ {
+ S_AREA_CODE = util.Settings.AREACode;
+ }
+ else
+ {
+ S_AREA_CODE = po.S_AREA_CODE;
+ }
+ 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
+ {
+ 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;
+ var ReqTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString();
+ //var ReqTime = GetTimeStamp(DateTime.Now.AddHours(-8), 1, 2);
+ LogHelper.Info($"鍔犲瘑鍓�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime}");
+ var ReqVerify = GetMd5FromString(AppKey + AppSecret + ReqTime);
+ LogHelper.Info($"鍔犲瘑鍚�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime} ReqVerify={ReqVerify} url={url} req={reqData}");
+ var res = new HttpHelper().WebPost(url, reqData, "application/json", AppKey, ReqTime, ReqVerify);
+ if (!string.IsNullOrEmpty(res))
+ {
+ LogHelper.Info($"mobox 浠撳簱闄嶉噺鎺ュ彛杩斿洖 {res}");
+ var moboxres = JsonConvert.DeserializeObject<moboxres>(res);
+ if (moboxres.err_code != 0)
+ {
+ adds = false;
+ }
+ }
+ else
+ {
+ LogHelper.Info($"mobox 浠撳簱闄嶉噺鎺ュ彛杩斿洖涓虹┖");
+
+ }
+ var reqData2 = JsonConvert.SerializeObject(req2);
+ var ReqTime2 = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString();
+ //var ReqTime2 = GetTimeStamp(DateTime.Now.AddHours(-8), 1, 2);
+ LogHelper.Info($"鍔犲瘑鍓�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime2}");
+ var ReqVerify2 = GetMd5FromString(AppKey + AppSecret + ReqTime2);
+ LogHelper.Info($"鍔犲瘑鍚�AppKey={AppKey} AppSecret={AppSecret} ReqTime={ReqTime2} ReqVerify={ReqVerify2} url={url} req={reqData2}");
+ var res2 = new HttpHelper().WebPost(url, reqData2, "application/json", AppKey, ReqTime2, ReqVerify2);
+ if (!string.IsNullOrEmpty(res2))
+ {
+ LogHelper.Info($"mobox 搴撳尯闄嶉噺鎺ュ彛杩斿洖 {res2}");
+ var moboxres = JsonConvert.DeserializeObject<moboxres>(res);
+ if (moboxres.err_code != 0)
+
+ {
+ adds = false;
+ }
+ }
+ else
+ {
+ LogHelper.Info($"mobox 搴撳尯闄嶉噺鎺ュ彛杩斿洖涓虹┖");
+
+ }
+ //if (adds) addOnShelves(po, model.cntr_code, 2);
+
+ }
+ else LogHelper.Info($"鎵樼洏{model.cntr_code}鏃犻渶瑕佸崌闄嶉噺鐨勭墿鏂�);
+ db.CommitTran();
+ #endregion
return result;
}
-
- //鏍规嵁涓嶅悓鍑哄簱绫诲瀷 鍥炶皟sap
- if (po.S_OUT_TYPE == "鍐查攢鍑哄簱")
+ catch (Exception e)
{
- result = await CXAddOutboundOrder(model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ LogHelper.Info($"鎶ラ敊{e.Message}");
+ result.resultMsg = e.Message;
+ db.RollbackTran();
+ return result;
+ throw;
}
- else
- if (po.S_OUT_TYPE == "鍑哄簱")//鏅�鍑哄簱
- {
-
- result = await AddOutboundOrder(model.MaterList, model.arrival_no, model.cntr_code, model.start);
- }
- else if (po.S_OUT_TYPE == "璁″垝澶栧彂鏂欏嚭搴�)
- {
- result = await jhwtlAddOutboundOrder(model.MaterList, model.arrival_no, model.cntr_code, model.start);
- }
- else if (po.S_OUT_TYPE == "鎴愭湰涓績鍑哄簱")
- {
- result = await CBAddOutboundOrder(model.MaterList, model.arrival_no, model.cntr_code, model.start);
- }
-
- //閫氱敤鎺ュ彛 瀵瑰鍣ㄨ揣鍝佺殑鍒犲噺 鍜岀敓鎴愬洖搴撳崟 閮借鐢ㄧ殑鎺ュ彛
- result = await TYAddOutboundOrder(model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE);
- return result;
}
}
- public static async Task<SimpleResult> TYAddOutboundOrder(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())
+ //using (var db = new SqlHelper<object>().GetInstance())
+ //{
+ var result = new SimpleResult();
+
+ try
{
- var result = new SimpleResult();
+ //搴撲綅淇℃伅
+ var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
+ //鍑哄簱鍗曡鎯�+ var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
+ //鍒嗘嫞鍗�+ //var popp = db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_BS_NO == arrival_no&&a.S_SORT_TYPE=="鏈垎绫� && a.N_B_STATE == 2).First();
- try
+ //鍥炲弬鐗╂枡淇℃伅
+ List<OutboundRecord> records = new List<OutboundRecord>();
+ var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
+ foreach (var item in MaterList)
{
- //搴撲綅淇℃伅
- var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
- //鍑哄簱鍗曡鎯�- var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
-
-
- //鍥炲弬鐗╂枡淇℃伅
- List<OutboundRecord> records = new List<OutboundRecord>();
- var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
- foreach (var item in MaterList)
+ // 鎻掑叆鍒版墭鐩樻槑缁嗚〃
+ var cntr = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code).ToList();
+ if (cntr.Count() > 0)
{
- // 鎻掑叆鍒版墭鐩樻槑缁嗚〃
- var cntr = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code).ToList();
- if (cntr.Count() > 0)
+ db.BeginTran();
+ //1.鏌ョ湅鏄惁鏈夌浉鍚岀墿鏂欐壒娆＄殑淇℃伅锛屽鏋滄湁瑕佺疮鍑忓皯锛屼笉鍚屾壒娆＄殑鍙互鍒嗗紑&& a.N_BS_ROW_NO == item.N_ROW_NO
+ var cir = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code && a.S_ITEM_CODE == item.item_code).First();//&& a.S_BATCH_NO == item.S_BATCH_NO
+ if (cir != null)
{
- db.BeginTran();
- //1.鏌ョ湅鏄惁鏈夌浉鍚岀墿鏂欐壒娆＄殑淇℃伅锛屽鏋滄湁瑕佺疮鍑忓皯锛屼笉鍚屾壒娆＄殑鍙互鍒嗗紑&& a.N_BS_ROW_NO == item.N_ROW_NO
- var cir = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code && a.S_ITEM_CODE == item.item_code ).First();//&& a.S_BATCH_NO == item.S_BATCH_NO
- 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)
{
- cir.F_QTY -= item.qty;
- cir.F_ALLOC_QTY -= item.qty;
- cir.T_MODIFY = DateTime.Now;
- if (cir.F_QTY == 0)
- {
- db.Deleteable(cir).ExecuteCommand();
- }
- else
- {
- db.Updateable(cir).UpdateColumns(it => new { it.F_QTY, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();
- //娣诲姞鍥炲簱浣滀笟
-
-
- }
+ db.Deleteable(cir).ExecuteCommand();
}
else
{
- db.RollbackTran();
- result.resultCode = 1;
- result.resultMsg = $"鐗╂枡涓嶅瓨鍦▄item.item_code}";
- LogHelper.Info($"鐗╂枡涓嶅瓨鍦▄item.item_code}");
- return result;
+ db.Updateable(cir).UpdateColumns(it => new { it.F_QTY,it.S_CNTR_TYPE, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();
+ //娣诲姞鍥炲簱浣滀笟
}
- 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,
+ }
+ else
+ {
+ db.RollbackTran();
+ result.resultCode = 1;
+ result.resultMsg = $"鐗╂枡涓嶅瓨鍦▄item.item_code}";
+ LogHelper.Info($"鐗╂枡涓嶅瓨鍦▄item.item_code}");
+ return result;
+ }
+
+ OutboundRecord outboundRecord = new OutboundRecord();
+ outboundRecord.S_WLPZBH = pz?.S_WLPZBH;
+ outboundRecord.S_WLPZND = pz?.S_WLPZND;
+ outboundRecord.S_TYPE = S_OUT_TYPE;
- 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;
- outboundRecord.S_TYPE = S_OUT_TYPE;
-
- outboundRecord.S_NO = arrival_no;
- outboundRecord.S_WLBM = item.item_code;
- outboundRecord.S_SL = item.qty;
- outboundRecord.S_CNTR_CODE = cntr_code;
- records.Add(outboundRecord);
+ outboundRecord.S_NO = arrival_no;
+ outboundRecord.S_WLBM = item.item_code;
+ outboundRecord.S_SL = item.qty;
+ outboundRecord.S_CNTR_CODE = cntr_code;
+ records.Add(outboundRecord);
+ }
+ else
+ {
+ result.resultCode = 1;
+ result.resultMsg = $"鑾峰彇鎵樼洏淇℃伅澶辫触{cntr_code}";
+ LogHelper.Info($"鑾峰彇鎵樼洏淇℃伅澶辫触{cntr_code}");
+ return result;
+ }
+ }
+ 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 = $"鑾峰彇鎵樼洏淇℃伅澶辫触{cntr_code}";
- LogHelper.Info($"鑾峰彇鎵樼洏淇℃伅澶辫触{cntr_code}");
+ 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}";
+ }
}
- db.Insertable<OutboundRecord>(records).ExecuteCommand();
-
- db.CommitTran();
+ else
+ {
+ result.resultCode = 1;
+ result.resultMsg += $"鎵句笉鍒板鍣ㄥ搴斾换鍔′俊鎭瘂cntr_code}";
+ return result;
+ }
+
}
- catch (Exception ex)
- {
- db.RollbackTran();
- LogHelper.Info("鐗╂枡淇℃伅缁戝畾鍒版弧瀹瑰櫒涓� + ex.Message);
- Console.WriteLine(ex.Message);
-
- throw;
- }
- 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;
+ }
+ return result;
}
+
+ //}
@@ -1948,157 +2411,177 @@
/// <param name="cntr_code"></param>
/// <param name="start"></param>
/// <returns></returns>
- public static async Task<SimpleResult> CBAddOutboundOrder(List<Mater> MaterList, string arrival_no, string cntr_code, string start)
+ public static async Task<SimpleResult> CBAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
{
- using (var db = new SqlHelper<object>().GetInstance())
+ //using (var db = new SqlHelper<object>().GetInstance())
+ //{
+ // var db = new SqlHelper<object>().GetInstance();
+ var result = new SimpleResult();
+
+ try
{
- // var db = new SqlHelper<object>().GetInstance();
- var result = new SimpleResult();
-
- try
+ //搴撲綅淇℃伅
+ var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
+ //鍑哄簱鍗曡鎯�+ var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
+ //var CntrItemRels = db.Queryable<CntrItemRel>().Where(a => a.S_BS_NO == arrival_no).ToList();
+ //鍑哄簱鍥炶皟鍏ュ弬
+ var cbCenterBackDto = new CBcenterBackDto.Root
{
- //搴撲綅淇℃伅
- var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
- //鍑哄簱鍗曡鎯�- var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
- //var CntrItemRels = db.Queryable<CntrItemRel>().Where(a => a.S_BS_NO == arrival_no).ToList();
- //鍑哄簱鍥炶皟鍏ュ弬
- var cbCenterBackDto = new CBcenterBackDto.Root
+ ROOT = new CBcenterBackDto.ROOT
{
- ROOT = new CBcenterBackDto.ROOT
+ HEAD = new List<CBcenterBackDto.HEADItem>
{
- HEAD = new List<CBcenterBackDto.HEADItem>
- {
- }
}
- };
- //鍥炲弬鐗╂枡淇℃伅
- List<CBcenterBackDto.HEADItem> iTEMs = new List<CBcenterBackDto.HEADItem>();
- List<OutboundRecord> records = new List<OutboundRecord>();
- string GZRQ = "";
- string PZZDRQ = "";
- if (po.BUDAT != null)
- {
- GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
}
- if (po.BLDAT != null)
- {
- PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");
+ };
+ //鍥炲弬鐗╂枡淇℃伅
+ List<CBcenterBackDto.HEADItem> iTEMs = new List<CBcenterBackDto.HEADItem>();
+ List<OutboundRecord> records = new List<OutboundRecord>();
+ string GZRQ = "";
+ string PZZDRQ = "";
+ if (po.BUDAT != null)
+ {
+ GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
+ }
+ if (po.BLDAT != null)
+ {
+ PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");
- }
- foreach (var item in MaterList)
- {
- var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.item_code).FirstOrDefault();
- CBcenterBackDto.HEADItem ckbitem = new CBcenterBackDto.HEADItem();
- ckbitem.KEY = arrival_no;
+ }
+ foreach (var item in MaterList)
+ {
+ var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.item_code).FirstOrDefault();
+ CBcenterBackDto.HEADItem ckbitem = new CBcenterBackDto.HEADItem();
+ ckbitem.KEY = arrival_no;
- ckbitem.CBZX = po.S_CBZX;
- ckbitem.WLBH = item.item_code;
- ckbitem.SL = item.qty;
- ckbitem.KCDD = podetail?.S_KCDD;
- ckbitem.LRZX = po.S_LRZX;
- ckbitem.ZZKM = po.S_ZZKM;
- ckbitem.GC = po.S_FACTORY;
- ckbitem.GZRY = po.UNAME;
+ ckbitem.CBZX = po.S_CBZX;
+ ckbitem.WLBH = item.item_code;
+ ckbitem.SL = item.qty;
+ ckbitem.KCDD = podetail?.S_KCDD;
+ ckbitem.LRZX = po.S_LRZX;
+ ckbitem.ZZKM = po.S_ZZKM;
+ ckbitem.GC = po.S_FACTORY;
+ ckbitem.GZRY = po.UNAME;
- ckbitem.PC = podetail?.S_BATCH_NO;
- ckbitem.PZRQ = PZZDRQ;
- ckbitem.GZRQ = GZRQ;
+ ckbitem.PC = podetail?.S_BATCH_NO;
+ ckbitem.PZRQ = PZZDRQ;
+ ckbitem.GZRQ = GZRQ;
- CBcenterBackDto.ITEM listitem1 = new CBcenterBackDto.ITEM();
- // List<CBcenterBackDto.ITEM> listitem1 = new List<CBcenterBackDto.ITEM>();
- //string[] xlhValues = item.S_SERIAL_NO.Split(',');
- //var serialNos = string.Join(",", CntrItemRels
- // .Where(s => s.S_ITEM_CODE == item.item_code)
- // .Select(s => s.S_SERIAL_NO));
- //string[] xlhValues = serialNos.Split(',');
- // string[] xlhValues = item.S_SERIAL_NO.Split(',');
- listitem1.XLH= podetail?.S_SERIAL_NO.Split(',').ToList();
- //foreach (var xlhValue in xlhValues)
- //{
- // CBcenterBackDto.ITEM newItem = new CBcenterBackDto.ITEM { XLH = xlhValue };
- // listitem1.Add(newItem);
- //}
- ckbitem.ITEM = listitem1;
- iTEMs.Add(ckbitem);
-
-
- }
- cbCenterBackDto.ROOT.HEAD = iTEMs;
- //db.Insertable<OutboundRecord>(records).ExecuteCommand();
- #region wms-sap鍥炶皟
- //绫昏浆json
- var json = JsonConvert.SerializeObject(cbCenterBackDto.ROOT);
- //json杞瑇ml
- 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())
+ CBcenterBackDto.ITEM listitem1 = new CBcenterBackDto.ITEM();
+ // List<CBcenterBackDto.ITEM> listitem1 = new List<CBcenterBackDto.ITEM>();
+ //string[] xlhValues = item.S_SERIAL_NO.Split(',');
+ //var serialNos = string.Join(",", CntrItemRels
+ // .Where(s => s.S_ITEM_CODE == item.item_code)
+ // .Select(s => s.S_SERIAL_NO));
+ //string[] xlhValues = serialNos.Split(',');
+ // string[] xlhValues = item.S_SERIAL_NO.Split(',');
+ listitem1.XLH = podetail?.S_SERIAL_NO.Split(',').ToList();
+ //foreach (var xlhValue in xlhValues)
//{
- // // 鍙戦� POST 璇锋眰骞舵帴鏀跺搷搴�- // HttpResponseMessage responsess = await client.PostAsync(url, content);
- // responseXml = await responsess.Content.ReadAsStringAsync();
-
+ // CBcenterBackDto.ITEM newItem = new CBcenterBackDto.ITEM { XLH = xlhValue };
+ // listitem1.Add(newItem);
//}
+ ckbitem.ITEM = listitem1;
+ iTEMs.Add(ckbitem);
- #region sap鍥炶皟
- // 鍒涘缓Web Service浠ｇ悊绫诲疄渚�- ZSCM2_CBZX service = new ZSCM2_CBZX();
- // service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
- // 鍑嗗璇锋眰鍙傛暟
- ZfmScm2CbzxMm001 request = new ZfmScm2CbzxMm001();
- request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
- LogHelper.Info($"鎴愭湰涓績鍑哄簱SAP鍥炶皟");
- // 璋冪敤Web Service
- ZfmScm2CbzxMm001Response responses = service.ZfmScm2CbzxMm001(request);
- // 澶勭悊鍝嶅簲
- LogHelper.Info("SAP杩斿洖缁撴灉: " + responses.Output);
+ }
+ cbCenterBackDto.ROOT.HEAD = iTEMs;
+ //db.Insertable<OutboundRecord>(records).ExecuteCommand();
+ #region wms-sap鍥炶皟
+ //绫昏浆json
+ var json = JsonConvert.SerializeObject(cbCenterBackDto.ROOT);
+ //json杞瑇ml
+ string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
- // 瑙ｆ瀽Output涓殑鍑瘉鍙风瓑淇℃伅
+ 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();
- #endregion
- 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());
+ //}
- //娣诲姞鍑瘉璁板綍琛�- result.resultMsg = data.ROOT.ITEM.MSGDESP;
- result.resultCode = data.ROOT.ITEM.MSGCODE;
- if (data.ROOT.ITEM.MSGCODE == 0)
+ #region sap鍥炶皟
+ // 鍒涘缓Web Service浠ｇ悊绫诲疄渚�+ ZSCM2_CBZX service = new ZSCM2_CBZX();
+ service.PreAuthenticate = true;
+ service.Url = service.Url + "?sap-language=ZH";
+ // service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
+ // 鍑嗗璇锋眰鍙傛暟
+ ZfmScm2CbzxMm001 request = new ZfmScm2CbzxMm001();
+ request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
+ LogHelper.Info($"鎴愭湰涓績鍑哄簱SAP鍥炶皟");
+ // 璋冪敤Web Service
+ ZfmScm2CbzxMm001Response responses = service.ZfmScm2CbzxMm001(request);
+
+ // 澶勭悊鍝嶅簲
+ LogHelper.Info("SAP杩斿洖缁撴灉: " + responses.Output);
+
+ // 瑙ｆ瀽Output涓殑鍑瘉鍙风瓑淇℃伅
+
+ #endregion
+ 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());
+
+ //娣诲姞鍑瘉璁板綍琛�+ result.resultMsg = data.ROOT.ITEM.MSGDESP;
+ result.resultCode = data.ROOT.ITEM.MSGCODE;
+ if (data.ROOT.ITEM.MSGCODE == 0)
+ {
+
+ foreach (var item in MaterList)
{
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.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_WH_CODE = po.S_WH_CODE;
+ materialVoucher.S_AREA_CODE = po.S_AREA_CODE;
+ materialVoucher.F_QTY = item.qty;
materialVoucher.STATUS = 0;
+ materialVoucher.S_GZRQ = po.BUDAT;
+ materialVoucher.UNAME = po.UNAME;
db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
}
- #endregion
-
- db.CommitTran();
+ //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();
}
- catch (Exception ex)
- {
- db.RollbackTran();
- LogHelper.Info("鎴愭湰涓績鍥炶皟鎶ラ敊" + ex.Message);
- Console.WriteLine(ex.Message);
+ #endregion
- throw;
- }
- return result;
+ //db.CommitTran();
}
+ catch (Exception ex)
+ {
+ //db.RollbackTran();
+ LogHelper.Info("鎴愭湰涓績鍥炶皟鎶ラ敊" + ex.Message);
+ Console.WriteLine(ex.Message);
+ throw;
+ }
+ return result;
}
+
+ //}
/// <summary>
/// 璁″垝澶栭�鏂欏洖璋� /// </summary>
@@ -2107,175 +2590,190 @@
/// <param name="cntr_code"></param>
/// <param name="start"></param>
/// <returns></returns>
- public static async Task<SimpleResult> jhwtlAddOutboundOrder(List<Mater> MaterList, string arrival_no, string cntr_code, string start)
+ public static async Task<SimpleResult> jhwtlAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
{
- using (var db = new SqlHelper<object>().GetInstance())
+ //using (var db = new SqlHelper<object>().GetInstance())
+ //{
+ // var db = new SqlHelper<object>().GetInstance();
+ var result = new SimpleResult();
+ try
{
- // var db = new SqlHelper<object>().GetInstance();
- var result = new SimpleResult();
- try
+ //搴撲綅淇℃伅
+ var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
+ //鍑哄簱鍗曡鎯�+ var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
+
+ var CntrItemRels = db.Queryable<CntrItemRel>().Where(a => a.S_BS_NO == arrival_no).ToList();
+ //鍑哄簱鍥炶皟鍏ュ弬
+
+ DateTime dateTime;
+ DateTime dateTime1;
+ string GZRQ = "";
+ string PZZDRQ = "";
+ if (po.BUDAT != null)
{
- //搴撲綅淇℃伅
- var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
- //鍑哄簱鍗曡鎯�- var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
+ GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
+ }
+ if (po.BLDAT != null)
+ {
+ PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");
- var CntrItemRels = db.Queryable<CntrItemRel>().Where(a => a.S_BS_NO == arrival_no).ToList();
- //鍑哄簱鍥炶皟鍏ュ弬
-
- DateTime dateTime;
- DateTime dateTime1;
- string GZRQ = "";
- string PZZDRQ = "";
- if (po.BUDAT != null)
+ }
+ JHWBackDto.Root myRoot = new JHWBackDto.Root
+ {
+ ROOT = new JHWBackDto.ROOT
{
- GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
- }
- if (po.BLDAT != null)
- {
- PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");
-
- }
- JHWBackDto.Root myRoot = new JHWBackDto.Root
- {
- ROOT = new JHWBackDto.ROOT
+ HEAD = new JHWBackDto.HEAD
{
- HEAD = new JHWBackDto.HEAD
- {
-
- KEY = po.S_NO,
- GZRQ = GZRQ,
- PZZDRQ = PZZDRQ,
- YHM = po.UNAME,
- PZTTWB = po.BKTXT,
- YDLX = po.S_BS_TYPE,
- TSKCBS = po.SOBKZ,
- ITEM = new List<JHWBackDto.ITEM>
- {
- }
- },
-
- }
- };
- //鍥炲弬鐗╂枡淇℃伅
- List<JHWBackDto.ITEM> iTEMs = new List<JHWBackDto.ITEM>();
- List<OutboundRecord> records = new List<OutboundRecord>();
+ KEY = po.S_NO,
+ GZRQ = GZRQ,
+ PZZDRQ = PZZDRQ,
+ YHM = po.UNAME,
+ PZTTWB = po.BKTXT,
+ YDLX = po.S_BS_TYPE,
+ TSKCBS = po.SOBKZ,
+ ITEM = new List<JHWBackDto.ITEM>
+ {
+
+ }
+ },
+
+ }
+ };
+ //鍥炲弬鐗╂枡淇℃伅
+ List<JHWBackDto.ITEM> iTEMs = new List<JHWBackDto.ITEM>();
+ foreach (var item in MaterList)
+ {
+ var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.item_code).FirstOrDefault();
+ JHWBackDto.ITEM ckbitem = new JHWBackDto.ITEM();
+ ckbitem.WLBH = item.item_code;
+ ckbitem.GC = po.S_FACTORY;
+ //ckbitem.PH = podetail?.S_PH;
+ //ckbitem.TSKCBS = podetail?.S_TSKCBS;
+ ckbitem.XSDD = podetail?.S_XSDD;
+ ckbitem.XSDDHXM = podetail?.S_XSDDXMBH;
+ ckbitem.SL = item.qty;
+ ckbitem.DW = podetail?.S_UOM;
+ ckbitem.DDH = podetail?.S_DDH;
+ //ckbitem.DDHXM = (podetail?.N_ROW_NO);
+ ckbitem.WBS = podetail?.S_WBS;
+ ckbitem.KCDD = podetail?.S_KCDD;
+ ckbitem.PC = podetail?.S_BATCH_NO;
+ JHWBackDto.ITEM1 listitem1 = new JHWBackDto.ITEM1();
+ //string[] xlhValues = item.S_SERIAL_NO.Split(',');
+ //var serialNos = string.Join(",", CntrItemRels
+ // .Where(s => s.S_ITEM_CODE == item.item_code)
+ // .Select(s => s.S_SERIAL_NO));
+ //string[] xlhValues = serialNos.Split(',');
+ string[] xlhValues = podetail?.S_SERIAL_NO.Split(',');
+ //foreach (var xlhValue in xlhValues)
+ //{
+ // JHWBackDto.ITEM1 newItem = new JHWBackDto.ITEM1 { XLH = xlhValue };
+ // listitem1.Add(newItem);
+ //}
+ listitem1.XLH = podetail?.S_SERIAL_NO.Split(',').ToList();
+ ckbitem.ITEM1 = listitem1;
+ iTEMs.Add(ckbitem);
+
+ //娣诲姞鍑哄簱褰曞嚟璇佽〃
+ //var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
+ //OutboundRecord outboundRecord = new OutboundRecord();
+ //outboundRecord.S_WLPZBH = pz.S_WLPZBH;
+ //outboundRecord.S_WLPZND = pz.S_WLPZND;
+ //outboundRecord.S_TYPE = "璁″垝澶栭�鏂�;
+
+ //outboundRecord.S_NO = arrival_no;
+ //outboundRecord.S_WLBM = item.item_code;
+ //outboundRecord.S_SL = item.qty;
+ //outboundRecord.S_CNTR_CODE = cntr_code;
+ //records.Add(outboundRecord);
+
+ }
+ myRoot.ROOT.HEAD.ITEM = iTEMs;
+ //db.Insertable<OutboundRecord>(records).ExecuteCommand();
+ #region wms-sap鍥炶皟
+ //绫昏浆json
+
+ var json = JsonConvert.SerializeObject(myRoot.ROOT);
+ //json杞瑇ml
+ string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
+
+ LogHelper.Info($"璁″垝澶栧彂鏂欏嚭搴搙ml鏁版嵁{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浠ｇ悊绫诲疄渚�+ ZSCM2_SCFLJHW service = new ZSCM2_SCFLJHW();
+ service.PreAuthenticate = true;
+ service.Url = service.Url + "?sap-language=ZH";
+ // service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
+ // 鍑嗗璇锋眰鍙傛暟
+ ZscmScflJhw request = new ZscmScflJhw();
+ request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
+ LogHelper.Info($"璁″垝澶朣AP鍥炶皟");
+ // 璋冪敤Web Service
+ ZscmScflJhwResponse responses = service.ZscmScflJhw(request);
+
+ // 澶勭悊鍝嶅簲
+ LogHelper.Info("SAP杩斿洖缁撴灉: " + responses.Output);
+
+ // 瑙ｆ瀽Output涓殑鍑瘉鍙风瓑淇℃伅
+
+ #endregion
+
+ XmlDocument xmlDoc = new XmlDocument();
+ xmlDoc.LoadXml(responses.Output.ToString());
+ JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+ var data = JsonConvert.DeserializeObject<ReturnJHWBcak.Root>(jsonObject.ToString());
+ //娣诲姞鍑瘉璁板綍琛�+ result.resultMsg = data.ROOT.ITEM.MSGDESP;
+ result.resultCode = data.ROOT.ITEM.MSGCODE;
+ if (data.ROOT.ITEM.MSGCODE == 0)
+ {
foreach (var item in MaterList)
{
- var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.item_code).FirstOrDefault();
- JHWBackDto.ITEM ckbitem = new JHWBackDto.ITEM();
- ckbitem.WLBH = item.item_code;
- ckbitem.GC = po.S_FACTORY;
- //ckbitem.PH = podetail?.S_PH;
- //ckbitem.TSKCBS = podetail?.S_TSKCBS;
- ckbitem.XSDD = podetail?.S_XSDD;
- ckbitem.XSDDHXM = podetail?.S_XSDDXMBH;
- ckbitem.SL = item.qty;
- ckbitem.DW = podetail?.S_UOM;
- ckbitem.DDH = podetail?.S_DDH;
- //ckbitem.DDHXM = (podetail?.N_ROW_NO);
- ckbitem.WBS = podetail?.S_WBS;
- ckbitem.KCDD = podetail?.S_KCDD;
- ckbitem.PC = podetail?.S_BATCH_NO;
- JHWBackDto.ITEM1 listitem1 = new JHWBackDto.ITEM1();
- //string[] xlhValues = item.S_SERIAL_NO.Split(',');
- //var serialNos = string.Join(",", CntrItemRels
- // .Where(s => s.S_ITEM_CODE == item.item_code)
- // .Select(s => s.S_SERIAL_NO));
- //string[] xlhValues = serialNos.Split(',');
- string[] xlhValues = podetail?.S_SERIAL_NO.Split(',');
- //foreach (var xlhValue in xlhValues)
- //{
- // JHWBackDto.ITEM1 newItem = new JHWBackDto.ITEM1 { XLH = xlhValue };
- // listitem1.Add(newItem);
- //}
- listitem1.XLH = podetail?.S_SERIAL_NO.Split(',').ToList();
- ckbitem.ITEM1 = listitem1;
- iTEMs.Add(ckbitem);
-
- //娣诲姞鍑哄簱褰曞嚟璇佽〃
- //var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
- //OutboundRecord outboundRecord = new OutboundRecord();
- //outboundRecord.S_WLPZBH = pz.S_WLPZBH;
- //outboundRecord.S_WLPZND = pz.S_WLPZND;
- //outboundRecord.S_TYPE = "璁″垝澶栭�鏂�;
-
- //outboundRecord.S_NO = arrival_no;
- //outboundRecord.S_WLBM = item.item_code;
- //outboundRecord.S_SL = item.qty;
- //outboundRecord.S_CNTR_CODE = cntr_code;
- //records.Add(outboundRecord);
-
+ MaterialVoucher materialVoucher = new MaterialVoucher();
+ materialVoucher.S_NO = po.S_NO;
+ 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?.WLPZ;
+ materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
+ materialVoucher.S_WH_CODE = po.S_WH_CODE;
+ materialVoucher.S_AREA_CODE = po.S_AREA_CODE;
+ materialVoucher.S_GZRQ = po.BUDAT;
+ materialVoucher.UNAME = po.UNAME;
+ materialVoucher.F_QTY = item.qty;
+ materialVoucher.STATUS = 0;
+ db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
}
- myRoot.ROOT.HEAD.ITEM = iTEMs;
- //db.Insertable<OutboundRecord>(records).ExecuteCommand();
- #region wms-sap鍥炶皟
- //绫昏浆json
- var json = JsonConvert.SerializeObject(myRoot.ROOT);
- //json杞瑇ml
- string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
-
- LogHelper.Info($"璁″垝澶栧彂鏂欏嚭搴搙ml鏁版嵁{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浠ｇ悊绫诲疄渚�- ZSCM2_SCFLJHW service = new ZSCM2_SCFLJHW();
- // service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
- // 鍑嗗璇锋眰鍙傛暟
- ZscmScflJhw request = new ZscmScflJhw();
- request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
- LogHelper.Info($"璁″垝澶朣AP鍥炶皟");
- // 璋冪敤Web Service
- ZscmScflJhwResponse responses = service.ZscmScflJhw(request);
-
- // 澶勭悊鍝嶅簲
- LogHelper.Info("SAP杩斿洖缁撴灉: " + responses.Output);
-
- // 瑙ｆ瀽Output涓殑鍑瘉鍙风瓑淇℃伅
-
- #endregion
-
- 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());
- //娣诲姞鍑瘉璁板綍琛�- result.resultMsg = data.ROOT.ITEM.MSGDESP;
- result.resultCode = data.ROOT.ITEM.MSGCODE;
- 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
-
- db.CommitTran();
}
- catch (Exception ex)
- {
- db.RollbackTran();
- LogHelper.Info("璁″垝澶栭�鏂欏洖璋冩姤閿� + ex.Message);
- Console.WriteLine(ex.Message);
+ #endregion
- throw;
- }
- return result;
+ //db.CommitTran();
}
+ catch (Exception ex)
+ {
+ //db.RollbackTran();
+ LogHelper.Info("璁″垝澶栭�鏂欏洖璋冩姤閿� + ex.Message);
+ Console.WriteLine(ex.Message);
+ throw;
+ }
+ return result;
}
+
+ //}
/// <summary>
/// 閫氱敤鍐查攢鍥炶皟
/// </summary>
@@ -2284,110 +2782,173 @@
/// <param name="cntr_code"></param>
/// <param name="start"></param>
/// <returns></returns>
- public static async Task<SimpleResult> CXAddOutboundOrder(List<Mater> MaterList, string arrival_no, string cntr_code, string start)
+ public static async Task<SimpleResult> CXAddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
{
// var db = new SqlHelper<object>().GetInstance();
- using (var db = new SqlHelper<object>().GetInstance())
+
+ var result = new SimpleResult();
+
+
+ try
{
- var result = new SimpleResult();
+ //搴撲綅淇℃伅
+ var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
+ //鍑哄簱鍗曡鎯�+ var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
-
- try
+ string GZRQ = "";
+ if (po.BUDAT != null)
{
- //搴撲綅淇℃伅
- var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
- //鍑哄簱鍗曡鎯�- var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
- //鏉ユ簮鍐查攢鍑瘉瀵瑰簲鐨勭墿鏂欏嚟璇佷俊鎭�- //var poIn = db.Queryable<TN_Inbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == po.S_BS_NO).First();
- //鏍规嵁鍏ュ簱鏌ョ湅鍑瘉缂栧彿淇℃伅
- //var poIPz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == poIn.S_NO).First();
- //鍑哄簱鍥炶皟鍏ュ弬
- CXCkBackDto.Root myRoot = new CXCkBackDto.Root
+ GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
+ }
+
+ //鏉ユ簮鍐查攢鍑瘉瀵瑰簲鐨勭墿鏂欏嚟璇佷俊鎭�+ //var poIn = db.Queryable<TN_Inbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == po.S_BS_NO).First();
+ //鏍规嵁鍏ュ簱鏌ョ湅鍑瘉缂栧彿淇℃伅
+ //var poIPz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == poIn.S_NO).First();
+ //鍑哄簱鍥炶皟鍏ュ弬
+ CXCkBackDto.Root myRoot = new CXCkBackDto.Root
+ {
+ ROOT = new CXCkBackDto.ROOT
{
- ROOT = new CXCkBackDto.ROOT
+ HEAD = new List<CXCkBackDto.HEAD>
{
- HEAD = new CXCkBackDto.HEAD
- {
- WLPZ = po.S_WLPZ,
- WLPZNF = po.S_WLPZNF,
- WLPZXM = MaterList[0].N_ROW_NO,
- GZRQ = "2025-03-20",
- SRRQ = "2025-03-19",
- GZRY = "杩囪处浜哄憳濮撳悕"
- }
+
+ //GZRQ = GZRQ,
+ //SRRQ = PZZDRQ,
+ //WLPZ = po.S_WLPZ,
+ //WLPZNF = po.S_WLPZNF,
+ //WLPZXM = MaterList[0].N_ROW_NO,
+
+ //GZRY = po.UNAME
}
- };
- //鍥炲弬鐗╂枡淇℃伅
- //List<OutboundRecord> records = new List<OutboundRecord>();
- //foreach (var item in MaterList)
- //{
+ }
+ };
+ 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();
+ foreach (var item in MaterList)
+ {
+ CXCkBackDto.HEAD hEAD = new CXCkBackDto.HEAD();
+ hEAD.GZRQ = GZRQ;
+ hEAD.SRSJ = DateTime.Now.ToString("yyyyMMdd");
- // db.BeginTran();
- // //鍑哄簱璁板綍
- // var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
- // OutboundRecord outboundRecord = new OutboundRecord();
- // outboundRecord.S_WLPZBH = pz.S_WLPZBH;
- // outboundRecord.S_WLPZND = pz.S_WLPZND;
+ //hEAD.WLPZ = porecord.Where(s => s.S_WLBM == item.item_code && s.S_WLH == item.N_ROW_NO).First()?.S_WLPZBH;
+ //hEAD.WLPZNF = porecord.Where(s=>s.S_WLBM==item.item_code&&s.S_WLH==item.N_ROW_NO).First()?.S_WLPZND;
- // outboundRecord.S_NO = arrival_no;
- // outboundRecord.S_WLBM = item.item_code;
- // outboundRecord.S_SL = item.qty;
- // outboundRecord.S_CNTR_CODE = cntr_code;
- // records.Add(outboundRecord);
+ //hEAD.WLPZ = porecord.First()?.S_WLPZBH;
+ //hEAD.WLPZNF = porecord.First()?.S_WLPZND;
- //}
- //db.Insertable<OutboundRecord>(records).ExecuteCommand();
- #region wms-sap鍥炶皟
- //绫昏浆json
- var json = JsonConvert.SerializeObject(myRoot.ROOT);
- //json杞瑇ml
- string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
+ hEAD.WLPZ = porecord.FirstOrDefault()?.S_WLPZBH;
+ hEAD.WLPZNF = porecord.FirstOrDefault()?.S_WLPZND;
+ hEAD.WLPZXM = item.N_ROW_NO;
+ hEAD.GZRY = po.UNAME;
+ listhead.Add(hEAD);
+ }
+ myRoot.ROOT.HEAD = listhead;
- 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())
+ #region wms-sap鍥炶皟
+
+
+
+ //绫昏浆json
+ var json = JsonConvert.SerializeObject(myRoot.ROOT);
+ //json杞瑇ml
+ string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
+
+ LogHelper.Info($"鍐查攢鍑哄簱鍥炶皟xml鏁版嵁{xml}");
+
+ ZSCM2_CXPZ service = new ZSCM2_CXPZ();
+ service.PreAuthenticate = true;
+ service.Url = service.Url + "?sap-language=ZH";
+ // service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
+ // 鍑嗗璇锋眰鍙傛暟
+ ZfmScm2CxpzMm001 request = new ZfmScm2CxpzMm001();
+ request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
+ LogHelper.Info($"閫氱敤鍐查攢SAP鍥炶皟");
+ // 璋冪敤Web Service
+ ZfmScm2CxpzMm001Response responses = service.ZfmScm2CxpzMm001(request);
+
+ // 澶勭悊鍝嶅簲
+ LogHelper.Info("閫氱敤鍐查攢SAP杩斿洖缁撴灉: " + responses.Output);
+
+ XmlDocument xmlDoc = new XmlDocument();
+ xmlDoc.LoadXml(responses.Output.ToString());
+ JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+ EnsureArrayFormat(jsonObject, "ITEM", "");
+ var data = JsonConvert.DeserializeObject<ReturnTYBcak.Root>(jsonObject.ToString());
+ var resmeg = "";
+ int rescode = 0;
+ //娣诲姞鍑瘉璁板綍琛�+ if (data != null)
+ {
+ List<MaterialVoucher> materiallist = new List<MaterialVoucher>();
+ foreach (var item in data.ROOT.ITEM)
{
- // 鍙戦� POST 璇锋眰骞舵帴鏀跺搷搴�- HttpResponseMessage responsess = await client.PostAsync(url, content);
- responseXml = await responsess.Content.ReadAsStringAsync();
+ if (item.MSGCODE == 0)
+ {
+
+ var onr = MaterList.Where(s => s.N_ROW_NO == item.WLPZHXM).FirstOrDefault();
+
+ MaterialVoucher materialVoucher = new MaterialVoucher();
+ materialVoucher.S_NO = po.S_NO;
+ materialVoucher.S_TYPE = po.S_OUT_TYPE;
+ materialVoucher.S_WLPZBH = item?.WLPZBH;
+ materialVoucher.S_WLPZND = item?.WLPZND;
+ materialVoucher.S_WLPZHXM = item?.WLPZHXM;
+
+ materialVoucher.S_YWLPZBH = item?.YWLPZBH;
+ materialVoucher.S_YWLPZND = item?.YWLPZND;
+ materialVoucher.S_YWLPZHXM = item?.YWLPZHXM;
+ materialVoucher.S_WH_CODE = po.S_WH_CODE;
+ materialVoucher.S_AREA_CODE = po.S_AREA_CODE;
+ 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;
+ materiallist.Add(materialVoucher);
+
+
+ }
+ else
+ {
+ rescode = 1;
+ resmeg += item?.MSGDESP;
+ }
+
}
+ if (materiallist.Count() > 0)
+ {
-
- XmlDocument xmlDoc = new XmlDocument();
- xmlDoc.LoadXml(responseXml.ToString());
- JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
- var data = JsonConvert.DeserializeObject<ReturnWcBcak.Root>(jsonObject.ToString());
- //娣诲姞鍑瘉璁板綍琛�- result.resultMsg = data.ROOT.ITEM.MSGDESP;
- result.resultCode = data.ROOT.ITEM.MSGCODE;
- 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
-
- db.CommitTran();
+ db.Insertable<MaterialVoucher>(materiallist).ExecuteCommand();
+ }
}
- catch (Exception ex)
- {
- db.RollbackTran();
- LogHelper.Info("閫氱敤鍐查攢鍥炶皟鎶ラ敊" + ex.Message);
- Console.WriteLine(ex.Message);
- throw;
- }
- return result;
+
+
+
+ result.resultMsg = resmeg;
+ result.resultCode = rescode;
+ #endregion
+
+ //db.CommitTran();
}
+ catch (Exception ex)
+ {
+ //db.RollbackTran();
+ LogHelper.Info("閫氱敤鍐查攢鍥炶皟鎶ラ敊" + ex.Message);
+ Console.WriteLine(ex.Message);
+ throw;
+ }
+ return result;
}
+
+
/// <summary>
/// 鏅�鍥炶皟鎺ュ彛
@@ -2397,193 +2958,175 @@
/// <param name="cntr_code"></param>
/// <param name="start"></param>
/// <returns></returns>
- public static async Task<SimpleResult> AddOutboundOrder(List<Mater> MaterList, string arrival_no, string cntr_code, string start)
+ public static async Task<SimpleResult> AddOutboundOrder(SqlSugarClient db, List<Mater> MaterList, string arrival_no, string cntr_code, string start)
{
- using (var db = new SqlHelper<object>().GetInstance())
+ //using (var db = new SqlHelper<object>().GetInstance())
+ //{
+ // var db = new SqlHelper<object>().GetInstance();
+ var result = new SimpleResult();
+
+ try
{
- // var db = new SqlHelper<object>().GetInstance();
- var result = new SimpleResult();
+ //搴撲綅淇℃伅
+ var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
+ //鍑哄簱鍗曡鎯�+ var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
+ string GZRQ = "";
+ string PZZDRQ = "";
+ //if (po.Details[0].S_CJRQ != null)
+ //{
+ // GZRQ = DateTime.Parse(po.Details[0].S_CJRQ.ToString()).ToString("yyyyMMdd");
+ //}
+ //if (po.Details[0].S_XQRQ != null)
+ //{
+ // PZZDRQ = DateTime.Parse(po.Details[0].S_XQRQ.ToString()).ToString("yyyyMMdd");
+
+ //}
CkBcakDto.Root myRoot = new CkBcakDto.Root
{
ROOT = new CkBcakDto.ROOT
{
WLPZ = new CkBcakDto.WLPZ
{
- ZLSH = "娴佹按鍙峰�",
- YWLX = "涓氬姟绫诲瀷鍊�,
- GZRQ = DateTime.Now.ToString("yyyy-MM-dd"), // 鍋囪鏃ユ湡鏍煎紡涓�骞�鏈�鏃�
- GZRY = "杩囪处浜哄憳鍊�,
+ KEY = po.S_NO,
+ ZYWLX = "2",
+ PZRQ = DateTime.Now.ToString("yyyyMMdd"),
+ GZRQ =DateTime.Now.ToString("yyyyMMdd"), // 鍋囪鏃ユ湡鏍煎紡涓�骞�鏈�鏃�
+ GZRY = po.S_CREATOR_NAME,
ITEM = new List<CkBcakDto.ITEM>
{
}
}
}
};
- try
+ //鍑哄簱鍥炶皟鍏ュ弬
+
+ //鍥炲弬鐗╂枡淇℃伅
+ List<CkBcakDto.ITEM> iTEMs = new List<CkBcakDto.ITEM>();
+ foreach (var item in MaterList)
{
- //搴撲綅淇℃伅
- var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
- //鍑哄簱鍗曡鎯�- var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
- //鍑哄簱鍥炶皟鍏ュ弬
+ db.BeginTran();
- //鍥炲弬鐗╂枡淇℃伅
- List<CkBcakDto.ITEM> iTEMs = new List<CkBcakDto.ITEM>();
- List<OutboundRecord> records = new List<OutboundRecord>();
+
+ var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.item_code).FirstOrDefault();
+ CkBcakDto.ITEM ckbitem = new CkBcakDto.ITEM();
+ ckbitem.SCDD = podetail?.S_SCDD;
+ ckbitem.ZJBM = podetail?.S_ZJBM;
+ ckbitem.FHSL = item.qty;
+ ckbitem.DW = podetail?.S_UOM;
+ ckbitem.YLBH = podetail?.S_YLBH;
+ ckbitem.YLXMH = podetail?.S_YLXMH;
+ ckbitem.GC = po.S_FACTORY;
+ ckbitem.KCDD = podetail?.S_KCDD;
+
+ 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();
+ ////string[] xlhValues = item.S_SERIAL_NO.Split(',');
+ //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();
+ //foreach (var xlhValue in xlhValues)
+ //{
+ // CkBcakDto.ITEM1 newItem = new CkBcakDto.ITEM1 { XLH = xlhValue };
+ // listitem1.Add(newItem);
+ //}
+ ckbitem.ITEM1 = listitem1;
+ 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)
+ {
+ myRoot.ROOT.WLPZ.ZYWLX = "2";
+ }
+ //db.Insertable<OutboundRecord>(records).ExecuteCommand();
+ #region wms-sap鍥炶皟
+ //绫昏浆json
+ var json = JsonConvert.SerializeObject(myRoot.ROOT);
+ //json杞瑇ml
+ 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();
+
+ //}
+ ZSCM2_SCFL service = new ZSCM2_SCFL();
+ service.PreAuthenticate = true;
+ service.Url = service.Url + "?sap-language=ZH";
+ // service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
+ // 鍑嗗璇锋眰鍙傛暟
+ ZscmScfl request = new ZscmScfl();
+ request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
+ LogHelper.Info($"鍑哄簱SAP鍥炶皟");
+ // 璋冪敤Web Service
+ ZscmScflResponse responses = service.ZscmScfl(request);
+
+ // 澶勭悊鍝嶅簲
+ LogHelper.Info("鍑哄簱SAP杩斿洖缁撴灉: " + responses.Output);
+
+ XmlDocument xmlDoc = new XmlDocument();
+ xmlDoc.LoadXml(responses.Output.ToString());
+ JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
+ var data = JsonConvert.DeserializeObject<ReturnJHWBcak.Root>(jsonObject.ToString());
+ //娣诲姞鍑瘉璁板綍琛�+ result.resultMsg = data.ROOT.ITEM.MSGDESP;
+ result.resultCode = data.ROOT.ITEM.MSGCODE;
+ if (data.ROOT.ITEM.MSGCODE == 0)
+ {
foreach (var item in MaterList)
{
- // 鎻掑叆鍒版墭鐩樻槑缁嗚〃
- //var cntr = ContainerHelper.GetCntrItemRel(cntr_code);
- //var cntr = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code).ToList();
- //if (cntr.Count() > 0)
- //{
- db.BeginTran();
- //1.鏌ョ湅鏄惁鏈夌浉鍚岀墿鏂欐壒娆＄殑淇℃伅锛屽鏋滄湁瑕佺疮鍑忓皯锛屼笉鍚屾壒娆＄殑鍙互鍒嗗紑
- //var cir = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code && a.S_ITEM_CODE == item.item_code && a.S_BATCH_NO == item.S_BATCH_NO && a.N_ROW_NO == item.N_ROW_NO).First();
- //if (cir != null)
- //{
- //cir.F_QTY -= item.qty;
- //cir.F_ALLOC_QTY -= item.qty;
- //cir.T_MODIFY = DateTime.Now;
- //if (cir.F_QTY == 0)
- //{
- // db.Deleteable(cir).ExecuteCommand();
- //}
- //else
- //{
- // db.Updateable(cir).UpdateColumns(it => new { it.F_QTY, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();
- // //娣诲姞鍥炲簱浣滀笟
-
- //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,
- // N_TYPE = 1,
- // S_TYPE = WMSTask.GetTypeStr(1),
- // S_OP_DEF_CODE = "",
- // S_OP_DEF_NAME = "pda鍏ュ簱"
- // };
- // if (WMSHelper.CreateWmsTask(wmsTask))
- // {
- // LocationHelper.LockLoc(start, 1);
- // result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
- // }
-
-
-
- //}
-
- var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.item_code).FirstOrDefault();
- CkBcakDto.ITEM ckbitem = new CkBcakDto.ITEM();
- ckbitem.SCDD = podetail?.S_SCDD;
- ckbitem.ZJBM = podetail?.S_ZJBM;
- ckbitem.FHSL = item.qty;
- ckbitem.DW = podetail?.S_UOM;
- ckbitem.YLBH = podetail?.S_YLBH;
- ckbitem.YLXMH = podetail?.S_YLXMH;
- ckbitem.GC = po.S_FACTORY;
- ckbitem.KCDD = podetail?.S_KCDD;
-
- 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();
- ////string[] xlhValues = item.S_SERIAL_NO.Split(',');
- //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.Split(',').ToList();
- //foreach (var xlhValue in xlhValues)
- //{
- // CkBcakDto.ITEM1 newItem = new CkBcakDto.ITEM1 { XLH = xlhValue };
- // listitem1.Add(newItem);
- //}
- ckbitem.ITEM1 = listitem1;
- iTEMs.Add(ckbitem);
-
- //}
- //else
- //{
- // db.RollbackTran();
- // result.resultCode = 1;
- // result.resultMsg = $"鐗╂枡涓嶅瓨鍦▄item.item_code}";
- // LogHelper.Info($"鐗╂枡涓嶅瓨鍦▄item.item_code}");
- // return result;
- //}
- //var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
- //OutboundRecord outboundRecord = new OutboundRecord();
- //outboundRecord.S_WLPZBH = pz.S_WLPZBH;
- //outboundRecord.S_WLPZND = pz.S_WLPZND;
-
- //outboundRecord.S_NO = arrival_no;
- //outboundRecord.S_WLBM = item.item_code;
- //outboundRecord.S_SL = item.qty;
- //outboundRecord.S_CNTR_CODE = cntr_code;
- //records.Add(outboundRecord);
- //}
- //else
- //{
- // result.resultCode = 1;
- // result.resultMsg = $"鑾峰彇鎵樼洏淇℃伅澶辫触{cntr_code}";
- // LogHelper.Info($"鑾峰彇鎵樼洏淇℃伅澶辫触{cntr_code}");
- // return result;
- //}
+ MaterialVoucher materialVoucher = new MaterialVoucher();
+ materialVoucher.S_NO = po.S_NO;
+ 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?.WLPZ;
+ 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.S_GZRQ = po.BUDAT;
+ materialVoucher.UNAME = po.UNAME;
+ materialVoucher.STATUS = 0;
+ db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
}
- //db.Insertable<OutboundRecord>(records).ExecuteCommand();
- #region wms-sap鍥炶皟
- //绫昏浆json
- var json = JsonConvert.SerializeObject(myRoot.ROOT);
- //json杞瑇ml
- 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();
-
- }
-
-
- XmlDocument xmlDoc = new XmlDocument();
- xmlDoc.LoadXml(responseXml.ToString());
- JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
- var data = JsonConvert.DeserializeObject<ReturnWcBcak.Root>(jsonObject.ToString());
- //娣诲姞鍑瘉璁板綍琛�- result.resultMsg = data.ROOT.ITEM.MSGDESP;
- result.resultCode = data.ROOT.ITEM.MSGCODE;
- 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
-
- db.CommitTran();
}
- catch (Exception ex)
- {
- db.RollbackTran();
- LogHelper.Info("鏅�鍑哄簱鍥炶皟" +
- "" + ex.Message);
- Console.WriteLine(ex.Message);
+ ////娣诲姞鍑瘉璁板綍琛�+ //result.resultMsg = data.ROOT.ITEM.MSGDESP;
+ //result.resultCode = data.ROOT.ITEM.MSGCODE;
+ //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
- throw;
- }
- return result;
+ //db.CommitTran();
}
+ catch (Exception ex)
+ {
+ //db.RollbackTran();
+ LogHelper.Info("鏅�鍑哄簱鍥炶皟" +
+ "" + ex.Message);
+ Console.WriteLine(ex.Message);
+ throw;
+ }
+ return result;
}
+
+ //}
@@ -2596,7 +3139,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();
@@ -2605,7 +3148,10 @@
try
{
-
+ if (MaterList.Count() < 1)
+ {
+ throw new Exception("绱鐮佺洏鏁伴噺鐗╂枡鏁版嵁涓虹┖");
+ }
foreach (var item in MaterList)
{
var allInfolist = db.Queryable<TN_Inbound_Detail>()
@@ -2638,12 +3184,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);
@@ -2742,7 +3289,7 @@
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- continue;
+ break ;
}
po.Details.Add(new TN_Ll_detail
{
@@ -2752,14 +3299,27 @@
S_ITEM_CODE = a.WLBM,
S_ITEM_NAME = item.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;
- db.Insertable<TN_Ll_detail>(po.Details).ExecuteCommand();
+ if (po.Details.Count()>0)
+ {
+ var result1 = db.Insertable<TN_Ll_Order>(po).ExecuteCommand() > 0;
+ db.Insertable<TN_Ll_detail>(po.Details).ExecuteCommand();
+ }
}
}
@@ -2781,7 +3341,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鎵ц涓鏂欏崟锛岀墿鏂檣a.WLBM}鐗╂枡涓嶅厑璁稿垹闄�;
iTEMs.Add(lLDReturnRoots);
- continue;
+ break;
}
var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
if (po1.Count() == 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
@@ -2797,7 +3357,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- continue;
+ break;
}
TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail
{
@@ -2807,6 +3367,17 @@
S_ITEM_CODE = a.WLBM,
S_ITEM_NAME = item.S_ITEM_NAME,
F_QTY = a.XQSL,
+ S_ZJBM = a.ZJBM,
+ S_YLBH = a.YLBH,
+ S_YLXMH = a.YLHXM,
+ S_ZJWLTH = a.ZJWLTH,
+ S_ZJWLMS = a.ZJWLMS,
+ S_ZHFHBS = a.ZHFHBS,
+ S_CJRQ = a.CJRQ,
+ S_LLDSCBS = a.LLDSCBS,
+ S_GXH = a.GXH,
+ S_XQRQ = a.XQRQ,
+ S_SCGLY = a.SCGLY,
S_BATCH_NO = "鏃�,
S_ERP_WH_CODE = a.KCDD,
N_ITEM_STATE = 1
@@ -2830,7 +3401,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鏇存柊澶辫触锛屾洿鏂版暟閲忓繀椤诲ぇ浜庡綋鍓嶇墿鏂欐暟閲弡a.WLBM}";
iTEMs.Add(lLDReturnRoots);
- continue;
+ break;
}
}
}
@@ -2857,7 +3428,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎";
iTEMs.Add(lLDReturnRoots);
- continue;
+ break;
}
}
else
@@ -2876,7 +3447,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- continue;
+ break;
}
TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail
{
@@ -2886,6 +3457,17 @@
S_ITEM_CODE = a.WLBM,
S_ITEM_NAME = item.S_ITEM_NAME,
F_QTY = a.XQSL,
+ S_ZJBM = a.ZJBM,
+ S_YLBH = a.YLBH,
+ S_YLXMH = a.YLHXM,
+ 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,
S_BATCH_NO = "鏃�,
S_ERP_WH_CODE = a.KCDD,
N_ITEM_STATE = 1
@@ -2907,6 +3489,13 @@
db.Insertable<TN_Ll_detail>(listtn).ExecuteCommand();
}
}
+
+
+ lLDReturnRoots.GC = itemscddll.GC;
+ lLDReturnRoots.LLDH = itemscddll.LLDH;
+ lLDReturnRoots.MSGCODE = 0;
+ lLDReturnRoots.MSGDESP = $"鎴愬姛";
+ iTEMs.Add(lLDReturnRoots);
db.CommitTran();
}
@@ -2972,7 +3561,7 @@
else
{
//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 };
+ 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 };
po1.Details = new List<TN_Outbound_Detail>();
if (po.Details.Count() > 0)
@@ -2994,6 +3583,17 @@
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
@@ -3339,7 +3939,7 @@
MaterialVoucher materialVoucher = new MaterialVoucher();
materialVoucher.S_NO = model.S_NO;
materialVoucher.S_TYPE = po.S_IN_TYPE;
- materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZBH;
+ materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
materialVoucher.STATUS = 0;
db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
@@ -3363,14 +3963,14 @@
//var db = new SqlHelper<object>().GetInstance();
using (var db = new SqlHelper<object>().GetInstance())
{
-
+ LogHelper.Info($"杩涙潵浜�);
bool resu = false;
try
{
db.BeginTran();
var po = db.Queryable<TN_Inbound_Order>().Includes(p => p.Details).Where(a => a.S_NO == model.S_NO).First();
-
+ LogHelper.Info($"杩涙潵浜�");
#region MyRegion
if (po.Details.Count > 0)
{
@@ -3446,7 +4046,6 @@
}
else LogHelper.Info($"鍏ュ簱鍗曟槑缁嗘棤鍊�);
#endregion
-
var CntrItemRels = db.Queryable<CntrItemRel>().Where(a => a.S_BS_NO == model.S_NO).ToList();
if (po == null)
{
@@ -3550,11 +4149,14 @@
#region sap鍥炶皟
// 鍒涘缓Web Service浠ｇ悊绫诲疄渚� ZSCM_NC service = new ZSCM_NC();
+ // 娣诲姞璇█璁剧疆锛堜腑鏂囷級
+ service.PreAuthenticate = true;
+ service.Url = service.Url + "?sap-language=ZH";
// service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
// 鍑嗗璇锋眰鍙傛暟
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);
@@ -3576,8 +4178,8 @@
if (data.ROOT.ITEM.MSGCODE == 0)
{
materialVoucher.S_NO = model.S_NO;
- materialVoucher.S_TYPE = po.S_BS_TYPE;
- materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZBH;
+ 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();
@@ -3590,17 +4192,17 @@
if (po.S_IN_TYPE == "璁″垝澶栭�鏂欏叆搴�)
{
DateTime dateTime;
- DateTime dateTime1 ;
+ DateTime dateTime1;
string GZRQ = "";
string PZZDRQ = "";
- if (po.BUDAT!=null)
+ if (po.BUDAT != null)
{
GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
}
if (po.BLDAT != null)
{
PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");
-
+
}
JHWBackDto.Root myRoot = new JHWBackDto.Root
{
@@ -3620,7 +4222,7 @@
}
},
-
+
}
};
//鍥炲弬鐗╂枡淇℃伅
@@ -3643,7 +4245,7 @@
ckbitem.KCDD = podetail?.S_KCDD;
ckbitem.PC = podetail?.S_BATCH_NO;
#region MyRegion
- // List<JHWBackDto.ITEM1> listitem1 = new List<JHWBackDto.ITEM1>();
+ // List<JHWBackDto.ITEM1> listitem1 = new List<JHWBackDto.ITEM1>();
JHWBackDto.ITEM1 listitem1 = new JHWBackDto.ITEM1();
listitem1.XLH = podetail?.S_SERIAL_NO.Split(',').ToList();
////string[] xlhValues = item.S_SERIAL_NO.Split(',');
@@ -3668,9 +4270,9 @@
////绫昏浆json
var json = JsonConvert.SerializeObject(myRoot.ROOT);
////json杞瑇ml
- string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
+ string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
- LogHelper.Info($"璁″垝澶栭�鏂檟ml鏁版嵁{xml}");
+ LogHelper.Info($"璁″垝澶栭�鏂檟ml鏁版嵁{xml}");
//// 鍒涘缓 StringContent 骞舵寚瀹氬獟浣撶被鍨嬩负 "text/xml"
//HttpContent content = new StringContent(xml, Encoding.UTF8, "application/xml");
//string url = Settings.WCSSeverUrl + "/api/WmsSap/cesReceiveXmlData";
@@ -3685,6 +4287,9 @@
#region sap鍥炶皟
// 鍒涘缓Web Service浠ｇ悊绫诲疄渚� ZSCM2_SCFLJHW service = new ZSCM2_SCFLJHW();
+ // 娣诲姞璇█璁剧疆锛堜腑鏂囷級
+ service.PreAuthenticate = true;
+ service.Url = service.Url + "?sap-language=ZH";
// service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
// 鍑嗗璇锋眰鍙傛暟
ZscmScflJhw request = new ZscmScflJhw();
@@ -3712,7 +4317,7 @@
MaterialVoucher materialVoucher = new MaterialVoucher();
materialVoucher.S_NO = po.S_NO;
materialVoucher.S_TYPE = po.S_IN_TYPE;
- materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZBH;
+ materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
materialVoucher.STATUS = 0;
db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
@@ -3810,6 +4415,9 @@
#region sap鍥炶皟
// 鍒涘缓Web Service浠ｇ悊绫诲疄渚� ZSCM_WC service = new ZSCM_WC();
+
+ service.PreAuthenticate = true;
+ service.Url = service.Url + "?sap-language=ZH";
service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
// 鍑嗗璇锋眰鍙傛暟
ZscmWc request = new ZscmWc();
@@ -3840,7 +4448,9 @@
MaterialVoucher materialVoucher = new MaterialVoucher();
materialVoucher.S_NO = model.S_NO;
materialVoucher.S_TYPE = po.S_IN_TYPE;
- materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZBH;
+ 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();
@@ -3861,23 +4471,51 @@
{
var materpz = db.Queryable<TN_Inbound_Order>().Where(s => s.S_NO == po.S_NO).First();
+ string GZRQ = "";
+ LogHelper.Info($"鍐查攢鍏ュ簱鍏ュ簱{po.BUDAT}");
+ if (po.BUDAT != null)
+ {
+ GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
+ }
//鍑哄簱鍥炶皟鍏ュ弬
CXCkBackDto.Root roots = new CXCkBackDto.Root
{
ROOT = new CXCkBackDto.ROOT
{
- HEAD = new CXCkBackDto.HEAD
+ HEAD = new List<CXCkBackDto.HEAD>
{
- WLPZ = materpz.S_WLPZ,
- WLPZNF = materpz.S_WLPZNF,
- WLPZXM = null,
- GZRQ = "2025-03-20",
- SRRQ = DateTime.Now.ToString(),
- GZRY = "杩囪处浜哄憳濮撳悕"
}
}
};
+ List<CXCkBackDto.HEAD> listhead = new List<CXCkBackDto.HEAD>();
+ //鍑哄簱鍗曡鎯�+ LogHelper.Info($"鍐查攢鍏ュ簱鍏ュ簱{GZRQ}");
+ var porecord = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == po.S_BS_NO && a.STATUS == 0).ToList();
+ //var podet = db.Queryable<tn_i>().Where(a => a.S_NO == po.S_BS_NO&&a.STATUS==0).ToList();
+ LogHelper.Info($"鏁伴噺{porecord.Count()}");
+ LogHelper.Info($"鏁伴噺{po.Details.Count()}");
+ //if (porecord.Count() <1 )
+ //{
+ // LogHelper.Info($"鍑瘉鍙蜂笉瀛樺湪");
+ //}
+ foreach (var item in po.Details)
+ {
+ CXCkBackDto.HEAD hEAD = new CXCkBackDto.HEAD();
+ hEAD.GZRQ = GZRQ;
+ hEAD.SRSJ = DateTime.Now.ToString("yyyyMMdd");
+ //hEAD.WLPZ = porecord.First()?.S_WLPZBH;
+ hEAD.WLPZ = po.S_WLPZ;
+ hEAD.WLPZNF = po.S_WLPZND;
+ //hEAD.WLPZ = porecord.Where(s => s.S_WLBM == item.S_ITEM_CODE && s.S_WLH == item.N_ROW_NO).First()?.S_WLPZBH;
+ //hEAD.WLPZNF = porecord.Where(s=>s.S_WLBM==item.S_ITEM_CODE&&s.S_WLH==item.N_ROW_NO).First()?.S_WLPZND;
+ //hEAD.WLPZNF = porecord.First()?.S_WLPZND;
+ hEAD.WLPZXM = item.N_ROW_NO;
+ hEAD.GZRY = po.UNAME;
+ listhead.Add(hEAD);
+ }
+ roots.ROOT.HEAD = listhead;
+
var json = JsonConvert.SerializeObject(roots.ROOT);
string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
XElement responseXElement = XElement.Parse(xml);
@@ -3889,41 +4527,116 @@
// 纭繚HTTP鎴愬姛鐘舵�鍊� response.EnsureSuccessStatusCode();
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();
- }
+
+ ZSCM2_CXPZ service = new ZSCM2_CXPZ();
+ service.PreAuthenticate = true;
+ service.Url = service.Url + "?sap-language=ZH";
+ // 鍑嗗璇锋眰鍙傛暟
+ ZfmScm2CxpzMm001 request = new ZfmScm2CxpzMm001();
+ request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
+ LogHelper.Info($"閫氱敤鍐查攢SAP鍥炶皟");
+ // 璋冪敤Web Service
+ ZfmScm2CxpzMm001Response responses = service.ZfmScm2CxpzMm001(request);
+
+
+ // 澶勭悊鍝嶅簲
+ LogHelper.Info("閫氱敤鍐查攢SAP杩斿洖缁撴灉: " + responses.Output);
+
+
+
+ //string xmlqqq = "<ROOT>\r\n\t<ITEM>\r\n\t\t<YWLPZBH>490062947</YWLPZBH>\r\n\t\t<YWLPZND>2025</YWLPZND>\r\n\t\t<YWLPZHXM>001</YWLPZHXM>\r\n\t\t<WLPZBH>490062949</WLPZBH>\r\n\t\t<WLPZND>\r\n\t\t</WLPZND>\r\n\t\t<WLPZHXM>D0001</WLPZHXM>\r\n\t\t<MSGCODE>0</MSGCODE>\r\n\t\t<MSGDESP>鏁版嵁鎺ユ敹鎴愬姛,骞跺啿涓攢鎴愬姛!</MSGDESP>\r\n\t</ITEM>\r\n</ROOT>";
// 灏�XmlDocument 杞崲涓�JSON 瀛楃涓� //JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
XmlDocument xmlDoc = new XmlDocument();
- xmlDoc.LoadXml(responseXml.ToString());
+ 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<ReturnJHWBcak.Root>(jsonObject.ToString());
+ var data = JsonConvert.DeserializeObject<ReturnTYBcak.Root>(jsonObject.ToString());
+ var resmeg = "";
+ int rescode = 0;
//娣诲姞鍑瘉璁板綍琛�- result.resultMsg = data.ROOT.ITEM.MSGDESP;
- result.resultCode = data.ROOT.ITEM.MSGCODE;
- MaterialVoucher materialVoucher = new MaterialVoucher();
- materialVoucher.S_NO = model.S_NO;
- materialVoucher.S_TYPE = po.S_IN_TYPE;
- materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZBH;
- materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
- materialVoucher.STATUS = 0;
- db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ if (data != null)
+ {
+ List<MaterialVoucher> materiallist = new List<MaterialVoucher>();
+ foreach (var item in data.ROOT.ITEM)
+ {
+ if (item.MSGCODE == 0)
+ {
+
+ var onr = po.Details.Where(s => s.N_ROW_NO == item.WLPZHXM).FirstOrDefault();
+
+ MaterialVoucher materialVoucher = new MaterialVoucher();
+ materialVoucher.S_NO = po.S_NO;
+ materialVoucher.S_TYPE = po.S_IN_TYPE;
+ materialVoucher.S_WLPZBH = item?.WLPZBH;
+ materialVoucher.S_WLPZND = item?.WLPZND;
+ materialVoucher.S_WLPZHXM = item?.WLPZHXM;
+
+ materialVoucher.S_YWLPZBH = item?.YWLPZBH;
+ materialVoucher.S_YWLPZND = item?.YWLPZND;
+ materialVoucher.S_YWLPZHXM = item?.YWLPZHXM;
+ materialVoucher.S_WH_CODE = po.S_WH_CODE;
+ materialVoucher.S_AREA_CODE = po.S_AREA_CODE;
+ materialVoucher.F_QTY = onr != null ? onr.F_QTY : 0;
+ //materialVoucher.STATUS = 0;
+ resmeg += item?.MSGDESP;
+ materiallist.Add(materialVoucher);
+
+
+ }
+ else
+ {
+ rescode = 1; resmeg += item?.MSGDESP;
+ }
+
+
+ }
+ if (materiallist.Count() > 0)
+ {
+
+ db.Insertable<MaterialVoucher>(materiallist).ExecuteCommand();
+ }
+ }
+
+
+
+
+ result.resultMsg = resmeg;
+ result.resultCode = rescode;
+ //娣诲姞鍑瘉璁板綍琛�+ //result.resultMsg = data.ROOT.ITEM.MSGDESP;
+ //result.resultCode = data.ROOT.ITEM.MSGCODE;
+ //List<MaterialVoucher> materiallist = new List<MaterialVoucher>();
+ //if (data.ROOT.ITEM.MSGCODE == 0)
+ //{
+ // foreach (var item in po.Details)
+ // {
+ // MaterialVoucher materialVoucher = new MaterialVoucher();
+ // materialVoucher.S_NO = po.S_NO;
+ // materialVoucher.S_TYPE = po.S_IN_TYPE;
+ // materialVoucher.S_WLBM = item.S_ITEM_CODE;
+ // materialVoucher.S_WLH = item.N_ROW_NO;
+ // materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZ;
+ // 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.F_QTY;
+ // materialVoucher.STATUS = 0;
+ // db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ // }
+ //}
+ //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
}
db.CommitTran();
}
catch (Exception ex)
{
- LogHelper.Info($"鍏ュ簱鍥炶皟鎶ラ敊{ex.Message}");
+ LogHelper.Info($"鍥炶皟鎶ラ敊{ex.Message}");
db.RollbackTran();
throw;
}
--
Gitblit v1.9.1