From 2e9ca8f1ec3efc5c98fcec1b1e4225db874c0bee Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 17 四月 2024 10:22:02 +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 | 18 ++++++------------
1 files changed, 6 insertions(+), 12 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..f6d45f3 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,16 +1,10 @@
-package com.mes.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;
+package com.mes.temperingglass.service;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.mapper.TemperingMapper;
import java.util.List;
import org.springframework.stereotype.Service;
@Service
-@DS("glass_info")
public class TemperingOverService {
private final TemperingMapper temperingMapper;
//PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
@@ -20,15 +14,15 @@
//鎺ユ敹鍑虹倝淇″彿鍜岀倝鍙�
public String SelectOutSignal () {
- S7control.getinstance().WriteWord("鍑虹倝淇″彿", (short)1);
+ //S7control.getinstance().WriteWord("鍑虹倝淇″彿", (short)1);
return "GlassInfo";
}
//鍙戦�佺‘璁ゆ敹鍒颁俊鍙�
public void OverSignal () {
- S7control.getinstance().WriteWord("纭瀛�", (short)1);
+ //S7control.getinstance().WriteWord("纭瀛�", (short)1);
}
//鏄剧ず閽㈠寲鍑虹倝鍚庣殑鐗堝浘淇℃伅
- public List <Tempering> SelectOutGlass () {
+ public List <TemperingGlassInfo> SelectOutGlass () {
return temperingMapper.SelectOutGlass();
}
--
Gitblit v1.8.0