Commit 1c6ad7c3 authored by yanghao's avatar yanghao

task: #240 空运/海运-PDA/后台, 添加理货相关页面的属性

parent 8d3153c7
...@@ -226,9 +226,7 @@ import java.util.*; ...@@ -226,9 +226,7 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.ORDER_IS_APPROVAL_IN_PROCESS;
import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.ORDER_LINE_CHANNEL_NOT_NULL; import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.ORDER_LINE_CHANNEL_NOT_NULL;
import static cn.iocoder.yudao.module.order.enums.OrderApprovalTypeEnum.WAREHOUSE_ADJUST;
import static cn.iocoder.yudao.module.shipment.enums.BoxAirStatusEnum.TO_WAREHOUSED; import static cn.iocoder.yudao.module.shipment.enums.BoxAirStatusEnum.TO_WAREHOUSED;
import static cn.iocoder.yudao.module.shipment.enums.BoxStatusEnum.UNLOADED; import static cn.iocoder.yudao.module.shipment.enums.BoxStatusEnum.UNLOADED;
import static cn.iocoder.yudao.module.shipment.enums.ErrorCodeConstants.*; import static cn.iocoder.yudao.module.shipment.enums.ErrorCodeConstants.*;
...@@ -2198,6 +2196,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements ...@@ -2198,6 +2196,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
// 设置报关方式 // 设置报关方式
boxTallyBackVO.setCustomsType(boxPreloadGoodsDO.getCustomsType()); boxTallyBackVO.setCustomsType(boxPreloadGoodsDO.getCustomsType());
// 是否有关联单
boolean hasRelationOrder = orderGoodsItemList.stream().anyMatch(t -> t.getGuanLianOrderCount() > 1);
boxTallyBackVO.setHasRelationOrder(hasRelationOrder);
Long installNum = boxOrderCheckInfoService.selectCount(new LambdaQueryWrapperX<BoxOrderCheckInfoDO>() Long installNum = boxOrderCheckInfoService.selectCount(new LambdaQueryWrapperX<BoxOrderCheckInfoDO>()
.eq(BoxOrderCheckInfoDO::getShipmentId, shipmentId) .eq(BoxOrderCheckInfoDO::getShipmentId, shipmentId)
.eq(BoxOrderCheckInfoDO::getOrderId, orderId) .eq(BoxOrderCheckInfoDO::getOrderId, orderId)
...@@ -2281,6 +2283,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements ...@@ -2281,6 +2283,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
// 设置报关方式 // 设置报关方式
boxGuanlianOrderBackVO.setCustomsType(boxPreloadGoodsDO.getCustomsType()); boxGuanlianOrderBackVO.setCustomsType(boxPreloadGoodsDO.getCustomsType());
// 是否有关联单
boolean hasRelationOrder = orderGoodsItemList.stream().anyMatch(t -> t.getGuanLianOrderCount() > 1);
boxGuanlianOrderBackVO.setHasRelationOrder(hasRelationOrder);
// Long installNum = boxOrderCheckInfoService.selectCount(new LambdaQueryWrapperX<BoxOrderCheckInfoDO>() // Long installNum = boxOrderCheckInfoService.selectCount(new LambdaQueryWrapperX<BoxOrderCheckInfoDO>()
// .eq(BoxOrderCheckInfoDO::getShipmentId, shipmentId) // .eq(BoxOrderCheckInfoDO::getShipmentId, shipmentId)
// .eq(BoxOrderCheckInfoDO::getOrderId, orderIdTmp) // .eq(BoxOrderCheckInfoDO::getOrderId, orderIdTmp)
......
...@@ -65,4 +65,7 @@ public class BoxGuanlianOrderBackVO { ...@@ -65,4 +65,7 @@ public class BoxGuanlianOrderBackVO {
@ApiModelProperty(value = "混箱状态, 1-混箱") @ApiModelProperty(value = "混箱状态, 1-混箱")
private Integer mixStatus = 0; private Integer mixStatus = 0;
@ApiModelProperty(value = "是否有关联单")
private Boolean hasRelationOrder = false;
} }
...@@ -77,5 +77,8 @@ public class BoxTallyBackVO { ...@@ -77,5 +77,8 @@ public class BoxTallyBackVO {
@ApiModelProperty(value = "混箱状态, 1-混箱") @ApiModelProperty(value = "混箱状态, 1-混箱")
private Integer mixStatus = 0; private Integer mixStatus = 0;
@ApiModelProperty(value = "是否有关联单")
private Boolean hasRelationOrder = false;
} }
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