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

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

@@ -2026,7 +2026,8 @@
         ldpn.signin_quantity,
         IF(ldpn.outbound_quantity > 0,IF(ldpn.outbound_quantity = ldpn.quantity,'已出库','部分出库'),'未出库') AS aaa,
         IF(ldpn.signin_quantity > 0,IF(ldpn.signin_quantity = ldpn.quantity,'已签收','部分签收'),'未签收') AS bbb,
-        IF((ldpn.quantity - ldpn.delivery_quantity -ldpn.outbound_quantity) = 0,IF(ldpn.quantity > 0,'已配送','未知'),IF(( ldpn.delivery_quantity +ldpn.outbound_quantity) > 0  ,'部分配送','未配送')) AS ccc,        FROM
+        IF((ldpn.quantity - ldpn.delivery_quantity -ldpn.outbound_quantity) = 0,IF(ldpn.quantity > 0,'已配送','未知'),IF(( ldpn.delivery_quantity +ldpn.outbound_quantity) > 0  ,'部分配送','未配送')) AS ccc
+        FROM
         logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldpl.stock_article_id = ldsa.id
         LEFT JOIN logpm_distribution_parcel_number AS ldpn ON ldpn.parcel_list_id = ldpl.id