修改导入订单表格样式

ZengTao

2024-03-25 5c1c0b9de58edb54443e43edf8a141b8231563e6

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

@@ -116,9 +116,16 @@
                //读取DB105区文件
                PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
      
                //String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//请求
                //double width=plcmes.getPlcParameter("Height").getValue();//宽
                //double height=plcmes.getPlcParameter("width").getValue();//高
                // String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//请求
                // String MesSend=plcmes.getPlcParameter("MESToGaStatus").getValue();//发送
                // double width=Double.valueOf(plcmes.getPlcParameter("Height").getValue());//宽
                // double height=Double.valueOf(plcmes.getPlcParameter("width").getValue());//高

                // String PlcRequest=S7control.getinstance().ReadWord("DB14.26", 1).get(0)+"";
                // double width=Double.parseDouble(S7control.getinstance().ReadWord("DB14.28", 1).get(0)+"");
                // double height=Double.parseDouble(S7control.getinstance().ReadWord("DB14.30", 1).get(0)+"");
                // String MesSend=S7control.getinstance().ReadWord("DB14.170", 1).get(0)+"";

                //获取测量的长，宽
                
                
@@ -131,16 +138,28 @@



                String PlcRequest = "1";
                double width = 402;
                double height = 402;
                // String PlcRequest = "1";
                // String MesSend = "0";
                // double width = 402;
                // double height = 402;
                
                //匹配
                if ("1".equals(PlcRequest)) {
                    GlassInfo MesureGlassinfo=HomeService.Normal(width, height, "1");
                                       
                    
                }
                // //匹配
                // //System.err.println(PlcRequest+","+MesSend+","+width+","+height);
                // if ("0".equals(PlcRequest)) {
                //     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) {
                //         // 测量成功
                //         S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);

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

                // }
                Queue LastQueue= QueueMapper.selectLastQueue();
                // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
                // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
@@ -158,7 +177,7 @@
                List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
                jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);

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