From b1187e08e13a9bafc2742591f82ed9abc9c89935 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 09 五月 2025 13:21:27 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II
---
nglib/src/ng/devices/ModbusService.java | 29 ++++++-----------------------
1 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/nglib/src/ng/devices/ModbusService.java b/nglib/src/ng/devices/ModbusService.java
index c56725e..06a514e 100644
--- a/nglib/src/ng/devices/ModbusService.java
+++ b/nglib/src/ng/devices/ModbusService.java
@@ -72,7 +72,6 @@
}
-
//涓�娆¤鍙栬涓�
String once(){
//鎸夌収閰嶇疆璇绘暟鎹�
@@ -112,27 +111,24 @@
String flag=null;
String messsage="000000000000000000";
EPlcType ePlcType=null;
- if(this.machineID==4){
- ePlcType=EPlcType.S1500;
- }else if(this.machineID==6){
+ if(this.functionType==10){
ePlcType=EPlcType.S200_SMART;
- }else{
+ }else if(this.functionType==11){
+ ePlcType=EPlcType.S1500;
+ }else if(this.functionType==12){
ePlcType=EPlcType.S1200;
+ }else{
+ return "";
}
S7control s7=new S7control(ePlcType, ip, port, 0, 0);
- //List<Integer> word=s7.readWord("DB34.122", 1);
List<Integer> listWord=s7.readWord(this.remarks,(this.readSize/2));
if(listWord==null){
System.out.println("notread");
return "";
}
for(int i=0;i<listWord.size();i++){
- //System.out.println("i "+listWord.size()+" "+messsage);
messsage+=HexUtil.intTo2ByteHex(listWord.get(i));
}
-
- //System.out.println(messsage);
- //System.out.println(ip+" "+s7.readWord("DB34.122", 1));
//鏁版嵁搴�
DBHelper db=DBHelper.getDBHelper("mes");
try{
@@ -154,25 +150,12 @@
//寰楀埌瀛樺偍杩囩▼杩斿洖鐨勫�硷紝鏁扮粍绗竴涓负鍦板潃锛岀浜屼釜涓哄��
int resultsLength=results.length;
int resultsSize=resultsLength/2;
-
for(int i=1;i<resultsSize+1;i++){
int addressIndex=(i-1)*2;
int valueIndex=i*2-1;
s7.writeWord(results[addressIndex],Integer.valueOf(results[valueIndex]));//鍙傛暟缁勫啓鍏�
}
-// if(results.length==2){
-// s7.writeWord(results[0],Integer.valueOf(results[1]) );
-// }
-// if(results.length==4){
-// s7.writeWord(results[0],Integer.valueOf(results[1]));//閰嶆柟
-// s7.writeWord(results[2],Integer.valueOf(results[3]));//閫熷害
-// }
- List<Integer> listWord2=s7.readWord(this.remarks,(this.readSize/2));
- System.out.println(listWord2.size());
-
}
-
-
}
catch(Exception e){
e.printStackTrace();
--
Gitblit v1.8.0