From f39fd71eedfd828e715d33356a8c38ffbe66eb1a Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 24 五月 2024 15:28:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java
index 1cc1983..387d325 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingOverService.java
@@ -1,36 +1,36 @@
-package com.mes.service;
+package com.mes.temperingglass.service;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.Tempering;
-import com.mes.entity.device.PLCAutoMes;
-import com.mes.entity.device.PlcParameterObject;
-import com.mes.mapper.TemperingMapper;
-import java.util.List;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.mapper.TemperingMapper;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service
-@DS("glass_info")
public class TemperingOverService {
-private final TemperingMapper temperingMapper;
- //PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+ private final TemperingMapper temperingMapper;
+
+ //PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
public TemperingOverService(TemperingMapper temperingMapper) {
this.temperingMapper = temperingMapper;
}
+
//鎺ユ敹鍑虹倝淇″彿鍜岀倝鍙�
- public String SelectOutSignal () {
-
- S7control.getinstance().WriteWord("鍑虹倝淇″彿", (short)1);
+ public String SelectOutSignal() {
+
+ //S7control.getinstance().WriteWord("鍑虹倝淇″彿", (short)1);
return "GlassInfo";
}
+
//鍙戦�佺‘璁ゆ敹鍒颁俊鍙�
- public void OverSignal () {
- S7control.getinstance().WriteWord("纭瀛�", (short)1);
+ public void OverSignal() {
+ //S7control.getinstance().WriteWord("纭瀛�", (short)1);
}
+
//鏄剧ず閽㈠寲鍑虹倝鍚庣殑鐗堝浘淇℃伅
- public List <Tempering> SelectOutGlass () {
+ public List<TemperingGlassInfo> SelectOutGlass() {
return temperingMapper.SelectOutGlass();
}
-
+
}
--
Gitblit v1.8.0