|
@@ -158,7 +158,7 @@ public class BizInboundOrderController extends BaseController {
|
|
}
|
|
}
|
|
bizInboundOrder.setTransferId(transferCode.getId());
|
|
bizInboundOrder.setTransferId(transferCode.getId());
|
|
// 判断转运托盘是否绑定5个以上的产品
|
|
// 判断转运托盘是否绑定5个以上的产品
|
|
- List<BizInboundOrder> bizInboundOrders = bizInboundOrderService.query().eq("transfer_code", bizInboundOrder.getTransferCode()).list();
|
|
|
|
|
|
+ List<BizInboundOrder> bizInboundOrders = bizInboundOrderService.query().eq("status", 2).eq("transfer_code", bizInboundOrder.getTransferCode()).list();
|
|
List<String> productCodes = bizInboundOrders.stream().map(BizInboundOrder::getProductCode).distinct().collect(Collectors.toList());
|
|
List<String> productCodes = bizInboundOrders.stream().map(BizInboundOrder::getProductCode).distinct().collect(Collectors.toList());
|
|
if (productCodes.stream().noneMatch(t -> t.equals(bizInboundOrder.getProductCode()))) {
|
|
if (productCodes.stream().noneMatch(t -> t.equals(bizInboundOrder.getProductCode()))) {
|
|
productCodes.add(bizInboundOrder.getProductCode());
|
|
productCodes.add(bizInboundOrder.getProductCode());
|
|
@@ -221,7 +221,7 @@ public class BizInboundOrderController extends BaseController {
|
|
}
|
|
}
|
|
bizInboundOrder.setTransferId(transferCode.getId());
|
|
bizInboundOrder.setTransferId(transferCode.getId());
|
|
// 判断转运托盘是否绑定5个以上的产品
|
|
// 判断转运托盘是否绑定5个以上的产品
|
|
- List<BizInboundOrder> bizInboundOrders = bizInboundOrderService.query().eq("transfer_code", bizInboundOrder.getTransferCode()).list();
|
|
|
|
|
|
+ List<BizInboundOrder> bizInboundOrders = bizInboundOrderService.query().eq("status", 2).eq("transfer_code", bizInboundOrder.getTransferCode()).list();
|
|
List<String> productCodes = bizInboundOrders.stream().map(BizInboundOrder::getProductCode).distinct().collect(Collectors.toList());
|
|
List<String> productCodes = bizInboundOrders.stream().map(BizInboundOrder::getProductCode).distinct().collect(Collectors.toList());
|
|
if (productCodes.stream().noneMatch(t -> t.equals(bizInboundOrder.getProductCode()))) {
|
|
if (productCodes.stream().noneMatch(t -> t.equals(bizInboundOrder.getProductCode()))) {
|
|
productCodes.add(bizInboundOrder.getProductCode());
|
|
productCodes.add(bizInboundOrder.getProductCode());
|