From be26d5065b4a07123638c220c0792e9250a458e6 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 11 一月 2024 09:41:27 +0800
Subject: [PATCH] 批次上料
---
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/OpcServiceMain.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/OpcServiceMain.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/OpcServiceMain.java
index f83c90f..a616a56 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/OpcServiceMain.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/OpcServiceMain.java
@@ -9,6 +9,7 @@
import cn.stylefeng.guns.modular.dq.materialTraceability.service.MaterialTraceabilityService;
import cn.stylefeng.guns.modular.em.equipmentAlarm.service.EquipmentAlarmService;
import cn.stylefeng.guns.modular.em.equipmentStatus.service.EquipmentStatusService;
+import cn.stylefeng.guns.modular.gm.greaseManage.service.GreaseManageService;
import cn.stylefeng.guns.modular.om.productionOrdeInfo.model.params.ProductionOrdeInfoParam;
import cn.stylefeng.guns.modular.om.productionOrdeInfo.model.result.ProductionOrdeInfoResult;
import cn.stylefeng.guns.modular.om.productionOrdeInfo.service.ProductionOrdeInfoService;
@@ -139,12 +140,15 @@
@Autowired
private LocationInfoService locationInfoService;
+ @Autowired
+ private GreaseManageService greaseManageService;
+
@Override
public void run(String... args) throws Exception {
if(GlobalVariable.TERMINATED) {
opc.init(productionOrdeInfoService,passingStationCollectionService,paramCollectionService,collectionParamConfService,serialNumbersConfService,
equipmentStatusService,equipmentAlarmService,materialTraceabilityService,equipmentInfoService,
- repairManageInfoService,locationInfoService);
+ repairManageInfoService,locationInfoService,greaseManageService);
GlobalVariable.PRODUCT_TYPE_MAP.put("191.220001-01","1");
GlobalVariable.PRODUCT_TYPE_MAP.put("191.220003-01","2");
@@ -172,7 +176,7 @@
cachedThreadPool.execute(new OP130TaskThreadPool());
cachedThreadPool.execute(new OP130BTaskThreadPool());
cachedThreadPool.execute(new OP140TaskThreadPool());
- cachedThreadPool.execute(new OP150TaskThreadPool());
+ /* cachedThreadPool.execute(new OP150TaskThreadPool());*/
cachedThreadPool.execute(new OP160TaskThreadPool());
cachedThreadPool.execute(new OP170TaskThreadPool());
@@ -191,7 +195,7 @@
//DOP
cachedThreadPool.execute(new DOP010TaskThreadPool());
- cachedThreadPool.execute(new DOP020TaskThreadPool());
+ /*cachedThreadPool.execute(new DOP020TaskThreadPool());*/
//EOP
cachedThreadPool.execute(new EOP010TaskThreadPool());
--
Gitblit v1.9.3