From f7b58cf11dad9b6acfbe3eab4352d72a57fb7ecf Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期四, 15 五月 2025 18:07:53 +0800
Subject: [PATCH] 1.冲销出库流程联调 2.冲销入库流程联调 3.普通出库 回调逻辑测试 4.物料凭证表结构修改，逻辑修改
---
api/WmsSpaHelper.cs | 853 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 584 insertions(+), 269 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index 6a2b796..98d4402 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -34,6 +34,7 @@
using System.Net;
using SqlSugar;
using static HH.WCS.Mobox3.pinggao.models.SapRoot.GYSDto;
+using System.Web.Services.Protocols;
namespace HH.WCS.Mobox3.pinggao.api
{
@@ -821,17 +822,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 +861,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;
}
@@ -1749,7 +1795,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 = "",
@@ -1774,11 +1820,15 @@
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())
{
+ try
+ {
+
+
result.resultMsg = "鎴愬姛";
result.resultCode = 0;
if (string.IsNullOrEmpty(model.arrival_no))
@@ -1802,34 +1852,125 @@
//鏍规嵁涓嶅悓鍑哄簱绫诲瀷 鍥炶皟sap
if (po.S_OUT_TYPE == "鍐查攢鍑哄簱")
{
- result = await CXAddOutboundOrder(model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ result = await CXAddOutboundOrder(db,model.MaterList, model.arrival_no, model.cntr_code, model.start);
}
else
if (po.S_OUT_TYPE == "鍑哄簱")//鏅�鍑哄簱
{
- result = await AddOutboundOrder(model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ result = await AddOutboundOrder(db,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);
+ result = await jhwtlAddOutboundOrder(db, 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 CBAddOutboundOrder(db, 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;
+ result = await TYAddOutboundOrder(db,model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE);
+ #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 };
+ model.MaterList.ForEach(a =>
+ {
+ LogHelper.Info($"濉厖鏁版嵁");
+ LogHelper.Info($"鍑忎粨搴撻噺琛ㄦ暟鎹�浠撳簱{po.S_WH_CODE} 鐗╂枡缂栫爜{a.item_code} 鐗╂枡鍚嶇О 鏁伴噺{a.qty}");
+ req.item_info.Add(new AddChangeModel.itemModel
+ {
+ wh_code = po.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 = po.S_WH_CODE,
+ area_code = po.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;
+
+ }
+ catch (Exception e)
+ {result.resultMsg=e.Message;
+ db.RollbackTran();
+ return result;
+ throw;
+ }
}
}
- 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)
{
// 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
@@ -1838,7 +1979,8 @@
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();
//鍥炲弬鐗╂枡淇℃伅
List<OutboundRecord> records = new List<OutboundRecord>();
@@ -1923,11 +2065,11 @@
}
db.Insertable<OutboundRecord>(records).ExecuteCommand();
- db.CommitTran();
+ //db.CommitTran();
}
catch (Exception ex)
{
- db.RollbackTran();
+ //db.RollbackTran();
LogHelper.Info("鐗╂枡淇℃伅缁戝畾鍒版弧瀹瑰櫒涓� + ex.Message);
Console.WriteLine(ex.Message);
@@ -1936,7 +2078,7 @@
return result;
}
- }
+ //}
@@ -1948,10 +2090,10 @@
/// <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();
@@ -2051,6 +2193,8 @@
#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();
@@ -2075,21 +2219,37 @@
result.resultCode = data.ROOT.ITEM.MSGCODE;
if (data.ROOT.ITEM.MSGCODE == 0)
{
- MaterialVoucher materialVoucher = new MaterialVoucher();
- materialVoucher.S_NO = po.S_NO;
- materialVoucher.S_TYPE = po.S_OUT_TYPE;
- materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZBH;
- materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
+
+ foreach (var item in MaterList)
+ {
+ 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?.WLPZBH;
+ materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
+ materialVoucher.S_WH_CODE = po.S_WH_CODE;
+ materialVoucher.S_AREA_CODE = po.S_AREA_CODE;
+ materialVoucher.F_QTY = item.qty;
materialVoucher.STATUS = 0;
- db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ }
+ //MaterialVoucher materialVoucher = new MaterialVoucher();
+ //materialVoucher.S_NO = po.S_NO;
+ //materialVoucher.S_TYPE = po.S_OUT_TYPE;
+ //materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZBH;
+ //materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
+ //materialVoucher.STATUS = 0;
+ //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
}
#endregion
- db.CommitTran();
+ //db.CommitTran();
}
catch (Exception ex)
{
- db.RollbackTran();
+ //db.RollbackTran();
LogHelper.Info("鎴愭湰涓績鍥炶皟鎶ラ敊" + ex.Message);
Console.WriteLine(ex.Message);
@@ -2098,7 +2258,7 @@
return result;
}
- }
+ //}
/// <summary>
/// 璁″垝澶栭�鏂欏洖璋� /// </summary>
@@ -2107,10 +2267,10 @@
/// <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
@@ -2160,7 +2320,6 @@
};
//鍥炲弬鐗╂枡淇℃伅
List<JHWBackDto.ITEM> iTEMs = new List<JHWBackDto.ITEM>();
- List<OutboundRecord> records = new List<OutboundRecord>();
foreach (var item in MaterList)
{
var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.item_code).FirstOrDefault();
@@ -2212,6 +2371,7 @@
//db.Insertable<OutboundRecord>(records).ExecuteCommand();
#region wms-sap鍥炶皟
//绫昏浆json
+
var json = JsonConvert.SerializeObject(myRoot.ROOT);
//json杞瑇ml
string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
@@ -2231,6 +2391,8 @@
#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();
@@ -2249,24 +2411,35 @@
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());
+ var data = JsonConvert.DeserializeObject<ReturnJHWBcak.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();
+ 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_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.STATUS = 0;
+ db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ }
+ }
#endregion
- db.CommitTran();
+ //db.CommitTran();
}
catch (Exception ex)
{
- db.RollbackTran();
+ //db.RollbackTran();
LogHelper.Info("璁″垝澶栭�鏂欏洖璋冩姤閿� + ex.Message);
Console.WriteLine(ex.Message);
@@ -2275,7 +2448,7 @@
return result;
}
- }
+ //}
/// <summary>
/// 閫氱敤鍐查攢鍥炶皟
/// </summary>
@@ -2284,11 +2457,10 @@
/// <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();
@@ -2298,6 +2470,13 @@
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 = "";
+ if (po.BUDAT != null)
+ {
+ 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();
//鏍规嵁鍏ュ簱鏌ョ湅鍑瘉缂栧彿淇℃伅
@@ -2307,78 +2486,128 @@
{
ROOT = new CXCkBackDto.ROOT
{
- HEAD = new CXCkBackDto.HEAD
+ HEAD = new List<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).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();
+ hEAD.WLPZ = po.S_WLPZ;
+ hEAD.WLPZNF = po.S_WLPZND;
+ hEAD.WLPZXM = item.N_ROW_NO;
+ hEAD.GZRY = po.UNAME;
+ listhead.Add(hEAD);
+ }
+ myRoot.ROOT.HEAD = listhead;
+
#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_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(responseXml.ToString());
+ xmlDoc.LoadXml(responses.Output.ToString());
JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
- var data = JsonConvert.DeserializeObject<ReturnWcBcak.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 = 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();
+ if (data!=null)
+ {
+ List<MaterialVoucher> materiallist = new List<MaterialVoucher>();
+ foreach (var item in data.ROOT.ITEM)
+ {
+ if (item.MSGCODE == 0)
+ {
+
+ var onr = MaterList.Where(s => s.N_ROW_NO == item.WLPZHXM).First();
+
+ 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.F_QTY = onr.qty;
+ //materialVoucher.STATUS = 0;
+ resmeg += item?.MSGDESP;
+ materiallist.Add(materialVoucher);
+
+
+ }
+ else {
+ rescode = 1;
+ }
+
+
+ }
+ if (materiallist.Count()>0)
+ {
+
+ db.Insertable<MaterialVoucher>(materiallist).ExecuteCommand();
+ }
+ }
+
+
+
+
+ result.resultMsg = resmeg;
+ result.resultCode = rescode;
#endregion
- db.CommitTran();
+ //db.CommitTran();
}
catch (Exception ex)
{
- db.RollbackTran();
+ //db.RollbackTran();
LogHelper.Info("閫氱敤鍐查攢鍥炶皟鎶ラ敊" + ex.Message);
Console.WriteLine(ex.Message);
@@ -2387,7 +2616,7 @@
return result;
}
- }
+
/// <summary>
/// 鏅�鍥炶皟鎺ュ彛
@@ -2397,86 +2626,56 @@
/// <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();
- CkBcakDto.Root myRoot = new CkBcakDto.Root
- {
- ROOT = new CkBcakDto.ROOT
- {
- WLPZ = new CkBcakDto.WLPZ
- {
- ZLSH = "娴佹按鍙峰�",
- YWLX = "涓氬姟绫诲瀷鍊�,
- GZRQ = DateTime.Now.ToString("yyyy-MM-dd"), // 鍋囪鏃ユ湡鏍煎紡涓�骞�鏈�鏃�
- GZRY = "杩囪处浜哄憳鍊�,
- ITEM = new List<CkBcakDto.ITEM>
- {
- }
- }
- }
- };
+
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();
+ 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");
- //鍑哄簱鍥炶皟鍏ュ弬
+ }
+ CkBcakDto.Root myRoot = new CkBcakDto.Root
+ {
+ ROOT = new CkBcakDto.ROOT
+ {
+ WLPZ = new CkBcakDto.WLPZ
+ {
+ KEY = po.S_NO,
+ ZYWLX = "涓氬姟绫诲瀷鍊�,
+ PZRQ = PZZDRQ,
+ GZRQ = GZRQ, // 鍋囪鏃ユ湡鏍煎紡涓�骞�鏈�鏃�
+ GZRY = po.UNAME,
+ ITEM = new List<CkBcakDto.ITEM>
+ {
+ }
+ }
+ }
+ };
+ //鍑哄簱鍥炶皟鍏ュ弬
- //鍥炲弬鐗╂枡淇℃伅
- List<CkBcakDto.ITEM> iTEMs = new List<CkBcakDto.ITEM>();
- List<OutboundRecord> records = new List<OutboundRecord>();
+ //鍥炲弬鐗╂枡淇℃伅
+ List<CkBcakDto.ITEM> iTEMs = new List<CkBcakDto.ITEM>();
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();
@@ -2503,77 +2702,83 @@
//}
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;
- //}
}
- //db.Insertable<OutboundRecord>(records).ExecuteCommand();
- #region wms-sap鍥炶皟
- //绫昏浆json
- var json = JsonConvert.SerializeObject(myRoot.ROOT);
+ myRoot.ROOT.WLPZ.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($"鍑哄簱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();
+ 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(responseXml.ToString());
+ 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());
+ var data = JsonConvert.DeserializeObject<ReturnJHWBcak.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();
+ 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_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.STATUS = 0;
+ db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ }
+ }
+ ////娣诲姞鍑瘉璁板綍琛�+ //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.CommitTran();
}
catch (Exception ex)
{
- db.RollbackTran();
+ //db.RollbackTran();
LogHelper.Info("鏅�鍑哄簱鍥炶皟" +
"" + ex.Message);
Console.WriteLine(ex.Message);
@@ -2583,7 +2788,7 @@
return result;
}
- }
+ //}
@@ -2605,7 +2810,10 @@
try
{
-
+ if (MaterList.Count()<1)
+ {
+ throw new Exception("绱鐮佺洏鏁伴噺鐗╂枡鏁版嵁涓虹┖");
+ }
foreach (var item in MaterList)
{
var allInfolist = db.Queryable<TN_Inbound_Detail>()
@@ -3363,14 +3571,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)
{
@@ -3550,6 +3758,9 @@
#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();
@@ -3576,7 +3787,7 @@
if (data.ROOT.ITEM.MSGCODE == 0)
{
materialVoucher.S_NO = model.S_NO;
- materialVoucher.S_TYPE = po.S_BS_TYPE;
+ materialVoucher.S_TYPE = po.S_IN_TYPE;
materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZBH;
materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
materialVoucher.STATUS = 0;
@@ -3685,6 +3896,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();
@@ -3810,6 +4024,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();
@@ -3860,24 +4077,52 @@
else if (po.S_IN_TYPE == "鍐查攢鍏ュ簱")
{
- var materpz = db.Queryable<TN_Inbound_Order>().Where(s => s.S_NO == po.S_NO).First();
-
+ //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 +4134,111 @@
// 纭繚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);
+
// 灏�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());
+ //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).First();
+
+ 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.F_QTY;
+ //materialVoucher.STATUS = 0;
+ resmeg += item?.MSGDESP;
+ materiallist.Add(materialVoucher);
+
+
+ }
+ else
+ {
+ rescode = 1;
+ }
+
+
+ }
+ 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