diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java index 7262f1440..8b805a8e7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java @@ -234,7 +234,7 @@ public class ReviewOrderApplicationService { } db.setPendingReviewQty(pending.subtract(qty)); db.setReviewedQty(reviewed.add(qty)); - // 同步页面传入的重量/体积/面积 + // 同步页面传入的重量/体积/面积/尺寸 if (i.getNetWeightKg() != null) { db.setNetWeightKg(i.getNetWeightKg()); } @@ -247,6 +247,9 @@ public class ReviewOrderApplicationService { if (i.getAreaSqm() != null) { db.setAreaSqm(i.getAreaSqm()); } + if (i.getSize() != null) { + db.setSize(i.getSize()); + } fillOperator(db); reviewMaterialDetailMapper.updateById(db); } @@ -288,7 +291,7 @@ public class ReviewOrderApplicationService { db.setReviewedQty(reviewed.subtract(qty)); db.setPendingReviewQty(pending.add(qty)); db.setCancelQty(cancel.add(qty)); - // 同步页面传入的重量/体积/面积 + // 同步页面传入的重量/体积/面积/尺寸 if (i.getNetWeightKg() != null) { db.setNetWeightKg(i.getNetWeightKg()); } @@ -301,6 +304,9 @@ public class ReviewOrderApplicationService { if (i.getAreaSqm() != null) { db.setAreaSqm(i.getAreaSqm()); } + if (i.getSize() != null) { + db.setSize(i.getSize()); + } fillOperator(db); reviewMaterialDetailMapper.updateById(db); } @@ -337,16 +343,16 @@ public class ReviewOrderApplicationService { // 与出库单「复核确认」一致:复核数量与拣货数量不一致时生成复核异常单(FHYC) genOutOrderAbnormalAfterReviewConfirm(reviewOrderId); // 校验:复核确认前,已复核数量必须等于计划数量 - List details = reviewOrderMapper.queryDetailByReviewOrderId(reviewOrderId); - if (!CollectionUtils.isEmpty(details)) { - for (ReviewMaterialDetailPO detail : details) { - BigDecimal reviewed = nz(detail.getReviewedQty()); - BigDecimal plan = nz(detail.getMaterialPlanQty()); - if (reviewed.compareTo(plan) != 0) { - throw new ServiceException("该物料已复核数量不等于计划数量"); - } - } - } +// List details = reviewOrderMapper.queryDetailByReviewOrderId(reviewOrderId); +// if (!CollectionUtils.isEmpty(details)) { +// for (ReviewMaterialDetailPO detail : details) { +// BigDecimal reviewed = nz(detail.getReviewedQty()); +// BigDecimal plan = nz(detail.getMaterialPlanQty()); +// if (reviewed.compareTo(plan) != 0) { +// throw new ServiceException("该物料已复核数量不等于计划数量"); +// } +// } +// } ReviewOrder order = reviewOrderMapper.selectById(reviewOrderId); if (order == null) { continue; @@ -751,8 +757,11 @@ public class ReviewOrderApplicationService { if (i.getAreaSqm() != null) { db.setAreaSqm(i.getAreaSqm()); } + if (i.getSize() != null) { + db.setSize(i.getSize()); + } if (qtyTouched || i.getNetWeightKg() != null || i.getGrossWeightKg() != null - || i.getVolumeCbm() != null || i.getAreaSqm() != null) { + || i.getVolumeCbm() != null || i.getAreaSqm() != null || i.getSize() != null) { fillOperator(db); reviewMaterialDetailMapper.updateById(db); }