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

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

@@ -331,11 +331,11 @@
     </select>
     <select id="getOrderNoList" resultType="com.logpm.distribution.vo.DistributionStockArticleQRCodeVO">
         select ldsa.id,ldsa.order_code,ldsa.mall_name ,ldsa.customer_name ,ldsa.customer_telephone ,
-        ldsa.customer_address ,ldsa.sending,ldsa.waybill_number waybillNumber,
+        ldsa.customer_address ,ldsa.sending,ldpl.waybill_number waybillNumber,
         ldsa.accept_warehouse_name as objective ,ldsa.send_warehouse_name departureStation,ldsa.dealer_name
         dealerName,ldsa.dealer_code dealerCode,ldsa.total_number totalNumber,
         CONCAT_WS('/', IFNULL(ldpl.firsts, ''), IFNULL(ldpl.second, ''), IFNULL(ldpl.third_product, '')) AS category,
-        CONCAT_WS( '',IFNULL(ldpl.material_name, '')) AS materialName ,ldpl.order_package_code qrCode,ldsa.waybill_number,
+        CONCAT_WS( '',IFNULL(ldpl.material_name, '')) AS materialName ,ldpl.order_package_code qrCode,ldpl.waybill_number,
         CONCAT_WS('/', IFNULL(lww.shipper_name, ''), IFNULL(lww.shipper_mobile, '')) AS shipperName,lww.shipper_address shipperAddress
 
         from logpm_distribution_parcel_list ldpl