diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/domain/ToBeRepair.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/domain/ToBeRepair.java index 5b07ec9..33513fb 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/domain/ToBeRepair.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/domain/ToBeRepair.java @@ -81,10 +81,13 @@ public class ToBeRepair { */ private String isScrap; + private Integer isScrapFilter; + /** * 创建人 */ private String createUser; + private String createBy; /** * 维修时间 diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java index 56b8ee3..ccb43e1 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java @@ -79,4 +79,32 @@ public interface RepairMapper { * @return */ List getDetailsList(ToBeRepair toBeRepair); + + /** + * 根据设备类型和编号查询 + * @param toBeRepair + * @return + */ + ToBeRepair selectByTypeIdAndCode(ToBeRepair toBeRepair); + + /** + * 新增设备生命周期数据 + * @param bean2 + * @return + */ + int addToolLifecycleByRepair(ToBeRepair bean2); + + /** + * 更新台账信息 + * @param bean2 + * @return + */ + int updateToolLifecycle(ToBeRepair bean2); + + /** + * 更新设备信息 + * @param toBeRepair + * @return + */ + int updateMaDevInfo(ToBeRepair toBeRepair); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 030fe5d..6b2f666 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -180,15 +180,54 @@ public class RepairServiceImpl implements RepairService { return AjaxResult.error("请选择审核数据"); } String username = SecurityUtils.getLoginUser().getSysUser().getNickName(); + Long userId = SecurityUtils.getLoginUser().getUserid(); for (ToBeRepair toBeRepair : bean.getToBeRepairList()) { - toBeRepair.setCreateUser(username); - int res = mapper.auditData(toBeRepair); - if (res <= 0) { - throw new Exception("审核数据失败"); + if (!StringHelper.isNullOrEmptyString(toBeRepair.getAuditStatus())){ + toBeRepair.setCreateUser(username); + int res = mapper.auditData(toBeRepair); + if (res <= 0) { + throw new Exception("审核数据失败"); + } + //如果是审核通过,需要增加周期表数据以及更新台账信息 + if ("1".equals(toBeRepair.getAuditStatus())){ + if ("工具".equals(toBeRepair.getType())){ + //根据typeId和code查询台账信息 + ToBeRepair bean1 = mapper.selectByTypeIdAndCode(toBeRepair); + if (bean1 != null && bean1.getId() > 0){ + //1、添加周期表数据 + ToBeRepair bean2 = new ToBeRepair(); + bean2.setId(bean1.getId()); + bean2.setCreateBy(userId+""); + bean2.setCreateUser(username); + bean2.setCode(toBeRepair.getCode()); + bean2.setRepairNum(toBeRepair.getRepairNum()); + bean2.setIsScrap(toBeRepair.getIsScrap()); + bean2.setIsScrapFilter(Integer.valueOf(toBeRepair.getIsScrap())); + int re = mapper.addToolLifecycleByRepair(bean2); + if (re <= 0) { + throw new Exception("添加周期表数据失败"); + } + //2、更新台账信息 + int re2 = mapper.updateToolLifecycle(bean2); + if (re2 <= 0) { + throw new Exception("更新台账信息失败"); + } + } + } else if ("装备".equals(toBeRepair.getType())){ + //更新台账信息 + toBeRepair.setCreateBy(userId+""); + toBeRepair.setIsScrapFilter(Integer.valueOf(toBeRepair.getIsScrap())); + int re3 = mapper.updateMaDevInfo(toBeRepair); + if (re3<=0){ + throw new Exception("更新台账信息失败"); + } + } + } + } else { + throw new Exception("缺少审核状态"); } } return AjaxResult.success("审核成功"); - } catch (Exception e) { e.printStackTrace(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml index d50c3b7..d6378f1 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -41,6 +41,32 @@ NOW() ) + + insert into tool_lifecycle( + ledger_id, + tool_code, + action_type, + change_num, + status_before, + status_after, + operator_id, + operator_name, + operate_time, + create_time + ) + values ( + #{id}, + #{code}, + '维修', + #{repairNum}, + '维修', + '在库', + #{createBy}, + #{createUser}, + NOW(), + NOW() + ) + update cs_device_change set del_flag = '1' where id = #{id} @@ -55,6 +81,40 @@ review_time=NOW() where id = #{id} + + update tool_ledger + set + repair_num=repair_num-#{repairNum}, + + + available_num=available_num+#{repairNum}, + status='0', + + + scrap_num=scrap_num+#{repairNum}, + status='3', + + + update_time=NOW() + where id = #{id} + + + update ma_dev_info + set + + + ma_status='1', + + + ma_status='99', + + + + update_by=#{createBy}, + + update_time=NOW() + where type_id = #{typeId} and code=#{code} + + \ No newline at end of file