From b1c37cebc8531a256bb9b0f428a4f81f3ad6310b Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 22 四月 2025 08:47:00 +0800
Subject: [PATCH] 上片机逻辑修改

---
 nglib/src/ng/devices/MysqlService.java |   87 ++++++++++++++++++++++++++++++-------------
 1 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/nglib/src/ng/devices/MysqlService.java b/nglib/src/ng/devices/MysqlService.java
index 8a4079f..3a35c86 100644
--- a/nglib/src/ng/devices/MysqlService.java
+++ b/nglib/src/ng/devices/MysqlService.java
@@ -5,6 +5,8 @@
 
 import builder.Manager;
 import builder.S7control;
+import builder.httpApi;
+import com.alibaba.fastjson.JSONObject;
 import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
 import ng.db.DBHelper;
 import ng.db.DBSession;
@@ -102,9 +104,6 @@
 		// TODO Auto-generated method stub
 		//读次数+1
 		ioCount++;
-		//判断是否不调用
-	//	 if(this.PassInvoke(arg0.Content))
-		// return false;
 		//转化为mysql输入参数
 		String s=this.packToString(arg0);
 		//更新最后一条读报文
@@ -112,31 +111,65 @@
 	    DBSession sn=null;
 	    String result=null;
 	    String flag=null;
+		//上片
+		if(id==2){
+			try{
+				//JSONObject jSONObject=httpApi.selectLoadRack();
+				JSONObject jSONObject=new JSONObject();
+				jSONObject.put("thickness", "4");
+				jSONObject.put("width", "3660");
+				jSONObject.put("height", "2440");
+				jSONObject.put("sameCount", "1");
+				jSONObject.put("glassType", "string");
+				if (jSONObject!=null){
+					//创建连接
+					sn=this.db.createSession(false);
+					Connection con= sn.getConnection();
+					//调用那个存储过程
+					CallableStatement sql=con.prepareCall("{call Total_method_load(?,?,?,?,?,?,?,?)}");
+					sql.registerOutParameter(7, java.sql.Types.VARCHAR);
+					sql.registerOutParameter(8, java.sql.Types.VARCHAR);
+					sql.setString(1, s);
+					sql.setLong(2, id);
+					sql.setDouble(3, Double.valueOf(jSONObject.get("width").toString()) );
+					sql.setDouble(4, Double.valueOf(jSONObject.get("height").toString()) );
+					sql.setDouble(5, Double.valueOf(jSONObject.get("thickness").toString()) );
+					sql.setLong(6, Integer.valueOf(jSONObject.get("sameCount").toString()) );
+					sql.execute();
+					//读取返回参数
+					result= sql.getString(7);
+					flag= sql.getString(8);//1 表示任务完成数量减一
+					if ("1".equals(flag) ){
+						//JSONObject loadRackReductionJson=httpApi.loadRackReduction();
+					}
+				}
+			}catch(Exception e){
+				e.printStackTrace();
+			}finally{
+				sn.close();
+			}
+		}else{
+			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);
 
-	    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);
-
-	    }
-	    catch(Exception e){
-	    	e.printStackTrace();
-	    }
-	    finally{
-	    	sn.close();
-	    	
-	    }
-	
+			}catch(Exception e){
+				e.printStackTrace();
+			}finally{
+				sn.close();
+			}
+		}
 	    if(result!=null){
 	    	if(result.length()>0){
 	    	char c=result.charAt(0);

--
Gitblit v1.8.0