From c3f4df2e435c6522e0f0191720995aadc773358a Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Mon, 9 Dec 2024 09:25:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=BA=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/material/controller/BackApplyController.java | 3 ++- .../src/main/resources/mapper/app/BackReceiveMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java index 469f8c4..f00cf35 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java @@ -363,7 +363,7 @@ public class BackApplyController extends BaseController { } bean.setCode(code); bean.setTaskType(36); - bean.setTaskStatus("37"); + bean.setTaskStatus("139"); boolean addTaskResult = backApplyService.insertSelective(bean) > 0; // 创建任务 if (addTaskResult && bean.getTaskId() != null) { @@ -405,6 +405,7 @@ public class BackApplyController extends BaseController { /* 设置领料任务ID*/ leaseApplyDetails.setId(backApplyInfoId); // 插入领料任务明细 + leaseApplyDetails.setAuditNum(leaseApplyDetails.getPreNum()); boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0; if (!addLeaseTaskDetailsResult) { return AjaxResult.error("退料任务创建成功，但退料任务明细插入失败"); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml index ab21e65..e665ef0 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -743,8 +743,8 @@ bad.pre_num as preNum, bad.audit_num as auditNum, 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))) - THEN (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.pre_num-IFNULL(bb.finished_back_num,0)-IFNULL(aa.back_num,0)) 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) END as num,