From 04b8eff075a04db23e6f908855699b4d2954588c Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期四, 23 五月 2024 18:47:01 +0800
Subject: [PATCH] 380新产品,优化
---
jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java | 11 ++++-
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java | 2
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java | 37 ++++++++++++++++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 13 ------
jcdm-ui/src/views/dashboard/LineChart.vue | 2
jcdm-admin/src/main/resources/application.yml | 2
jcdm-ui/src/api/main/da/opcuaconfig/opcuaconfig.js | 4 +-
jcdm-ui/src/views/main/kb/crankshaft/index.vue | 13 +++---
jcdm-admin/src/main/java/com/jcdm/MesApplication.java | 2 +
9 files changed, 58 insertions(+), 28 deletions(-)
diff --git a/jcdm-admin/src/main/java/com/jcdm/MesApplication.java b/jcdm-admin/src/main/java/com/jcdm/MesApplication.java
index 9e69293..05140db 100644
--- a/jcdm-admin/src/main/java/com/jcdm/MesApplication.java
+++ b/jcdm-admin/src/main/java/com/jcdm/MesApplication.java
@@ -1,5 +1,7 @@
package com.jcdm;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
diff --git a/jcdm-admin/src/main/resources/application.yml b/jcdm-admin/src/main/resources/application.yml
index 0faf0b2..a35b0e8 100644
--- a/jcdm-admin/src/main/resources/application.yml
+++ b/jcdm-admin/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/jcdm/uploadPath锛孡inux閰嶇疆 /home/jcdm/uploadPath锛�
- profile: D:/ruoyi/uploadPath
+ profile: D:/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
index 58411d3..b0f50d9 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
@@ -146,7 +146,7 @@
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime now = LocalDateTime.now();
LocalDateTime startTime = LocalDateTime.of(now.getYear(),now.getMonthValue(),now.getDayOfMonth(),8,0,0);
- LocalDateTime endTime = LocalDateTime.of(now.getYear(),now.getMonthValue(),now.plusDays(1).getDayOfMonth(),22,0,0);
+ LocalDateTime endTime = LocalDateTime.of(now.getYear(),now.getMonthValue(),now.plusDays(1).getDayOfMonth(),23,0,0);
String s1 = startTime.format(formatter);
String s2 = endTime.format(formatter);
bsOrderScheduling.setStartTime(s1);
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 a4d16b5..b94f8f4 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,6 +6,9 @@
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.plcserver.sub.OPCUaSubscription;
import com.kangaroohy.milo.model.ReadWriteEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +28,8 @@
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.common.core.page.TableDataInfo;
+import static com.jcdm.main.plcserver.sub.OPCUaSubscription.miloService;
+
/**
* 浜や簰淇″彿閰嶇疆Controller
*
@@ -37,6 +42,7 @@
{
@Autowired
private IDaOpcuaConfigService daOpcuaConfigService;
+ private IDaParamCollectionService daParamCollectionService;
/**
* 鏌ヨ浜や簰淇″彿閰嶇疆鍒楄〃
@@ -115,7 +121,36 @@
ReadWriteEntity entity = new ReadWriteEntity("CFL4HX."+locationCode+".SNCode", SNCode);
Boolean out= true;
try {
- OPCUaSubscription.miloService.writeToOpcUa(entity);//鍐橲N
+ miloService.writeToOpcUa(entity);//鍐橲N
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return toAjax(out);
+ }
+
+ /**
+ * 閰嶇摝鎵爜
+ */
+ @PreAuthorize("@ss.hasPermi('da:opcuaconfig:query')")
+ @GetMapping(value = "/barcode/{barcode}/{locationCode}")
+ public AjaxResult setBarcode(@PathVariable("barcode") String barcode,@PathVariable("locationCode") String locationCode) {
+ Boolean out= true;
+ try {
+ Object SNCodeObject = miloService.readFromOpcUa("CFL4HX."+locationCode+".Code1").getValue();
+ if (null == SNCodeObject){
+ SNCodeObject = miloService.readFromOpcUa("CFL4HX."+locationCode+ ".Code").getValue();
+ }
+ if (null != SNCodeObject){
+ String SNCode = SNCodeObject.toString();
+ //鎻掑叆鏁版嵁
+ DaParamCollection saveData = new DaParamCollection();
+ saveData.setSfcCode(SNCode);
+ saveData.setParamValue(barcode);
+ saveData.setLocationCode(locationCode);
+ saveData.setParamCode("XTM");
+ saveData.setParamName("鏇茶酱鐮�");
+ daParamCollectionService.insertDaParamCollection(saveData);
+ }
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 6f85176..57f569a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -61,10 +61,7 @@
lists,
rmRepairRecordService,
bsTechnologyRouteChildInfoService);
-
-
miloService.subscriptionFromOpcUa(collect,100,opcUaSubscription);
-
}
/**
@@ -74,16 +71,6 @@
DaOpcuaConfig config = new DaOpcuaConfig();
config.setState(0);
List<DaOpcuaConfig> list = iDaOpcuaConfigService.selectDaOpcuaConfigList(config);
-// List<String> lists = new ArrayList<>();
-// if (CollUtil.isNotEmpty(list)){
-// lists = list.stream().map(DaOpcuaConfig::getNode).distinct().collect(Collectors.toList());
-// }
-// List<String> lists = new ArrayList<>();
-//// lists.add(OPCElement.OP010_SaveRequest);//璇锋眰淇濆瓨
-//// lists.add(OPCElement.OP010_CodeCheck);//璇锋眰妫�绱㈡潯鐮�
-//// lists.add(OPCElement.OP020_SaveRequest);//璇锋眰淇濆瓨
-// lists.add(OPCElement.OP120_SaveRequestLast);//璇锋眰淇濆瓨
-// lists.add(OPCElement.OP120_ZZ_CODE_CHECK);//璇锋眰淇濆瓨
return list;
}
}
diff --git a/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java b/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java
index 8780f63..6a15961 100644
--- a/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java
+++ b/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java
@@ -2,6 +2,8 @@
import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService;
+import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
+import com.jcdm.main.da.passingStationCollection.service.impl.DaPassingStationCollectionServiceImpl;
import com.jcdm.main.webservice.service.ReceivingServices;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -19,6 +21,10 @@
@Component("ryTask")
public class RyTask
{
+ @Autowired
+ private DaPassingStationCollectionServiceImpl passingStationCollectionServiceImpl;
+ @Autowired
+ private IBsOrderSchedulingService bsOrderSchedulingService;
private static final Logger logger = LoggerFactory.getLogger("sys-user");
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
{
@@ -32,11 +38,10 @@
public void ryNoParams()
{
- System.out.println("鎵ц鏃犲弬鏂规硶");
+ String a=passingStationCollectionServiceImpl.SelectSN("88","OP010");
+ System.out.println("鎵ц杩囩▼杩斿洖锛�" + a);
}
- @Autowired
- private IBsOrderSchedulingService bsOrderSchedulingService;
String url = "http://podqapp.cfmoto.com.cn:50100/XISOAPAdapter/MessageServlet?senderParty=&senderService=BC_MES&receiverParty=&receiverService=&interface=SI_ZPP_CF_BC_001_SYN_OUT&interfaceNamespace=http://cfmoto.com/xi/MES";
public void workReportingTasks(){
report10();
diff --git a/jcdm-ui/src/api/main/da/opcuaconfig/opcuaconfig.js b/jcdm-ui/src/api/main/da/opcuaconfig/opcuaconfig.js
index 548cecc..e8ceb38 100644
--- a/jcdm-ui/src/api/main/da/opcuaconfig/opcuaconfig.js
+++ b/jcdm-ui/src/api/main/da/opcuaconfig/opcuaconfig.js
@@ -18,9 +18,9 @@
}
// 鏌ヨ浜や簰淇″彿閰嶇疆璇︾粏
-export function setSNCode(SNCode,locationCode) {
+export function setBarcode(barcode,locationCode) {
return request({
- url: '/da/opcuaconfig/SNCode/' + SNCode+'/'+locationCode,
+ url: '/da/opcuaconfig/barcode/' + barcode+'/'+locationCode,
method: 'get'
})
}
diff --git a/jcdm-ui/src/views/dashboard/LineChart.vue b/jcdm-ui/src/views/dashboard/LineChart.vue
index 8efc27c..bfbeb02 100644
--- a/jcdm-ui/src/views/dashboard/LineChart.vue
+++ b/jcdm-ui/src/views/dashboard/LineChart.vue
@@ -83,7 +83,7 @@
left: 'left' // 鏍囬浣嶇疆
},
xAxis: {
- data: ['8:00', '9:00', '10:00','11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00','21:00','22:00'],
+ data: ['8:00', '9:00', '10:00','11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00','21:00','22:00','23:00'],
boundaryGap: false,
axisTick: {
show: false
diff --git a/jcdm-ui/src/views/main/kb/crankshaft/index.vue b/jcdm-ui/src/views/main/kb/crankshaft/index.vue
index 82fbb3f..ca24c8f 100644
--- a/jcdm-ui/src/views/main/kb/crankshaft/index.vue
+++ b/jcdm-ui/src/views/main/kb/crankshaft/index.vue
@@ -32,7 +32,7 @@
<el-form ref="form" :model="form" label-width="25%" >
<el-form-item prop="engineNo" style="margin-top: 16px">
<span slot="label" style="font-size:22px;color:black;"><strong>鏇茶酱鐮�</strong></span>
- <el-input style="font-size:20px" v-model="form.engineNo" placeholder="璇锋壂鎻忔洸杞寸爜" clearable @input="EngineNohandleChange">
+ <el-input style="font-size:20px" v-model="form.barcode" placeholder="璇锋壂鎻忔洸杞寸爜" clearable @input="EngineNohandleChange">
<el-button slot="append" plain type="info" @click="EngineNohandleChange" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
@@ -94,7 +94,7 @@
import { listOrderScheduling, getOrderScheduling, delOrderScheduling, addOrderScheduling, updateOrderScheduling } from "@/api/main/bs/orderScheduling/orderScheduling";
import { listPassingStationCollection, getPassingStationCollection, delPassingStationCollection, addPassingStationCollection, updatePassingStationCollection } from "@/api/main/da/passingStationCollection/passingStationCollection";
import {listLineInfo} from "@/api/main/bs/lineInfo/lineInfo";
-import { setSNCode } from "@/api/main/da/opcuaconfig/opcuaconfig";
+import { setBarcode } from "@/api/main/da/opcuaconfig/opcuaconfig";
import {getIp, listStationConf} from "@/api/main/sc/stationConf";
import QRCode from "qrcodejs2";
@@ -134,7 +134,7 @@
},
// 琛ㄥ崟鍙傛暟
form: {
- engineNo: null,
+ barcode: null,
productType:null,
orderNo:null,
qualityStatus:null,
@@ -194,7 +194,7 @@
},
reset() {
this.form = {
- engineNo:null,
+ barcode:null,
productType:null,
orderNo:null,
qualityStatus:null,
@@ -205,8 +205,9 @@
this.resetForm("form");
},
EngineNohandleChange(){
- if(this.form.engineNo !== null && this.form.engineNo !== undefined){
- setSNCode(this.form.engineNo,this.locationCode)
+
+ if(this.form.barcode !== null && this.form.barcode !== undefined){
+ setBarcode(this.form.barcode,this.locationCode)
}
},
parseQRCode(code) {
--
Gitblit v1.9.3