From 0f3a1cb96455f4ae8458926849cd00147ee9b2fb Mon Sep 17 00:00:00 2001 From: yxw Date: Fri, 27 Sep 2024 13:30:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81MesProductionPartContext=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0cutQty=EF=BC=88=E8=A3=81=E7=89=87=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E9=87=8F=EF=BC=89=202=E3=80=81=E8=A3=81?= =?UTF-8?q?=E7=89=87=E5=B7=A5=E5=8D=95=E7=BB=91=E5=AE=9A=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/step/MesWorkOrderCutProductSnSaveStepService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutProductSnSaveStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutProductSnSaveStepService.java index 5444a01..e71c53c 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutProductSnSaveStepService.java +++ b/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()); From c8576f6f92164d435e77064d6ec3c35b661cdf80 Mon Sep 17 00:00:00 2001 From: yxw Date: Fri, 27 Sep 2024 13:30:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81MesProductionPartContext=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0cutQty=EF=BC=88=E8=A3=81=E7=89=87=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E9=87=8F=EF=BC=89=202=E3=80=81=E8=A3=81?= =?UTF-8?q?=E7=89=87=E5=B7=A5=E5=8D=95=E7=BB=91=E5=AE=9A=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/step/MesWorkOrderCutWorkOrderSaveStepService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutWorkOrderSaveStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutWorkOrderSaveStepService.java index dc4d3da..1a12755 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutWorkOrderSaveStepService.java +++ b/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