Merge branch 'dev' into pre-production

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

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

@@ -1264,11 +1264,10 @@
         SELECT
         ldsl.order_code  AS orderCode,
         ldsld.stock_package_code  AS orderPackageCode,
-        2 AS type,
-        IF
-        ( ldll.id IS NULL, 0, 1 ) AS isLoading,
-        IF(ldll.id is  null or ldll.signfor_state = 1,1,0)  AS isSignfor,
-        0 AS isAbnormal
+        IF(ldrs.id is not null,2,null) AS type,
+        IF(ldrs.id is not null,IF( ldll.id IS NULL, 0, 1 ),null) AS isLoading,
+        IF(ldrs.id is not null,IF( ldll.id IS NULL OR ldll.signfor_state = 1, 0, 1 ),null) AS isSignfor,
+        IF(ldrs.id is not null,	0 ,null) AS isAbnormal
         FROM
         logpm_distribution_reservation AS ldr
         LEFT JOIN logpm_distribution_reservation_stocklist AS ldrs ON ldr.id = ldrs.reservation_id