|
|
@ -6894,7 +6894,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib |
|
|
|
String orderCode = distributionStockArticleEntity.getOrderCode(); |
|
|
|
String orderCode = distributionStockArticleEntity.getOrderCode(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
temp.put("合同号", orderCode); |
|
|
|
temp.put("批次号", orderCode); |
|
|
|
|
|
|
|
|
|
|
|
//查询产品名称拼接
|
|
|
|
//查询产品名称拼接
|
|
|
|
String productName = distributionReservationPackageService.getConcatThirdProductByOrderId(reservationId, stockArticleId); |
|
|
|
String productName = distributionReservationPackageService.getConcatThirdProductByOrderId(reservationId, stockArticleId); |
|
|
@ -6941,7 +6941,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
Integer reservationNum = reservationStocklistEntity.getReservationNum(); |
|
|
|
Integer reservationNum = reservationStocklistEntity.getReservationNum(); |
|
|
|
temp.put("合同号", distributionStockListEntity.getOrderCode()); |
|
|
|
temp.put("批次号", distributionStockListEntity.getIncomingBatch()); |
|
|
|
temp.put("产品名称", distributionStockListEntity.getDescriptionGoods() + "(" + reservationNum + ")"); |
|
|
|
temp.put("产品名称", distributionStockListEntity.getDescriptionGoods() + "(" + reservationNum + ")"); |
|
|
|
//todo 单位是否需要查询物料表
|
|
|
|
//todo 单位是否需要查询物料表
|
|
|
|
temp.put("单位", Optional.ofNullable(distributionStockListEntity.getCargoUnit()).orElse(null)); |
|
|
|
temp.put("单位", Optional.ofNullable(distributionStockListEntity.getCargoUnit()).orElse(null)); |
|
|
|