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 | 128 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 128 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 a065715..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
@@ -1,7 +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;
@@ -33,6 +40,73 @@
{
@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())
+// .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());
+ list = collect1;
+ list.addAll(collect2);
+ }
+ for (BsFormulaChildInfo formulaChildInfo : list) {
+// formulaChildInfo.setSort(formulaChildInfo.getStepSort());
+// formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
+// formulaChildInfo.setImg(formulaChildInfo.getOperationSteps());
+ if(formulaChildInfo.getCollectData()!=null&& !"".equals(formulaChildInfo.getCollectData())){
+ if(formulaChildInfo.getCollectData().contains("[")){
+ String data = formulaChildInfo.getCollectData();
+ data = data.replace("[", "").replace("]", "").replace(" ", "");
+ String[] tightenDataParts = data.split(",");
+ formulaChildInfo.setCollectData("鎵煩"+tightenDataParts[0]+"瑙掑害"+tightenDataParts[1]+"鎵煩缁撴灉"+tightenDataParts[2]+"瑙掑害缁撴灉"+tightenDataParts[3]);
+ }
+ }
+ }
+ return getDataTable(list);
+ }
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
@@ -79,6 +153,24 @@
}
/**
+ * 鎵爜纭
+ */
+ @GetMapping("/jrmUpdateResults")
+ public AjaxResult jrmUpdateResults(BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ return bsFormulaChildInfoService.jrmUpdateResults(bsFormulaChildInfo);
+ }
+
+ /**
+ * 鎵爜纭
+ */
+ @GetMapping("/yzUpdateResults")
+ public AjaxResult yzUpdateResults(BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ return bsFormulaChildInfoService.yzUpdateResults(bsFormulaChildInfo);
+ }
+
+ /**
* 鏀捐璇风┖鐘舵��
*/
@GetMapping("/workpieceRelease")
@@ -88,6 +180,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")
@@ -97,6 +216,15 @@
}
/**
+ * 鎷х揣鍚庢洿鏂板搴旀暟鎹�
+ */
+ @GetMapping("/yzUpdateTighteningFormula")
+ public AjaxResult yzUpdateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ return bsFormulaChildInfoService.yzUpdateTighteningFormula(bsFormulaChildInfo);
+ }
+
+ /**
* 瀵煎嚭閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
*/
@PreAuthorize("@ss.hasPermi('bs:formulaChild:export')")
--
Gitblit v1.9.3