更新测试后代码

wu

2024-10-26 328f9b1f7a046378ef5d8f2b8337770fff372cc7

 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -8,8 +8,7 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;

import com.example.springboot.entity.FlowCard;
import com.example.springboot.entity.FlowCard;
import com.example.springboot.entity.Flowcard;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.MeasureSetting;
import com.example.springboot.entity.Out_slice;
@@ -77,7 +76,6 @@
                outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
                storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
                glassInfoMapper = WebSocketServer.applicationContext.getBean(GlassInfoMapper.class);

                // 获取其车的位置
                if (S7control.getinstance().CheckConnected() == true&&false) {
                    double carposition = 0;
@@ -132,36 +130,38 @@
                boolean istest = true;
                // String PlcRequest = "1";
                // String MesSend = "0";
                // double width = 0;
                // double height = 0;
                // double width = 727;
                // double height = 414;

                // 匹配
                // System.err.println(PlcRequest+","+MesSend+","+width+","+height);
                // if (plcmes.getPlcParameter("GaToMES").getValue() != null) {
                // String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// 请求
                // String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// 发送
                // double width = Double.valueOf(plcmes.getPlcParameter("width").getValue());//
                if (plcmes.getPlcParameter("GaToMES").getValue() != null) {
                String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// 请求
                String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// 发送
                double width = Double.valueOf(plcmes.getPlcParameter("width").getValue());//
                // 宽
                // double height =
                // Double.valueOf(plcmes.getPlcParameter("Height").getValue());// 高
                // if ("0".equals(PlcRequest) && istest) {
                // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                // (short) 0);
                // }
                // if ("1".equals(PlcRequest) && "0".equals(MesSend)) {
                // boolean is = HomeService.Normal(width, height, "1");
                // if (is && istest) {
                // // 测量成功
                // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                // (short) 1);
                double height =Double.valueOf(plcmes.getPlcParameter("Height").getValue());// 高
                if ("0".equals(PlcRequest) && istest) {
                S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                (short) 0);
                }
                // System.out.println("PlcRequest:" + PlcRequest+"MesSend:" + MesSend+"width:" + width+"height:" + height);

                // } else if (istest) {
                // // 重新测量
                // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                // (short) 4);
                // }
                // }
                // }
            
                if ("1".equals(PlcRequest) && "0".equals(MesSend)) {
                boolean is = HomeService.Normal(width, height, "1");
                if (is && istest) {
                // 测量成功
                S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);

                } 
                else if (istest) {
                // 重新测量
                S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                (short) 4);
                }
                }
                }

                // S7control.getinstance().WriteWord("DB14.170", (short)0);

@@ -202,7 +202,7 @@
                jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);

                // //查询当前订单任务
                List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
                List<Flowcard> OrderTask = storageCageService.SelectOrderTask();
                jsonObject.append("OrderTask", OrderTask);

                // jsonObject.append("params", new short[] { 30, 40, });