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

重庆优化

This commit is contained in:
15856 2024-12-09 09:25:58 +08:00
parent 9e99b7aa77
commit c3f4df2e43
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
View File

@ -363,7 +363,7 @@ public class BackApplyController extends BaseController {
} }
bean.setCode(code); bean.setCode(code);
bean.setTaskType(36); bean.setTaskType(36);
bean.setTaskStatus("37"); bean.setTaskStatus("139");
boolean addTaskResult = backApplyService.insertSelective(bean) > 0; boolean addTaskResult = backApplyService.insertSelective(bean) > 0;
// 创建任务 // 创建任务
if (addTaskResult && bean.getTaskId() != null) { if (addTaskResult && bean.getTaskId() != null) {
@ -405,6 +405,7 @@ public class BackApplyController extends BaseController {
/* 设置领料任务ID*/ /* 设置领料任务ID*/
leaseApplyDetails.setId(backApplyInfoId); leaseApplyDetails.setId(backApplyInfoId);
// 插入领料任务明细 // 插入领料任务明细
leaseApplyDetails.setAuditNum(leaseApplyDetails.getPreNum());
boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0; boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0;
if (!addLeaseTaskDetailsResult) { if (!addLeaseTaskDetailsResult) {
return AjaxResult.error("退料任务创建成功，但退料任务明细插入失败"); return AjaxResult.error("退料任务创建成功，但退料任务明细插入失败");

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

@ -743,8 +743,8 @@
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,
CASE WHEN ((IFNULL(sai.num, 0)-IFNULL(aa.back_num,0)) > (bad.audit_num-IFNULL(bb.finished_back_num,0)-IFNULL(aa.back_num,0))) CASE WHEN ((IFNULL(sai.num, 0)-IFNULL(aa.back_num,0)) > (bad.pre_num-IFNULL(bb.finished_back_num,0)-IFNULL(aa.back_num,0)))
THEN (bad.audit_num-IFNULL(bb.finished_back_num,0)-IFNULL(aa.back_num,0)) THEN (bad.pre_num-IFNULL(bb.finished_back_num,0)-IFNULL(aa.back_num,0))
ELSE ELSE
(CASE WHEN (IFNULL(sai.num, 0)-IFNULL(aa.back_num,0)) < 0 THEN 0 ELSE (IFNULL(sai.num, 0)-IFNULL(aa.back_num,0)) END) (CASE WHEN (IFNULL(sai.num, 0)-IFNULL(aa.back_num,0)) < 0 THEN 0 ELSE (IFNULL(sai.num, 0)-IFNULL(aa.back_num,0)) END)
END as num, END as num,