bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完成部分退料功能

This commit is contained in:
sxu 2024-08-01 18:26:51 +08:00
parent f36fc6f0dd
commit c5940da435
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
View File

@ -181,8 +181,6 @@ public class BackReceiveServiceImpl implements BackReceiveService {
//修改back_apply_details为已退料（1） //修改back_apply_details为已退料（1）
res = updateStatus(record); res = updateStatus(record);
} }
//完成退料的部分，更新 back_check_details 为 is_finished=1，此部分不支持撤回
finishBackCheckDetails(record);
List<BackApplyInfo> hgList = backReceiveMapper.getHgList(record); List<BackApplyInfo> hgList = backReceiveMapper.getHgList(record);
if (hgList != null && hgList.size() > 0) { if (hgList != null && hgList.size() > 0) {
res = insertIad(hgList); res = insertIad(hgList);
@ -238,6 +236,9 @@ public class BackReceiveServiceImpl implements BackReceiveService {
throw new RuntimeException("该机具未被领料使用"); throw new RuntimeException("该机具未被领料使用");
} }
} }
//完成退料的部分，更新 back_check_details 为 is_finished=1，此部分不支持撤回
finishBackCheckDetails(record);
} }
} else { } else {
throw new RuntimeException("typeId为空"); throw new RuntimeException("typeId为空");

8
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -776,7 +776,7 @@
LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
WHERE WHERE
bcd.parent_id=#{parentId} and bcd.type_id=#{typeId} bcd.parent_id=#{parentId} and bcd.type_id=#{typeId}
and bcd.back_status='1' and bcd.back_status='1' and bcd.is_finished is null
</select> </select>
<select id="getWxList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo"> <select id="getWxList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
@ -796,7 +796,7 @@
LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
WHERE WHERE
bcd.parent_id=#{parentId} and bcd.type_id=#{typeId} bcd.parent_id=#{parentId} and bcd.type_id=#{typeId}
and bcd.back_status='2' and bcd.back_status='2' and bcd.is_finished is null
</select> </select>
<select id="getBfList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo"> <select id="getBfList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
@ -819,7 +819,7 @@
LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
WHERE WHERE
bcd.parent_id=#{parentId} and bcd.type_id=#{typeId} bcd.parent_id=#{parentId} and bcd.type_id=#{typeId}
and bcd.back_status='3' and bcd.back_status='3' and bcd.is_finished is null
</select> </select>
<select id="codeQuery" resultType="com.bonus.sgzb.app.domain.BackApplyInfo"> <select id="codeQuery" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
@ -950,7 +950,7 @@
LEFT JOIN back_apply_info bai ON bai.id = bcd.parent_id LEFT JOIN back_apply_info bai ON bai.id = bcd.parent_id
LEFT JOIN tm_task_agreement tta ON tta.task_id = bai.task_id LEFT JOIN tm_task_agreement tta ON tta.task_id = bai.task_id
WHERE WHERE
bcd.parent_id = #{parentId} and bcd.type_id=#{typeId} bcd.parent_id = #{parentId} and bcd.type_id=#{typeId} and bcd.is_finished is null
GROUP By bcd.type_id,bcd.ma_id GROUP By bcd.type_id,bcd.ma_id
</select> </select>
<select id="getBackMachine" resultType="com.bonus.sgzb.app.domain.TmTask"> <select id="getBackMachine" resultType="com.bonus.sgzb.app.domain.TmTask">