From fd9710cc08275363a94e16b439196c27fc2213e8 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 19 Jul 2024 17:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E5=AE=8C=E6=88=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/BackApplyController.java | 1 + .../sgzb/app/mapper/BackApplyAppMapper.java | 5 +++++ .../sgzb/app/service/BackApplyService.java | 2 ++ .../app/service/impl/BackApplyServiceImpl.java | 5 +++++ .../impl/LeaseOutDetailsServiceImpl.java | 18 ++---------------- .../mapper/app/BackApplyAppMapper.xml | 3 +++ .../mapper/material/MaWholeSetMapper.xml | 1 + 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java index 381c4732..92b7e2c8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java @@ -220,6 +220,7 @@ public class BackApplyController extends BaseController { } for (BackApplyInfo backApplyInfo : record.getBackApplyDetails()) { backApplyInfo.setParentId(record.getParentId()); + backApplyService.updateBackInfo(record.getParentId(),record.getCompanyId()); boolean re = backApplyService.upload(backApplyInfo) > 0; if (!re) { return AjaxResult.error("退料任务明细插入失败"); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java index 01da2bc8..65372139 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java @@ -5,6 +5,7 @@ import com.bonus.sgzb.app.domain.BmAgreementInfo; import com.bonus.sgzb.app.domain.MachinePart; import com.bonus.sgzb.app.domain.TmTask; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -41,11 +42,13 @@ public interface BackApplyAppMapper { int del(BackApplyInfo record); List examineList(BackApplyInfo record); + List examineListByUser(BackApplyInfo record); List examineView(BackApplyInfo record); int audit(BackApplyInfo record); + int updateBackApply(BackApplyInfo record); List selectBackApplyInfo(BackApplyInfo record); @@ -57,4 +60,6 @@ public interface BackApplyAppMapper { List getMaTypeDetails(BackApplyInfo backApplyInfo); MachinePart getMachineParts(TmTask typeId); + + void updateBackInfo(@Param("parentId") Integer parentId,@Param("companyId") String companyId); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java index e2b5275a..d7f27808 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java @@ -112,4 +112,6 @@ public interface BackApplyService { * @return int */ int refuse(BackApplyInfo record); + + void updateBackInfo(Integer parentId,String companyId); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java index 80a1d8fc..b3dce6c2 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java @@ -205,4 +205,9 @@ public class BackApplyServiceImpl implements BackApplyService { return 0; } + @Override + public void updateBackInfo(Integer parentId,String companyId) { + backApplyMapper.updateBackInfo(parentId,companyId); + } + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 54502146..4aa3c6ea 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -215,22 +215,8 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { // 插入领料出库明细表（lease_out_details） res = leaseOutDetailsMapper.insertSelective(record); if (res > 0) { - if (record.getManageType() == 2) { - // 成套机具减少 (ma_type 设备规格表)的库存数量 - res = leaseOutDetailsMapper.updateMaTypeStockNum(record); - // 成套机具减少 (ma_type 设备规格表)配件的库存数量 - List typeIds = leaseOutDetailsMapper.getMaTypeDetails(record); - typeIds.removeIf(item -> item == null); - for (TmTask typeId : typeIds) { - MachinePart machinePart = leaseOutDetailsMapper.getMachineParts(typeId); - machinePart.setPartNum((typeId.getPartNum() * record.getOutNum())); - typeId.setNum(machinePart.getNum() - machinePart.getPartNum()); - res = leaseOutDetailsMapper.updateMaTypeStockNumCt(typeId); - } - } else { - // 普通机具减少 (ma_type 设备规格表)的库存数量 - res = leaseOutDetailsMapper.updateMaTypeStockNum(record); - } + // 普通机具减少 (ma_type 设备规格表)的库存数量 + res = leaseOutDetailsMapper.updateMaTypeStockNum(record); // 更新 (ma_machine 设备表)的状态 leaseOutDetailsMapper.updateMaMachineStatus(record); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml index d1eeff16..122ebcd1 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml @@ -337,6 +337,9 @@ WHERE bai.id = #{id} + + update back_apply_info set company_id = #{companyId} where id = #{parentId} + DELETE diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml index 697b4feb..f71bd688 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml @@ -83,6 +83,7 @@ and mws.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') GROUP BY mws.parent_id,mws.whole_type_name + order by mws.create_time desc