From b7e71faaec8e83386714b405f74d02b2f52c7755 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 26 五月 2025 10:02:20 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II
---
nglib/src/ng/devices/MysqlService.java | 65 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/nglib/src/ng/devices/MysqlService.java b/nglib/src/ng/devices/MysqlService.java
index f94cb08..fb4ad57 100644
--- a/nglib/src/ng/devices/MysqlService.java
+++ b/nglib/src/ng/devices/MysqlService.java
@@ -97,7 +97,6 @@
pack.Content=bb;
return true;
}
-
//服务实现函数
@Override
protected boolean Service(ModbusDataPackage arg0, ModbusDataPackage arg1) {
@@ -114,42 +113,52 @@
//上片
if(id==2){
try{
+ //创建连接
+ sn=this.db.createSession(false);
+ Connection con= sn.getConnection();
JSONObject jSONObject=HttpApi.selectLoadRack();
+ boolean isSuccess=HttpApi.sendShelfTask();
// JSONObject jSONObject=new JSONObject();
// jSONObject.put("thickness", "4");
// jSONObject.put("width", "3660");
// jSONObject.put("height", "2440");
// jSONObject.put("sameCount", "1");
// jSONObject.put("glassType", "string");
+ double width_load = 0;
+ double height_load = 0;
+ double thickness_load = 0;
+ int sameCount_load = 0;
+ String glassType="";
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) ){
- for (int i=0;i<1;){
- JSONObject loadRackReductionJson=HttpApi.loadRackReduction();
- if ("true".equals(loadRackReductionJson.get("success").toString())){
- //调用成功
- i++;
- break;
- }
- }
+ width_load = Double.valueOf(jSONObject.get("width").toString());
+ height_load = Double.valueOf(jSONObject.get("height").toString());
+ thickness_load = Double.valueOf(jSONObject.get("thickness").toString());
+ sameCount_load = Integer.valueOf(jSONObject.get("sameCount").toString());
+ glassType =jSONObject.get("glassType").toString();
+ }
+ //System.out.println(width_load+","+height_load+","+thickness_load+","+sameCount_load+","+glassType);
+ //调用那个存储过程
+ CallableStatement sql=con.prepareCall("{call Total_method_load(?,?,?,?,?,?,?,?,?)}");
+ sql.registerOutParameter(8, java.sql.Types.VARCHAR);
+ sql.registerOutParameter(9, java.sql.Types.VARCHAR);
+ sql.setString(1, s);
+ sql.setLong(2, id);
+ sql.setDouble(3, width_load );
+ sql.setDouble(4, height_load );
+ sql.setDouble(5, thickness_load );
+ sql.setLong(6, sameCount_load );
+ sql.setString(7, glassType );
+ sql.execute();
+ //读取返回参数
+ //System.out.println("result:"+result);
+ result= sql.getString(8);
+ flag= sql.getString(9);//1 表示任务完成数量减一
+ if ("1".equals(flag) ){
+ //减少上片数量
+ JSONObject b=HttpApi.loadRackReduction();
- }
+ }else if("3".equals(flag) ){
+
}
}catch(Exception e){
e.printStackTrace();
--
Gitblit v1.8.0