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

退料接收时,检查结算表拿到待退料数量,防止多退

This commit is contained in:
sxu 2024-08-28 09:14:16 +08:00
parent bf33534597
commit 262cd6d595
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
View File

@ -286,6 +286,11 @@ public class BackApplyInfo extends BaseEntity {
*/ */
private String finishedBackNum; private String finishedBackNum;
/**
* 此协议号最大剩余退料数
*/
private String maxBackNum;
@ApiModelProperty(value = "详情id和数量") @ApiModelProperty(value = "详情id和数量")
private String detailsIdByNum; private String detailsIdByNum;

5
sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -672,15 +672,18 @@
bad.pre_num as preNum, bad.pre_num as preNum,
bad.audit_num as auditNum, bad.audit_num as auditNum,
bad.status as status, bad.status as status,
IFNULL(sai.num, 0) as max_back_num,
IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num, IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num,
IFNULL(bb.finished_back_num, 0) as finished_back_num,
mt.manage_type as manageType, mt.manage_type as manageType,
bb.finished_back_num,
mtk.user_id, mtk.user_id,
CONCAT('NSJJ',mt.`code`,mt.model_code) as `code` CONCAT('NSJJ',mt.`code`,mt.model_code) as `code`
FROM FROM
back_apply_details bad back_apply_details bad
LEFT JOIN back_apply_info bai on bai.id=bad.parent_id LEFT JOIN back_apply_info bai on bai.id=bad.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
LEFT JOIN (select agreement_id, sum(IFNULL(num, 0)) as num from slt_agreement_info where status=0
group by agreement_id) sai on tta.agreement_id=sai.agreement_id
LEFT JOIN ma_type mt on mt.type_id=bad.type_id LEFT JOIN ma_type mt on mt.type_id=bad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id=mt.parent_id LEFT JOIN ma_type mt2 ON mt2.type_id=mt.parent_id
LEFT JOIN ma_type_keeper mtk on mt.type_id=mtk.type_id LEFT JOIN ma_type_keeper mtk on mt.type_id=mtk.type_id