From 5ae75705ac5755cdfe48336cafbf0b9f0800c310 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 12 四月 2024 15:47:53 +0800
Subject: [PATCH] 增加配置,迁移代码
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
index ae34d3d..2c9b60c 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
@@ -5,54 +5,52 @@
import com.mes.common.PlcParameterObject;
import com.mes.upworkstation.entity.UpWorkstation;
import com.mes.upworkstation.mapper.LoadGlassMapper;
-
+import com.mes.common.S7object;
+/**
+ * @author SNG-010
+ */
@Service
public class LoadGlassService {
- private LoadGlassMapper LoadGlassMapper;
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+ private LoadGlassMapper loadGlassMapper;
+//PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅
public List<UpWorkstation> selectAll() {
- List<UpWorkstation> glassInfo= LoadGlassMapper.selectALL();
- return glassInfo;
+ return loadGlassMapper.selectALL();
}
//澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
- public void insertGlass(UpWorkstation upwork) {
- LoadGlassMapper.insertGlass(upwork);
- }
+ public void insertGlass(UpWorkstation upwork) {
+ loadGlassMapper.insertGlass(upwork);
+ }
//鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
public void deleteGlass(int id) {
- LoadGlassMapper.deleteGlass(id);
+ loadGlassMapper.deleteGlass(id);
}
//鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
public boolean isCanLoadGlass() {
- String loadstate=plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
- if(loadstate.equals("1")) {
- return true;
- }else{
- return false;
- }
+ String loadstart="鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
+ return "1".equals(loadstart);
}
//鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
public void selectPriority() {
- int loadid1=LoadGlassMapper.selectPriority(1);
- int loadid2=LoadGlassMapper.selectPriority(2);
+ int loadid1=loadGlassMapper.selectPriority(1);
+ int loadid2=loadGlassMapper.selectPriority(2);
//鍒ゆ柇涓�浜屽彿宸ヤ綅鍝竟鐨勯『搴忔洿鍏�
if(loadid1>loadid2) {
- //s7control.WriteWord("DB100.10", (short)2);
+ S7object.getinstance().plccontrol.WriteWord("DB100.10", (short)2);
}else if(loadid1==loadid2){
//褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
- int glassnum1=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
- int glassnum2=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+ int glassnum1=1;//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+ int glassnum2=2;//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
if(glassnum1>glassnum2){
- // s7control.WriteWord("DB100.10", (short)2);
+ S7object.getinstance().plccontrol.WriteWord("DB100.10", (short)2);
}else{
- //s7control.WriteWord("DB100.10", (short)1);
+ S7object.getinstance().plccontrol.WriteWord("DB100.10", (short)1);
}
}else{
- //s7control.WriteWord("DB100.10", (short)1);
+ S7object.getinstance().plccontrol.WriteWord("DB100.10", (short)1);
}
}
--
Gitblit v1.8.0