From bdb4046a1ed5358a94cc9ce846f2a1ec88e5d5ec Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期二, 18 六月 2024 10:51:57 +0800 Subject: [PATCH] - --- jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 63 +++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 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 6814c17..a77d9ca 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 @@ -7,6 +7,8 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jcdm.main.constant.Constants; +import com.kangaroohy.milo.model.ReadWriteEntity; +import com.kangaroohy.milo.service.MiloService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -39,12 +41,46 @@ @Autowired private IBsFormulaChildInfoService bsFormulaChildInfoService; + @Autowired + private MiloService miloService; + + /** + * 鎵爜纭 + */ + @GetMapping("/fistSetpNumber") + 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(stepNumber).build()); + } catch (Exception e) { + throw new RuntimeException(e); + } + return AjaxResult.success(stepNumber); + } + /** * 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */ @GetMapping("/noPageListFormulaChild") public TableDataInfo noPageListFormulaChild(BsFormulaChildInfo bsFormulaChildInfo) { + List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>() .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode()) .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode())); @@ -142,6 +178,33 @@ } /** + * 鏀捐璇风┖鐘舵�� + */ + @GetMapping("/checkMaterialCode") + public AjaxResult checkMaterialCode(BsFormulaChildInfo bsFormulaChildInfo) + { + return bsFormulaChildInfoService.checkMaterialCode(bsFormulaChildInfo); + } + + /** + * 鏀捐璇风┖鐘舵�� + */ + @GetMapping("/clearWorkpieceRelease") + public AjaxResult clearWorkpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) + { + return bsFormulaChildInfoService.clearWorkpieceRelease(bsFormulaChildInfo); + } + + /** + * 鏀捐璇风┖鐘舵�� + */ + @GetMapping("/jrmWorkpieceRelease") + public AjaxResult jrmWorkpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) + { + return bsFormulaChildInfoService.jrmWorkpieceRelease(bsFormulaChildInfo); + } + + /** * 鎷х揣鍚庢洿鏂板搴旀暟鎹� */ @GetMapping("/updateTighteningFormula") -- Gitblit v1.9.3