weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(wms): 复核状态逻辑修改

Browse Source
This commit is contained in:
zhaoqing
2026-08-08 11:46:55 +08:00
parent 4fde6e1a9c
commit 02de8706e2
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java
+22 -13
View File
@@ -234,7 +234,7 @@ public class ReviewOrderApplicationService {
} }
db.setPendingReviewQty(pending.subtract(qty)); db.setPendingReviewQty(pending.subtract(qty));
db.setReviewedQty(reviewed.add(qty)); db.setReviewedQty(reviewed.add(qty));
// 同步页面传入的重量/体积/面积 // 同步页面传入的重量/体积/面积/尺寸
if (i.getNetWeightKg() != null) { if (i.getNetWeightKg() != null) {
db.setNetWeightKg(i.getNetWeightKg()); db.setNetWeightKg(i.getNetWeightKg());
} }
@@ -247,6 +247,9 @@ public class ReviewOrderApplicationService {
if (i.getAreaSqm() != null) { if (i.getAreaSqm() != null) {
db.setAreaSqm(i.getAreaSqm()); db.setAreaSqm(i.getAreaSqm());
} }
if (i.getSize() != null) {
db.setSize(i.getSize());
}
fillOperator(db); fillOperator(db);
reviewMaterialDetailMapper.updateById(db); reviewMaterialDetailMapper.updateById(db);
} }
@@ -288,7 +291,7 @@ public class ReviewOrderApplicationService {
db.setReviewedQty(reviewed.subtract(qty)); db.setReviewedQty(reviewed.subtract(qty));
db.setPendingReviewQty(pending.add(qty)); db.setPendingReviewQty(pending.add(qty));
db.setCancelQty(cancel.add(qty)); db.setCancelQty(cancel.add(qty));
// 同步页面传入的重量/体积/面积 // 同步页面传入的重量/体积/面积/尺寸
if (i.getNetWeightKg() != null) { if (i.getNetWeightKg() != null) {
db.setNetWeightKg(i.getNetWeightKg()); db.setNetWeightKg(i.getNetWeightKg());
} }
@@ -301,6 +304,9 @@ public class ReviewOrderApplicationService {
if (i.getAreaSqm() != null) { if (i.getAreaSqm() != null) {
db.setAreaSqm(i.getAreaSqm()); db.setAreaSqm(i.getAreaSqm());
} }
if (i.getSize() != null) {
db.setSize(i.getSize());
}
fillOperator(db); fillOperator(db);
reviewMaterialDetailMapper.updateById(db); reviewMaterialDetailMapper.updateById(db);
} }
@@ -337,16 +343,16 @@ public class ReviewOrderApplicationService {
// 与出库单「复核确认」一致：复核数量与拣货数量不一致时生成复核异常单（FHYC） // 与出库单「复核确认」一致：复核数量与拣货数量不一致时生成复核异常单（FHYC）
genOutOrderAbnormalAfterReviewConfirm(reviewOrderId); genOutOrderAbnormalAfterReviewConfirm(reviewOrderId);
// 校验：复核确认前，已复核数量必须等于计划数量 // 校验：复核确认前，已复核数量必须等于计划数量
List<ReviewMaterialDetailPO> details = reviewOrderMapper.queryDetailByReviewOrderId(reviewOrderId); // List<ReviewMaterialDetailPO> details = reviewOrderMapper.queryDetailByReviewOrderId(reviewOrderId);
if (!CollectionUtils.isEmpty(details)) { // if (!CollectionUtils.isEmpty(details)) {
for (ReviewMaterialDetailPO detail : details) { // for (ReviewMaterialDetailPO detail : details) {
BigDecimal reviewed = nz(detail.getReviewedQty()); // BigDecimal reviewed = nz(detail.getReviewedQty());
BigDecimal plan = nz(detail.getMaterialPlanQty()); // BigDecimal plan = nz(detail.getMaterialPlanQty());
if (reviewed.compareTo(plan) != 0) { // if (reviewed.compareTo(plan) != 0) {
throw new ServiceException("该物料已复核数量不等于计划数量"); // throw new ServiceException("该物料已复核数量不等于计划数量");
} // }
} // }
} // }
ReviewOrder order = reviewOrderMapper.selectById(reviewOrderId); ReviewOrder order = reviewOrderMapper.selectById(reviewOrderId);
if (order == null) { if (order == null) {
continue; continue;
@@ -751,8 +757,11 @@ public class ReviewOrderApplicationService {
if (i.getAreaSqm() != null) { if (i.getAreaSqm() != null) {
db.setAreaSqm(i.getAreaSqm()); db.setAreaSqm(i.getAreaSqm());
} }
if (i.getSize() != null) {
db.setSize(i.getSize());
}
if (qtyTouched || i.getNetWeightKg() != null || i.getGrossWeightKg() != null 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); fillOperator(db);
reviewMaterialDetailMapper.updateById(db); reviewMaterialDetailMapper.updateById(db);
} }