From cf8b5f8204d63ea82d7113fe33aae6ae0f5d9b05 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Tue, 9 Sep 2025 20:10:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E7=AB=A3=E5=B7=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BackApplyInfoController.java | 12 ++++ .../material/ma/domain/vo/SampleSync.java | 6 ++ .../ma/service/impl/MachineServiceImpl.java | 65 ++++++------------- .../service/impl/WarehousingServiceImpl.java | 6 +- .../mapper/material/ma/MachineMapper.xml | 32 ++++----- .../material/push/ProDataUseInfoMapper.xml | 2 +- 6 files changed, 59 insertions(+), 64 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 7f03fbbb..d5cd0cef 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 @@ -225,6 +225,18 @@ public class BackApplyInfoController extends BaseController { return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } + /** + * 根据typeId查询领料机具列表 + * @param dto + * @return + */ + @ApiOperation(value = "根据typeId查询领料机具列表") + @GetMapping("/selectMachineByIdListQrScan") + public AjaxResult selectMachineByIdListQrScan(BackApplyInfo dto){ + List list = backApplyInfoService.selectMachineByIdList(dto); + return AjaxResult.success(list); + } + /** * app根据设备编码去检索领料详情 * @param dto diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/SampleSync.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/SampleSync.java index e5a45650..657c48f1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/SampleSync.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/SampleSync.java @@ -52,4 +52,10 @@ public class SampleSync extends BaseEntity private String typeNameCode; private int parentId; + + //机具名称 + private String modelName ; + + //规格型号 + private String typeName ; } 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 f44eb82a..10c43698 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 @@ -343,7 +343,7 @@ public class MachineServiceImpl implements IMachineService List notExistList = new ArrayList<>(); List successList = new ArrayList<>(); // 原sueecssList修正拼写 List exceptionList = new ArrayList<>(); // 新增异常列表 - + List noSuccessList = new ArrayList<>(); //2.构建bigList的typeNameCode映射表（优化查询效率） Map> typeNameCodeMap = new HashMap<>(); for (SampleSync bigItem : bigList) { @@ -357,76 +357,53 @@ public class MachineServiceImpl implements IMachineService List matchedBigItems = typeNameCodeMap.getOrDefault(sampleTypeNameCode, Collections.emptyList()); if (matchedBigItems.isEmpty()) { - //无匹配项 + // 无匹配项 sample.setResult("未发现该机具"); sample.setIsSuccess(0); notExistList.add(sample); } else if (matchedBigItems.size() > 1) { - //匹配超过1个，存入异常列表 + // 匹配超过1个，存入异常列表 sample.setResult("该机具编码重复"); sample.setIsSuccess(0); exceptionList.add(sample); } else { - //仅匹配1个，检查maStatus + // 仅匹配1个，提取公共属性设置 SampleSync matchedItem = matchedBigItems.get(0); + sample.setModelName(matchedItem.getModelName()); + sample.setTypeName(matchedItem.getTypeName()); Integer maStatus = matchedItem.getMaStatus(); - if (maStatus != null) { - // 根据现有业务逻辑，6/7/8/10代表"报废"，18代表"丢失" + // 预计算"不合格"状态 + boolean isUnqualified = "不合格".equals(sample.getResult()); + + if (isUnqualified) { + // 优先处理不合格状态，减少嵌套判断 + sample.setResult("不合格"); + sample.setIsSuccess(0); + noSuccessList.add(sample); + } else if (maStatus != null) { + sample.setIsSuccess(0); + // 根据maStatus分类 if (maStatus == 6 || maStatus == 7 || maStatus == 8 || maStatus == 10) { sample.setResult("该机具已报废"); - sample.setIsSuccess(0); scrapList.add(sample); } else if (maStatus == 18) { sample.setResult("该机具已丢失"); - sample.setIsSuccess(0); lostList.add(sample); } else { + // 非报废/丢失状态，标记为成功 sample.setIsSuccess(1); - // 非报废/丢失状态，暂存入成功列表（可根据实际业务调整） successList.add(sample); } } else { // maStatus为空，视为未匹配 + sample.setResult("未发现该机具"); + sample.setIsSuccess(0); notExistList.add(sample); } } } - - - - - - - - -// //丢失、报废、不存在的编号都为异常，不合格 -// //1.查询过滤出来报废的机具编码 -// List lostList = new ArrayList<>(); -// List scrapList = new ArrayList<>(); -// List notExistList = new ArrayList<>(); -// List sueecssList = new ArrayList<>(); -// SampleSync sampleOne = new SampleSync(); -// for (int i = 0; i < samples.size(); i++) { -// sampleOne = machineMapper.getSampleList(samples.get(i)); -// if(sampleOne != null && (sampleOne.getMaStatus() == 6 || sampleOne.getMaStatus() == 7 || sampleOne.getMaStatus() == 8 || sampleOne.getMaStatus() == 10)){ -// samples.get(i).setResult("该机具已报废"); -// samples.get(i).setIsSuccess(0); -// scrapList.add(samples.get(i)); -// }else if(sampleOne != null && sampleOne.getMaStatus() == 18){ -// samples.get(i).setResult("该机具已报废"); -// samples.get(i).setIsSuccess(0); -// scrapList.add(samples.get(i)); -// }else if(sampleOne != null){ -// samples.get(i).setIsSuccess(1); -// sueecssList.add(samples.get(i)); -// }else{ -// samples.get(i).setResult("未发现该机具"); -// samples.get(i).setIsSuccess(0); -// notExistList.add(samples.get(i)); -// } -// } //对数据进行汇总 List allList = new ArrayList<>(); allList.addAll(lostList); @@ -434,7 +411,7 @@ public class MachineServiceImpl implements IMachineService allList.addAll(notExistList); allList.addAll(successList); allList.addAll(exceptionList); - + allList.addAll(noSuccessList); // 使用批量更新 if(successList != null && !successList.isEmpty()){ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java index f768b78e..8e386bda 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java @@ -88,7 +88,7 @@ public class WarehousingServiceImpl implements WarehousingService { * @return */ @Override - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public AjaxResult savePutInfo(SavePutInfoDto dto) { log.info("新增入库盘点入参dto：{}", dto); Long userId = SecurityUtils.getLoginUser().getUserid(); @@ -136,8 +136,8 @@ public class WarehousingServiceImpl implements WarehousingService { } catch (Exception e) { log.error("保存入库盘点异常:{}",e.getMessage()); - // 添加事务回滚逻辑，保证入库全部成功或者全部失败 - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); +// // 添加事务回滚逻辑，保证入库全部成功或者全部失败 +// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error(ExceptionEnum.SAVE_TO_DATABASE.getCode(), ExceptionEnum.SAVE_TO_DATABASE.getMsg()); } return AjaxResult.success(res); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml index 0401f249..711df728 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml @@ -1085,20 +1085,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -1134,6 +1130,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"