From 1bddc62a1d3a4596d45e15e272aa1e2adea4590d Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 29 Apr 2024 08:44:37 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BC=98=E5=8C=96=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/aucma/api/service/impl/PdaServiceImpl.java  | 2 +-
 .../main/resources/mapper/base/BaseSpaceInfoMapper.xml   | 5 +++--
 .../mapper/report/RecordExceptionProcessMapper.xml       | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java b/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java
index 37344b8..047baca 100644
--- a/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java
+++ b/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java
@@ -165,7 +165,7 @@ public class PdaServiceImpl implements IPdaBindingService {
             } else {
                 boxCode.append(",").append(map.get("BOX_BARCODE"));
             }
-            resultMessage  = "箱体码：" + boxCode + "已审批完成，请进行PDA降级处理！";
+            resultMessage  = boxCode + "已审批完成，请进行降级处理！";
         }
         return resultMessage;
     }
diff --git a/aucma-base/src/main/resources/mapper/base/BaseSpaceInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseSpaceInfoMapper.xml
index 9320e9c..8d539d4 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseSpaceInfoMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseSpaceInfoMapper.xml
@@ -74,11 +74,12 @@
         SELECT si.STORE_CODE              MATERIALCODE,
         si.STORE_NAME              MATERIALNAME,
         ml.MATERIAL_SPECIFICATIONS STORENAME,
-        SUM(MATERIAL_AMOUNT)       SPACESTOCK
-        FROM BASE_SPACEDETAIL sd
+        SUM(sd.SPACE_STOCK)        SPACESTOCK
+        FROM BASE_SPACEINFO sd
         left join base_storeinfo si on si.STORE_CODE = si.STORE_CODE
         left join BASE_MATERIALINFO ml on ml.MATERIAL_CODE = sd.MATERIAL_TYPE
         WHERE ml.MATERIAL_SPECIFICATIONS is not null
+        AND sd.SPACE_STOCK > 0
         <if test="storeCode != null  and storeCode != ''">and si.store_code = #{storeCode}</if>
         GROUP BY si.STORE_CODE, si.STORE_NAME, ml.MATERIAL_SPECIFICATIONS
         ORDER BY si.STORE_CODE, si.STORE_NAME
diff --git a/aucma-report/src/main/resources/mapper/report/RecordExceptionProcessMapper.xml b/aucma-report/src/main/resources/mapper/report/RecordExceptionProcessMapper.xml
index 13219c7..a921c6c 100644
--- a/aucma-report/src/main/resources/mapper/report/RecordExceptionProcessMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/RecordExceptionProcessMapper.xml
@@ -81,16 +81,16 @@
                 and rep.apply_time between to_date(#{params.beginApplyTime}, 'yyyy-mm-dd hh24:mi:ss') and
                 to_date(#{params.endApplyTime}, 'yyyy-mm-dd hh24:mi:ss')
             </if>
-            <if test="qualityUserFlag != null  and qualityUserFlag != ''">and rep.quality_user_flag = #{qualityUserFlag}
+            <if test="qualityUserFlag != null  and qualityUserFlag != 9">and rep.quality_user_flag = #{qualityUserFlag}
             </if>
             <if test="failureReason != null  and failureReason != ''">and rep.failure_reason = #{failureReason}</if>
             <if test="failureType != null  and failureType != ''">and rep.failure_type = #{failureType}</if>
             <if test="qualityUserTime != null ">and rep.quality_user_time = #{qualityUserTime}</if>
-            <if test="productionManagerFlag != null  and productionManagerFlag != ''">and rep.production_manager_flag =
+            <if test="productionManagerFlag != null  and productionManagerFlag != 9">and rep.production_manager_flag =
                 #{productionManagerFlag}
             </if>
             <if test="productionManagerTime != null ">and rep.production_manager_time = #{productionManagerTime}</if>
-            <if test="qualityManagerFlag != null  and qualityManagerFlag != ''">and rep.quality_manager_flag =
+            <if test="qualityManagerFlag != null  and qualityManagerFlag != 9">and rep.quality_manager_flag =
                 #{qualityManagerFlag}
             </if>
             <if test="qualityManagerTime != null ">and rep.quality_manager_time = #{qualityManagerTime}</if>
@@ -105,6 +105,9 @@
             <if test="createdTime != null ">and rep.created_time = #{createdTime}</if>
             <if test="updatedBy != null  and updatedBy != ''">and rep.updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and rep.updated_time = #{updatedTime}</if>
+            <if test="qualityUserFlag == 9 ">and rep.quality_user_flag IS NULL </if>
+            <if test="productionManagerFlag == 9 ">and rep.production_manager_flag IS NULL</if>
+            <if test="qualityManagerFlag == 9 ">and rep.quality_manager_flag IS NULL</if>
         </where>
         order by rep.apply_time desc
     </select>