Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutProductSnSaveStepService.java

@@ -146,7 +146,7 @@ public class MesWorkOrderCutProductSnSaveStepService extends BaseStepService {
 
                 produceSn.setCustSn(produceSn.getCustSn());
                 produceSn.setSerialNumber(doGenerateSerialNo(reqBean, resultBean, MesPcnExtConstWords.DEFAULT_SERIAL_NUMBER_RULE, part));
-                produceSn.setQty(mesProductionPartContext.getQty());
+                produceSn.setQty(mesProductionPartContext.getCutQty());
 
                 produceSn.setWorkOrderNo(mesProductionPartContext.getWorkOrderNo());
                 produceSn.setCustCode(mesProductionPartContext.getCustCode());

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutWorkOrderSaveStepService.java

@@ -86,7 +86,7 @@ public class MesWorkOrderCutWorkOrderSaveStepService extends BaseStepService {
 
             for (MesProductionPartContext mesProductionPartContext : productionPartContextList) {
                 MesWorkOrder workOrder = workOrderExtService.getWorkOrder(reqBean.getOrganizeCode(), mesProductionPartContext.getWorkOrderNo());
-                workOrder.setCompleteQty(MathOperation.add(workOrder.getCompleteQty(), mesProductionPartContext.getQty()));
+                workOrder.setCompleteQty(MathOperation.add(workOrder.getCompleteQty(), mesProductionPartContext.getCutQty()));
                 if (MathOperation.compareTo(workOrder.getCompleteQty(), workOrder.getQty()) >= 0 && workOrder.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue()) != 0)
                     workOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
                 else