1.备货打印添加客户地址

2.备货订制品包件下面增加物料信息

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderInfoVO.java

@@ -13,6 +13,8 @@ public class DistributionStockupOrderInfoVO implements Serializable {
 
 	private String customer;//客户
 
+	private String address;//地址
+
 	private Integer planNum;//计划件数
 
 	private Integer scanNum;//备货件数

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListInfoVO.java

@@ -14,6 +14,7 @@ public class DistributionStockupStockListInfoVO implements Serializable {
 		private Long stockListId;//库存品id
 
 	private String customer;//客户
+	private String deliveryAddress;//地址
 
 	private Integer planNum;//计划件数
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java

@@ -1,8 +1,11 @@
 package com.logpm.distribution.vo;
 
+import com.logpm.distribution.entity.DistributionParcelDetailsEntity;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 @Data
 public class PackageStockupVO implements Serializable {
@@ -21,4 +24,6 @@ public class PackageStockupVO implements Serializable {
 
 	private Long scanId;//扫码记录id
 
+	private List<DistributionParcelDetailsEntity> detailsEntities = new ArrayList<>();
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -170,6 +170,7 @@
         select ldr.id reservationId,
                ldsl.id stockListId,
                ldr.consignee customer,
+               ldr.delivery_address deliveryAddress,
                ldr.goods_area_name stockupArea,
                ldrs.reservation_num planNum,
                ldsl.storage_location warehouseArea,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -18,6 +18,7 @@ package com.logpm.distribution.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +26,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataCodeClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.app.StockupDTO;
+import com.logpm.distribution.entity.DistributionParcelDetailsEntity;
 import com.logpm.distribution.entity.DistributionReservationEntity;
 import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.excel.DistributionStockupExcel;
@@ -80,6 +82,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	@Autowired
 	private IBasicdataWarehouseClient basicdataWarehouseClient;
 
+	@Autowired
+	private IDistributionParcelDetailsService distributionParcelDetailsService;
+
 
 	@Override
 	public IPage<DistributionStockupVO> selectDistributionStockupPage(IPage<DistributionStockupVO> page, DistributionStockupVO distributionStockup) {
@@ -343,10 +348,16 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if(!Objects.isNull(vo.getScanId())){
 				scanNum++;
 			}
+			String orderPackageCode = vo.getPackageBarCode();
+			QueryWrapper<DistributionParcelDetailsEntity> qw = new QueryWrapper<>();
+			qw.eq("package_code",orderPackageCode);
+			List<DistributionParcelDetailsEntity> parcelDetailsEntityList = distributionParcelDetailsService.list(qw);
+			vo.setDetailsEntities(parcelDetailsEntityList);
 		}
 		DistributionStockupOrderInfoVO vo  = new DistributionStockupOrderInfoVO();
 		vo.setReservationId(reservationId);
 		vo.setCustomer(reservationEntity.getConsignee());
+		vo.setAddress(reservationEntity.getDeliveryAddress());
 		vo.setPlanNum(size);
 		vo.setScanNum(scanNum);
 		vo.setStockupArea(reservationEntity.getGoodsAreaName());