Merge remote-tracking branch 'origin/dev_temp_xw202503020000_45316' into test

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());