From ce5adde12c908a3228ed6685c0d86013d2f12731 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 13 May 2024 16:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionSignforMapper.xml     | 8 ++++----
 .../distribution/mapper/DistrilbutionBillLadingMapper.xml | 2 +-
 2 files changed, 5 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 792df3355..fd099d700 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
@@ -1169,7 +1169,7 @@
         IF
         ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading,
         1 is_out,
-        ldpl.conditions AS goods_type,
+        IF(ldpl.conditions = 1, 0 ,ldpl.conditions) AS goods_type,
         ldl.received_quantity AS signNum,
         5 AS broke_state
         FROM
@@ -1200,7 +1200,7 @@
         IF
         ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading,
         1 is_out,
-        ldpl.conditions AS goods_type,
+        IF(ldpl.conditions = 1, 0 ,ldpl.conditions) AS goods_type,
         ldl.received_quantity AS signNum,
         5 AS broke_state
         FROM
@@ -1234,7 +1234,7 @@
             ldl.signing_time AS sign_time,
             1 AS is_out,
             ldsl.quantity_stock AS num,
-            3 AS goods_type,
+            2 AS goods_type,
             ldl.received_quantity AS sign_num,
             4 AS broke_state
         FROM
@@ -1269,7 +1269,7 @@
             ldl.signing_time AS sign_time,
             1 AS is_out,
             ldsl.quantity_stock AS num,
-            3 AS goods_type,
+            2 AS goods_type,
             ldl.received_quantity AS sign_num,
             4 AS broke_state
         FROM
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index 56e275b55..8d5ec4e8d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -905,7 +905,7 @@
         ldbls.update_time AS update_time,
         ldbls.quantity AS num,
         ldbls.quantity AS signNum,
-        3 AS goods_type
+        2 AS goods_type
         FROM
         logpm_distribution_bill_lading_scan AS ldbls
         LEFT JOIN logpm_dis_stock_list_detail AS ldsld ON ldbls.bill_lading_id = ldsld.reservation_id AND ldsld.is_deleted = 0