From 36746596927952a6b860129a62eec9059bf083a7 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期六, 26 四月 2025 18:06:27 +0800
Subject: [PATCH] 优化了备料逻辑
---
Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs b/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs
index 024841b..167efff 100644
--- a/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs
+++ b/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs
@@ -162,7 +162,7 @@
// return action;
// }
- // if (barcodeScanned.SCANQTY != inv.Barcode.Qty.ToDecimal())
+ // if (barcodeScanned.SCANQTY != inv.Barcode.Qty.ToDouble())
// {
// action.IsSuccessed = false;
// action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.DiffQty", inv.SN); //$"姝ょ墿鏂欐潯鐮佸叆搴撴暟閲忎笌娓呯偣鏁伴噺涓嶅悓锛屼笉鑳藉叆搴�";
@@ -187,11 +187,11 @@
{
foreach (var item in inv.Items)
{
- item.QTY = inv.Barcode.Qty.ToDecimal();
+ item.QTY = inv.Barcode.Qty.ToDouble();
}
foreach (var item in inv.Packages)
{
- item.QTY = inv.Barcode.Qty.ToDecimal();
+ item.QTY = inv.Barcode.Qty.ToDouble();
}
}
//CustomerSupplyPuton.LocationCode = nLocation.LOCATION_CODE;
@@ -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)
@@ -295,7 +295,7 @@
dtl.INVENTORYQTY = total;
}
//billDetail.DELIVERYDATE = DateTime.Now.Date;
- //billDetail.QTY = total; //inv.Barcode.Qty.ToDecimal();
+ //billDetail.QTY = total; //inv.Barcode.Qty.ToDouble();
var isCompleted = false;
// 鏇存柊鍗曟嵁HEADER鐘舵��
var billHeader = Biz.Db.Queryable<BIZ_ERP_PROD_RETURN>().Where(t => t.BILLCODE.ToUpper() == billCode).First();
@@ -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.ToDecimal();
+ //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