Merge branch 'dev' into pre-production

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

@@ -142,14 +142,8 @@
         (select IFNULL(sum(lds.stock_quantity),0)
         from logpm_distribution_stock lds
         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 ','), '')
+        ldsa.trays pallet ,
-        from logpm_distribution_parcel_list ldpl
+        ldsa.allocation goodsAllocation,
-        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3'
-        where  ldpl.stock_article_id = ldbs.stock_article_id) pallet ,
-        (select COALESCE(GROUP_CONCAT(DISTINCT lwug.allocation_title SEPARATOR ','), '')
-        from logpm_distribution_parcel_list ldpl
-        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3'
-        where ldpl.stock_article_id = ldbs.stock_article_id)  goodsAllocation,
         ldsa.service_number serviceNumber,ldsa.waybill_number waybillNumber,ldsa.train_number trainNumber,ldsa.send_warehouse_name sendWarehouseName,
         GROUP_CONCAT(DISTINCT ldbls.scan_user) AS scanUser ,MAX(ldbls.create_time) AS signingTime
         from
@@ -177,8 +171,8 @@
         ldpl.send_warehouse_name sendWarehouseName,
         ldpl.order_code orderCode,
         ldpl.service_number serviceNumber,
-        lwtg.tray_code pallet,
+        ldpl.pallet pallet,
-        lwug.allocation_title goodsAllocation,
+        ldpl.goods_allocation goodsAllocation,
         ldpl.order_package_status orderPackageStatus,
         case
         when lds.id  is  null then '未备货'