Merge branch 'dev' into pre-production

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

@@ -1169,7 +1169,7 @@
         IF
         ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading,
         1 is_out,
-        ldpl.conditions AS goods_type,
+        IF(ldpl.conditions = 1, 0 ,ldpl.conditions) AS goods_type,
         ldl.received_quantity AS signNum,
         5 AS broke_state
         FROM
@@ -1200,7 +1200,7 @@
         IF
         ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading,
         1 is_out,
-        ldpl.conditions AS goods_type,
+        IF(ldpl.conditions = 1, 0 ,ldpl.conditions) AS goods_type,
         ldl.received_quantity AS signNum,
         5 AS broke_state
         FROM
@@ -1234,7 +1234,7 @@
             ldl.signing_time AS sign_time,
             1 AS is_out,
             ldsl.quantity_stock AS num,
-            3 AS goods_type,
+            2 AS goods_type,
             ldl.received_quantity AS sign_num,
             4 AS broke_state
         FROM
@@ -1269,7 +1269,7 @@
             ldl.signing_time AS sign_time,
             1 AS is_out,
             ldsl.quantity_stock AS num,
-            3 AS goods_type,
+            2 AS goods_type,
             ldl.received_quantity AS sign_num,
             4 AS broke_state
         FROM

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

@@ -905,7 +905,7 @@
         ldbls.update_time AS update_time,
         ldbls.quantity AS num,
         ldbls.quantity AS signNum,
-        3 AS goods_type
+        2 AS goods_type
         FROM
         logpm_distribution_bill_lading_scan AS ldbls
         LEFT JOIN logpm_dis_stock_list_detail AS ldsld ON ldbls.bill_lading_id = ldsld.reservation_id AND ldsld.is_deleted = 0

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

@@ -141,7 +141,7 @@
         where  ldpl.material_name is not null and ldpl.stock_article_id = ldbs.stock_article_id)   materialName,
         (select IFNULL(sum(lds.stock_quantity),0)
         from logpm_distribution_stock lds
-        where lds.stock_article = ldbs.stock_article_id  ) preparedQuantity ,
+        where lds.stock_article = ldbs.stock_article_id AND lds.bill_lading_id = ldbl.id  ) preparedQuantity ,
         (select COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '')
         from logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3'
@@ -156,12 +156,12 @@
         logpm_distrilbution_bill_lading  AS ldbl
         LEFT JOIN logpm_distrilbution_bill_stock ldbs  ON ldbs.bill_lading_id = ldbl.id
         LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id
-        LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id
+<!--        LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id-->
         LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldbl.id = ldbls.bill_lading_id
         <where>
             ldbs.is_deleted = 0 and  ldbs.bill_lading_id = #{param.billLadingId}  and ldbs.order_status in (1,3)
         </where>
-        GROUP BY ldbl.id
+        GROUP BY ldbl.id,ldbs.stock_article_id
     </select>
     <select id="getBillOrderPack" resultType="com.logpm.distribution.vo.DistributionBillOrderPackVO">
         SELECT