自提签收调整

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

@@ -67,7 +67,7 @@ public interface DistributionDeliveryDetailsMapper extends BaseMapper<Distributi
 	 * @param coding
 	 * @return
 	 */
-	List<DistrilbutionBillLadingInventoryAppVO> listCode(@Param("billLadingId") String billLadingId,@Param("coding") String coding);
+	List<DistrilbutionBillLadingInventoryAppVO> listCode(@Param("billLadingId") String billLadingId);
 
     IPage<DistributionBillInventoryVO> getBillOrderInventory(IPage<Object> page, @Param("param") DistributionDeliveryDetailsEntity deliveryDetails);
 

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

@@ -75,13 +75,16 @@
         where lddd.bill_lading_id = #{id} and lddd.is_deleted = 0
     </select>
     <select id="listCode" resultType="com.logpm.distribution.vo.app.DistrilbutionBillLadingInventoryAppVO">
-     select lddd.quantity,lddd.stock_list_id stockListId,lddd.id ldddId
+        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-->
         where
         lddd.is_deleted = 0
         and lddd.bill_lading_id = #{billLadingId}
+        <!--        LEFT-->
+        <!--        JOIN logpm_distribution_stock lds on lddd.stock_list_id = lds.stock_list_id-->
 <!--        and lds.coding = #{coding}-->
 <!--        select lddd.quantity,lddd.stock_list_id stockListId,lddd.id ldddId-->
 <!--        from logpm_distribution_delivery_details lddd-->

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java

@@ -61,7 +61,7 @@ public interface IDistributionDeliveryDetailsService extends BaseService<Distrib
 	 */
     DistributionDeliveryDetailsVO oneListNum(Long billLadingId);
 
-	List<DistrilbutionBillLadingInventoryAppVO> listCode(String billLadingId, String coding);
+	List<DistrilbutionBillLadingInventoryAppVO> listCode(String billLadingId);
 
 	/**
 	 * 自提库存品查询

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

@@ -77,8 +77,8 @@ public class DistributionDeliveryDetailsServiceImpl extends BaseServiceImpl<Dist
 	}
 
 	@Override
-	public List<DistrilbutionBillLadingInventoryAppVO> listCode(String billLadingId, String coding) {
-		return baseMapper.listCode(billLadingId,coding) ;
+	public List<DistrilbutionBillLadingInventoryAppVO> listCode(String billLadingId) {
+		return baseMapper.listCode(billLadingId) ;
 	}
 
 	@Override

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

@@ -1810,7 +1810,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			//扫描
 			if ("1".equals(type)) {
 				//查询该自提单存在几种品类的库存品
-				List<DistrilbutionBillLadingInventoryAppVO> inventoryAppVO = distributionDeliveryDetailsService.listCode(String.valueOf(billLadingId), String.valueOf(coding));
+				List<DistrilbutionBillLadingInventoryAppVO> inventoryAppVO = distributionDeliveryDetailsService.listCode(String.valueOf(billLadingId));
 				if (ObjectUtils.isNotNull(inventoryAppVO)) {
 					List<Long> stocklistIds = inventoryAppVO.stream().map(DistrilbutionBillLadingInventoryAppVO::getStockListId).collect(Collectors.toList());
 					//查询该自提单所有的库存品包件信息