From 41b7547baef44aa973000c47c391abc4c9e78e8e Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 19 Nov 2024 17:03:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BackApplyInfoController.java | 18 ++++++++ .../back/mapper/BackApplyInfoMapper.java | 22 ---------- .../back/service/IBackApplyInfoService.java | 15 +++---- .../impl/BackApplyInfoServiceImpl.java | 39 ++++++++++------- .../material/basic/domain/BmProject.java | 5 +++ .../bonus/material/basic/domain/BmUnit.java | 4 ++ .../material/common/mapper/SelectMapper.java | 14 ++++++ .../service/impl/SelectServiceImpl.java | 10 +++++ .../purchase/domain/PurchaseCheckDetails.java | 8 ++++ .../impl/PurchaseCheckInfoServiceImpl.java | 43 +++++++++++++++++++ .../material/back/BackApplyInfoMapper.xml | 23 +++------- .../mapper/material/common/SelectMapper.xml | 36 ++++++++++++++++ .../purchase/PurchaseCheckDetailsMapper.xml | 16 +++++-- 13 files changed, 188 insertions(+), 65 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java index 6bb38b28..672b85a9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java @@ -100,6 +100,24 @@ public class BackApplyInfoController extends BaseController { } } + /** + * 新增退料任务app + * @param dto + * @return + */ + @ApiOperation(value = "新增退料任务app") + @PreventRepeatSubmit + @RequiresPermissions("back:info:add") + @SysLog(title = "退料任务", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增退料任务app") + @PostMapping("/insertApp") + public AjaxResult insertApp(@RequestBody BackApplyRequestVo dto) { + try { + return backApplyInfoService.insertApp(dto); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } + } + /** * 修改退料任务 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java index 09e2f7e2..0d8584a5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java @@ -56,14 +56,6 @@ public interface BackApplyInfoMapper { */ public int deleteBackApplyInfoById(Long id); - /** - * 批量删除退料任务 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBackApplyInfoByIds(Long[] ids); - /** * 查询任务编号 * @param date @@ -121,20 +113,6 @@ public interface BackApplyInfoMapper { */ int insertCheckDetails(BackApplyDetails details); - /** - * 删除任务 - * @param taskId - * @return - */ - int deleteTask(Long taskId); - - /** - * 删除任务关联协议 - * @param taskId - * @return - */ - int deleteTaskAgreement(Long taskId); - /** * 删除退料主表 * @param id diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java index 6939d38d..fbe37ccb 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java @@ -45,14 +45,6 @@ public interface IBackApplyInfoService { */ public AjaxResult updateBackApplyInfo(BackApplyRequestVo dto); - /** - * 批量删除退料任务 - * - * @param ids 需要删除的退料任务主键集合 - * @return 结果 - */ - public int deleteBackApplyInfoByIds(Long[] ids); - /** * 删除退料任务信息 * @@ -81,4 +73,11 @@ public interface IBackApplyInfoService { * @return */ AjaxResult editPrintStatus(BackApplyInfo dto); + + /** + * 新增退料任务app + * @param dto + * @return + */ + AjaxResult insertApp(BackApplyRequestVo dto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index dcd326cb..19cb2135 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -19,6 +19,8 @@ import com.bonus.material.back.domain.vo.MaCodeVo; import com.bonus.material.basic.domain.BmFileInfo; import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.settlement.domain.SltAgreementInfo; +import com.bonus.material.task.mapper.TmTaskAgreementMapper; +import com.bonus.material.task.mapper.TmTaskMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.bonus.material.back.mapper.BackApplyInfoMapper; @@ -44,6 +46,12 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { @Resource private BmFileInfoMapper bmFileInfoMapper; + @Resource + private TmTaskMapper taskMapper; + + @Resource + private TmTaskAgreementMapper taskAgreementMapper; + /** * 查询退料任务 * @@ -212,7 +220,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { if (StringUtils.isNotBlank(dto.getBackApplyInfo().getPhone()) && !PhoneUtil.isMobile(dto.getBackApplyInfo().getPhone())) { return AjaxResult.error("手机号格式不正确，请重新填写!"); } - //对提交的退料详情树木进行校验 + //对提交的退料详情数目进行校验 for (BackApplyDetails backApplyDetails : dto.getBackApplyDetailsList()) { if (backApplyDetails.getNum() != null && backApplyDetails.getPreNum() != null) { if (backApplyDetails.getNum() < backApplyDetails.getPreNum()) { @@ -403,8 +411,8 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { List maCodeList = backApplyInfoMapper.selectByCode(id); // 删除相关任务信息 int result = 0; - result += backApplyInfoMapper.deleteTask(backApplyInfo.getTaskId()); - result += backApplyInfoMapper.deleteTaskAgreement(backApplyInfo.getTaskId()); + result += taskMapper.deleteTmTaskByTaskId(backApplyInfo.getTaskId()); + result += taskAgreementMapper.deleteTmTaskAgreementByTaskId(backApplyInfo.getTaskId()); result += backApplyInfoMapper.deleteBackApplyDetails(backApplyInfo.getId()); result += backApplyInfoMapper.deleteCheckDetails(backApplyInfo.getId()); // 删除退料详情附件 @@ -440,17 +448,6 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } - /** - * 批量删除退料任务 - * - * @param ids 需要删除的退料任务主键 - * @return 结果 - */ - @Override - public int deleteBackApplyInfoByIds(Long[] ids) { - return backApplyInfoMapper.deleteBackApplyInfoByIds(ids); - } - /** * 删除退料任务信息 * @@ -488,8 +485,8 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { private int deleteTaskInfo(BackApplyInfo backApplyInfo) { // 删除任务、任务协议及相关信息 int result = 0; - result += backApplyInfoMapper.deleteTask(backApplyInfo.getTaskId()); - result += backApplyInfoMapper.deleteTaskAgreement(backApplyInfo.getTaskId()); + result += taskMapper.deleteTmTaskByTaskId(backApplyInfo.getTaskId()); + result += taskAgreementMapper.deleteTmTaskAgreementByTaskId(backApplyInfo.getTaskId()); result += backApplyInfoMapper.deleteBackApply(backApplyInfo.getId()); result += backApplyInfoMapper.deleteBackApplyDetails(backApplyInfo.getId()); result += backApplyInfoMapper.deleteCheckDetails(backApplyInfo.getId()); @@ -627,6 +624,16 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { return result > 0 ? AjaxResult.success() : AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } + /** + * 新增退料申请app + * @param dto + * @return + */ + @Override + public AjaxResult insertApp(BackApplyRequestVo dto) { + return null; + } + /** * 更新任务表及退料申请表状态 * @param backApplyInfo diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java index 3266ee74..b293d999 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java @@ -25,6 +25,11 @@ public class BmProject extends BaseEntity { private static final long serialVersionUID = 1L; + /** + * 是否app 端(app采有非下拉树) + */ + private Boolean isApp; + /** 主键ID */ private Long proId; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java index 922436a5..863b72ee 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java @@ -23,6 +23,10 @@ import javax.validation.constraints.Size; public class BmUnit extends BaseEntity { private static final long serialVersionUID = 1L; + /** + * 是否app 端(app采有非下拉树) + */ + private Boolean isApp; /** 类型ID */ private Long unitId; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java index 1cdea8ee..7759ce30 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java @@ -137,4 +137,18 @@ public interface SelectMapper { * @return */ List getUseTypeTreeL21(List list); + + /** + * 获取单位下拉选app + * @param bmUnit + * @return + */ + List getUnitListApp(BmUnit bmUnit); + + /** + * 获取工程下拉选app + * @param bmProject + * @return + */ + List getProjectListApp(BmProject bmProject); } 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 caf997d7..642c9fba 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 @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -36,6 +37,10 @@ public class SelectServiceImpl implements SelectService { */ @Override public AjaxResult getUnitList(BmUnit bmUnit) { + if (bmUnit.getIsApp() != null && bmUnit.getIsApp()) { + List list = mapper.getUnitListApp(bmUnit); + return AjaxResult.success(list); + } List groupList = new ArrayList<>(); List list = new ArrayList<>(); try { @@ -59,6 +64,11 @@ public class SelectServiceImpl implements SelectService { */ @Override public AjaxResult getProjectList(BmProject bmProject) { + if (bmProject.getIsApp() != null && bmProject.getIsApp()) { + List list = mapper.getProjectListApp(bmProject); + list.removeIf(Objects::isNull); + return AjaxResult.success(list); + } List groupList = new ArrayList<>(); List list = new ArrayList<>(); try { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java index 3b19acaa..d65943e9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java @@ -79,6 +79,14 @@ public class PurchaseCheckDetails extends BaseEntity { @ApiModelProperty(value = "验收结论") private String checkResult; + /** 质保材料 */ + @ApiModelProperty(value = "质保材料") + private String warnDocuments; + + /** 原因 */ + @ApiModelProperty(value = "原因") + private String reason; + /** 物资厂家id */ //@Excel(name = "物资厂家id") @ApiModelProperty(value = "物资厂家id") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index b815c4d1..82e40764 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -87,15 +87,38 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { MaTypeManageTypeEnum.CODE_DEVICE.getTypeId().equals(o.getManageType()) && getPurchaseMaCodeCount(o.getTaskId(), o.getTypeId()) > 0) .collect(Collectors.toList()); } + //针对于app查询可能存在的验收图片 + extractedFile(purchaseCheckDetailsList); } else { purchaseQueryDto.setStatusList(null); purchaseCheckDetailsList = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto); + //针对于app查询可能存在的验收图片 + extractedFile(purchaseCheckDetailsList); } purchaseCheckDtoResult.setPurchaseCheckDetailsList(purchaseCheckDetailsList); } return purchaseCheckDtoResult; } + /** + * 提取app新购验收文件信息 + * @param purchaseCheckDetailsList + */ + private void extractedFile(List purchaseCheckDetailsList) { + if (!CollectionUtils.isEmpty(purchaseCheckDetailsList)) { + for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) { + BmFileInfo fileInfo = new BmFileInfo(); + fileInfo.setTaskType(10); + fileInfo.setModelId(purchaseCheckDetails.getId()); + fileInfo.setTaskId(purchaseCheckDetails.getTaskId()); + List bmFileInfoList = bmFileInfoMapper.selectBmFileInfoList(fileInfo); + if (!CollectionUtils.isEmpty(bmFileInfoList)) { + purchaseCheckDetails.setBmFileInfos(bmFileInfoList); + } + } + } + } + private int getPurchaseMaCodeCount(Long taskId, Long typeId) { return purchaseMacodeInfoMapper.getPurchaseMaCodeCount(taskId, typeId); } @@ -285,6 +308,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { details.setStatus(PurchaseTaskStatusEnum.TO_STORE.getStatus()); } result = purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details) > 0 ? AjaxResult.success("detail验证成功") : AjaxResult.error("details无验证信息"); + extractedFile(details); } } else { for (PurchaseCheckDetails details : purchaseVerifyVo.getPurchaseCheckDetailsList()) { @@ -294,6 +318,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { .setTaskId(details.getTaskId()) .setTaskType(TmTaskTypeEnum.TM_TASK_PURCHASE.getTaskTypeId()) .setTaskStatus(PurchaseTaskStatusEnum.TASK_TO_START.getStatus())); + extractedFile(details); } } } @@ -303,6 +328,24 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { } } + /** + * app新购验收图片上传方法抽取 + * @param details + */ + private void extractedFile(PurchaseCheckDetails details) { + if (!CollectionUtils.isEmpty(details.getBmFileInfos())) { + for (BmFileInfo bmFileInfo : details.getBmFileInfos()) { + if (bmFileInfo.getTaskType() != null && bmFileInfo.getTaskType() == 10) { + bmFileInfo.setTaskId(details.getTaskId()); + bmFileInfo.setModelId(details.getId()); + bmFileInfo.setCreateBy(SecurityUtils.getUsername()); + bmFileInfo.setCreateTime(DateUtils.getNowDate()); + bmFileInfoMapper.insertBmFileInfo(bmFileInfo); + } + } + } + } + /** * 根据任务id查询验收单 * diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index 3210a194..033e308f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -71,11 +71,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bai.phone like concat('%', #{keyWord}, '%') ) + + and bu.unit_id = #{unitId} + + + and bp.pro_id = #{proId} + - and bai.status = #{status} + and tt.task_status = #{status} GROUP BY bai.`code` ORDER BY bai.create_time desc @@ -565,21 +571,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from back_apply_info where id = #{id} - - delete from back_apply_info where id in - - #{id} - - - - - update tm_task set status = 0 where task_id = #{taskId} - - - - delete from tm_task_agreement where task_id = #{taskId} - - delete from back_apply_info where id = #{id} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml index c7610c70..22853232 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml @@ -305,4 +305,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY level + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index 0843dddc..df2908b9 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -44,7 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select pcd.id, pcd.task_id, pcd.type_id, pcd.purchase_price, pcd.purchase_tax_price, pcd.purchase_num, pcd.check_num, pcd.bind_num, pcd.check_result, pcd.supplier_id, pcd.status, pcd.create_by, pcd.production_time, pcd.create_time, pcd.update_by, pcd.update_time, pcd.remark, pcd.check_url_name, pcd.check_url, pcd.input_num, pcd.input_status, pcd.input_time, pcd.file_name, - pcd.file_url, pcd.company_id, pcd.fix_code, mt.type_name, mt.unit_name, mtp.type_name as ma_type_name, mt.manage_type as manage_type + pcd.file_url, pcd.company_id, pcd.fix_code, mt.type_name, mt.unit_name, mtp.type_name as ma_type_name, mt.manage_type as manage_type, + pcd.warn_documents as warnDocuments, pcd.reason as reason from purchase_check_details pcd left join ma_type mt on pcd.type_id = mt.type_id left join ma_type mtp on mt.parent_id = mtp.type_id @@ -331,8 +332,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update purchase_check_details - set - `status` = #{status}, check_result = #{checkResult}, check_num = purchase_num + + `status` = #{status}, + check_result = #{checkResult}, + check_num = purchase_num, + + warn_documents = #{warnDocuments}, + + + reason = #{reason} + + where 1=1