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

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

@@ -43,8 +43,8 @@ public class DistrilbutionBillLadingAppVO extends DistrilbutionBillLadingEntity
 	private Integer carType;
 	private String carTypeStr;
 
-	private String condition;//提货状态
-	private String conditionStr;//提货状态
+	private String conditions;//提货状态
+	private String conditionsStr;//提货状态
 
 	private String pickUpPlate;//车牌号
 

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

@@ -124,7 +124,7 @@
 
     </select>
 
-    <select id="selectStockListInfoList" resultType="com.logpm.distribution.vo.DistributionStockupStockListInfoVO">
+    <select id="selectStockListInfoList" resultType="com.logpm.distribution.vo.StockListInfoListVO">
         select
                s.coding packageCode,
                s.goods_name name
@@ -136,13 +136,7 @@
         where ldr.is_deleted = 0
           and s.id is not null
           and ldr.id = #{reservationId}
-          and ldsl.description_goods = #{descriptionGoods}
-          and ldsl.storage_location = #{allocation}
-          and ldsl.tray_name = #{pallet}
-          and ldsl.sku = #{sku}
-          and ldsl.cargo_norms = #{cargoNorms}
-          and ldsl.cargo_unit = #{cargoUnit}
-
+          and ldrs.stocklist_id = #{stockListId}
     </select>
 
     <select id="selectWarehouseAreaByReservationId" resultType="String">

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

@@ -66,7 +66,7 @@
     <select id="pageListApp" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingAppVO">
         select lad.id billLadingId,
         3 carType,
-        lad.`condition` `condition`,
+        lad.`conditions` `conditions`,
         lad.Pick_up_plate pickUpPlate,
         lad.consignee consignee,
         lad.create_time,