From bf77815eb78c19989e21abd15003a7a7b4e8070f Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Sun, 14 Sep 2025 21:04:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ma/service/impl/MachineServiceImpl.java | 272 +++++------------- 1 file changed, 79 insertions(+), 193 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java index 10c43698..e8e5af28 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java @@ -456,148 +456,33 @@ public class MachineServiceImpl implements IMachineService if (baseInfo == null) { return AjaxResult.error("扫描二维码信息为空"); } - machine.setMaId(baseInfo.getMaId()); - //2根据二维码查询初次入库时间 - Machine inTime = machineMapper.getInTimeByQrcode(machine); - //服务工程次数，检验次数 - Machine serviceNum = machineMapper.getServiceNumByQrcode(machine); - //更换配件次数 - Machine checkNum = machineMapper.getCheckNumByQrcode(machine); - //报废时间 - Machine scrapTime = machineMapper.getScrapTimeByQrcode(machine); -// //3根据机具id查询领退工程 -// Machine leaseInfo = machineMapper.getLeaseInfoByQrcode(machine); - - // 根据maid查询领料任务 - LeaseApplyInfo leaseInfo = machineMapper.getLeaseParentId(machine); - if (leaseInfo == null || leaseInfo.getParentId() == null){ - baseInfo.setLeaseTime(null); - baseInfo.setLeaseUnit(null); - baseInfo.setLeaseProject(null); - - }else{ - LeaseApplyInfo leaseDetail = machineMapper.getLeaseUnitAndProject(leaseInfo); - baseInfo.setLeaseTime(String.valueOf(leaseInfo.getLeaseTime())); - baseInfo.setLeaseUnit(leaseDetail.getUnitName()); - baseInfo.setLeaseProject(leaseDetail.getProjectName()); - } - - // 根据maid查询退料任务 - LeaseApplyInfo leaseInfoBack = machineMapper.getBackParentId(machine); - if (leaseInfoBack == null || leaseInfoBack.getParentId() == null){ - baseInfo.setBackTime(null); - baseInfo.setBackUnit(null); - baseInfo.setBackProject(null); - }else{ - LeaseApplyInfo leaseDetailBack = machineMapper.getBackUnitAndProject(leaseInfoBack); - baseInfo.setBackTime(String.valueOf(leaseDetailBack.getLeaseTime())); - baseInfo.setBackUnit(leaseDetailBack.getUnitName()); - baseInfo.setBackProject(leaseDetailBack.getProjectName()); - } - - - if (inTime != null){ - Integer taskId = inTime.getTaskId(); - if(taskId != null){ - baseInfo.setInTime(inTime.getInTime()+"(新购)"); - }else{ - baseInfo.setInTime(inTime.getInTime()); - } - - } - - if(serviceNum != null){ - baseInfo.setServiceNum(serviceNum.getServiceNum()); - }else{ - baseInfo.setServiceNum(0); - } - - if(checkNum != null){ - baseInfo.setCheckNum(checkNum.getCheckNum()); - }else{ - baseInfo.setCheckNum(0); - } - - if (scrapTime != null){ - baseInfo.setScrapTime(scrapTime.getScrapTime()); - }else{ - baseInfo.setScrapTime("暂无"); - } - + //获取服务工程次数、更换配件次数、报废时间、领退料工程时间等信息 + fillMachineInfo(baseInfo, machine); return success(baseInfo); } @Override public AjaxResult getHisByCode(Machine machine) { - List result = new ArrayList<>(); - List maList = machineMapper.getListByCode(machine); - if (CollectionUtils.isNotEmpty(maList)){ - if(maList.size() == 1){ - Machine baseInfo = maList.get(0); - machine.setMaId(baseInfo.getMaId()); - machine.setMaCode(baseInfo.getMaCode()); - //2根据二维码查询初次入库时间 - Machine inTime = machineMapper.getInTimeByQrcode(machine); - //服务工程次数，检验次数 - Machine serviceNum = machineMapper.getServiceNumByQrcode(machine); - //更换配件次数 - Machine checkNum = machineMapper.getCheckNumByQrcode(machine); - //报废时间 - Machine scrapTime = machineMapper.getScrapTimeByQrcode(machine); - //3根据机具id查询领退工程 - Machine leaseInfo = machineMapper.getLeaseInfoByQrcode(machine); - if (inTime != null){ - Integer taskId = inTime.getTaskId(); - if(taskId != null){ - baseInfo.setInTime(inTime.getInTime()+"(新购)"); - }else{ - baseInfo.setInTime(inTime.getInTime()); - } - - } - - if(serviceNum != null){ - baseInfo.setServiceNum(serviceNum.getServiceNum()); - }else{ - baseInfo.setServiceNum(0); - } - - if(checkNum != null){ - baseInfo.setCheckNum(checkNum.getCheckNum()); - }else{ - baseInfo.setCheckNum(0); - } - - if (scrapTime != null){ - baseInfo.setScrapTime(scrapTime.getScrapTime()); - }else{ - baseInfo.setScrapTime("暂无"); - } - - if(leaseInfo != null){ - baseInfo.setLeaseTime(leaseInfo.getLeaseTime()); - baseInfo.setLeaseUnit(leaseInfo.getLeaseUnit()); - baseInfo.setLeaseProject(leaseInfo.getLeaseProject()); - baseInfo.setBackTime(leaseInfo.getBackTime()); - baseInfo.setBackUnit(leaseInfo.getBackUnit()); - baseInfo.setBackProject(leaseInfo.getBackProject()); - } - result.add(baseInfo); - return success(result); - - }else{ - return success(maList); - } - }else{ - return error("暂无该设备信息"); - } - + List maList = machineMapper.getListByCode(machine); + if (CollectionUtils.isEmpty(maList)) { + if (!StringHelper.isNullOrEmptyString(machine.getQrCode())){ + return AjaxResult.error("扫描二维码信息为空"); + } else { + return error("暂无该设备信息"); + } + } + if (maList.size() == 1) { + Machine baseInfo = maList.get(0); + machine.setQrCode(baseInfo.getQrCode()); + fillMachineInfo(baseInfo, machine); + return success(Collections.singletonList(baseInfo)); + } + return success(maList); } @Override public AjaxResult getHisByCodeNew(Machine machine) { try { - List result = new ArrayList<>(); List maList=new ArrayList<>(); if (machine.getDevType()==0){ maList = machineMapper.getHisByCodeNew(machine); @@ -606,75 +491,76 @@ public class MachineServiceImpl implements IMachineService } else if (machine.getDevType()==2){ maList = machineMapper.getListByCode(machine); } - - if (CollectionUtils.isNotEmpty(maList)){ - if(maList.size() == 1){ - Machine baseInfo = maList.get(0); - if (baseInfo.getJiJuType()==2){ - machine.setMaId(baseInfo.getMaId()); - machine.setMaCode(baseInfo.getMaCode()); - //2根据二维码查询初次入库时间 - Machine inTime = machineMapper.getInTimeByQrcode(machine); - //服务工程次数，检验次数 - Machine serviceNum = machineMapper.getServiceNumByQrcode(machine); - //更换配件次数 - Machine checkNum = machineMapper.getCheckNumByQrcode(machine); - //报废时间 - Machine scrapTime = machineMapper.getScrapTimeByQrcode(machine); - //3根据机具id查询领退工程 - Machine leaseInfo = machineMapper.getLeaseInfoByQrcode(machine); - if (inTime != null){ - Integer taskId = inTime.getTaskId(); - if(taskId != null){ - baseInfo.setInTime(inTime.getInTime()+"(新购)"); - }else{ - baseInfo.setInTime(inTime.getInTime()); - } - - } - if(serviceNum != null){ - baseInfo.setServiceNum(serviceNum.getServiceNum()); - }else{ - baseInfo.setServiceNum(0); - } - - if(checkNum != null){ - baseInfo.setCheckNum(checkNum.getCheckNum()); - }else{ - baseInfo.setCheckNum(0); - } - - if (scrapTime != null){ - baseInfo.setScrapTime(scrapTime.getScrapTime()); - }else{ - baseInfo.setScrapTime("暂无"); - } - if(leaseInfo != null){ - baseInfo.setLeaseTime(leaseInfo.getLeaseTime()); - baseInfo.setLeaseUnit(leaseInfo.getLeaseUnit()); - baseInfo.setLeaseProject(leaseInfo.getLeaseProject()); - baseInfo.setBackTime(leaseInfo.getBackTime()); - baseInfo.setBackUnit(leaseInfo.getBackUnit()); - baseInfo.setBackProject(leaseInfo.getBackProject()); - } - result.add(baseInfo); - return success(result); - } else { - result.add(baseInfo); - return success(result); - } - } else { - return success(maList); - } - }else{ + if (CollectionUtils.isEmpty(maList)) { return error("暂无该设备信息"); } + if (maList.size() == 1) { + Machine baseInfo = maList.get(0); + if (baseInfo.getJiJuType() == 2) { + fillMachineInfo(baseInfo, machine); + } + return success(Collections.singletonList(baseInfo)); + } + return success(maList); } catch (Exception e) { e.printStackTrace(); return error("暂无该设备信息"); } } + /** + * 公共方法 + * 获取服务工程次数、更换配件次数、报废时间、领退料工程时间等信息 + */ + private void fillMachineInfo(Machine baseInfo, Machine machine) { + machine.setMaId(baseInfo.getMaId()); + machine.setMaCode(baseInfo.getMaCode()); + // 初次入库时间 + Machine inTime = machineMapper.getInTimeByQrcode(machine); + if (inTime != null) { + Integer taskId = inTime.getTaskId(); + if (taskId != null) { + baseInfo.setInTime(inTime.getInTime() + "(新购)"); + } else { + baseInfo.setInTime(inTime.getInTime()); + } + } + // 服务工程次数 + Machine serviceNum = machineMapper.getServiceNumByQrcode(machine); + baseInfo.setServiceNum(serviceNum != null ? serviceNum.getServiceNum() : 0); + // 更换配件次数 + Machine checkNum = machineMapper.getCheckNumByQrcode(machine); + baseInfo.setCheckNum(checkNum != null ? checkNum.getCheckNum() : 0); + // 报废时间 + Machine scrapTime = machineMapper.getScrapTimeByQrcode(machine); + baseInfo.setScrapTime(scrapTime != null ? scrapTime.getScrapTime() : "暂无"); + // 查询领料任务 + LeaseApplyInfo leaseInfo = machineMapper.getLeaseParentId(machine); + if (leaseInfo == null || leaseInfo.getParentId() == null) { + baseInfo.setLeaseTime(null); + baseInfo.setLeaseUnit(null); + baseInfo.setLeaseProject(null); + } else { + LeaseApplyInfo leaseDetail = machineMapper.getLeaseUnitAndProject(leaseInfo); + baseInfo.setLeaseTime(String.valueOf(leaseInfo.getLeaseTime())); + baseInfo.setLeaseUnit(leaseDetail.getUnitName()); + baseInfo.setLeaseProject(leaseDetail.getProjectName()); + } + // 查询退料任务 + LeaseApplyInfo leaseInfoBack = machineMapper.getBackParentId(machine); + if (leaseInfoBack == null || leaseInfoBack.getParentId() == null) { + baseInfo.setBackTime(null); + baseInfo.setBackUnit(null); + baseInfo.setBackProject(null); + } else { + LeaseApplyInfo leaseDetailBack = machineMapper.getBackUnitAndProject(leaseInfoBack); + baseInfo.setBackTime(String.valueOf(leaseDetailBack.getLeaseTime())); + baseInfo.setBackUnit(leaseDetailBack.getUnitName()); + baseInfo.setBackProject(leaseDetailBack.getProjectName()); + } + } + + @Override public AjaxResult editMachineStatus(Machine machine) { machine.setUpdateTime(DateUtils.getNowDate());