Skip to content

J
jiedao-api-boot-master
Commit fe70ed10 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'master-fix' into release 

# Conflicts:
#	yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
parents 80868350 85c95eeb
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 14 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java
View file @ fe70ed10
......@@ -1100,16 +1100,16 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
if (Objects.nonNull(orderItemDO.getIsPayAdvance()) && orderItemDO.getIsPayAdvance() == 1) {
if (!Objects.equals(orderDO.getInWarehouseState(), OrderWarehouseInStatusEnum.warehouse_finished.getValue())
&& orderDO.getShipmentState() == 0
&& Objects.nonNull(orderItemDO.getWarehouseInInfoVO())
&& orderItemDO.getWarehouseInInfoVO().getCartonsNum() > 0) {
continue;
}
isPayAdvanceException = true;
} else {
if (!Objects.equals(orderDO.getShipmentState(), OrderStatusMsgEnum.PRE_INSTALLED.getShipmentState()) && !Objects.equals(orderDO.getShipmentState(), OrderStatusMsgEnum.WAREHOUSED.getShipmentState())) {
continue;
}
}
// else {
// if (!Objects.equals(orderDO.getShipmentState(), OrderStatusMsgEnum.PRE_INSTALLED.getShipmentState()) && !Objects.equals(orderDO.getShipmentState(), OrderStatusMsgEnum.WAREHOUSED.getShipmentState())) {
// continue;
// }
// }
//运费
this.createReceivable(orderDO,
orderItemDO, 1,
......@@ -1160,18 +1160,19 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
if (type == 1) {
// 未生成应收时，根据预付状态判断当前订单状态是否生成应收单
if (Objects.nonNull(orderItemDO.getIsPayAdvance()) && orderItemDO.getIsPayAdvance() == 1) {
if (!Objects.equals(orderDO.getInWarehouseState(), OrderWarehouseInStatusEnum.warehouse_finished.getValue()) &&
orderDO.getShipmentState() == 0 &&
Objects.nonNull(orderItemDO.getWarehouseInInfoVO()) &&
orderItemDO.getWarehouseInInfoVO().getCartonsNum() > 0) {
if (!Objects.equals(orderDO.getInWarehouseState(), OrderWarehouseInStatusEnum.warehouse_finished.getValue())
&& orderDO.getShipmentState() == 0
// && Objects.nonNull(orderItemDO.getWarehouseInInfoVO())
&& orderItemDO.getWarehouseInInfoVO().getCartonsNum() > 0) {
continue;
}
isPayAdvanceException = true;
} else {
if (!Objects.equals(orderDO.getShipmentState(), OrderStatusMsgEnum.PRE_INSTALLED.getShipmentState()) && !Objects.equals(orderDO.getShipmentState(), OrderStatusMsgEnum.WAREHOUSED.getShipmentState())) {
continue;
}
}
// else {
// if (!Objects.equals(orderDO.getShipmentState(), OrderStatusMsgEnum.PRE_INSTALLED.getShipmentState()) && !Objects.equals(orderDO.getShipmentState(), OrderStatusMsgEnum.WAREHOUSED.getShipmentState())) {
// continue;
// }
// }
this.createReceivable(orderDO, orderItemDO, 2, orderItemDO.getOneClearanceFreight(), orderItemDO.getClearanceFreight(), orderItemDO.getClearanceFreightCurrency());
}
} else {
......@@ -2776,7 +2777,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
// 处理未报价时，如果是已入仓产品去生成应收
isPayAdvanceException = this.addOrderReceivable(orderDO,
1);
} else if (orderDO.getShipmentState() > 0) {
} else if (orderDO.getShipmentState() > 0 || type == 18) {
// 已出货订单修改计价都需要更新应收单
isPayAdvanceException = this.addOrderReceivable(orderDO,
1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment