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 | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 852182c..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
@@ -13,6 +13,8 @@
import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
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;
@@ -54,12 +56,16 @@
@Autowired
private IDaPsConfService daPsConfService;
+ @Autowired
+ private IScMaterialConfService materialConfService;
+
@Override
public void run(ApplicationArguments args) throws Exception {
//PLC鍒癕ES鐗╂枡杞崲
- Constants.materialMap.put("1","9900199052A");
- Constants.materialMap.put("2","9900199053B");
+ initMaterialConf();
+// Constants.materialMap.put("1","9900199052A");
+// Constants.materialMap.put("2","9900199053B");
//鍒嗘010-090娈� 鐢佃姱宸ヤ綅
Constants.OP020_OP090.add(Constants.OP020);
@@ -114,6 +120,14 @@
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鐢�
*/
--
Gitblit v1.9.3