Merge branch 'dev' into pre-production

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

@@ -76,8 +76,12 @@
     </select>
     <select id="listCode" resultType="com.logpm.distribution.vo.app.DistrilbutionBillLadingInventoryAppVO">
      select lddd.quantity,lddd.stock_list_id stockListId,lddd.id ldddId
-        from logpm_distribution_delivery_details lddd LEFT JOIN logpm_distribution_stock lds on lddd.stock_list_id = lds.stock_list_id
+        from logpm_distribution_delivery_details lddd LEFT
-        where lddd.is_deleted = 0 and lds.bill_lading_id = #{billLadingId} and lds.coding = #{coding}
+<!--        JOIN logpm_distribution_stock lds on lddd.stock_list_id = lds.stock_list_id-->
+        where
+        lddd.is_deleted = 0
+        and lds.bill_lading_id = #{billLadingId}
+<!--        and lds.coding = #{coding}-->
 <!--        select lddd.quantity,lddd.stock_list_id stockListId,lddd.id ldddId-->
 <!--        from logpm_distribution_delivery_details lddd-->
 <!--        where lddd.is_deleted = 0 and lddd.bill_lading_id = #{billLadingId} and lds.coding = #{coding}-->

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

@@ -1735,6 +1735,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		inventory.getRecords().forEach(i -> {
 			List<DisStockListDetailEntity> listed = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
 				.eq(DisStockListDetailEntity::getReservationId, i.getId())
+				.eq(DisStockListDetailEntity::getStockListId, i.getStockListId())
 				.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
 			);
 			if (Func.isNotEmpty(listed)){
@@ -1808,7 +1809,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			distributionBillLadingScan.setScanType(1);
 			//扫描
 			if ("1".equals(type)) {
-				//库存品
+				//查询该自提单存在几种品类的库存品
 				List<DistrilbutionBillLadingInventoryAppVO> inventoryAppVO = distributionDeliveryDetailsService.listCode(String.valueOf(billLadingId), String.valueOf(coding));
 				if (ObjectUtils.isNotNull(inventoryAppVO)) {
 					List<Long> stocklistIds = inventoryAppVO.stream().map(DistrilbutionBillLadingInventoryAppVO::getStockListId).collect(Collectors.toList());