diff --git a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java index 4182b61..033f789 100644 --- a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java +++ b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java @@ -650,13 +650,12 @@ public class PODetailServiceImpl extends ServiceImpl i /** * 按新业务规则判定发货后的目标状态: - * 1) c_ship_qty == inspect_approve_qty 且 qty == inspect_qty => 已发货; + * 1) c_ship_qty == qty => 已发货; * 2) 其余情况 => 部分发货。 */ private String resolveShipStatus(BigDecimal newShipQty, BigDecimal inspectApproveQty, BigDecimal orderQty, BigDecimal inspectQty) { - if (newShipQty.compareTo(inspectApproveQty) == 0 - && orderQty.compareTo(inspectQty) == 0) { + if ( orderQty.compareTo(newShipQty) == 0) { return "已发货"; } return "部分发货";