From 5c1521a807f00ff57b7967280a4e47ff9c850033 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 2 Feb 2024 10:34:43 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E7=AD=BE=E6=94=B6=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionSignforMapper.xml    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index b230711fa..922e4a3c9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/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,0,1)  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