优化

src/com/mes/ui/DataUtil.java

@@ -9,6 +9,7 @@ import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.Properties;
 
 public class DataUtil {
@@ -214,15 +215,15 @@ public class DataUtil {
         }
     }
 
-    // 上传扭力参数
+    // 上传扭力枪拧紧参数 -> mes_product_ygsl
     public static JSONObject upParams(String upparams) {
         try{
             String mes_server_ip = MesClient.mes_server_ip;
             String url = "http://"+mes_server_ip+":8980/js/a/mes/mesProductYgsl/batchsave";
-            String params = "__ajax=json&params="+upparams;
-            System.out.println("params="+params);
+            String params = "__ajax=json&params="+URLEncoder.encode(upparams, "UTF-8");
+            System.out.println("ygsl upload url="+url);
             String result = doPost(url,params);
-            System.out.println("result="+result);
+            System.out.println("ygsl result="+result);
 
             if(result.equalsIgnoreCase("false")) {
                 return null;
@@ -234,6 +235,31 @@ public class DataUtil {
         }
     }
 
+    // 上传拉铆过程参数 -> mes_product_prod
+    public static JSONObject upParamsLm(String upparams) {
+        try{
+            String mes_server_ip = MesClient.mes_server_ip;
+            String oprno = MesClient.mes_gw;
+            String lineSn = MesClient.mes_line_sn;
+            String url = "http://"+mes_server_ip+":8980/js/a/mes/mesProductProd/batchsave";
+            String params = "__ajax=json&params="+URLEncoder.encode(upparams, "UTF-8")
+                    +"&oprno="+URLEncoder.encode(oprno, "UTF-8")
+                    +"&lineSn="+URLEncoder.encode(lineSn, "UTF-8");
+            System.out.println("lamao upload url="+url);
+            String result = doPost(url, params);
+            System.out.println("lamao result="+result);
+
+            if(result == null || result.equalsIgnoreCase("false")) {
+                return null;
+            }else {
+                return JSONObject.parseObject(result);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     public static JSONObject checkpz(String sn) {
         try{
             String enconding = "UTF-8";

src/com/mes/ui/MesClient.java

@@ -106,7 +106,7 @@ public class MesClient extends JFrame {
 
 
     public static String namea = "A"; // 扭力枪通道 A
-    public static Integer maxa = 19; // A枪任务数
+    public static Integer maxa = 20; // A枪任务数
     public static Integer cura = 0; // A枪当前数
     public static Integer resulta = 0; // A枪结果 0=NG 1=OK
     public static List<String> atids = new ArrayList<>();
@@ -521,9 +521,9 @@ public class MesClient extends JFrame {
                     List<ProdReq> prods = JdbcUtils.getProds();
                     System.out.println("lamao:"+ JSON.toJSONString(prods));
                     if(prods.size() > 0){
-                        // 定时上传参数
-                        JSONObject retObj = DataUtil.upParams(JSON.toJSONString(prods));
-                        if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+                        // 定时上传拉铆参数到 mes_product_prod
+                        JSONObject retObj = DataUtil.upParamsLm(JSON.toJSONString(prods));
+                        if(retObj != null && retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
                             // 更新sqlite已同步
                             for(ProdReq prodReq:prods){
                                 JdbcUtils.updateProdSync(prodReq.getId(),1);

src/com/mes/ui/PlcUtil.java

@@ -27,7 +27,7 @@ public class PlcUtil {
             Float smin = plc.readFloat32("DB41.12.0") - plc.readFloat32("DB41.20.0");
 
             int fmax = plc.readInt32("DB41.0.0") + plc.readInt32("DB41.4.0");
-            Float smax = plc.readInt32("DB41.12.0") + plc.readFloat32("DB41.16.0");
+            Float smax = plc.readFloat32("DB41.12.0") + plc.readFloat32("DB41.16.0");
 
             String qty = "0";
             if(getResultDingA(plc).equals("OK")){

src/com/mes/util/JdbcUtils.java

@@ -19,7 +19,8 @@ public class JdbcUtils {
             conn = DriverManager.getConnection(DATABASE_URL);//连接数据库zhou.db,不存在则创建
             System.out.println("连接到SQLite数据库成功！");
             create_bw_record();//初始化结构表
-            create_bw_tightening();//初始化
+            create_bw_tightening();//初始化拧紧表
+            create_bw_prod();//初始化拉铆表
         } catch (Exception e) {
             // TODO Auto-generated catch block
         	close();//关闭数据库连接
@@ -288,23 +289,16 @@ public class JdbcUtils {
 	}
 
 	public static List<ProdReq> getProds() {
-		//SQL语句
-		String sql = "select id,gw,line_sn,type,sn,fout,sout,fmin,smin,fmax,smax,qty,serial_number,sync,record_time,ucode from bw_prod where sync = 0 order by id asc limit 100";
-		Connection conn = JdbcUtils.getConn();
-		Statement stmt=null;
-		ResultSet ret = null;
-		String password=null;
 		List<ProdReq> prods = new ArrayList<>();
 		try {
-			// 确保连接已经打开
-			if (JdbcUtils.conn == null || JdbcUtils.conn.isClosed()) {
-				JdbcUtils.openConnection();
+			if (conn == null || conn.isClosed()) {
+				openConnection();
 			}
 
-			stmt = conn.createStatement();
-			//执行语句，得到结果集
-			ret = stmt.executeQuery(sql);
-			System.out.println("sql:"+ sql);
+			String sql = "select id,gw,line_sn,type,sn,fout,sout,fmin,smin,fmax,smax,qty,serial_number,sync,record_time,ucode from bw_prod where sync = 0 order by id asc limit 100";
+			Statement statement = conn.createStatement();
+			ResultSet ret = statement.executeQuery(sql);
+			System.out.println("sql:" + sql);
 			while (ret.next()) {
 				ProdReq prodReq = new ProdReq();
 				prodReq.setId(ret.getInt(1));
@@ -326,7 +320,7 @@ public class JdbcUtils {
 				prods.add(prodReq);
 			}
 			ret.close();
-			conn.close();//关闭连接
+			statement.close();
 		} catch (SQLException e1) {
 			e1.printStackTrace();
 		}