Commit 1745f02b authored by wux's avatar wux

Merge branch 'release' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into release

parents 4615bca1 9519e7aa
ALTER TABLE member_user_level_details MODIFY COLUMN `config_id` bigint DEFAULT NULL COMMENT '会员等级配置id'
ALTER TABLE member_user_level_operate_log MODIFY COLUMN `config_id` bigint DEFAULT NULL COMMENT '会员等级配置id';
ALTER table member_user_level_operate_log MODIFY COLUMN `config_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '会员等级配置名称';
......@@ -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