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/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java
index 1e7d0d6..ad695ba 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchMiddleware/controller/DaTileMatchMiddlewareController.java
@@ -1,9 +1,13 @@
package com.jcdm.main.da.tileMatchMiddleware.controller;
import java.util.List;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.collection.CollUtil;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
+import com.jcdm.main.da.passingStationCollection.domain.ProductNewPassStation;
+import com.jcdm.main.da.passingStationCollection.service.ProductNewPassStationService;
import com.jcdm.main.da.tileMatchRules.domain.DaTileMatchRules;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +42,9 @@
{
@Autowired
private IDaTileMatchMiddlewareService daTileMatchMiddlewareService;
+
+ @Resource
+ private ProductNewPassStationService productNewPassStationService;
/**
* 鏌ヨ娲诲杩炴潌閰嶇摝涓棿鍒楄〃
@@ -124,12 +131,12 @@
DaTileMatchMiddleware TileMatchMiddleware=new DaTileMatchMiddleware();
TileMatchMiddleware.setSfcCode(SNCode);
TileMatchMiddleware.setPalletNo(barcode);
- TileMatchMiddleware.setState(2L);
+ TileMatchMiddleware.setState(2);
List<DaTileMatchMiddleware> TileMatchMiddlewareList=daTileMatchMiddlewareService.selectDaTileMatchMiddlewareList(TileMatchMiddleware);
if(TileMatchMiddlewareList.size()>0){
for(int i=0;i<TileMatchMiddlewareList.size();i++){
DaTileMatchMiddleware Middleware=TileMatchMiddlewareList.get(i);
- Middleware.setState(3L);
+ Middleware.setState(3);
daTileMatchMiddlewareService.updateDaTileMatchMiddleware(Middleware);
}
rMiddleware=TileMatchMiddlewareList.get(0);
@@ -144,17 +151,32 @@
@PreAuthorize("@ss.hasPermi('da:tileMatchMiddleware:query')")
@GetMapping(value = "/barcode")
- public DaTileMatchMiddleware setBarcode(String barcode,String locationCode) {
+ public DaTileMatchMiddleware setBarcode(String barcode,String locationCode) throws Exception {
DaTileMatchMiddleware rMiddleware=new DaTileMatchMiddleware();;
- rMiddleware.setState(1L);
+ rMiddleware.setState(1);
List<DaTileMatchMiddleware> TileMatchMiddlewareList=daTileMatchMiddlewareService.selectDaTileMatchMiddlewareList(rMiddleware);
+ String SNCode="";
if(TileMatchMiddlewareList.size()>0){
rMiddleware=TileMatchMiddlewareList.get(0);
rMiddleware.setPalletNo(locationCode);
rMiddleware.setConnectingrodNo(barcode);
- rMiddleware.setState(2L);
+ rMiddleware.setState(2);
+ SNCode=rMiddleware.getSfcCode();
daTileMatchMiddlewareService.updateDaTileMatchMiddleware(rMiddleware);
+ //鑾峰彇浜у搧鍨嬪彿
+ ProductNewPassStation productNewPassStation = new ProductNewPassStation();
+ productNewPassStation.setSfcCode(SNCode);
+ List<ProductNewPassStation> productPassStationList = productNewPassStationService.getProductPassStationList(productNewPassStation);
+ if (CollUtil.isNotEmpty(productPassStationList)){
+ ProductNewPassStation station = productPassStationList.get(0);
+ String productType = station.getProductType();
+ rMiddleware.setProductType(productType);
+ }
}
+// ReadWriteEntity entity = new ReadWriteEntity("CFL3ZZ.CR010.Code", SNCode);
+// InitCallback.miloService.writeToOpcUa(entity);//鍐橲N
+// ReadWriteEntity entity2 = new ReadWriteEntity("CFL3ZZ.CR010.CodeRequestFeed", 1);
+// InitCallback.miloService.writeToOpcByte(entity2);//鍐欏畬鎴�
return rMiddleware;
}
}
--
Gitblit v1.9.3