备货SQL调整

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

@@ -298,7 +298,7 @@
     </select>
 
     <select id="selectStockupStockListNew" resultType="com.logpm.distribution.vo.DistributionStockupStockListVO">
-        SELECT
+        SELECT DISTINCT
 <!--        ldslNew.id AS stockListId,-->
         ldslNew.sku AS sku,
         ldslNew.cargo_number AS cargoNumber,
@@ -307,7 +307,7 @@
         ldslNew.cargo_unit AS cargoUnit,
         ldslNew.tray_name AS trayName,
         ldslNew.unpack AS unpack,
-        ldslNew.source_type AS sourceType,
+<!--        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,-->

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

@@ -831,7 +831,7 @@
                 ldsl.cargo_number cargoNumber,
                 ldsl.description_goods descriptionGoods,
                 ldl.signfor_state signforState,
-                ldl.order_package_code coding,
+                ldl.order_package_code orderPackageCode,
                 lbm.specification specification,
                 lbm.logpm_unit logpmUnit
                 FROM