From b7c6607e6937df8f60d99a076178f3173213af1e Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 17 九月 2025 15:59:20 +0800
Subject: [PATCH] 1、送货条码操作类型修改

---
 MES.Service/service/BasicData/ProductionOrderManager.cs |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs
index c0e86fc..aea600c 100644
--- a/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -200,11 +200,14 @@
                 BatchNo = erpDto.FLot,
                 Warehouse = erpDto.FStockID,
                 IssuingMethod = erpDto.FIssueType,
-                Unit = erpDto.FUnitID2,
-                Unit2 = erpDto.FUnitID3,
+                Unit = erpDto.FUnitID,
+                Unit2 = erpDto.FUnitID,
                 SupplyingType = erpDto.FSupplyType,
                 Numerator = Convert.ToDecimal(erpDto.FNumerator),
                 Denominator = Convert.ToDecimal(erpDto.FDenominator),
+               CompositionQty = Convert.ToDecimal(erpDto.FNumerator) != 0 ?
+               Math.Round(Convert.ToDecimal(erpDto.FNumerator) / Convert.ToDecimal(erpDto.FDenominator), 2) :
+                0,
                 ErpId = erpDto.FPPOMENTRYID,
                 ErpHeaderId = erpDto.FPPOMID,
                 FixedLoss = Convert.ToDecimal(erpDto.FFixScrapQty),
@@ -212,7 +215,7 @@
                 SubItemType = erpDto.FMaterialType,
                 ItemNo = erpDto.FReplaceGroup,
                 OwnerType = erpDto.FOwnerTypeId,
-                Owner = erpDto.FOwnerID2,
+                Owner = erpDto.FOwnerID,
                 Fisgetscrap = erpDto.FISGETSCRAP,
                 Fiskeycomponent = erpDto.FISKEYCOMPONENT,
                 Fsrctransorgid = erpDto.FSRCTRANSORGID,

--
Gitblit v1.9.3