From 235d23f498e46e3415bf12a81b2056b792ea1808 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 09 五月 2025 14:52:41 +0800
Subject: [PATCH] 朝阳仓储BUG修改 1.传递中文字符 2.仓储车接口调整
---
nglib/src/ng/devices/MysqlService.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/nglib/src/ng/devices/MysqlService.java b/nglib/src/ng/devices/MysqlService.java
index 3a35c86..f94cb08 100644
--- a/nglib/src/ng/devices/MysqlService.java
+++ b/nglib/src/ng/devices/MysqlService.java
@@ -5,7 +5,7 @@
import builder.Manager;
import builder.S7control;
-import builder.httpApi;
+import builder.HttpApi;
import com.alibaba.fastjson.JSONObject;
import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
import ng.db.DBHelper;
@@ -114,13 +114,13 @@
//上片
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");
+ 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);
@@ -140,7 +140,15 @@
result= sql.getString(7);
flag= sql.getString(8);//1 表示任务完成数量减一
if ("1".equals(flag) ){
- //JSONObject loadRackReductionJson=httpApi.loadRackReduction();
+ for (int i=0;i<1;){
+ JSONObject loadRackReductionJson=HttpApi.loadRackReduction();
+ if ("true".equals(loadRackReductionJson.get("success").toString())){
+ //调用成功
+ i++;
+ break;
+ }
+ }
+
}
}
}catch(Exception e){
--
Gitblit v1.8.0