From f45adc67774453c32b7ba39a2c7edff7e7bfa0c8 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期三, 14 五月 2025 08:50:52 +0800
Subject: [PATCH] 回库流程 修改 sap联调 计划外退料出库 成本中心出库
---
api/WmsSpaHelper.cs | 178 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 126 insertions(+), 52 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index d3ab124..6a2b796 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -654,7 +654,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>
@@ -1042,8 +1122,6 @@
var po = WMSHelper.GetInboundOrder(itemwlpz.HEAD.WLPZH);
if (po == null)
{
-
-
#region MyRegion
po = new TN_Inbound_Order { S_NO = itemwlpz.HEAD.WLPZH, S_WLPZND = itemwlpz.HEAD.ND, S_FACTORY = itemwlpz.ITEM[0].GC, S_IN_TYPE = "鍐呴噰鍏ュ簱", S_BS_TYPE = itemwlpz.HEAD.YDLX };
po.Details = new List<TN_Inbound_Detail>();
@@ -1051,28 +1129,7 @@
{
itemwlpz.ITEM.ForEach(a =>
{
- //if (a.ITEM1.Select(s => s.XLH).Count() > 0)//鍒ゆ柇搴忓垪鍙锋槸鍚︿负澶氫釜
- //{
- // foreach (var item in a.ITEM1.Select(s => s.XLH))
- // {
- // po.Details.Add(new TN_Inbound_Detail
- // {
- // S_IO_NO = model.ROOT.WLPZ.HEAD.WLPZBH,
- // N_ROW_NO = po.Details.Count + 1,
- // S_ITEM_CODE = a.WLH,
- // F_QTY = a.SL,
- // S_ITEM_STATE = "鐗╂枡",
- // S_ITEM_NAME = "鐗╂枡",
- // F_ACC_B_QTY = 0,
- // S_KCDD = a.KCDD,
- // S_UOM = a.JBJLDW,//璁￠噺鍗曚綅
- // S_SERIAL_NO = item,
- // S_BATCH_NO = a.PC,
- // });
- // }
- //}
- //else
- //{
+
po.Details.Add(new TN_Inbound_Detail
{
S_IO_NO = itemwlpz.HEAD.WLPZH,
@@ -1114,7 +1171,6 @@
{
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
@@ -1125,7 +1181,7 @@
N_ROW_NO = a.WLPZHXM,
S_ITEM_CODE = a.WLBM,
F_QTY = a.SL,
- S_ITEM_STATE = "鐗╂枡",
+ S_ITEM_STATE = "姝ｅ父",
S_ITEM_NAME = "鐗╂枡",
S_CKPZKJND = a.CKPZND,
F_ACC_B_QTY = 0,
@@ -1146,9 +1202,6 @@
}
}
}
-
-
-
result.resultMsg = "鎴愬姛";
result.WLPZBH = itemwlpz.HEAD.WLPZH;
result.WLPZND = itemwlpz.HEAD.ND;
@@ -1161,7 +1214,6 @@
catch (Exception e)
{
var result = new SimpleResult();
-
result.resultMsg = "澶辫触";
result.WLPZBH = "";
result.WLPZND = "0";
@@ -1735,6 +1787,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();
@@ -1745,7 +1798,7 @@
return result;
}
- po.S_OUT_TYPE = "鎴愭湰涓績鍑哄簱";
+
//鏍规嵁涓嶅悓鍑哄簱绫诲瀷 鍥炶皟sap
if (po.S_OUT_TYPE == "鍐查攢鍑哄簱")
{
@@ -1797,8 +1850,8 @@
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.N_BS_ROW_NO == item.N_ROW_NO).First();//&& a.S_BATCH_NO == item.S_BATCH_NO
+ //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;
@@ -1923,21 +1976,36 @@
//鍥炲弬鐗╂枡淇℃伅
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.WLBH = item.item_code;
+ ckbitem.KEY = arrival_no;
- ckbitem.SL = item.qty;
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.S_CREATOR_NAME;
- ckbitem.PZRQ = DateTime.Now.ToString();
+ ckbitem.GZRY = po.UNAME;
- ckbitem.KCDD = podetail?.S_KCDD;
ckbitem.PC = podetail?.S_BATCH_NO;
+ ckbitem.PZRQ = PZZDRQ;
+ ckbitem.GZRQ = GZRQ;
+
CBcenterBackDto.ITEM listitem1 = new CBcenterBackDto.ITEM();
@@ -1947,7 +2015,7 @@
// .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(',');
+ // string[] xlhValues = item.S_SERIAL_NO.Split(',');
listitem1.XLH= podetail?.S_SERIAL_NO.Split(',').ToList();
//foreach (var xlhValue in xlhValues)
//{
@@ -2001,16 +2069,20 @@
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();
@@ -2018,7 +2090,7 @@
catch (Exception ex)
{
db.RollbackTran();
- LogHelper.Info("璁″垝澶栭�鏂欏洖璋冩姤閿� + ex.Message);
+ LogHelper.Info("鎴愭湰涓績鍥炶皟鎶ラ敊" + ex.Message);
Console.WriteLine(ex.Message);
throw;
@@ -2144,7 +2216,7 @@
//json杞瑇ml
string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
- LogHelper.Info($"鍑鸿鍒掑鍙戞枡鍑哄簱xml鏁版嵁{xml}");
+ LogHelper.Info($"璁″垝澶栧彂鏂欏嚭搴搙ml鏁版嵁{xml}");
// 鍒涘缓 StringContent 骞舵寚瀹氬獟浣撶被鍨嬩负 "text/xml"
//HttpContent content = new StringContent(xml, Encoding.UTF8, "application/xml");
//string url = Settings.WCSSeverUrl + "/api/WmsSap/cesReceiveXmlData";
@@ -2570,8 +2642,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_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);
@@ -2900,7 +2972,7 @@
else
{
//var az = db.Queryable<AZInventory>().ToList();
- var po1 = new TN_Outbound_Order { S_NO = WMSHelper.GenerateShippNo(), S_FACTORY = po.S_FACTORY, 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)
@@ -2914,8 +2986,10 @@
S_DO_NO = po1.S_NO,
S_AREA_CODE = "HJQ",
N_ROW_NO = a.N_ROW_NO,
+ S_KCDD = a.S_KCDD,
S_ITEM_CODE = a.S_ITEM_CODE,
S_ITEM_NAME = a.S_ITEM_NAME,
+ S_UOM = a.S_UOM,
F_QTY = a.F_QTY - a.F_ACC_D_QTY,
S_BATCH_NO = a.S_BATCH_NO,
S_SERIAL_NO = a.S_SERIAL_NO,
--
Gitblit v1.9.1