From d1bd20f33173a250015130bbe68fd47f37fd9160 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 29 八月 2025 16:12:33 +0800
Subject: [PATCH] 修改点胶页面
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java | 293 +++++++++++++++++------------
JiuMuMesParent/JsonFile/PlcDispensing.json | 247 ++++++++++++++++++++++++
UI-Project/src/views/GlueDispenser/glueDispenser.vue | 16
UI-Project/src/views/MechanicalArm/mechanicalArm.vue | 2
4 files changed, 426 insertions(+), 132 deletions(-)
diff --git a/JiuMuMesParent/JsonFile/PlcDispensing.json b/JiuMuMesParent/JsonFile/PlcDispensing.json
new file mode 100644
index 0000000..81ae992
--- /dev/null
+++ b/JiuMuMesParent/JsonFile/PlcDispensing.json
@@ -0,0 +1,247 @@
+{
+ "plcAddressBegin":"00C8",
+ "plcAddressLength":"50",
+ "requestHead":"000100000006010300C80032",
+ "parameterInfo":[
+ {
+ "codeId": "plcRequest",
+ "addressIndex": "400",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "plcRequestID",
+ "addressIndex": "402",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "plcReport",
+ "addressIndex": "410",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "plcReportID",
+ "addressIndex": "412",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "mesSend",
+ "addressIndex": "420",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "mesSendID",
+ "addressIndex": "422",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "JPZX",
+ "addressIndex": "424",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+
+ {
+ "codeId": "thickness",
+ "addressIndex": "426",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "side1",
+ "addressIndex": "428",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "side2",
+ "addressIndex": "430",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "side3",
+ "addressIndex": "432",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "side4",
+ "addressIndex": "434",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "R_angle1_1",
+ "addressIndex": "436",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "R_angle1_2",
+ "addressIndex": "438",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "R_angle2_1",
+ "addressIndex": "440",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "R_angle2_2",
+ "addressIndex": "442",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "R_angle3_1",
+ "addressIndex": "444",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "R_angle3_2",
+ "addressIndex": "446",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "R_angle4_1",
+ "addressIndex": "448",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "R_angle4_2",
+ "addressIndex": "450",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "mesConfirm",
+ "addressIndex": "454",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "mesConfirmID",
+ "addressIndex": "456",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "alarmStatus",
+ "addressIndex": "460",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "alarmWord1",
+ "addressIndex": "462",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "alarmWord2",
+ "addressIndex": "464",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "alarmWord3",
+ "addressIndex": "466",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "alarmWord4",
+ "addressIndex": "468",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "machineStatusWord",
+ "addressIndex": "470",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "inputOrOut2",
+ "addressIndex": "474",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "inputOrOut3",
+ "addressIndex": "476",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "inputOrOut4",
+ "addressIndex": "478",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "inputOrOut5",
+ "addressIndex": "480",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "inputOrOut6",
+ "addressIndex": "482",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ },
+ {
+ "codeId": "inputOrOut7",
+ "addressIndex": "484",
+ "addressLength": "2",
+ "type": "word",
+ "unit": ""
+ }
+ ]
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
index b882c87..fb1ab1d 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
@@ -21,6 +21,7 @@
/**
* 鑷姩鎵撴爣鏈�
+ *
* @Author : yanzhxiin
* @Date: 2024/8/20 11:19
* @Description:
@@ -63,184 +64,230 @@
//鏈烘鎵�
@Scheduled(fixedDelay = 500)
public void MarkingTasks() {
- machineListLoad =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"涓婄墖"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "loadTask");
- for (Machine machine : machineListLoad) {
- JSONObject jsonObjectItem = new JSONObject();
- //鏍囧噯妯″紡 鎵惧凡棰嗗彇鏈畬鎴愮殑绗竴鏉′换鍔�
- LineConfiguration lineConfiguration=lineConfigurationService.machineLineConfiguration(machine);
- //姝ょ嚎璺凡棰嗗彇鐨勪换鍔�
- List<PrimitiveTask> findPrimitiveTasking=primitiveTaskService.findPrimitiveTasking(machine,lineConfiguration.getLineId());
- //姝ょ嚎璺湭棰嗗彇鐨勪换鍔� 鏈湴
- //List<PrimitiveTask> findPrimitiveTask=primitiveTaskService.findPrimitiveTaskNotFinish();
- //姝ょ嚎璺湭棰嗗彇鐨勪换鍔� 瀹㈡埛鏁版嵁搴�
- List<KBBTJPDrawingBP> list =kBBTJPDrawingBPService.notReceiveKBBTJPDrawingBP();
- jsonObjectItem.append("findPrimitiveTask", list);
- jsonObjectItem.append("findPrimitiveTasking", findPrimitiveTasking);
- //jsonObject.append("findPrimitiveTask", findPrimitiveTask);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListLoad = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "涓婄墖"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "loadTask");
+ for (Machine machine : machineListLoad) {
+ JSONObject jsonObjectItem = new JSONObject();
+ //鏍囧噯妯″紡 鎵惧凡棰嗗彇鏈畬鎴愮殑绗竴鏉′换鍔�
+ LineConfiguration lineConfiguration = lineConfigurationService.machineLineConfiguration(machine);
+ //姝ょ嚎璺凡棰嗗彇鐨勪换鍔�
+ List<PrimitiveTask> findPrimitiveTasking = primitiveTaskService.findPrimitiveTasking(machine, lineConfiguration.getLineId());
+ //姝ょ嚎璺湭棰嗗彇鐨勪换鍔� 鏈湴
+ //List<PrimitiveTask> findPrimitiveTask=primitiveTaskService.findPrimitiveTaskNotFinish();
+ //姝ょ嚎璺湭棰嗗彇鐨勪换鍔� 瀹㈡埛鏁版嵁搴�
+ List<KBBTJPDrawingBP> list = kBBTJPDrawingBPService.notReceiveKBBTJPDrawingBP();
+ jsonObjectItem.append("findPrimitiveTask", list);
+ jsonObjectItem.append("findPrimitiveTasking", findPrimitiveTasking);
+ //jsonObject.append("findPrimitiveTask", findPrimitiveTask);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("MarkingTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
+
//纾ㄨ竟鏈�
@Scheduled(fixedDelay = 500)
public void edgingTasks() {
- machineListEdging =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"纾ㄨ竟"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "edgingTask");
- for (Machine machine : machineListEdging) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListEdging = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "纾ㄨ竟"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "edgingTask");
+ for (Machine machine : machineListEdging) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("edgingTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
//缈荤墖鍙�
@Scheduled(fixedDelay = 500)
public void flipSliceTasks() {
- machineListFlipSlice =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"缈荤墖"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "flipSlice");
- for (Machine machine : machineListFlipSlice) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListFlipSlice = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "缈荤墖"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "flipSlice");
+ for (Machine machine : machineListFlipSlice) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("flipSliceTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
+
}
//鎵撴爣鏈�
@Scheduled(fixedDelay = 500)
public void markingTasks() {
- machineListMarking =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩鎵撴爣鏈�"));
+ try {
+ machineListMarking = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩鎵撴爣鏈�"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "marking");
- for (Machine machine : machineListMarking) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "marking");
+ for (Machine machine : machineListMarking) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("markingTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
//涓濆嵃鏈�
@Scheduled(fixedDelay = 500)
public void silkScreenTasks() {
- machineListSilkScreen =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩涓濆嵃鏈�"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "silkScreenTask");
- for (Machine machine : machineListSilkScreen) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListSilkScreen = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩涓濆嵃鏈�"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "silkScreenTask");
+ for (Machine machine : machineListSilkScreen) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("silkScreenTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
+
//鐐硅兌鏈�
- //@Scheduled(fixedDelay = 500)
+ @Scheduled(fixedDelay = 500)
public void glueDispenserTasks() {
- machineListGlueDispenser =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩鐐硅兌鏈�"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "glueDispenser");
- for (Machine machine : machineListGlueDispenser) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListGlueDispenser = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩鐐硅兌鏈�"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "glueDispenser");
+ for (Machine machine : machineListGlueDispenser) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("glueDispenserTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
+
//鏃嬭浆鍙�
@Scheduled(fixedDelay = 500)
public void rotateTasks() {
- machineListRotate =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鏃嬭浆鍙�"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "rotate");
- for (Machine machine : machineListRotate) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListRotate = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鏃嬭浆鍙�"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "rotate");
+ for (Machine machine : machineListRotate) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("rotateTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
+
//璐磋啘鏈�
@Scheduled(fixedDelay = 500)
public void laminationTasks() {
- machineListLamination =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩璐磋啘鏈�"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "lamination");
- for (Machine machine : machineListLamination) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingService.findMachineTask(machine);
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObjectItem.append("sendRecords", sendRecords);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ try {
+ machineListLamination = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩璐磋啘鏈�"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "lamination");
+ for (Machine machine : machineListLamination) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingService.findMachineTask(machine);
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObjectItem.append("sendRecords", sendRecords);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("laminationTasks:{}", exception.getMessage());
}
- this.webSocketServer(jsonObject);
}
//鎶ュ伐椤甸潰鏌ヨ
@Scheduled(fixedDelay = 1000)
public void manualReporting() {
+ try {
+ machineListScanQrCode = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "璇嗗埆鎶ュ伐"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sessionMapName", "manualReporting");
+ for (Machine machine : machineListScanQrCode) {
+ JSONObject jsonObjectItem = new JSONObject();
+ List<Tasking> taskingList = taskingMapper.selectJoinList(Tasking.class, new MPJLambdaWrapper<Tasking>()
+ .selectAll(Tasking.class)
+ .innerJoin(LineConfiguration.class, LineConfiguration::getId, Tasking::getLineConfigurationId)
+ .innerJoin(Machine.class, Machine::getId, LineConfiguration::getMachineId)
+ .eq(LineConfiguration::getMachineId, machine.getId())
+ .eq(Tasking::getGlassState, "姝ｅ父")
+ .eq(Tasking::getState, "绾夸笂")
+ .ne(Tasking::getWorkState, "瀹屽伐")
+ .orderByDesc(Tasking::getOperationRecordTime));
+ jsonObjectItem.append("taskingList", taskingList);
+ jsonObjectItem.append("machine", machine);
+ jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ }
- machineListScanQrCode =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"璇嗗埆鎶ュ伐"));
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sessionMapName", "manualReporting");
- for (Machine machine : machineListScanQrCode) {
- JSONObject jsonObjectItem = new JSONObject();
- List<Tasking> taskingList=taskingMapper.selectJoinList(Tasking.class,new MPJLambdaWrapper<Tasking>()
- .selectAll(Tasking.class)
- .innerJoin(LineConfiguration.class,LineConfiguration::getId,Tasking::getLineConfigurationId)
- .innerJoin(Machine.class,Machine::getId,LineConfiguration::getMachineId)
- .eq(LineConfiguration::getMachineId,machine.getId())
- .eq(Tasking::getGlassState,"姝ｅ父")
- .eq(Tasking::getState,"绾夸笂")
- .ne(Tasking::getWorkState,"瀹屽伐")
- .orderByDesc(Tasking::getOperationRecordTime));
- jsonObjectItem.append("taskingList", taskingList);
- jsonObjectItem.append("machine", machine);
- jsonObject.append(machine.getId().toString(), jsonObjectItem);
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("manualReporting:{}", exception.getMessage());
}
-
- this.webSocketServer(jsonObject);
}
+
//绾夸笅鐜荤拑鏌ヨ
@Scheduled(fixedDelay = 1000)
public void downLineTask() {
- JSONObject jsonObject = new JSONObject();
- List<Tasking> downLineTask=taskingService.findDownLineTask();
- jsonObject.append("sessionMapName", "downLineTask");
- jsonObject.append("downLineTask", downLineTask);
- this.webSocketServer(jsonObject);
+ try {
+ JSONObject jsonObject = new JSONObject();
+ List<Tasking> downLineTask = taskingService.findDownLineTask();
+ jsonObject.append("sessionMapName", "downLineTask");
+ jsonObject.append("downLineTask", downLineTask);
+ this.webSocketServer(jsonObject);
+ } catch (Exception exception) {
+ log.info("downLineTask:{}", exception.getMessage());
+ }
}
public void webSocketServer(JSONObject jsonObject) {
try {
- String sessionMapName=jsonObject.getJSONArray("sessionMapName").get(0).toString();
+ log.info("鍙戦�佹暟鎹細{}", jsonObject.getJSONArray("sessionMapName").get(0).toString());
+ String sessionMapName = jsonObject.getJSONArray("sessionMapName").get(0).toString();
webSocketServer.sendToWeb(sessionMapName, jsonObject.toString());
} catch (Exception ex) {
log.info("{}鍙戦�佹暟鎹け璐ワ細{}", "rawGlassStorage", ex.getMessage());
diff --git a/UI-Project/src/views/GlueDispenser/glueDispenser.vue b/UI-Project/src/views/GlueDispenser/glueDispenser.vue
index 096c6d5..580ed7e 100644
--- a/UI-Project/src/views/GlueDispenser/glueDispenser.vue
+++ b/UI-Project/src/views/GlueDispenser/glueDispenser.vue
@@ -22,8 +22,10 @@
const downLineTask = ref([]);
const userInfo=JSON.parse(window.localStorage.getItem('userInfo'));
-const pageParams=userInfo.user.menus[0].pages[2].params;
+const pageParams=userInfo.user.menus[0].pages[12].params;
const pageParamsJson=JSON.parse(pageParams);
+console.log(userInfo.user);
+
const machineId = pageParamsJson.machineId;//褰撳墠椤甸潰鐨勮澶嘔D
console.log(machineId);
//浣跨敤WebSocket鏂瑰紡灞曠ず鏁版嵁
@@ -38,6 +40,7 @@
loadData.value = dataJson.taskingList[0];
findMachine.value = dataJson.machine[0];
+
sendRecords.value = dataJson.sendRecords[0].reverse();
};
@@ -331,7 +334,7 @@
</div>
<div id="main-body">
<!-- 琛ㄦ牸鍐呭 -->
- <el-table :data="loadData" stripe style="height:260px"
+ <el-table :data="loadData" stripe style="height:560px"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }">
<!-- <el-table-column type="selection" min-width="30" /> -->
@@ -360,12 +363,9 @@
</el-table>
</div>
- <div id="main-body" style="width: 100%; height: 460px;min-width: 1200px;">
+ <!-- <div id="main-body" style="width: 100%; height: 460px;min-width: 1200px;">
<img style="width: 70%;min-width: 900px; height: 460px;float: left;" src="../../assets/缈荤墖鍙�.png">
- <!-- <el-image style="width: 70%;min-width: 900px; height: 460px;float: left;" src="../../src/assets/缈荤墖鍙�.png"></el-image> -->
- <!-- <div style="width: 70%;min-width: 900px; height: 460px;background-image: url(../../src/assets/缈荤墖鍙�.png) ;background-size: 100% 100%;float: left;">
-
- </div> -->
+
<div style="width: 30%;min-width: 300px; height: 460px;float: left;padding: 20px;;">
<el-table :data="sendRecords" stripe
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center', height: '30px' }"
@@ -375,7 +375,7 @@
</div>
<div style="clear锛歜oth"></div>
- </div>
+ </div> -->
</div>
</template>
diff --git a/UI-Project/src/views/MechanicalArm/mechanicalArm.vue b/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
index 537a641..a173998 100644
--- a/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
+++ b/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
@@ -430,7 +430,7 @@
<el-table-column prop="workState" :label="$t('glassInfo.workState')" />
<el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="70">
<template #default="scope">
- <el-button size="mini" link type="primary" plain @click="startOrStopTask(scope.row, findMachine.id, 1)">{{
+ <el-button size="small" link type="primary" plain @click="startOrStopTask(scope.row, findMachine.id, 1)">{{
$t('functionState.getTask') }}</el-button>
</template>
</el-table-column>
--
Gitblit v1.8.0