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
and si.store_code = #{storeCode}
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')
- and rep.quality_user_flag = #{qualityUserFlag}
+ and rep.quality_user_flag = #{qualityUserFlag}
and rep.failure_reason = #{failureReason}
and rep.failure_type = #{failureType}
and rep.quality_user_time = #{qualityUserTime}
- and rep.production_manager_flag =
+ and rep.production_manager_flag =
#{productionManagerFlag}
and rep.production_manager_time = #{productionManagerTime}
- and rep.quality_manager_flag =
+ and rep.quality_manager_flag =
#{qualityManagerFlag}
and rep.quality_manager_time = #{qualityManagerTime}
@@ -105,6 +105,9 @@
and rep.created_time = #{createdTime}
and rep.updated_by = #{updatedBy}
and rep.updated_time = #{updatedTime}
+ and rep.quality_user_flag IS NULL
+ and rep.production_manager_flag IS NULL
+ and rep.quality_manager_flag IS NULL
order by rep.apply_time desc