Commit bcb29661 authored by 332784038@qq.com's avatar 332784038@qq.com

提单编辑列表过滤未入仓的产品信息

parent 97a6525f
......@@ -844,7 +844,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
makeBillOfLadingListBackVO.setOrderStatusString(firstBoxPreloadGoodsBackVO.getStatusMsg());
// 首次入仓时间
makeBillOfLadingListBackVO.setRucangTime(firstBoxPreloadGoodsBackVO.getRucangTime());
makeBillOfLadingListBackVO.setOrderItemList(orderGoodsItemList);
makeBillOfLadingListBackVO.setOrderItemList(orderGoodsItemList.stream().filter(item -> Objects.nonNull(item.getWarehouseInInfo()) && item.getWarehouseInInfoVO().getCartonsNum() > 0).collect(Collectors.toList()));
makeBillOfLadingListBackVO.setTidanNo(firstBoxPreloadGoodsBackVO.getTidanNum());
String customsTypeName = "";
if (makeBillOfLadingListBackVO.getCustomsType() == 2) {
......
......@@ -193,7 +193,7 @@ public class BoxPreloadGoodsBackVO {
@ApiModelProperty(value = "合包箱号")
private String pkgNum;
private WarehouseInInfoVO getWarehouseInInfoVO() {
public WarehouseInInfoVO getWarehouseInInfoVO() {
if(warehouseInInfoVO != null) return warehouseInInfoVO;
if(StringUtils.isNotEmpty(this.warehouseInInfo)) {
warehouseInInfoVO = JSONObject.parseObject(this.warehouseInInfo,
......
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