|
|
|
@ -557,7 +557,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
|
|
|
|
|
if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId())) { |
|
|
|
|
throw new ServiceException("订单的客户数据异常,无法转换!!"); |
|
|
|
|
} |
|
|
|
|
addStockList(distributionStockArticleEntity, parcelListEntity, 1); |
|
|
|
|
// addStockList(distributionStockArticleEntity, parcelListEntity, 1);
|
|
|
|
|
// //修改状态
|
|
|
|
|
DistributionParcelListEntity parcelList = new DistributionParcelListEntity(); |
|
|
|
|
parcelList.setId(i.getId()); |
|
|
|
@ -985,6 +985,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
|
|
|
|
|
distributionStockListInfo.setWarehouseId(distributionStockListEntity.getWarehouseId()); //仓库ID
|
|
|
|
|
distributionStockListInfo.setMarketId(distributionStockListEntity.getMarketId()); //商场
|
|
|
|
|
distributionStockListInfo.setCargoUnit(distributionStockListEntity.getCargoUnit()); //货物单位
|
|
|
|
|
distributionStockListInfo.setStorageLocation(distributionParcelListEntity.getPallet()); //货物单位
|
|
|
|
|
|
|
|
|
|
distributionStockListInfo.setMallName(distributionStockListEntity.getMallName()); //商场名称
|
|
|
|
|
distributionStockListInfo.setQuantityStock(distributionParcelListEntity.getQuantity()); //库存数量(包件数量)
|
|
|
|
@ -1002,6 +1003,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
|
|
|
|
|
// distributionStockListEntity.setCategory(Optional.ofNullable(distributionParcelList.getBrandId()+"").orElse(null));//品分类
|
|
|
|
|
// 品牌
|
|
|
|
|
distributionStockListInfo.setBrandId(distributionStockListEntity.getBrandId()); |
|
|
|
|
distributionStockListInfo.setBrandName(distributionStockListEntity.getBrandName()); |
|
|
|
|
distributionStockListInfo.setUnpackingQuantity(0); |
|
|
|
|
distributionStockListInfo.setSourceType("1"); //类型
|
|
|
|
|
|
|
|
|
@ -1027,6 +1029,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
|
|
|
|
|
distributionStockListInfo.setOrderCode(distributionStockArticleEntity.getOrderCode()); |
|
|
|
|
distributionStockListInfo.setParcelListId(distributionParcelListEntity.getId()); |
|
|
|
|
distributionStockListInfo.setPackageCode(distributionParcelListEntity.getOrderPackageCode()); |
|
|
|
|
distributionStockListInfo.setDespatch(distributionParcelListEntity.getWaybillNumber()); |
|
|
|
|
infoEntities.add(distributionStockListInfo); |
|
|
|
|
} |
|
|
|
|
distributionStockListInfoService.saveBatch(infoEntities); |
|
|
|
|