From b391b34e325e55161941a5fe5571e5ad1a0975fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Tue, 10 Aug 2021 13:16:42 +0800
Subject: [PATCH] scrap

---
 .../src/main/resources/mapper/SfcScrapMapper.xml     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/production/src/main/resources/mapper/SfcScrapMapper.xml b/production/src/main/resources/mapper/SfcScrapMapper.xml
index 754aa1bc..dd00b909 100644
--- a/production/src/main/resources/mapper/SfcScrapMapper.xml
+++ b/production/src/main/resources/mapper/SfcScrapMapper.xml
@@ -431,12 +431,12 @@
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
     <select id="generatorWord" resultType="hashmap">
-        SELECT DISTINCT WC.WORK_CENTER WORK_CENTER,WO.VALUE WORK_ORDER,WO2.VALUE  DWG_NO,ZSS.QTY QTY,ZSS.OPERATION OPERATION,
-                        ZSS.REASON REASON,ZSS."TYPE" "TYPE",
-                        CASE WHEN I1.VALUE != NULL THEN I1.VALUE * I.QTY_MULTIPLIER
-                WHEN I2.VALUE != NULL THEN I2.VALUE * I.QTY_MULTIPLIER
-                ELSE I.QTY_MULTIPLIER END WEIGHT,I.ITEM ITEM,S.SFC SFC,it.DESCRIPTION ITEM_DESCRIPTION,
-                SO.SHOP_ORDER SHOP_ORDER
+        SELECT DISTINCT NVL(WC.WORK_CENTER,' ') WORK_CENTER,NVL(WO.VALUE,' ') WORK_ORDER,NVL(WO2.VALUE,' ')  DWG_NO,NVL(ZSS.QTY,0) QTY,NVL(ZSS.OPERATION,' ') OPERATION,
+                        NVL(ZSS.REASON,' ') REASON,NVL(ZSS."TYPE",' ') "TYPE",
+                        CASE WHEN I1.VALUE != NULL THEN NVL(I1.VALUE * I.QTY_MULTIPLIER,0)
+                WHEN I2.VALUE != NULL THEN NVL(I2.VALUE * I.QTY_MULTIPLIER,0)
+                ELSE NVL(I.QTY_MULTIPLIER,0) END WEIGHT,NVL(I.ITEM,' ') ITEM,NVL(S.SFC,' ') SFC,NVL(it.DESCRIPTION,' ') ITEM_DESCRIPTION,
+                NVL(SO.SHOP_ORDER,' ') SHOP_ORDER
         FROM
         SHOP_ORDER SO
         LEFT JOIN WORK_CENTER WC ON SO.PLANNED_WORK_CENTER_BO = WC.HANDLE