From a320dcc8a480436f2f6b3ef81fe6b607f080a64a Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 15 五月 2024 19:15:50 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 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 4b05d80..6a5a950 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
@@ -1,9 +1,14 @@
package com.jcdm.main.bs.formulaChild.controller;
import java.util.List;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+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;
@@ -36,15 +41,39 @@
@Autowired
private IBsFormulaChildInfoService bsFormulaChildInfoService;
+ @Autowired
+ private MiloService miloService;
+
+ /**
+ * 鎵爜纭
+ */
+ @GetMapping("/fistSetpNumber")
+ public void 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);
+ }
+ }
+
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
*/
@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()));
+ 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());
+ list = collect1;
+ list.addAll(collect2);
+ }
for (BsFormulaChildInfo formulaChildInfo : list) {
// formulaChildInfo.setSort(formulaChildInfo.getStepSort());
// formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
--
Gitblit v1.9.3