diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index a6a91c1b3..d5d199fbe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -2857,28 +2857,34 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl loadscanAbnormalVOS = baseMapper.selectAbnormalPackageList(signforEntity.getReservationId(), signforEntity.getDeliveryId()); loadscanAbnormalVOS.forEach(p -> { - switch (p.getOrderPackageStatus()) { - case "10": - p.setOrderPackageStatusName(OrderPackageStatusConstant.weiruku.getName()); - break; - case "20": - p.setOrderPackageStatusName(OrderPackageStatusConstant.yiruku.getName()); - break; - case "30": - p.setOrderPackageStatusName(OrderPackageStatusConstant.zhongzhuanruku.getName()); - break; - case "40": - p.setOrderPackageStatusName(OrderPackageStatusConstant.zhiliu.getName()); - break; -// case "50": +// switch (p.getOrderPackageStatus()) { +// case "10": +// p.setOrderPackageStatusName(OrderPackageStatusConstant.weiruku.getName()); +// break; +// case "20": +// p.setOrderPackageStatusName(OrderPackageStatusConstant.yiruku.getName()); +// break; +// case "30": +// p.setOrderPackageStatusName(OrderPackageStatusConstant.zhongzhuanruku.getName()); +// break; +// case "40": +// p.setOrderPackageStatusName(OrderPackageStatusConstant.zhiliu.getName()); +// break; +//// case "50": +//// p.setOrderPackageStatusName(OrderPackageStatusConstant.yichuku.getName()); +//// break; +// case "60": // p.setOrderPackageStatusName(OrderPackageStatusConstant.yichuku.getName()); // break; - case "60": - p.setOrderPackageStatusName(OrderPackageStatusConstant.yichuku.getName()); - break; - case "70": - p.setOrderPackageStatusName(OrderPackageStatusConstant.yiqianshou.getName()); - break; +// case "70": +// p.setOrderPackageStatusName(OrderPackageStatusConstant.yiqianshou.getName()); +// break; +// } + + if (p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){ + p.setOrderPackageStatusName(OrderPackageStatusConstant.yiqianshou.getName()); + }else { + p.setOrderPackageStatusName("未签收"); } switch (p.getOrderPackageFreezeStatus()) { case "10": @@ -2980,7 +2986,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl