From 59e2283a10aee45e6a98e34b432ba345095116db Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 10 七月 2024 16:36:42 +0800
Subject: [PATCH] add 选瓦
---
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java
index 207876b..06f3b62 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java
@@ -6,18 +6,23 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.collection.CollUtil;
+import com.jcdm.common.core.domain.R;
import com.jcdm.main.da.opcuaconfig.domain.DaOpcuaConfig;
import com.jcdm.main.da.opcuaconfig.domain.NodeEntity;
import com.jcdm.main.da.opcuaconfig.service.IDaOpcuaConfigService;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
+import com.jcdm.main.da.passingStationCollection.domain.ProductNewPassStation;
+import com.jcdm.main.da.passingStationCollection.mapper.ProductNewPassStationMapper;
+import com.jcdm.main.da.passingStationCollection.service.ProductNewPassStationService;
import com.jcdm.main.da.tileMatchCollection.domain.DaTileMatchCollection;
import com.jcdm.main.da.tileMatchCollection.service.IDaTileMatchCollectionService;
import com.jcdm.main.da.tileMatchMiddleware.domain.DaTileMatchMiddleware;
import com.jcdm.main.da.tileMatchMiddleware.service.IDaTileMatchMiddlewareService;
import com.jcdm.main.da.tileMatchRules.domain.DaTileMatchRules;
import com.jcdm.main.da.tileMatchRules.service.IDaTileMatchRulesService;
+import com.jcdm.main.plcserver.conf.OPCElement;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
import com.kangaroohy.milo.model.ReadWriteEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -59,6 +64,12 @@
private IDaTileMatchMiddlewareService daTileMatchMiddlewareService;
@Resource
private IDaTileMatchCollectionService daTileMatchCollectionService;
+
+ @Resource
+ private ProductNewPassStationService productNewPassStationService;
+
+ @Resource
+ private ProductNewPassStationMapper productNewPassStationMapper;
/**
* 鏌ヨ浜や簰淇″彿閰嶇疆鍒楄〃
@@ -149,13 +160,12 @@
*/
@PreAuthorize("@ss.hasPermi('da:opcuaconfig:query')")
@GetMapping(value = "/barcode1")
- public DaParamCollection setBarcode1(String barcode,String locationCode) {
- Boolean out = true;
- DaParamCollection xParamCollection = null;
+ public R setBarcode1(String barcode, String locationCode) {
+ ProductNewPassStation resultPassStation = new ProductNewPassStation();
try {
- Object SNCodeObject = miloService.readFromOpcUa("CFL4HX." + locationCode + ".Code1").getValue();
+ Object SNCodeObject = miloService.readFromOpcUa("CFL4HX." + locationCode + ".Code").getValue();
if (null == SNCodeObject) {
- SNCodeObject = miloService.readFromOpcUa("CFL4HX." + locationCode + ".Code").getValue();
+ SNCodeObject = miloService.readFromOpcUa("CFL4HX." + locationCode + ".Code1").getValue();
}
if (null != SNCodeObject) {
String SNCode = SNCodeObject.toString();
@@ -176,36 +186,39 @@
MatchCollection.setParamName("鏇茶酱");
daTileMatchCollectionService.insertDaTileMatchCollection(MatchCollection);
- DaTileMatchRules TileMatchRules = new DaTileMatchRules();
- TileMatchRules.setProductSeries("380Y");
- TileMatchRules.setScanObject1("杩炴潌");
- TileMatchRules.setScanObject2("鏇茶酱");
- daTileMatchRulesService.selectDaTileMatchRulesList(TileMatchRules);
+// DaTileMatchRules TileMatchRules = new DaTileMatchRules();
+// TileMatchRules.setProductSeries("380Y");
+// TileMatchRules.setScanObject1("杩炴潌");
+// TileMatchRules.setScanObject2("鏇茶酱");
+// daTileMatchRulesService.selectDaTileMatchRulesList(TileMatchRules);
for (int i = 1; i <= 3; i++) {
DaTileMatchMiddleware TileMatchMiddleware = new DaTileMatchMiddleware();
TileMatchMiddleware.setSfcCode(SNCode);
TileMatchMiddleware.setCrankshaftNo(barcode);
- TileMatchMiddleware.setCylinder((long) i);
- TileMatchMiddleware.setState(1L);
+ TileMatchMiddleware.setCylinder(i);
+ TileMatchMiddleware.setState(1);
daTileMatchMiddlewareService.insertDaTileMatchMiddleware(TileMatchMiddleware);
}
- DaParamCollection ParamCollection = new DaParamCollection();
- ParamCollection.setSfcCode(SNCode);
- ParamCollection.setParamName("绠变綋");
- List<DaParamCollection> DaParamCollectionlist = daParamCollectionService.selectDaParamCollectionList(ParamCollection);
- List<DaParamCollection> XTParamCollection = DaParamCollectionlist.stream().filter(x -> "绠变綋".equals(x.getParamName())).collect(Collectors.toList());
- if (CollUtil.isNotEmpty(XTParamCollection)) {
- xParamCollection = XTParamCollection.get(0);
+
+ ProductNewPassStation productNewPassStation = new ProductNewPassStation();
+ productNewPassStation.setFinishFlag(OPCElement.UN_FINISH);
+ productNewPassStation.setSfcCode(SNCode);
+ List<ProductNewPassStation> productPassStationList = productNewPassStationService.getProductPassStationList(productNewPassStation);
+ if (CollUtil.isNotEmpty(productPassStationList)){
+ resultPassStation = productPassStationList.get(0);
+ String rodCode = barcode;
+ productNewPassStationMapper.updatePassStationRodCode(resultPassStation.getSfcCode(),rodCode);
+
}
- ReadWriteEntity entity6 = new ReadWriteEntity("CFL4HX.HOP030.Partcode", "1");
+ ReadWriteEntity entity6 = new ReadWriteEntity("CFL4HX.OP030.CodeComplete", 1);
miloService.writeToOpcByte(entity6);
}
} catch (Exception e) {
throw new RuntimeException(e);
}
- return xParamCollection;
+ return R.ok(resultPassStation);
}
}
--
Gitblit v1.9.3