From fe4a8ec610b23d33c697dbb76c298ff3b2e31ef1 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 29 四月 2025 01:14:39 +0800
Subject: [PATCH] 来料打印更新
---
Tiger.Business.WMS/Transaction/Old/OutWorkOrder.cs | 61 +++++++++++++++---------------
1 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Old/OutWorkOrder.cs b/Tiger.Business.WMS/Transaction/Old/OutWorkOrder.cs
index 1dd7340..b542fd4 100644
--- a/Tiger.Business.WMS/Transaction/Old/OutWorkOrder.cs
+++ b/Tiger.Business.WMS/Transaction/Old/OutWorkOrder.cs
@@ -49,8 +49,8 @@
public bool his_isComplete { get; set; }
public bool isCutting { get; set; }
public string ScanAfCut { get; set; }
- public decimal cutQty { get; set; }
- public decimal remainQty { get; set; }
+ public double cutQty { get; set; }
+ public double remainQty { get; set; }
public string QrCode { get; set; }
public BIZ_WMS_TRANSFER transferH = null;
@@ -504,7 +504,7 @@
transferSn = null;
var isFirstDtl = true;
remainQty = 0;
- decimal curQty = CurInv.CurPkg.QTY;
+ double curQty = CurInv.CurPkg.QTY;
foreach (var d in dtls)
{
var actPrQty = d.PRQTY - d.QTY;
@@ -591,43 +591,42 @@
var tfdtl = dtls.OrderBy(q => q.BILLLINE.ToDecimal()).Last();
tfdtl.QTY += cutQty;
//璋冩嫧
- transferH = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCECODE == req.BILLCODE).First() ?? new()
+ transferH = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCE_ORDER == req.BILLCODE).First() ?? new()
{
- BILLCODE = "TF-" + req.BILLCODE,
- BILLDATE = DateTime.Now,
- STATUS = BIZ_WMS_TRANSFER.STATUSs.INIT.GetValue(),
- BIZTYPE = null,
- OUTWAREHOUSECODE = CurInv.Warehouse.WH_CODE,
- INWAREHOUSECODE = CurInv.Warehouse.TRANSFER_WH,
- SOURCETYPE = 0,
- SOURCECODE = req.BILLCODE,
+ ORDER_NO = "TF-" + req.BILLCODE,
+ ORDER_DATE = DateTime.Now,
+ STATUS = BIZ_WMS_TRANSFER.STATUSs.Init.GetValue(),
+ OUT_WH_CODE = CurInv.Warehouse.WH_CODE,
+ IN_WH_CODE = CurInv.Warehouse.TRANSFER_WH,
+ SOURCE_CODE = nameof(req),
+ SOURCE_ORDER = req.BILLCODE,
AUTH_ORG = OrgCode
};
- transferDtl = Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(x => x.BILLCODE == transferH.BILLCODE && x.BILLLINE == tfdtl.BILLLINE).First() ?? new()
+ transferDtl = Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(x => x.ORDER_NO == transferH.ORDER_NO && x.ORDER_LINE == tfdtl.BILLLINE).First() ?? new()
{
- BILLCODE = transferH.BILLCODE,
- BILLLINE = tfdtl.BILLLINE,
- LINESTATUS = BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue(),
+ ORDER_NO = transferH.ORDER_NO,
+ ORDER_LINE = tfdtl.BILLLINE,
+ STATUS = BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue(),
ITEM_CODE = CurInv.ItemInfo.ITEM_CODE,
- UNITCODE = "",
- PRQTY = remainQty,
- OUTQTY = remainQty,
- INQTY = remainQty,
- OUTWAREHOUSECODE = CurInv.Warehouse.WH_CODE,
- INWAREHOUSECODE = CurInv.Warehouse.TRANSFER_WH,
- SOURCETYPE = transferH.SOURCETYPE,
- SOURCECODE = transferH.SOURCECODE,
- SOURCELINE = tfdtl.BILLLINE,
+ UNIT = "",
+ QTY_REQ = remainQty,
+ QTY_OUT = remainQty,
+ QTY_IN = remainQty,
+ OUT_WH_CODE = CurInv.Warehouse.WH_CODE,
+ IN_WH_CODE = CurInv.Warehouse.TRANSFER_WH,
+ SOURCE_CODE = transferH.SOURCE_CODE,
+ SOURCE_ORDER = transferH.SOURCE_ORDER,
+ SOURCE_LINE = tfdtl.BILLLINE,
REMARK = "",
AUTH_ORG = OrgCode
};
- Logger.Interface.Info($"宸ュ崟棰嗘枡 =>鐢熸垚璋冩嫧鏄庣粏锛屽崟鍙凤細[{transferH.BILLCODE}]锛孮ty:{remainQty}锛岀姸鎬�:{transferDtl.LINESTATUS}锛岄」娆★細[{transferDtl.BILLLINE}]");
+ Logger.Interface.Info($"宸ュ崟棰嗘枡 =>鐢熸垚璋冩嫧鏄庣粏锛屽崟鍙凤細[{transferH.ORDER_NO}]锛孮ty:{remainQty}锛岀姸鎬�:{transferDtl.STATUS}锛岄」娆★細[{transferDtl.ORDER_LINE}]");
transferSn = new()
{
- BILLCODE = transferH.BILLCODE,
- BILLLINE = tfdtl.BILLLINE,
+ ORDER_NO = transferH.ORDER_NO,
+ ORDER_LINE = tfdtl.BILLLINE,
ITEM_CODE = CurInv.ItemInfo.ITEM_CODE,
SN = CurInv.CurPkg.SN,
QTY = CurInv.CurPkg.QTY,
@@ -670,11 +669,11 @@
//detail 鍏ㄩ儴瀹屾垚浜�
req.STATUS = BIZ_ERP_PROD_OUT.STATUSs.COMPLETE.GetValue();
Logger.Interface.Info($"宸ュ崟棰嗘枡 =>棰嗘枡鍗昜{req.BILLCODE}]鍙戞枡瀹屾垚锛屽崟澶寸姸鎬�:{req.STATUS}");
- transferH = transferH != null ? transferH : Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCECODE == req.BILLCODE).First();
+ transferH = transferH != null ? transferH : Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCE_ORDER == req.BILLCODE).First();
if (transferH != null)
{
- transferH.STATUS = BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue();
- Logger.Interface.Info($"宸ュ崟棰嗘枡 =>鏇存柊璋冩嫧鍗昜{transferH.BILLCODE}]鐘舵��:{transferH.STATUS}");
+ transferH.STATUS = BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue();
+ Logger.Interface.Info($"宸ュ崟棰嗘枡 =>鏇存柊璋冩嫧鍗昜{transferH.ORDER_NO}]鐘舵��:{transferH.STATUS}");
}
}
else
--
Gitblit v1.9.3