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 | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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..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
@@ -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);
}
/**
@@ -164,6 +180,15 @@
/**
* 鏀捐璇风┖鐘舵��
*/
+ @GetMapping("/checkMaterialCode")
+ public AjaxResult checkMaterialCode(BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ return bsFormulaChildInfoService.checkMaterialCode(bsFormulaChildInfo);
+ }
+
+ /**
+ * 鏀捐璇风┖鐘舵��
+ */
@GetMapping("/clearWorkpieceRelease")
public AjaxResult clearWorkpieceRelease(BsFormulaChildInfo bsFormulaChildInfo)
{
--
Gitblit v1.9.3