|
|
@@ -200,7 +200,9 @@ public class MesClient extends JFrame {
|
|
|
if(work_status == 1 && cold_plate_bound){
|
|
|
List<Boolean> yxstatus = plcA.readCoil(3128,1);
|
|
|
if(yxstatus.size() >= 1 && !yxstatus.get(0)){
|
|
|
- if(!MesClient.curSn.isEmpty() && MesClient.aMax > 0 && MesClient.aMax == MesClient.sortA){
|
|
|
+ if(MesClient.zdStatusA == 1){
|
|
|
+ // NG复判中断中,保持锁枪
|
|
|
+ }else if(!MesClient.curSn.isEmpty() && MesClient.aMax > 0 && MesClient.aMax == MesClient.sortA){
|
|
|
ModbusUtil.setPowerOff(plcA);
|
|
|
}else{
|
|
|
ModbusUtil.setPowerOn(plcA);
|
|
|
@@ -209,7 +211,9 @@ public class MesClient extends JFrame {
|
|
|
|
|
|
List<Boolean> yxstatusb = plcB.readCoil(3128,1);
|
|
|
if(yxstatusb.size() >= 1 && !yxstatusb.get(0)){
|
|
|
- if(!MesClient.curSn.isEmpty() && MesClient.bMax > 0 && MesClient.bMax == MesClient.sortB){
|
|
|
+ if(MesClient.zdStatusB == 1){
|
|
|
+ // NG复判中断中,保持锁枪
|
|
|
+ }else if(!MesClient.curSn.isEmpty() && MesClient.bMax > 0 && MesClient.bMax == MesClient.sortB){
|
|
|
ModbusUtil.setPowerOff(plcB);
|
|
|
}else{
|
|
|
ModbusUtil.setPowerOn(plcB);
|