diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java index 1aafdc05..c225c4ad 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java @@ -340,7 +340,7 @@ public class NormalQMController extends BaseController { .setMatnr(code.getItemCode()) .setEbeln(code.getPoNum()) .setEbelp(Integer.valueOf(code.getPoLineNumber())) - .setMenge(code.getRejectQty()) + .setMenge(code.getUnqualifiedQty()) .setMatDoc(code.getReceiveNum()) .setDocYear(DateTimeUtil.format(LocalDate.now(), "yyyy")) ); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java index 4366e0f8..85ae9bb0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalQMControllerService.java @@ -73,17 +73,19 @@ public class NormalQMControllerService { .setMaterialBatch(code.getMaterialBatch()) .setSerialNum(code.getSerialNum()) .setInspectionResult(code.getInspectionResult()) - .setQualifiedQty(code.getReceiveQty()) - .setUnqualifiedQty(code.getRejectQty()) + .setQualifiedQty(code.getQualifiedQty()) + .setUnqualifiedQty(code.getUnqualifiedQty()) ); taskItemVO.setUnqualifiedQty( ObjectUtil.defaultIfNull(taskItemVO.getUnqualifiedQty(), BigDecimal.ZERO) .add(ObjectUtil.defaultIfNull(code.getUnqualifiedQty(), BigDecimal.ZERO))); taskItemVO.setQualifiedQty( ObjectUtil.defaultIfNull(taskItemVO.getQualifiedQty(), BigDecimal.ZERO) - .add(ObjectUtil.defaultIfNull(code.getReceiveQty(), BigDecimal.ZERO))); - taskItemVO.setInQty(ObjectUtil.defaultIfNull(code.getQualifiedQty(), BigDecimal.ZERO) - .add(ObjectUtil.defaultIfNull(code.getUnqualifiedQty(), BigDecimal.ZERO))); + .add(ObjectUtil.defaultIfNull(code.getQualifiedQty(), BigDecimal.ZERO))); + taskItemVO.setInQty(ObjectUtil.defaultIfNull(taskItemVO.getInQty(), BigDecimal.ZERO) + .add(ObjectUtil.defaultIfNull(code.getReceiveQty(), BigDecimal.ZERO)) + .add(ObjectUtil.defaultIfNull(code.getUnqualifiedQty(), BigDecimal.ZERO)) + ); }); } }