Ver código fonte

委外订单不去除管理费

fgd 1 ano atrás
pai
commit
9c40e48ecb

+ 2 - 1
sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageBomServiceImpl.java

@@ -116,7 +116,8 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
                                 || ObjectUtil.equals(item.getDetailType(), InDetailTypeEnum.GIVE_BACK.getKey()))) {
                         return true;
                     } else if (ObjectUtil.equals(dto.getType(), InOutTypeEnum.OUT.getKey())
-                         && ObjectUtil.equals(item.getDetailType(), OutDetailTypeEnum.PRODUCTION.getKey())) {
+                         && (ObjectUtil.equals(item.getDetailType(), OutDetailTypeEnum.PRODUCTION.getKey())
+                            || ObjectUtil.equals(item.getDetailType(), OutDetailTypeEnum.ALLOT.getKey()))) {
                         return true;
                     }
                     return false;

+ 0 - 1
sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -583,7 +583,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
             }
             dto.setProductTotalAmount(BigDecimal.ZERO);
             dto.setDeliveryMaterialsFee(BigDecimal.ZERO);
-            dto.setManagementFee(BigDecimal.ZERO);
             dto.setPackingLabor(dto.getPackingLabor().multiply(new BigDecimal(2)));
             dto.setTotalAmount(dto.getProductTotalAmount()
                     .add(dto.getCustomProcessingFee())