From 459d4a2b2bd5390a5d02947e75a934207fb9ad0c Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 24 三月 2025 17:08:39 +0800
Subject: [PATCH] 更新U9实体，新增业务实体
---
Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs b/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs
index 425ba4a..167efff 100644
--- a/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs
+++ b/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs
@@ -246,7 +246,7 @@
return action;
}
string billCode = barcodeScanneds?.BUSINESSCODE;
- string billCodeT = barcodeScannedsT?.BILLCODE;
+ string billCodeT = barcodeScannedsT?.ORDER_NO;
//string billLine = barcodeScanneds[0].BILLLINE;
foreach (var item in inv.Items)
@@ -321,41 +321,41 @@
}
Logger.Default.Info($"鏇存柊鍗曟嵁鏄庣粏淇℃伅:鍗曞彿[{billCode}]锛岄」娆{string.Join(",", billDetail.Select(q=>q.BILLLINE))}]锛屾暟閲廩{string.Join(",", billDetail.Select(q => q.INVENTORYQTY))}]锛岀姸鎬乕{string.Join(",", billDetail.Select(q => q.LINESTATUS))}]");
//璋冩嫧鍗�
- var billDetailT = Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(t => t.BILLCODE.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE == inv.ItemInfo.ITEM_CODE).ToList();
+ var billDetailT = Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(t => t.ORDER_NO.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE == inv.ItemInfo.ITEM_CODE).ToList();
foreach (var dtl in billDetailT)
{
- dtl.INWAREHOUSECODE = putOnInfo.Warehouse.WH_CODE;
+ dtl.IN_WH_CODE = putOnInfo.Warehouse.WH_CODE;
}
var totalT = Biz.Db.Queryable<BIZ_WMS_TRANSFER_SN>()
- .Where(t => t.BILLCODE.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE == inv.ItemInfo.ITEM_CODE)
+ .Where(t => t.ORDER_NO.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE == inv.ItemInfo.ITEM_CODE)
.Where(t => t.STATUS == WMS_ITEM.STATUSs.InStore.GetValue() || inv.Items.Select(q => q.SN).Contains(t.SN))
.Sum(x => x.QTY);
foreach (var dtl in billDetailT)
{
- dtl.INQTY = total;
- dtl.INVENTORYQTY = total;
+ dtl.QTY_IN = total;
+ //dtl.INVENTORYQTY = total;
if (dtl.ITEM_CODE == lotNo?.ITEM_CODE)
{
- dtl.BATCH_NO_IN = WarehouseName.Contains("瀹緵") ? lotNo.LOTNO : "";
- dtl.BATCH_NO_OUT = WarehouseName.Contains("瀹緵") ? lotNo.LOTNO : "";
+ dtl.IN_LOTNO = WarehouseName.Contains("瀹緵") ? lotNo.LOTNO : "";
+ dtl.OUT_LOTNO = WarehouseName.Contains("瀹緵") ? lotNo.LOTNO : "";
}
}
//billDetail.DELIVERYDATE = DateTime.Now.Date;
//billDetail.QTY = total; //inv.Barcode.Qty.ToDouble();
var isCompletedT = false;
// 鏇存柊鍗曟嵁HEADER鐘舵��
- var billHeaderT = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(t => t.BILLCODE.ToUpper() == billCodeT).First();
- if (billDetailT.Sum(t => t.PRQTY) == totalT)
+ var billHeaderT = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(t => t.ORDER_NO.ToUpper() == billCodeT).First();
+ if (billDetailT.Sum(t => t.QTY_REQ) == totalT)
{
foreach (var dtl in billDetailT)
{
- dtl.LINESTATUS = BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue();
+ dtl.STATUS = BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue();
}
//barcodeScanned.STATUS = WMS_ITEM.STATUSs.InStore.GetValue();
- if (!Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(t => t.BILLCODE.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE != inv.ItemInfo.ITEM_CODE && t.LINESTATUS != BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue()).Any())
+ if (!Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(t => t.ORDER_NO.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE != inv.ItemInfo.ITEM_CODE && t.STATUS != BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue()).Any())
{
- billHeaderT.STATUS = BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue();
+ billHeaderT.STATUS = BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue();
isCompletedT = true;
}
}
@@ -363,10 +363,10 @@
{
foreach (var dtl in billDetailT)
{
- dtl.LINESTATUS = BIZ_WMS_TRANSFER.STATUSs.WORKING.GetValue();
+ dtl.STATUS = BIZ_WMS_TRANSFER.STATUSs.Storing.GetValue();
}
}
- Logger.Default.Info($"鏇存柊鍗曟嵁鏄庣粏淇℃伅:鍗曞彿[{billCodeT}]锛岄」娆{string.Join(",", billDetailT.Select(q => q.BILLLINE))}]锛屾暟閲廩{string.Join(",", billDetailT.Select(q => q.INVENTORYQTY))}]锛岀姸鎬乕{string.Join(",", billDetail.Select(q => q.LINESTATUS))}]");
+ Logger.Default.Info($"鏇存柊鍗曟嵁鏄庣粏淇℃伅:鍗曞彿[{billCodeT}]锛岄」娆{string.Join(",", billDetailT.Select(q => q.ORDER_LINE))}]锛屾暟閲廩{string.Join(",", billDetailT.Select(q => q.QTY_IN))}]锛岀姸鎬乕{string.Join(",", billDetail.Select(q => q.LINESTATUS))}]");
#endregion
--
Gitblit v1.9.3