|
|
@@ -279,19 +279,25 @@ public class WorkStationPanel extends JPanel {
|
|
|
}
|
|
|
|
|
|
public void resetScanA() {
|
|
|
- this.workStatus = 0;
|
|
|
- this.checkQualityResult = false;
|
|
|
- finishOkButton.setEnabled(false);
|
|
|
+ JSONObject retObj = DataUtil.delCurSn(gw, serverIp, lineSn);
|
|
|
+ if (retObj.get("result")!=null && retObj.get("result").toString().equalsIgnoreCase("true")){
|
|
|
+ this.workStatus = 0;
|
|
|
+ this.checkQualityResult = false;
|
|
|
+ finishOkButton.setEnabled(false);
|
|
|
// finishNgButton.setEnabled(false);
|
|
|
- productSnField.setText("");
|
|
|
- fxLabel.setVisible(false);
|
|
|
+ productSnField.setText("");
|
|
|
+ fxLabel.setVisible(false);
|
|
|
|
|
|
- scanButton.setEnabled(true);
|
|
|
- statusLabel.setText("请扫工件码");
|
|
|
+ scanButton.setEnabled(true);
|
|
|
+ statusLabel.setText("请扫工件码");
|
|
|
// MesClient.setMenuStatus("开班点检,请先进行OKNG样件测试",-1);
|
|
|
|
|
|
- updateMaterailData();
|
|
|
+ updateMaterailData();
|
|
|
// shiftUserCheck();
|
|
|
+ } else {
|
|
|
+ statusLabel.setText("刷新失败");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
public static void updateMaterailData(){
|
|
|
try{
|