|
|
@@ -673,20 +673,22 @@ public class MesClient extends JFrame {
|
|
|
|
|
|
// 获取结果
|
|
|
String result = PLCUtils.getResult(plc);
|
|
|
+ System.out.println(result);
|
|
|
// 如果等于OK或者NG的时候才处理结果
|
|
|
if("OK".equals(result)){
|
|
|
// 获取参数
|
|
|
QmParam qmParam = PLCUtils.getParameter(plc);
|
|
|
// 发送参数
|
|
|
JSONObject retObj1 = DataUtil.sendQualityParam( user20, product_sn.getText().trim(), MesClient.mes_gw, MesClient.mes_line_sn,qmParam);
|
|
|
+ System.out.println(qmParam);
|
|
|
if(retObj1 != null && retObj1.get("result") != null && retObj1.get("result").toString().equalsIgnoreCase("true")) {
|
|
|
- MesClient.resetScanA();
|
|
|
- MesClient.setMenuStatus("测试结果上传成功，请扫下一件",0);
|
|
|
+ //MesClient.resetScanA();
|
|
|
+ MesClient.setMenuStatus("气密数据上传成功，请扫下一件",0);
|
|
|
}else{
|
|
|
MesClient.setMenuStatus("测试结果上传失败，请重试",-1);
|
|
|
}
|
|
|
String sn = product_sn.getText().trim();
|
|
|
- JSONObject retObj = DataUtil.sendQuality( sn,result,user20);
|
|
|
+ JSONObject retObj = DataUtil.sendQuality(sn,result,user20);
|
|
|
if (retObj != null && "true".equalsIgnoreCase(retObj.getString("result"))) {
|
|
|
resetState();
|
|
|
status_menu.setForeground(Color.GREEN);
|
|
|
@@ -711,9 +713,9 @@ public class MesClient extends JFrame {
|
|
|
status_menu.setText(msg);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
} else if (work_status == 0) {
|
|
|
+ String abc = PLCUtils.getResult(plc);
|
|
|
+ System.out.println(abc);
|
|
|
JSONObject result = DataUtil.getCurSn(mes_gw, mes_server_ip, mes_line_sn);
|
|
|
// 正常处理结果
|
|
|
if (result.containsKey("data")) {
|
|
|
@@ -723,8 +725,8 @@ public class MesClient extends JFrame {
|
|
|
JSONObject jsonObject = DataUtil.checkQuality(data, user20);
|
|
|
String msg = jsonObject.getString("message");
|
|
|
if (jsonObject.getString("result").equalsIgnoreCase("true")) {
|
|
|
- finish_ng_bt.setEnabled(true);
|
|
|
- finish_ok_bt.setEnabled(true);
|
|
|
+ /* finish_ng_bt.setEnabled(true);
|
|
|
+ finish_ok_bt.setEnabled(true);*/
|
|
|
check_quality_result = true;
|
|
|
work_status = 1;
|
|
|
MesClient.setMenuStatus(msg,0);
|
hfy