From 30120ca3c227f5e29f37d4b3eb3eff1fc1537edf Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 16 Jan 2025 19:27:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=BA=93sql=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=BA5=E7=89=88=E6=9C=AC=EF=BC=8C=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SecondaryWarehouseController.java | 32 +- .../domain/SecondCcrapApplyDetails.java | 48 +++ .../mapper/SecondaryWarehouseMapper.java | 14 + .../service/SecondaryWarehouseService.java | 8 + .../impl/SecondaryWarehouseServiceImpl.java | 68 ++++ .../material/SecondaryWarehouseMapper.xml | 358 +++++++++--------- 6 files changed, 355 insertions(+), 173 deletions(-) create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondCcrapApplyDetails.java diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java index fd662b9..d5db375 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java @@ -107,7 +107,6 @@ public class SecondaryWarehouseController extends BaseController { @PostMapping("/exportList") public void exportList(HttpServletResponse response, @RequestBody SecondaryWarehouse bean) { if (bean.getLeaseType().equals(0)) { - SecondaryWarehouseVo bean1 = new SecondaryWarehouseVo(); BeanUtils.copyProperties(bean, bean1); List list = service.getList1(bean1); @@ -131,6 +130,37 @@ public class SecondaryWarehouseController extends BaseController { return toAjax(i); } + @ApiOperation(value = "获取二级库报废申请列表") + @GetMapping("/getSecondScrapList") + public TableDataInfo getSecondScrapList(SecondCcrapApplyDetails bean) { + startPage(); + List list = service.getSecondScrapList(bean); + return getDataTable(list); + } + + @ApiOperation(value = "获取二级库报废申请列表详情（查看）") + @GetMapping("/getSecondScrapListDetails") + public TableDataInfo getSecondScrapListDetails(SecondCcrapApplyDetails bean) { + startPage(); + List list = service.getSecondScrapListDetails(bean); + return getDataTable(list); + } + + @ApiOperation(value = "二级库报废申请") + @PostMapping("/seconfScrap") + public AjaxResult seconfScrap(SecondCcrapApplyDetails bean) { + Integer i = service.seconfScrap(bean); + return toAjax(i); + } + + @ApiOperation(value = "二级库报废审核（通过/驳回）") + @PostMapping("/auditSeconfScrap") + public AjaxResult auditSeconfScrap(SecondCcrapApplyDetails bean) { + Integer i = service.auditSeconfScrap(bean); + return toAjax(i); + } + + /** * 获取操作记录 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondCcrapApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondCcrapApplyDetails.java new file mode 100644 index 0000000..a5cc8a8 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondCcrapApplyDetails.java @@ -0,0 +1,48 @@ +package com.bonus.sgzb.material.domain; + +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/1/16 - 13:29 + */ +@Data +public class SecondCcrapApplyDetails { + private Integer id; + // 报废单号 + private String code; + // 机具ID + private String maId; + // 规格ID + private String typeId; + // 报废数量，默认值为0 + private Integer scrapNum; + // 状态（0进行中，1已审核，2驳回） + private Integer status; + // 审核人 + private Integer auditBy; + // 审核时间 + private Date auditTime; + // 报废申请备注 + private String auditRemark; + // 创建者 + private String createBy; + // 创建时间 + private Date createTime; + // 更新者 + private String updateBy; + // 更新时间 + private Date updateTime; + // 所属二级库 + private Integer unitId; + private Integer type; + + private List teamLeaseInfos; + + private String unitName; + private String modelName; + private String typeName; +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java index 7ffd631..77e5718 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java @@ -79,4 +79,18 @@ public interface SecondaryWarehouseMapper { Integer selectParentId(TeamLeaseInfo teamLeaseInfo); List getDevStockCount(SecondaryWarehouse bean); + + List getSecondScrapList(SecondCcrapApplyDetails bean); + + Integer secondScrapApplyDetails(SecondCcrapApplyDetails teamLeaseInfo); + + Integer auditSeconfScrap(SecondCcrapApplyDetails bean); + + List getSeconfScrapByCode(SecondCcrapApplyDetails bean); + + Integer updateMaMachineStatus(String maId); + + Integer updateDevNum(SecondCcrapApplyDetails secondCcrapApplyDetails); + + List getSecondScrapListDetails(SecondCcrapApplyDetails bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java index f3ab9ba..918bf78 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java @@ -42,4 +42,12 @@ public interface SecondaryWarehouseService { Integer getDevCount(SecondaryWarehouse bean); List getDevStockCount(SecondaryWarehouse bean); + + List getSecondScrapList(SecondCcrapApplyDetails bean); + + Integer seconfScrap(SecondCcrapApplyDetails bean); + + Integer auditSeconfScrap(SecondCcrapApplyDetails bean); + + List getSecondScrapListDetails(SecondCcrapApplyDetails bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java index 92f37b5..86641bf 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java @@ -152,6 +152,74 @@ public class SecondaryWarehouseServiceImpl implements SecondaryWarehouseService return mapper.getDevStockCount(bean); } + @Override + public List getSecondScrapList(SecondCcrapApplyDetails bean) { + return mapper.getSecondScrapList(bean); + } + + @Override + public Integer seconfScrap(SecondCcrapApplyDetails teamLeaseInfo) { + teamLeaseInfo.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + Integer num = 0; + String code = "BF" + System.currentTimeMillis(); + if (teamLeaseInfo.getTeamLeaseInfos().size() > 0) { + num = 0; + for (TeamLeaseInfo bean : teamLeaseInfo.getTeamLeaseInfos()) { + // 编码设备 + if (StringUtils.isNotBlank(bean.getMaIds())) { + for (String maId : bean.getMaIds().split(",")) { + // 出库 + teamLeaseInfo.setMaId(maId); + teamLeaseInfo.setTypeId(bean.getTypeId()); + teamLeaseInfo.setScrapNum(1); + teamLeaseInfo.setCode(code); + teamLeaseInfo.setStatus(0); + num = mapper.secondScrapApplyDetails(teamLeaseInfo); + } + } else { + // 数量设备 + teamLeaseInfo.setScrapNum(bean.getOutNum()); + teamLeaseInfo.setTypeId(bean.getTypeId()); + teamLeaseInfo.setMaId(null); + teamLeaseInfo.setCode(code); + teamLeaseInfo.setStatus(0); + num = mapper.secondScrapApplyDetails(teamLeaseInfo); + } + } + } + return num; + } + + @Override + public Integer auditSeconfScrap(SecondCcrapApplyDetails bean) { + // 目前先做成统一审核，后续如果需要对不同机具单独审核在做修改 + int num = 0; + if (bean.getStatus() == 1) { + //同意 + num = mapper.auditSeconfScrap(bean); + if (num > 0) { + // 更新设备状态 + List list = mapper.getSeconfScrapByCode(bean); + for (SecondCcrapApplyDetails secondCcrapApplyDetails : list) { + if (StringUtils.isNotBlank(secondCcrapApplyDetails.getMaId())) { + mapper.updateMaMachineStatus(secondCcrapApplyDetails.getMaId()); + } else { + mapper.updateDevNum(secondCcrapApplyDetails); + } + } + } + } else if (bean.getStatus() == 2) { + //驳回 + num = mapper.auditSeconfScrap(bean); + } + return num; + } + + @Override + public List getSecondScrapListDetails(SecondCcrapApplyDetails bean) { + return mapper.getSecondScrapListDetails(bean); + } + @Override public List getList(SecondaryWarehouse bean) { bean.setLeaseType(1); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml index c4bb6ea..3a698fb 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml @@ -30,6 +30,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} + + UPDATE second_ccrap_apply_details + SET + audit_by = #{auditBy}, + audit_time = now(), + status = #{status} + WHERE + code = #{code} + + + UPDATE ma_machine + SET + ma_status = 22 + WHERE + ma_id = #{maId} + + + UPDATE ma_type + SET + num = num - #{scrapNum} + WHERE + type_id = #{typeId} + DELETE FROM second_lot_config WHERE @@ -388,35 +411,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ma_id = #{maId} + + + @@ -661,4 +671,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ma_type set num = num + #{outNum} where type_id = #{typeId} + + insert into second_scrap_apply_details (code,ma_id,type_id,scrap_num,create_by,create_time,unit_id,status,audit_remark) + values (#{code},#{maId},#{typeId},#{scrapNum},#{createBy},now(),#{unitId},#{status},#{auditRemark}); +