From 36d259b7fada9d24a423ac4bda3d07aa5864c0a1 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Sun, 2 Mar 2025 10:34:55 +0800
Subject: [PATCH] =?UTF-8?q?45316=20=E8=A3=81=E7=89=87=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=E6=9D=A1=E7=A0=81=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E9=87=8F=E4=B8=BA1200=EF=BC=8C=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E6=B1=87=E6=8A=A5=E9=9C=80=E8=A6=81=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?1200=E6=95=B0=E9=87=8F=E6=B1=87=E6=8A=A5=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=8C=89=E7=85=A7=E6=95=B0=E9=87=8F=E4=B8=BA1?=
 =?UTF-8?q?=E6=B1=87=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
index 4522235..d569404 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
@@ -596,7 +596,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         Map<String, Object> propertyMap = new HashMap<>();
 
         LOGGER.info("工单【{}]】报工原数量【{}】", oldMesWorkOrder.getWorkOrderNo(), oldMesWorkOrder.getReportedQty());
-        double reportQty = MathOperation.add(MesPcnExtConstWords.ONE, oldMesWorkOrder.getReportedQty());
+        double reportQty = MathOperation.add(productionRecord.getQty(), oldMesWorkOrder.getReportedQty());
         propertyMap.put("reportedQty", reportQty);
         if (StringUtils.isEmpty(productionRecord.getWorkOrderNo())) {
             double unCompleteQty = MathOperation.sub(oldMesWorkOrder.getQty(),  reportQty);
@@ -761,7 +761,8 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             newMesProductOffLine.setReportSn(productionRecord.getProductSn());
             newMesProductOffLine.setSerialNumber(productionRecord.getSerialNumber());
         }
-        newMesProductOffLine.setQty(1d);
+        newMesProductOffLine.setItemQty(productionRecord.getQty()* mesBom.getItemQty());
+        newMesProductOffLine.setQty(productionRecord.getQty());
         newMesProductOffLine.setBomVersion(oldMesWorkOrder.getProductVersion());
         newMesProductOffLine.setUnit(mesBom.getUnit());
         newMesProductOffLine.setBomCode(mesBom.getBomCode());