增加翻译文件和bug解决

wu

2024-11-26 fddf1c716af76c2968e08ce11895eaa1c26319a5

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

@@ -2,16 +2,20 @@

import cn.hutool.json.JSONObject;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import com.example.springboot.service.*;

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.Glass;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.MeasureSetting;
import com.example.springboot.entity.OutTask;
import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
@@ -77,9 +81,8 @@
                outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
                storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
                glassInfoMapper = WebSocketServer.applicationContext.getBean(GlassInfoMapper.class);

                // 获取其车的位置
                if (S7control.getinstance().CheckConnected() == true&&false) {
                if (S7control.getinstance().CheckConnected() == true && false) {
                    double carposition = 0;
                    float car = S7control.getinstance().readFloat32("DB10.1992");
                    carposition = (-40 + (car / (carend - carstart) * 595));
@@ -119,8 +122,8 @@
                // 是否需要人工确认上片玻璃
                jsonObject.append("isConfirm", isConfirm);
                // 查询当前铝框信息
                Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
                jsonObject.append("CurrentFrame", CurrentFrame);
                // Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
                // jsonObject.append("CurrentFrame", CurrentFrame);

                // 读取DB105区文件
                PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
@@ -132,44 +135,88 @@
                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());//
                // 宽
                // 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);
                if (plcmes.getPlcParameter("GaToMES").getValue() != null) {
                    String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// plc请求字
                    String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// mes发送字
                    String A01ToMES = plcmes.getPlcParameter("A01ToMES").getValue();// 扫码请求
                    String MESToA01 = plcmes.getPlcParameter("MESToA01").getValue();// 确认扫码
                    String Layer = plcmes.getPlcParameter("Layer").getValue();// 层号
                    String Mateid = plcmes.getPlcParameter("A01MateID").getValue();// 配对号
                    String Order = plcmes.getPlcParameter("A01OrderID").getValue();// 订单号
                    double width = Double.valueOf(plcmes.getPlcParameter("width").getValue());//
                    // 宽
                    double height = Double.valueOf(plcmes.getPlcParameter("Height").getValue());// 高

                // } else if (istest) {
                // // 重新测量
                // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                // (short) 4);
                // }
                // }
                // }
                    String celanedOrders = Order.replaceAll("[^a-zA-Z0-9.]", "").trim().split("\\.")[0];
                    String cleanedMateids = Mateid.replaceAll("[^0-9.]", "").trim().split("\\.")[0]; // 移除所有非数字字符
                    String cleanedLayers = Layer.replaceAll("[^0-9.]", "").trim().split("\\.")[0]; //

                    String celanedOrder = celanedOrders.isEmpty() ? "" : celanedOrders;
                    String cleanedMateid = cleanedMateids.isEmpty() ? "" : cleanedMateids;
                    String cleanedLayer = cleanedLayers.isEmpty() ? "" : cleanedLayers;

                    if ("4".equals(PlcRequest)) {
                        S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 0);
                        System.out.println("收四归零");
                    }
                    // 扫码请求时
                    if ("1".equals(A01ToMES) && "0".equals(MESToA01)&&"0".equals(MesSend)&&"0".equals(PlcRequest)) {
                        if(cleanedMateid==""||cleanedLayer==""){
                            cleanedMateid="0";
                            cleanedLayer="0";
                        }
                        int cont = storageCageService.ScanMatch(celanedOrder, Integer.parseInt(cleanedMateid),Integer.parseInt(cleanedLayer));
                        if (cont > 0) {
                            System.out.println("扫码成功");
                            System.out.println(
                                    "Order:" + celanedOrder + " Mateid:" + cleanedMateid + " Layer:" + cleanedLayer);
                            
                            S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToA01").getAddress(),
                                    (short) 1);
                            S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                                    (short) 1);
                        } else {
                            // QueueMapper.insertMatchFailure(1000, 1000, -1);
                            System.out.println(
                                    "Order:" + celanedOrder + " Mateid:" + cleanedMateid + " Layer:" + cleanedLayer);
                            System.out.println("扫码添加失败");
                        }

                    }
                    // 请求归零时
                    if ("4".equals(A01ToMES)) {
                        System.out.println("扫码归零成功");
                        S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToA01").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);

                        } else if (istest) {
                            // 匹配失败
                            S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
                                    (short) 4);
                        }
                    }
                }

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

                // 正在上片订单中的所有小片信息   
                // 正在上片订单中的所有小片信息
                List<GlassInfo> glassInfoFlowCard = glassInfoMapper.selectOrderState(1);
                jsonObject.append("glassInfoFlowCard", glassInfoFlowCard);

                Queue LastQueue = QueueMapper.selectLastQueue();
                Queue LastQueue = QueueMapper.selectLastQueue2();
                if (LastQueue == null) {
                    Queue nullQueue = new Queue();
                    nullQueue.setglassId("");
@@ -181,8 +228,8 @@
                    jsonObject.append("LastQueue", nullQueue);
                } else {
                    if (LastQueue.getstate() < 1) {
                        LastQueue.setglasswidth(0);
                        LastQueue.setglassheight(0);
                        LastQueue.setglasswidth(LastQueue.getglasswidthmm());
                        LastQueue.setglassheight(LastQueue.getglassheightmm());
                    }
                    jsonObject.append("LastQueue", LastQueue);
                }
@@ -201,30 +248,62 @@
                List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
                jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);

                // 查询当前出片队列
                List<Map> OutTask = storageCageService.SelectOutTask();
                jsonObject.append("OutTask", OutTask);

                // 查询最后6次出片记录
                List<Map> OutLog = storageCageService.SelectOutLog();
                jsonObject.append("OutLog", OutLog);

                // 查询所有玻璃厚度和膜系
                List<GlassInfo> SelectMeasure = storageCageService.SelectMeasure();
                jsonObject.append("SelectMeasure", SelectMeasure);
                // 查询当前膜系厚度
                MeasureSetting SelectSetting = storageCageService.SelectSetting();
                jsonObject.append("SelectSetting", SelectSetting);
                // 查询现在的玻璃厚度和膜系
                Map StorageCageForm = storageCageService.StorageCageForm();
                jsonObject.append("StorageCageForm", StorageCageForm);

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

                // jsonObject.append("params", new short[] { 30, 40, });
                // System.out.println("jsonObject:" + jsonObject);

                ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
                
                if (sendwServer != null) {
                    for (WebSocketServer webserver : sendwServer) {
                        webserver.sendMessage(jsonObject.toString());

                        if (webserver != null) {

                    Iterator<WebSocketServer> iterator = sendwServer.iterator();
                    while (iterator.hasNext()) {
                        WebSocketServer webserver = iterator.next();
                        webserver.sendMessage(jsonObject.toString());                     
                            List<String> messages = webserver.getMessages();

                            if (!messages.isEmpty()) {
                                // // 将最后一个消息转换为整数类型的列表
                                webserver.clearMessages();
                            }
                        }

                            }                     
                    }
                }

                // ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
                // if (sendwServer != null) {
                //     for (WebSocketServer webserver : sendwServer) {
                //         webserver.sendMessage(jsonObject.toString());
                //         if (webserver != null) {
                //             List<String> messages = webserver.getMessages();

                //             if (!messages.isEmpty()) {
                //                 // // 将最后一个消息转换为整数类型的列表
                //                 webserver.clearMessages();
                //             }
                //         }

                //     }
                // }

            } catch (InterruptedException e) {
                e.printStackTrace();
            }