change - 优化接口

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;
     }

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
+        SUM(sd.SPACE_STOCK)        SPACESTOCK
-        FROM BASE_SPACEDETAIL sd
+        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

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>