From 62e4c1883dfd13289970f8f20f0a56d86aff23ff Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 07 四月 2025 19:43:51 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II

---
 nglib/src/ng/devices/MysqlService.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/nglib/src/ng/devices/MysqlService.java b/nglib/src/ng/devices/MysqlService.java
index 7785c18..8a4079f 100644
--- a/nglib/src/ng/devices/MysqlService.java
+++ b/nglib/src/ng/devices/MysqlService.java
@@ -4,6 +4,8 @@
 import java.sql.Connection;
 
 import builder.Manager;
+import builder.S7control;
+import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
 import ng.db.DBHelper;
 import ng.db.DBSession;
 import ng.devices.ModbusService.ModbusDataPackage;
@@ -110,21 +112,22 @@
 	    DBSession sn=null;
 	    String result=null;
 	    String flag=null;
-	    
+
 	    try{
 	    //创建连接
 	    	sn=this.db.createSession(false);
 	    	Connection con= sn.getConnection();
-	    	//掉哦那个存储过程
-	    	 CallableStatement sql=con.prepareCall("{call Total_method(?,?,?,?)}");
-	    	 sql.registerOutParameter(3, java.sql.Types.VARCHAR);
-	      	 sql.registerOutParameter(4, java.sql.Types.VARCHAR);
-	      	 sql.setString(1, s);
-	      	 sql.setLong(2, id);
-	      	 sql.execute();
-	      	 //读取返回参数
-	      	 result= sql.getString(3);
-	      	flag= sql.getString(4);
+	    	//调用那个存储过程
+			CallableStatement sql=con.prepareCall("{call Total_method(?,?,?,?)}");
+			sql.registerOutParameter(3, java.sql.Types.VARCHAR);
+			sql.registerOutParameter(4, java.sql.Types.VARCHAR);
+			sql.setString(1, s);
+			sql.setLong(2, id);
+			sql.execute();
+			//读取返回参数
+			result= sql.getString(3);
+			flag= sql.getString(4);
+
 	    }
 	    catch(Exception e){
 	    	e.printStackTrace();
@@ -146,6 +149,7 @@
 	    		//更新最后一次发送
 	       this.lastSend=result;
 	       //返回要发送的报文
+				System.out.println(result);
 	       return this.fillPack(arg1,result);
 	    	}
 	    	}

--
Gitblit v1.8.0