hzd 2 nedēļas atpakaļ
vecāks
revīzija
d55c6d11c4
2 mainītis faili ar 51 papildinājumiem un 4 dzēšanām
  1. 44 0
      src/com/mes/ui/DataUtil.java
  2. 7 4
      src/com/mes/ui/MesClient.java

+ 44 - 0
src/com/mes/ui/DataUtil.java

@@ -190,6 +190,50 @@ public class DataUtil {
         return String.format("%-"+size+"s", strret);
     }
 
+    public static JSONObject bindWarehouseApi(String sn,String craft,String wsn,String ucode) {
+        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/mesProductRecord/bindWarehouse";
+            String params = "__ajax=json&oprno="+oprno+"&lineSn="+lineSn+"&sn="+sn+"&craft="+craft+"&wsn="+wsn+"&ucode="+ucode;
+            System.out.println("url="+url);
+            System.out.println("params="+params);
+            String result = doPost(url,params);
+            System.out.println("result="+result);
+
+            if(result.equalsIgnoreCase("false")) {
+                return null;
+            }else {
+                return JSONObject.parseObject(result);
+            }
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    public static JSONObject unBindWarehouseApi(String sn,String craft,String wsn,String ucode) {
+        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/mesProductRecord/unBindWarehouse";
+            String params = "__ajax=json&oprno="+oprno+"&lineSn="+lineSn+"&sn="+sn+"&craft="+craft+"&wsn="+wsn+"&ucode="+ucode;
+            System.out.println("url="+url);
+            System.out.println("params="+params);
+            String result = doPost(url,params);
+            System.out.println("result="+result);
+
+            if(result.equalsIgnoreCase("false")) {
+                return null;
+            }else {
+                return JSONObject.parseObject(result);
+            }
+        }catch (Exception e){
+            return null;
+        }
+    }
+
     public static JSONObject getBindMaterail() {
         try{
             String enconding = "UTF-8";

+ 7 - 4
src/com/mes/ui/MesClient.java

@@ -391,13 +391,16 @@ public class MesClient extends JFrame {
         //弹窗扫工件码
         String scanBarcode = JOptionPane.showInputDialog(null, "冷板码");
         if(scanBarcode!=null&&!scanBarcode.equalsIgnoreCase("")) {
-            String barcode36 = getBarcode(scanBarcode);
-            Boolean sendret = DataUtil.bindWarehouse(nettyClient,product_sn.getText(),barcode36,user20,"400006");
-            if (!sendret) {
+            String barcode36 = getBarcode(scanBarcode).trim();
+            JSONObject retObj = DataUtil.bindWarehouseApi(product_sn.getText(),"400006",barcode36,user20);
+            product_sn_LB.setText(product_sn.getText());
+            if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+
+            }else{
                 setMenuStatus("绑定失败!", 1);
                 return;
             }
-            product_sn_LB.setText(product_sn.getText());
+
         }
     }