From 4e83fa344f6cba81412fb354e7f32a88a8f34fde Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期二, 09 七月 2024 09:39:11 +0800 Subject: [PATCH] -切换大模组代码更改 --- jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java index b33d274..eaa2c2e 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java @@ -48,14 +48,30 @@ * 鎵爜纭 */ @GetMapping("/fistSetpNumber") - public void fistSetpNumber(BsFormulaChildInfo bsFormulaChildInfo) + public AjaxResult fistSetpNumber(BsFormulaChildInfo bsFormulaChildInfo) { +// try { +// String str = "PACK."+bsFormulaChildInfo.getProcessesCode()+".MStepNumber"; +// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(1).build()); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } + Integer stepNumber = 1; try { + List<BsFormulaChildInfo> op260 = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>().eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getProcessesCode())); + List<BsFormulaChildInfo> filteredList = op260.stream() + .filter(obj -> obj.getResults() != null && !obj.getResults().isEmpty()) + .collect(Collectors.toList()); + if(filteredList.size() > 0){ + stepNumber = Integer.valueOf(filteredList.get(filteredList.size()-1).getStepSort())+1; + } + String str = "PACK."+bsFormulaChildInfo.getProcessesCode()+".MStepNumber"; - miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(1).build()); + miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(stepNumber).build()); } catch (Exception e) { throw new RuntimeException(e); } + return AjaxResult.success(stepNumber); } /** @@ -67,7 +83,9 @@ List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>() .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode()) - .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode())); + .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode()) +// .orderByAsc(BsFormulaChildInfo::getStepSort) + ); if (CollUtil.isNotEmpty(list)){ List<BsFormulaChildInfo> collect1 = list.stream().filter(x -> Constants.OK.equals(x.getResults())).collect(Collectors.toList()); List<BsFormulaChildInfo> collect2 = list.stream().filter(x -> !Constants.OK.equals(x.getResults())).collect(Collectors.toList()); @@ -164,6 +182,15 @@ /** * 鏀捐璇风┖鐘舵�� */ + @GetMapping("/checkMaterialCode") + public AjaxResult checkMaterialCode(BsFormulaChildInfo bsFormulaChildInfo) + { + return bsFormulaChildInfoService.checkMaterialCode(bsFormulaChildInfo); + } + + /** + * 鏀捐璇风┖鐘舵�� + */ @GetMapping("/clearWorkpieceRelease") public AjaxResult clearWorkpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) { -- Gitblit v1.9.3