Merge remote-tracking branch 'origin/dev' into dev

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

@@ -13,6 +13,7 @@ public class PackageStockupVO implements Serializable {
 	private String orderCode;
 
 	private String packageBarCode;//包条码
+	private Long parceListId;//包条Id
 
 	private Integer goodsType;//货物类型
 	private String goodsTypeStr;//货物类型

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

@@ -99,11 +99,10 @@
           and CONCAT(ldpl.cargo_title,'-',ldpl.shelf_title,'-',ldpl.goods_allocation) = #{allocation}
           and ldpl.pallet = #{pallet}
           and ldr.is_deleted = 0 -->
-        select ldpl.order_code,ldpl.order_package_code, 1 goodsType, IF(lds.id is null,0,1) isScan,lds.id scanId
+        select ldpl.order_code orderCode,ldpl.order_package_code packageBarCode, 1 goodsType,ldrp.parce_list_id parceListId
         from logpm_distribution_reservation_package ldrp
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id =ldrp.parce_list_id and lwtg.association_type = '3'
-        LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id=ldrp.id
         <where>
              ldrp.reservation_id = #{reservationId}  and ldrp.stock_article_id = #{stockArticleId}  and ldrp.packet_bar_status in (1,3)
             <if test="trayId != null and trayId != ''"> and lwtg.tray_id = #{trayId}</if>

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

@@ -201,13 +201,13 @@
         ,(
         select COUNT(drp.id)
         from logpm_distribution_reservation_package drp
-        where drp.reservation_id = ldrp.reservation_id  and drp.packet_bar_status in (1,3)
+        where drp.reservation_id = ldrp.reservation_id  and drp.packet_bar_status in (1,3) and  drp.stock_article_id = ldpl.stock_article_id
         ) planNum,
         (
         select COUNT(lds.id)
         from logpm_distribution_reservation_package drp
         LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = drp.parce_list_id
-        where drp.reservation_id = ldrp.reservation_id and drp.packet_bar_status in (1,3)
+        where drp.reservation_id = ldrp.reservation_id and drp.packet_bar_status in (1,3) and  drp.stock_article_id = ldpl.stock_article_id
         ) scanNum
         from logpm_distribution_reservation_package ldrp
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id

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

@@ -38,7 +38,7 @@
     </delete>
 
     <select id="selectPackageExist" resultType="Integer">
-        select COUNT (ldpl.id)
+        select COUNT(ldpl.id)
         from logpm_distribution_stockup_info ldsi
                  LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id
                  LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id

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

@@ -88,6 +88,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	@Autowired
 	private IDistributionStockService distributionStockService;
 
+	@Autowired
+	private DistributionStockupMapper distributionStockupService;
+
 	@Autowired
 	private IDistributionStockListService distributionStockListService;
 
@@ -400,10 +403,19 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		List<PackageStockupVO> list = distributionParcelListService.selectOrderInfoList(reservationId, stockArticleId, stockupId, trayId);
 		int size = list.size(); //数量
 		Integer scanNum = 0;
+		DistributionStockupEntity byId = distributionStockupService.selectById(stockupId);
 		for (PackageStockupVO vo : list) {
-			if (!Objects.isNull(vo.getScanId())) {
+
+			List<DistributionStockEntity> list1 = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda()
+				.eq(DistributionStockEntity::getCoding, vo.getPackageBarCode())
+				.eq(DistributionStockEntity::getParcelListId, vo.getParceListId())
+			);
+			if(list1.size() > 0){
 				scanNum++; //已扫的数量
+				vo.setScanId(list1.get(0).getId());
+				vo.setIsScanStr("1");
 			}
+
 			//查询包件下面有没有具体的包件详情
 			String orderPackageCode = vo.getPackageBarCode();
 			QueryWrapper<DistributionParcelDetailsEntity> qw = new QueryWrapper<>();
@@ -417,7 +429,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		vo.setAddress(reservationEntity.getDeliveryAddress()); //地址
 		vo.setPlanNum(size); //计划件数
 		vo.setScanNum(scanNum); //备货件数
-		vo.setStockupArea(reservationEntity.getGoodsAreaName()); //备货区
+		vo.setStockupArea(byId.getStockupArea()); //备货区
 //		vo.setWarehouseArea(stockupId); //库位
 //		vo.setTrays(pallet); //托盘
 		vo.setPackageList(list); //