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 | 51 +++++++++++++--------------------------------------
1 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index 6b46ba6..6a2b796 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -1122,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>();
@@ -1131,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,
@@ -1194,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
@@ -1205,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,
@@ -1226,9 +1202,6 @@
}
}
}
-
-
-
result.resultMsg = "鎴愬姛";
result.WLPZBH = itemwlpz.HEAD.WLPZH;
result.WLPZND = itemwlpz.HEAD.ND;
@@ -1241,7 +1214,6 @@
catch (Exception e)
{
var result = new SimpleResult();
-
result.resultMsg = "澶辫触";
result.WLPZBH = "";
result.WLPZND = "0";
@@ -1826,6 +1798,7 @@
return result;
}
+
//鏍规嵁涓嶅悓鍑哄簱绫诲瀷 鍥炶皟sap
if (po.S_OUT_TYPE == "鍐查攢鍑哄簱")
{
@@ -1877,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;
@@ -2019,15 +1992,15 @@
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.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.GZRY = po.UNAME;
ckbitem.PC = podetail?.S_BATCH_NO;
ckbitem.PZRQ = PZZDRQ;
@@ -2243,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";
@@ -2670,7 +2643,7 @@
else
{
//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 };
+ 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);
@@ -2999,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)
@@ -3013,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