From b1e8d1f91ae06e1c7c04ae100c1d166ca72e8a94 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 9 Dec 2024 18:18:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=9C=B0=E7=9B=B4=E8=BD=AC=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SelectServiceImpl.java | 2 +- .../material/lease/domain/LeaseApplyInfo.java | 6 +- .../WorkSiteDirectManageController.java | 21 +-- .../ma/domain/DirectApplyDetails.java | 1 - .../ma/domain/DirectPassApplyInfoDetails.java | 9 +- .../service/WorkSiteDirectManageService.java | 16 +- .../impl/WorkSiteDirectManageImpl.java | 140 ++++++------------ .../settlement/domain/SltAgreementInfo.java | 8 + .../ma/WorkSiteDirectManageMapper.xml | 102 ++++++------- .../mapper/material/repair/RepairMapper.xml | 2 +- .../settlement/SltAgreementInfoMapper.xml | 8 +- 11 files changed, 133 insertions(+), 182 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java index dca53ee2..e5783530 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java @@ -42,7 +42,7 @@ public class SelectServiceImpl implements SelectService { return AjaxResult.success(list); } List groupList = new ArrayList<>(); - List list = new ArrayList<>(); + List list; try { list = mapper.getUnitList(bmUnit); if (CollectionUtils.isNotEmpty(list)) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java index d42f23c3..fed8eb52 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java @@ -137,14 +137,14 @@ public class LeaseApplyInfo extends BaseEntity { @Excel(name = "领料工程") private String leaseProject; - @ApiModelProperty(value = "租赁工程id") + @ApiModelProperty(value = "领料工程id") private Integer leaseProjectId; - @ApiModelProperty(value = "租赁单位") + @ApiModelProperty(value = "领料单位") @Excel(name = "领料单位") private String leaseUnit; - @ApiModelProperty(value = "租赁单位id") + @ApiModelProperty(value = "领料id") private Integer leaseUnitId; @ApiModelProperty(value = "协议id") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/WorkSiteDirectManageController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/WorkSiteDirectManageController.java index e9128f27..c504e15c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/WorkSiteDirectManageController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/WorkSiteDirectManageController.java @@ -8,6 +8,7 @@ import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.ma.domain.DirectApplyDetails; import com.bonus.material.ma.domain.DirectApplyInfo; import com.bonus.material.ma.domain.DirectApplyInfoDetails; +import com.bonus.material.ma.domain.DirectPassApplyInfoDetails; import com.bonus.material.ma.service.WorkSiteDirectManageService; import com.bonus.material.settlement.domain.SltAgreementInfo; import io.swagger.annotations.Api; @@ -90,16 +91,16 @@ public class WorkSiteDirectManageController extends BaseController { return AjaxResult.success("保存成功"); } -// @ApiOperation(value = "通过") -// @PostMapping("/pass") -// public AjaxResult pass(@RequestBody DirectPassApplyInfoDetails directApplyInfoDetails) { -// int rows = workSiteDirectManageService.passDirectApplyInfoDetails(directApplyInfoDetails); -// if (rows == 1) { -// return AjaxResult.success("已通过"); -// } else { -// return AjaxResult.error("未通过"); -// } -// } + @ApiOperation(value = "通过") + @PostMapping("/pass") + public AjaxResult pass(@RequestBody DirectPassApplyInfoDetails directApplyInfoDetails) { + int rows = workSiteDirectManageService.passDirectApplyInfoDetails(directApplyInfoDetails); + if (rows == 1) { + return AjaxResult.success("已通过"); + } else { + return AjaxResult.error("未通过"); + } + } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyDetails.java index 13d1d15c..a6bde5b4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyDetails.java @@ -44,5 +44,4 @@ public class DirectApplyDetails extends BaseEntity { private Integer useNum; private String companyId; - } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectPassApplyInfoDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectPassApplyInfoDetails.java index ed723580..92346538 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectPassApplyInfoDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectPassApplyInfoDetails.java @@ -2,7 +2,10 @@ package com.bonus.material.ma.domain; import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.material.back.domain.BackApplyInfo; +import com.bonus.material.back.domain.vo.BackApplyRequestVo; +import com.bonus.material.lease.domain.LeaseApplyInfo; import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo; import com.bonus.material.task.domain.TmTask; import lombok.Data; @@ -19,9 +22,11 @@ public class DirectPassApplyInfoDetails extends BaseEntity { private String id; - private TmTask leaseApplyInfo; + private TmTask tmTask; - private BackApplyInfo backApplyInfo; + private BackApplyRequestVo backApplyRequestVo; + + private LeaseApplyRequestVo leaseApplyRequestVo; private List leaseOutDetails; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java index 75848e6e..2486e628 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java @@ -32,21 +32,7 @@ public interface WorkSiteDirectManageService { int insertTmTask(TmTask bean); -// int insertAgreement(TmTask task); - -// int insertApplyInfoAndDetails(TmTask task); -// -// int insertLeaseOutDetail(List leaseOutDetails, TmTask task); -// -// int insertBackApplyInfoAndDetails(BackApplyInfo backApplyInfo); -// -// int insertTmTaskByBackInfo(BackApplyInfo backApplyInfo); - -// int insertAgreementByBackInfo(BackApplyInfo backApplyInfo); -// -// int insertBackCheckDetails(List backApplyDetails); - DirectApplyInfo getInfoById(SltAgreementInfo sltAgreementInfo); -// int passDirectApplyInfoDetails(DirectPassApplyInfoDetails directApplyInfoDetails); + int passDirectApplyInfoDetails(DirectPassApplyInfoDetails directApplyInfoDetails); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java index 231d423c..c16a172f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java @@ -1,12 +1,17 @@ package com.bonus.material.ma.service.impl; import cn.hutool.core.collection.CollUtil; +import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.back.domain.BackApplyInfo; import com.bonus.material.back.service.IBackApplyInfoService; import com.bonus.material.lease.domain.LeaseApplyDetails; import com.bonus.material.lease.domain.LeaseApplyInfo; import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo; +import com.bonus.material.lease.service.ILeaseApplyInfoService; import com.bonus.material.ma.domain.DirectApplyDetails; import com.bonus.material.ma.domain.DirectApplyInfo; import com.bonus.material.ma.domain.DirectPassApplyInfoDetails; @@ -42,6 +47,9 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { @Resource private IBackApplyInfoService backApplyService; + @Resource + private ILeaseApplyInfoService leaseApplyService; + // @Resource // private BackRecordMapper backRecordMapper; // @@ -324,60 +332,42 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { return directApplyInfo; } -// @Override -// @Transactional(rollbackFor = Exception.class) -// public int passDirectApplyInfoDetails(DirectPassApplyInfoDetails directApplyInfoDetails) { -// int res = 0; -// try { -// // 修改状态为通过 -// res = updateDirectApplyInfo(directApplyInfoDetails); -// if (res == 0) { -// throw new RuntimeException("updateDirectApplyInfo异常"); -// } -// -// //创建领料信息和详情 -// res = createLeaseInfo(directApplyInfoDetails); -// if (res == 0) { -// throw new RuntimeException("createLeaseInfo异常"); -// } -// -// //创建退料信息和详情 -// res = createBackInfo(directApplyInfoDetails); -// if (res == 0) { -// throw new RuntimeException("createBackInfo异常"); -// } -// -// } catch (Exception e) { -// log.error(e.getMessage()); -// } -// return res; -// } -// -// private int createBackInfo(DirectPassApplyInfoDetails directApplyInfoDetails) { -// int res = 0; -// try { -// BackApplyInfo backApplyInfo = directApplyInfoDetails.getBackApplyInfo(); -// // 创建退料任务(1、创建tm_task ) -// res = createTmTaskByBackInfo(backApplyInfo); -// if (res == 0) { -// throw new RuntimeException("createBackTmTask异常"); -// } -// //2.创建协议tm_task_agreement -// res = createAgreementByBackInfo(backApplyInfo); -// if (res == 0) { -// throw new RuntimeException("createBackAgreement异常"); -// } -// // 3、创建back_apply_info和back_apply_details和出库记录back_check_details和计算结算数据 -// res = createtBackApplyInfoAndDetails(backApplyInfo); -// if (res == 0) { -// throw new RuntimeException("createBackApplyInfoAndDetails异常"); -// } -// } catch (Exception e) { -// log.error(e.getMessage()); -// } -// return res; -// -// } + @Override + @Transactional(rollbackFor = Exception.class) + public int passDirectApplyInfoDetails(DirectPassApplyInfoDetails directApplyInfoDetails) { + int res; + try { + // 修改状态为通过 + if (StringUtils.isNotBlank(directApplyInfoDetails.getId())) { + DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId()); + directApplyInfos.setStatus("1"); + directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername()); + directApplyInfos.setAuditTime(DateUtils.getNowDate()); + res = refuseDirectApplyInfo(directApplyInfos); + } else { + throw new RuntimeException("updateDirectApplyInfo异常"); + } + + //创建领料信息和详情 + AjaxResult createLeaseResult = leaseApplyService.insertLeaseApplyInfo(directApplyInfoDetails.getLeaseApplyRequestVo()); + if (!createLeaseResult.isSuccess()) { + System.err.println(createLeaseResult.get("msg")); + throw new RuntimeException("createLeaseInfo异常"); + } + + //创建退料信息和详情 + AjaxResult createBackResult = backApplyService.insertBackApplyInfo(directApplyInfoDetails.getBackApplyRequestVo()); + if (!createBackResult.isSuccess()) { + System.err.println(createBackResult.get("msg")); + throw new RuntimeException("createBackInfo异常"); + } + + } catch (Exception e) { + log.error(e.getMessage()); + throw new RuntimeException(e.getMessage()); + } + return res; + } // // private int createtBackApplyInfoAndDetails(BackApplyInfo backApplyInfo) { // int res = 0; @@ -558,47 +548,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { // return res; // } -// private int createTmTask(TmTask task, String taskType) { -// int taskId = 0; -// int res = 0; -// try { -// if ("1".equals(taskType)) { -// // 生成领料code -// String lcode = tmTaskService.genderLeaseCode(); -// if (StringUtils.isEmpty(lcode)) { -// return res; -// } -// task.setCode(lcode); -// task.setTaskStatus(35); -// // 创建领料任务（tm_task） -// res = insertTmTask(task); -// if (res == 0) { -// throw new RuntimeException("insertTmTask异常"); -// } -// taskId = Integer.valueOf(task.getId()); -// } -// } catch (Exception e) { -// log.error(e.getMessage()); -// } -// -// return taskId; -// -// } -// -// private int updateDirectApplyInfo(DirectPassApplyInfoDetails directApplyInfoDetails) { -// int res = 0; -// if (StringUtils.isNotBlank(directApplyInfoDetails.getId())) { -// DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId()); -// directApplyInfos.setStatus("1"); -// directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername()); -// directApplyInfos.setAuditTime(DateUtils.getNowDate()); -// res = refuseDirectApplyInfo(directApplyInfos); -// } else { -// return res; -// } -// return res; -// } -// + // public int insertBcd(List backApplyDetails) { // int res = 0; // for (BackApplyInfo backApplyDetail : backApplyDetails) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java index 48cac3fb..6bb8b0c8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java @@ -169,4 +169,12 @@ public class SltAgreementInfo extends BaseEntity { @ApiModelProperty(value = "结算状态") private String sltStatus; + private String typeModelName; + + private String maCode; + + private Double useNum; + + private String keyWord; + } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml index a21c15a7..8dc226f7 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WorkSiteDirectManageMapper.xml @@ -1,6 +1,5 @@ - @@ -329,7 +328,12 @@ - update direct_apply_info set status = #{status},auditor=#{auditor},audit_time=#{auditTime},update_time = now() where id = #{id} + update + direct_apply_info + set + status = #{status},auditor=#{auditor},audit_time= now(),update_time = now() + where + id = #{id} @@ -417,21 +421,21 @@ LEFT JOIN bm_project bpl1 ON bpl1.pro_id = bai1.project_id LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id LEFT JOIN bm_unit bui1 ON bui1.unit_id = bai1.unit_id - WHERE - 1=1 - - and (bpl.pro_name like concat('%', #{keyWord}, '%') or + + + and (bpl.pro_name like concat('%', #{keyWord}, '%') or bui.unit_name like concat('%', #{keyWord}, '%')) - - - and bpl.pro_id = #{lotId} - - - and bui.unit_id = #{unitId} - - - and dai.status = #{status} - + + + and bpl.pro_id = #{lotId} + + + and bui.unit_id = #{unitId} + + + and dai.status = #{status} + + + @@ -484,7 +489,6 @@ SELECT dad.direct_num AS directNum, dad.type_id AS typeId, - mt.company_id AS companyId, mt3.type_name AS typeName, mt2.type_name AS kindName, mt.type_name AS modelName, @@ -494,16 +498,14 @@ mm.ma_id AS maId FROM direct_apply_info dai - LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id - LEFT JOIN slt_agreement_info sai ON dai.back_agreement_id = sai.agreement_id - AND sai.type_id = dad.type_id - LEFT JOIN ma_type mt ON mt.type_id = dad.type_id - LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id - LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id - LEFT JOIN ma_machine mm ON dad.ma_id = mm.ma_id + LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id + LEFT JOIN slt_agreement_info sai ON dai.back_agreement_id = sai.agreement_id AND sai.type_id = dad.type_id + LEFT JOIN ma_type mt ON mt.type_id = dad.type_id + LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id + LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id + LEFT JOIN ma_machine mm ON dad.ma_id = mm.ma_id WHERE - dai.id = #{id} - AND sai.STATUS = '0' + dai.id = #{id} AND sai.STATUS = '0' and (mt2.type_name like concat('%', #{keyWord}, '%') or mt.type_name like concat('%', #{keyWord}, '%')) @@ -515,22 +517,22 @@ \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 5a42ca67..ee4837dd 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -243,7 +243,7 @@ LEFT JOIN tm_task_agreement tta ON rd.task_id = tta.task_id LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id LEFT JOIN bm_unit_info bui ON bai2.unit_id = bui.unit_id - LEFT JOIN bm_project_lot bpi ON bai2.project_id = bpi.lot_id AND bpi.STATUS = '0' AND bpi.del_flag = '0' + LEFT JOIN bm_project bpi ON bai2.project_id = bpi.lot_id AND bpi.STATUS = '0' AND bpi.del_flag = '0' LEFT JOIN sys_user su ON rd.create_by = su.user_id left join sys_user su2 on rd.repairer = su2.user_id LEFT JOIN ma_machine mm ON mm.ma_id = rd.ma_id diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml index d6008bac..ec23db01 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml @@ -356,21 +356,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"