From 0e2425d59ffe4c698182f134a47dc84585bc8439 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 12 五月 2025 17:34:28 +0800
Subject: [PATCH] 成本中心退料出库接口实现
---
api/WmsSpaHelper.cs | 253 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 188 insertions(+), 65 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index b510dac..6b46ba6 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -33,6 +33,7 @@
using WHTest;
using System.Net;
using SqlSugar;
+using static HH.WCS.Mobox3.pinggao.models.SapRoot.GYSDto;
namespace HH.WCS.Mobox3.pinggao.api
{
@@ -654,6 +655,87 @@
return simpleResults;
}
/// <summary>
+ /// sap-wmsg渚涘簲鍟嗘伅娣诲姞SimpleResult
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ internal static Orderback.Root GYS_In(GYSDto.Root model)
+ {
+ var orderResponse = new Orderback.Root
+ {
+ ROOT = new Orderback.ROOT
+ {
+ ITEM = new List<Orderback.ITEM> { }
+
+ }
+ };
+
+ List<Orderback.ITEM> tEMs = new List<Orderback.ITEM>();
+ var db = new SqlHelper<object>().GetInstance();
+ try
+ {
+ db.BeginTran();
+ foreach (var item in model.ROOT.GYSXX)
+ {
+ Orderback.ITEM iTEM = new Orderback.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
+ {
+ 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";
+ iTEM.MSGDESP = $"鎴愬姛";
+ tEMs.Add(iTEM);
+ }
+ orderResponse.ROOT.ITEM = tEMs;
+ db.CommitTran();
+ }
+ catch (Exception e)
+ {
+ Orderback.ITEM iTEM = new Orderback.ITEM();
+ iTEM.SCDDH = "";
+ iTEM.GC = "";
+ iTEM.MSGCODE = "1";
+ iTEM.MSGDESP = e.Message;
+ tEMs.Add(iTEM);
+ orderResponse.ROOT.ITEM = tEMs;
+ db.RollbackTran();
+ return orderResponse;
+ throw;
+ }
+ return orderResponse;
+ }
+ /// <summary>
/// sap-wms鐢熶骇璁㈠崟淇℃伅娣诲姞SimpleResult
/// </summary>
/// <param name="model"></param>
@@ -706,7 +788,7 @@
iTEM.SCDDH = item.SCDDH;
iTEM.GC = item.GC;
iTEM.MSGCODE = "1";
- iTEM.MSGDESP = $"{item.SCDDH}涓嶅瓨鍦�;
+ iTEM.MSGDESP = $"{item.SCDDH}宸插瓨鍦�;
tEMs.Add(iTEM);
}
iTEM.SCDDH = item.SCDDH;
@@ -1733,6 +1815,7 @@
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();
@@ -1743,7 +1826,6 @@
return result;
}
-
//鏍规嵁涓嶅悓鍑哄簱绫诲瀷 鍥炶皟sap
if (po.S_OUT_TYPE == "鍐查攢鍑哄簱")
{
@@ -1921,35 +2003,52 @@
//鍥炲弬鐗╂枡淇℃伅
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;
ckbitem.WLBH = item.item_code;
- ckbitem.SL = item.qty;
ckbitem.CBZX = po.S_CBZX;
+ ckbitem.SL = item.qty;
+
+ ckbitem.KCDD = podetail?.S_KCDD;
ckbitem.ZZKM = po.S_ZZKM;
ckbitem.GC = po.S_FACTORY;
ckbitem.GZRY = po.S_CREATOR_NAME;
- ckbitem.PZRQ = DateTime.Now.ToString();
- ckbitem.KCDD = podetail?.S_KCDD;
ckbitem.PC = podetail?.S_BATCH_NO;
+ ckbitem.PZRQ = PZZDRQ;
+ ckbitem.GZRQ = GZRQ;
- List<CBcenterBackDto.ITEM> listitem1 = new List<CBcenterBackDto.ITEM>();
+
+ 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(',');
- foreach (var xlhValue in xlhValues)
- {
- CBcenterBackDto.ITEM newItem = new CBcenterBackDto.ITEM { XLH = xlhValue };
- listitem1.Add(newItem);
- }
+ // 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);
@@ -1964,33 +2063,53 @@
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();
+ //// 鍒涘缓 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_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);
+
+ // 瑙ｆ瀽Output涓殑鍑瘉鍙风瓑淇℃伅
+
+ #endregion
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());
+
//娣诲姞鍑瘉璁板綍琛� 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)
+ {
+ 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();
@@ -1998,7 +2117,7 @@
catch (Exception ex)
{
db.RollbackTran();
- LogHelper.Info("璁″垝澶栭�鏂欏洖璋冩姤閿� + ex.Message);
+ LogHelper.Info("鎴愭湰涓績鍥炶皟鎶ラ敊" + ex.Message);
Console.WriteLine(ex.Message);
throw;
@@ -2050,14 +2169,7 @@
{
HEAD = new JHWBackDto.HEAD
{
- //KEY = "KeyExample",
- //GZRQ = "2023-04-01",
- //PZZDRQ = "2023-04-02",
- //YHM = "Username",
- //PZTTWB = "HeaderText",
- //YDLX = "MovementType",
- //TSKCBS = "SpecialStock"
-
+
KEY = po.S_NO,
GZRQ = GZRQ,
PZZDRQ = PZZDRQ,
@@ -2082,9 +2194,7 @@
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;
@@ -2095,7 +2205,6 @@
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
@@ -2136,20 +2245,36 @@
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();
+ //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(responseXml.ToString());
+ xmlDoc.LoadXml(responses.Output.ToString());
JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
var data = JsonConvert.DeserializeObject<ReturnWcBcak.Root>(jsonObject.ToString());
//娣诲姞鍑瘉璁板綍琛�@@ -2391,18 +2516,18 @@
ckbitem.GC = po.S_FACTORY;
ckbitem.KCDD = podetail?.S_KCDD;
- List<CkBcakDto.ITEM1> listitem1 = new List<CkBcakDto.ITEM1>();
+ 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));
- string[] xlhValues = item.S_SERIAL_NO.Split(',');
- foreach (var xlhValue in xlhValues)
- {
- CkBcakDto.ITEM1 newItem = new CkBcakDto.ITEM1 { XLH = xlhValue };
- listitem1.Add(newItem);
- }
+ 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);
@@ -2544,8 +2669,8 @@
}
else
{
- //2.鎻掑叆鏂扮殑瀹瑰櫒鐗╂枡淇℃伅锛堝鍣ㄥ彿涓嶅彉锛�- cir = new CntrItemRel { S_CNTR_CODE = cntr.S_CODE.Trim(), S_BATCH_NO = item.S_BATCH_NO, S_SERIAL_NO = item.S_SERIAL_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 };
+ //2.鎻掑叆鏂扮殑瀹瑰櫒鐗╂枡淇℃伅锛堝鍣ㄥ彿涓嶅彉S_SERIAL_NO = item.S_SERIAL_NO,锛�+ cir = new CntrItemRel { S_CNTR_CODE = cntr.S_CODE.Trim(), 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);
@@ -3531,15 +3656,13 @@
JHWBackDto.ITEM ckbitem = new JHWBackDto.ITEM();
ckbitem.WLBH = item.S_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.F_QTY;
ckbitem.DW = podetail?.S_UOM;
ckbitem.DDH = podetail?.S_DDH;
+ //ckbitem.PH = podetail?.S_PH;
+ // ckbitem.TSKCBS = podetail?.S_TSKCBS;
//ckbitem.DDHXM = (podetail?.N_ROW_NO);
ckbitem.WBS = podetail?.S_WBS;
ckbitem.KCDD = podetail?.S_KCDD;
--
Gitblit v1.9.1