From f6789ac9f44a6b1f9d95421329bb1f0a7cd52d6d Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 07 三月 2025 18:37:11 +0800
Subject: [PATCH] -换型增加物料配置
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 204 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 144 insertions(+), 60 deletions(-)
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 9a9c710..0bb5872 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
@@ -1,21 +1,28 @@
package com.jcdm.main.plcserver;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jcdm.main.constant.Constants;
+import com.jcdm.main.da.cellData.service.IDaCellDataService;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
+import com.jcdm.main.da.opcuaconfig.domain.DaOpcuaConfig;
+import com.jcdm.main.da.opcuaconfig.service.IDaOpcuaConfigService;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
-import com.jcdm.main.da.testDeviceInterface.service.IDaTestDeviceInterfaceService;
+import com.jcdm.main.da.psConf.service.IDaPsConfService;
+import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
-import com.jcdm.main.plcserver.conf.OPCElement;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
+import com.jcdm.main.sc.materialConf.domain.ScMaterialConf;
+import com.jcdm.main.sc.materialConf.service.IScMaterialConfService;
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Component
public class CustomRunner implements ApplicationRunner {
@@ -32,17 +39,60 @@
@Autowired
private IDaParamCollectionService daParamCollectionService;
- @Autowired
- private IDaCollectionParamConfService daCollectionParamConfService;
@Autowired
private IOmProductionOrdeInfoService omProductionOrdeInfoService;
+
@Autowired
- private IDaTestDeviceInterfaceService daTestDeviceInterfaceService;
+ private IDaOpcuaConfigService daOpcuaConfigService;
+
+ @Autowired
+ private IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService;
+
+ @Autowired
+ private IDaCellDataService daCellDataService;
+
+ @Autowired
+ private IDaPsConfService daPsConfService;
+
+ @Autowired
+ private IScMaterialConfService materialConfService;
@Override
public void run(ApplicationArguments args) throws Exception {
+
+ //PLC鍒癕ES鐗╂枡杞崲
+ initMaterialConf();
+// Constants.materialMap.put("1","9900199052A");
+// Constants.materialMap.put("2","9900199053B");
+
+ //鍒嗘010-090娈� 鐢佃姱宸ヤ綅
+ Constants.OP020_OP090.add(Constants.OP020);
+ Constants.OP020_OP090.add(Constants.OP030);
+ Constants.OP020_OP090.add(Constants.OP040);
+ Constants.OP020_OP090.add(Constants.OP050);
+ Constants.OP020_OP090.add(Constants.OP060);
+ Constants.OP020_OP090.add(Constants.OP090);
+
+ //浜哄伐宸ヤ綅
+ Constants.OP100_OP150.add(Constants.OP100_1);
+ Constants.OP100_OP150.add(Constants.OP100_2);
+ Constants.OP100_OP150.add(Constants.OP150);
+
+ //妯＄粍宸ヤ綅List
+ Constants.ModuleList.add(Constants.OP110);
+ Constants.ModuleList.add(Constants.OP120);
+ Constants.ModuleList.add(Constants.OP130);
+ Constants.ModuleList.add(Constants.OP140);
+ //Constants.ModuleList.add(Constants.OP150);
+ Constants.ModuleList.add(Constants.OP160);
+ Constants.ModuleList.add(Constants.OP170);
+ Constants.ModuleList.add(Constants.OP180);
+ Constants.ModuleList.add(Constants.OP210);
+ Constants.ModuleList.add(Constants.OP220);
+
+ getDate();//灏嗘棩鏈熸斁鍏AP闆嗗悎锛�1P1S鐢�
OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
miloService,
@@ -50,71 +100,105 @@
collectionParamConfService,
daParamCollectionService,
omProductionOrdeInfoService,
- daTestDeviceInterfaceService);
+ daTestDeviceInterfaceTempService,
+ daCellDataService,
+ daPsConfService);
List<String> lists = getSubList();
System.out.println("璁㈤槄鍐呭锛�"+lists);
miloService.subscriptionFromOpcUa(lists,50,opcUaSubscription);
+
}
/**
* 璁㈤槄鍐呭
*/
public List<String> getSubList(){
- List<String> lists = new ArrayList<>();
- lists.add(OPCElement.PACK_OP230_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP240_RecordData);//璇锋眰璁板綍鏁版嵁.
-// lists.add(OPCElement.PACK_OP240_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP2501_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP2502_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP2503_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP260_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP260_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP270_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP270_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP290_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP290_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP300A_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP300B_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP310A_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP310B_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP330_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP380_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP380_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP400_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP400_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP410_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP410_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP4301_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP4302_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP4303_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP4304_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP440_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP450_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP450_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP460_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP460_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP4801_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP4802_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP4803_RecordData);//璇锋眰璁板綍鏁版嵁
-//
-// lists.add(OPCElement.PACK_OP500_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP500_AngleResult);//璇锋眰璁板綍鏁版嵁
-////
-// lists.add(OPCElement.PACK_OP280_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP320A_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP320B_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP340A_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP340B_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP350A_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP350B_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP360_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP365_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP390_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP470_RecordData);//璇锋眰璁板綍鏁版嵁
-
+ List<String> lists = daOpcuaConfigService.list(new LambdaQueryWrapper<DaOpcuaConfig>()
+ .eq(DaOpcuaConfig::getState, Constants.USE_ING))
+ .stream().map(DaOpcuaConfig::getNode).collect(Collectors.toList());
return lists;
}
+
+ public void initMaterialConf(){
+ List<ScMaterialConf> materialConfList = materialConfService.list(new LambdaQueryWrapper<ScMaterialConf>().eq(ScMaterialConf::getStatus, Constants.USE_ING));
+ for (ScMaterialConf materialConf : materialConfList) {
+ Constants.materialMap.put(materialConf.getModelCode(),materialConf.getMaterialCode());
+ }
+ System.out.println("鍒濆鍖栫墿鏂欒浆鎹細"+Constants.materialMap);
+ }
+
+ /**
+ * 灏嗘棩鏈熸斁鍏AP闆嗗悎锛�1P1S鐢�
+ */
+ public static void getDate(){
+ //骞�
+ Constants.YEARSMAP.put(2024,"E");
+ Constants.YEARSMAP.put(2025,"F");
+ Constants.YEARSMAP.put(2026,"G");
+ Constants.YEARSMAP.put(2027,"H");
+ Constants.YEARSMAP.put(2028,"J");
+ Constants.YEARSMAP.put(2029,"K");
+ Constants.YEARSMAP.put(2030,"L");
+ Constants.YEARSMAP.put(2031,"M");
+ Constants.YEARSMAP.put(2032,"N");
+ Constants.YEARSMAP.put(2033,"P");
+ Constants.YEARSMAP.put(2034,"R");
+ Constants.YEARSMAP.put(2035,"S");
+ Constants.YEARSMAP.put(2036,"T");
+ Constants.YEARSMAP.put(2037,"V");
+ Constants.YEARSMAP.put(2038,"W");
+ Constants.YEARSMAP.put(2039,"X");
+ Constants.YEARSMAP.put(2040,"Y");
+
+ //鏈�
+ Constants.MONTHSMAP.put(1,"1");
+ Constants.MONTHSMAP.put(2,"2");
+ Constants.MONTHSMAP.put(3,"3");
+ Constants.MONTHSMAP.put(4,"4");
+ Constants.MONTHSMAP.put(5,"5");
+ Constants.MONTHSMAP.put(6,"6");
+ Constants.MONTHSMAP.put(7,"7");
+ Constants.MONTHSMAP.put(8,"8");
+ Constants.MONTHSMAP.put(9,"9");
+ Constants.MONTHSMAP.put(10,"A");
+ Constants.MONTHSMAP.put(11,"B");
+ Constants.MONTHSMAP.put(12,"C");
+
+ //鏃�
+ Constants.DAYMAP.put(1,"1");
+ Constants.DAYMAP.put(2,"2");
+ Constants.DAYMAP.put(3,"3");
+ Constants.DAYMAP.put(4,"4");
+ Constants.DAYMAP.put(5,"5");
+ Constants.DAYMAP.put(6,"6");
+ Constants.DAYMAP.put(7,"7");
+ Constants.DAYMAP.put(8,"8");
+ Constants.DAYMAP.put(9,"9");
+ Constants.DAYMAP.put(10,"A");
+ Constants.DAYMAP.put(11,"B");
+ Constants.DAYMAP.put(12,"C");
+ Constants.DAYMAP.put(13,"D");
+ Constants.DAYMAP.put(14,"E");
+ Constants.DAYMAP.put(15,"F");
+ Constants.DAYMAP.put(16,"G");
+ Constants.DAYMAP.put(17,"H");
+ Constants.DAYMAP.put(18,"J");
+ Constants.DAYMAP.put(19,"K");
+ Constants.DAYMAP.put(20,"L");
+ Constants.DAYMAP.put(21,"M");
+ Constants.DAYMAP.put(22,"N");
+ Constants.DAYMAP.put(23,"P");
+ Constants.DAYMAP.put(24,"R");
+ Constants.DAYMAP.put(25,"S");
+ Constants.DAYMAP.put(26,"T");
+ Constants.DAYMAP.put(27,"V");
+ Constants.DAYMAP.put(28,"W");
+ Constants.DAYMAP.put(29,"X");
+ Constants.DAYMAP.put(30,"Y");
+ Constants.DAYMAP.put(31,"0");
+
+ }
+
}
--
Gitblit v1.9.3