bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退料编码查询，退料任务结束修改

This commit is contained in:
bonus 2025-07-26 19:10:34 +08:00
parent 02f28b9cbb
commit f7b00ae4c0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
View File

@ -828,12 +828,15 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
for (BackApplyDetails applyDetail : applyDetails) { for (BackApplyDetails applyDetail : applyDetails) {
if (CollectionUtils.isNotEmpty(listL4)) { if (CollectionUtils.isNotEmpty(listL4)) {
for (TypeTreeNode typeTreeNode : listL4) { for (TypeTreeNode typeTreeNode : listL4) {
if(applyDetail.getTypeId()!=null){
if (applyDetail.getTypeId().equals(typeTreeNode.getTypeId())) { if (applyDetail.getTypeId().equals(typeTreeNode.getTypeId())) {
if (applyDetail.getPreNum().compareTo(typeTreeNode.getNum()) > 0) { if (applyDetail.getPreNum().compareTo(typeTreeNode.getNum()) > 0) {
return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "退料数量不能大于在用数量"); return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "退料数量不能大于在用数量");
} }
} }
} }
}
} }
} }
} else { } else {

2
bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
View File

@ -1065,7 +1065,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT mm.ma_id AS maId, SELECT mm.ma_id AS maId,
mm.ma_code AS maCode, mm.ma_code AS maCode,
mm.ma_status AS maStatus,AAAAAAAAAAAAAAAAAAAAA mm.ma_status AS maStatus,
sd.dict_label AS maStatusName, sd.dict_label AS maStatusName,
mt1.type_name AS typeName, mt1.type_name AS typeName,
mm.type_id AS typeId, mm.type_id AS typeId,