Merge branch 'dev' into pre-production

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

@@ -299,7 +299,6 @@
 
     <select id="selectStockupStockListNew" resultType="com.logpm.distribution.vo.DistributionStockupStockListVO">
         SELECT DISTINCT
-<!--        ldslNew.id AS stockListId,-->
         ldslNew.sku AS sku,
         ldslNew.cargo_number AS cargoNumber,
         ldslNew.description_goods AS materialName,
@@ -307,10 +306,7 @@
         ldslNew.cargo_unit AS cargoUnit,
         ldslNew.tray_name AS trayName,
         ldslNew.unpack AS unpack,
-<!--        ldslNew.source_type AS sourceType,-->
-<!--        count(ldss.id) AS realNum,-->
         (SELECT count(*) FROM logpm_distribution_stock AS lds WHERE lds.stock_list_id = t.id AND lds.is_deleted = 0) AS realNum,
-<!--        t.deliveryDetailsId AS deliveryDetailsId,-->
         t.reservationNum as planNum,
         (
         select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number or association_value in (
@@ -333,8 +329,6 @@
         LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number
         LEFT JOIN logpm_distribution_stock ldss ON ldss.stock_list_id = t.id where ldslNew.is_deleted = 0
 
-
-
 <!--        SELECT-->
 <!--        ldsl.sku AS sku,-->
 <!--        ldsl.cargo_number AS cargoNumber,-->