From 3b69c53a60ba0bf36c44ff500b9f0ca622fef181 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 05 三月 2025 17:03:47 +0800
Subject: [PATCH] 添加大屏订单数据，添加往ERP传输现补数据功能
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 2
hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml | 33 +++
UI-Project/src/lang/en.js | 1
UI-Project/src/lang/py.js | 3
UI-Project/src/lang/zh.js | 3
UI-Project/src/views/ReportWork/reportWork.vue | 7
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/dto/OrderDTO.java | 62 ++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWorkDetail.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 6
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java | 9 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 29 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java | 6
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/OrderDetail.java | 58 ++++++
UI-Project/src/views/largescreendisplay/screendisplay.vue | 242 ++++++++++++++++++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml | 34 +++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java | 4
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java | 3
17 files changed, 479 insertions(+), 25 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 76000bd..4c40508 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -552,6 +552,7 @@
dreportwork :'Unreported work',
pendingwork :'Pending job application',
reportwork :'Reported work',
+ reportworked :'Reported worked',
incise :'slicing',
edging :'edging',
steel :'toughened',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index ce44e86..851ca1b 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -549,8 +549,9 @@
broke :'袩芯胁褉械卸写械薪懈械',
takeout :'袙蟹褟褌褜',
dreportwork :'鏈姤宸�',
- pendingwork :'寰呮姤宸�',
+ pendingwork :'宸茬幇琛�',
reportwork :'宸叉姤宸�',
+ reportworked :'宸插悓姝�',
incise :'鍒囧壊',
edging :'纾ㄨ竟',
steel :'袟邪泻邪谢泻邪',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 8e656a7..1e2840e 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -549,8 +549,9 @@
broke :'鐮存崯',
takeout :'鎷胯蛋',
dreportwork :'鏈姤宸�',
- pendingwork :'寰呮姤宸�',
+ pendingwork :'宸茬幇琛�',
reportwork :'宸叉姤宸�',
+ reportworked :'宸插悓姝�',
incise :'鍒囧壊',
edging :'纾ㄨ竟',
steel :'閽㈠寲',
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index c4229d1..1c043a5 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -14,8 +14,9 @@
<el-select v-model="report.status" :placeholder="$t('reportmanage.cstate')" style="margin-left: 10px;">
<!-- <el-option :label="$t('reportmanage.all')" value="0"></el-option> -->
<el-option :label="$t('reportmanage.dreportwork')" value="1"></el-option>
- <!-- <el-option :label="$t('reportmanage.pendingwork')" value="2"></el-option> -->
+ <el-option :label="$t('reportmanage.pendingwork')" value="7"></el-option>
<el-option :label="$t('reportmanage.reportwork')" value="3"></el-option>
+ <el-option :label="$t('reportmanage.reportworked')" value="8"></el-option>
</el-select>
<el-select v-model="report.workingProcedure" :placeholder="$t('reportmanage.cprocess')"
style="margin-left: 10px;">
@@ -175,7 +176,7 @@
}else{
selectedType.value = true;
}
- if (report.value.status == 1&&(report.value.type == 8||report.value.type == 1)) {
+ if ((report.value.status == 1||report.value.status == 7)&&(report.value.type == 8||report.value.type == 1)) {
selectedStatus.value = true;
}else{
selectedStatus.value = false;
@@ -216,7 +217,7 @@
ElMessage.error(response.message);
}
}
-
+ selectReportData();
};
const fetchTableData = async () => {
try {
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 4390eac..9785f41 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -15,9 +15,11 @@
let socket = null;
const rawGlassStorageDetailList = ref([])
+const orderDTOS = ref([])
const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/largenScreen`;
const handleMessage = (data) => {
rawGlassStorageDetailList.value = data.rawGlassStorageDetailList[0]
+ orderDTOS.value = data.orderDTOS[0]
};
let socket1 = null;
@@ -31,6 +33,15 @@
edgTwoTasks.value = data.edgTwoTasks[0];
engineeringOne.value = data.engineeringOne[0];
engineeringTwo.value = data.engineeringTwo[0];
+ if(numBoxes.value != edgOneTasks.value.length){
+ numBoxes.value = edgOneTasks.value.length;
+ boxStart();
+ }
+ if(numBoxes2.value != edgTwoTasks.value.length){
+ numBoxes2.value = edgTwoTasks.value.length;
+ boxStart2();
+ }
+
};
let socket2 = null;
@@ -40,7 +51,13 @@
const handleMessage2 = (data) => {
temperingTaskType.value = data.temperingTaskType[0];
temperingGlassInfoList.value = data.temperingGlassInfoList[0];
+ if(numBoxes3.value !=temperingTaskType.value){
+ numBoxes3.value =temperingTaskType.value;
+ boxStart3();
+ }
+
};
+
const tableDatad = ref([]);
const patternUsage = async () => {
@@ -64,6 +81,22 @@
films: ''
})
+// const tableDatac = ref([]);
+// const patternUsage = async () => {
+// try {
+// const response = await request.post('/glassStorage/rawGlassStorageDetails/patternUsage?width=' + ptnusage.value.width + '&height=' + ptnusage.value.height + '&thickness=' + ptnusage.value.thickness + '&films=' + ptnusage.value.films);
+// if (response.code == 200) {
+// ElMessage.success(response.message);
+// tableDatad.value = response.data;
+// } else {
+// ElMessage.error(response.message);
+// }
+// }
+// catch (error) {
+// console.error(error);
+// }
+// }
+
// 鐐瑰嚮涓嬫柟寮圭獥
const handlehistorical = (row) => {
@@ -72,6 +105,10 @@
};
// 鍦ㄧ粍浠舵寕杞芥椂璁剧疆榛樿鏃堕棿鑼冨洿
onMounted(() => {
+ boxStart();
+ boxStart2();
+ boxStart3();
+ requestAnimationFrame(animate);
socket = initializeWebSocket(socketUrl, handleMessage);
socket1 = initializeWebSocket(socketUrl1, handleMessage1);
socket2 = initializeWebSocket(socketUrl2, handleMessage2);
@@ -94,9 +131,169 @@
console.log("鍏抽棴浜�")
closeWebSocket();
});
+
+const numBoxes = ref(5);
+const numBoxes2 = ref(5);
+const numBoxes3 = ref(5); // 鍙姩鎬佷慨鏀圭殑 div 鏁伴噺
+const speed = 0.1;
+const maxX = 200; // 缁堢偣X鍧愭爣
+const maxY = -80; // 缁堢偣Y鍧愭爣
+const maxX2 = 250; // 缁堢偣X鍧愭爣
+const maxY2 = -165; // 缁堢偣Y鍧愭爣
+const maxX3 = 100; // 缁堢偣X鍧愭爣
+const maxY3 = -55; // 缁堢偣Y鍧愭爣
+const delayFrames = 600; // 姣忎釜 div 鐨勫欢杩熷抚鏁�
+
+const boxes = ref([]);
+const boxes2 = ref([]);
+const boxes3 = ref([]);
+
+// 鍒濆鍖� div 鏁版嵁
+const boxStart = () => {
+ boxes.value = [];
+ for (let i = 0; i < numBoxes.value; i++) {
+ boxes.value.push({
+ x: 0,
+ y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
+ direction: 'up',
+ delay: i * delayFrames,
+ style: {
+ width: '15px',
+ height: '15px',
+ backgroundColor: i % 2 === 0 ? 'red' : 'blue',
+ position: 'absolute',
+ transform: `translate(0px, 0px)`
+ }
+ });
+}
+}
+const boxStart2 = () => {
+ boxes2.value = [];
+ for (let i = 0; i < numBoxes2.value; i++) {
+ boxes2.value.push({
+ x: 0,
+ y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
+ direction: 'up',
+ delay: i * delayFrames,
+ style: {
+ width: '15px',
+ height: '15px',
+ backgroundColor: i % 2 === 0 ? 'red' : 'blue',
+ position: 'absolute',
+ transform: `translate(0px, 0px)`
+ }
+ });
+}
+}
+
+const boxStart3 = () => {
+ boxes3.value = [];
+ for (let i = 0; i < numBoxes3.value; i++) {
+ boxes3.value.push({
+ x: 0,
+ y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
+ direction: 'left',
+ delay: i * delayFrames,
+ style: {
+ width: '15px',
+ height: '15px',
+ backgroundColor: i % 2 === 0 ? 'red' : 'blue',
+ position: 'absolute',
+ transform: `translate(0px, 0px)`
+ }
+ });
+}
+}
+
+
+
+const animate = () => {
+ boxes.value.forEach((box) => {
+ if (box.delay > 0) {
+ box.delay--;
+ return;
+ }
+
+ if (box.direction === 'up') {
+ box.y -= speed;
+ if (box.y <= maxY) {
+ // box.y = 0; // 纭繚涓嶄細瓒呭嚭鐣岄檺
+ box.direction = 'left';
+ }
+ } else if (box.direction === 'left') {
+ box.x -= speed;
+ if (box.x <= -maxX) {
+ box.x = 0;
+ box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
+ box.direction = 'up';
+ }
+ }
+
+ box.style = {
+ ...box.style,
+ transform: `translate(${box.x}px, ${box.y}px)`
+ };
+ });
+
+ boxes2.value.forEach((box) => {
+ if (box.delay > 0) {
+ box.delay--;
+ return;
+ }
+
+ if (box.direction === 'up') {
+ box.y -= speed;
+ if (box.y <= maxY2) {
+ // box.y = 0; // 纭繚涓嶄細瓒呭嚭鐣岄檺
+ box.direction = 'left';
+ }
+ } else if (box.direction === 'left') {
+ box.x -= speed;
+ if (box.x <= -maxX2) {
+ box.x = 0;
+ box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
+ box.direction = 'up';
+ }
+ }
+ box.style = {
+ ...box.style,
+ transform: `translate(${box.x}px, ${box.y}px)`
+ };
+ });
+
+ boxes3.value.forEach((box) => {
+ if (box.delay > 0) {
+ box.delay--;
+ return;
+ }
+
+ if (box.direction === 'up') {
+ box.y -= speed;
+ if (box.y <= maxY3) {
+ // box.y = 0; // 纭繚涓嶄細瓒呭嚭鐣岄檺
+ box.direction = 'left';
+ box.x = 0;
+ box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
+ }
+ } else if (box.direction === 'left') {
+ box.x -= speed;
+ if (box.x <= -maxX3) {
+
+ box.direction = 'up';
+ }
+ }
+ box.style = {
+ ...box.style,
+ transform: `translate(${box.x}px, ${box.y}px)`
+ };
+ });
+ requestAnimationFrame(animate);
+};
+
</script>
<template>
<div style="height: 500px;">
+
<div class="awatch">
<div class="img-screen" alt="Screen">
<!-- 閽㈠寲鑹插潡 -->
@@ -107,7 +304,33 @@
<div v-if="engineeringTwo.length>1" class="slicing" style="width: 50px;height: 22px;top: 625px;left: 453px;position: absolute;background-color: red;"></div>
<!-- 鍘熺墖浠撳偍鑹插潡 -->
<div class="raw" style="width: 31px;height: 32px;top: 571px;left: 300px;position: absolute;">
- <div v-for="(item,index) in rawGlassStorageDetailList.slice(0,7)" :key="index" :style='"width: "+item.remainQuantity+"px;height: 5px;background-color: red;"'></div>
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(0,7)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <div class="raw" style="width: 31px;height: 47px;top: 610px;left: 300px;position: absolute;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(8,17)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <div class="raw" style="width: 31px;height: 13px;top: 675px;left: 300px;position: absolute;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(18,20)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <div class="raw" style="width: 31px;height: 22px;top: 657px;left: 370px;position: absolute;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(21,25)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <div class="raw" style="width: 31px;height: 9px;top: 561px;left: 370px;position: absolute;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(26,27)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <div class="raw" style="width: 31px;height: 9px;top: 612px;left: 370px;position: absolute;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(28,29)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <!-- 纾ㄨ竟鑹插潡 -->
+ <div class="container" style="position: relative;width: 20px;height: 20px;top: 572px;left: 645px;border: 1px solid #000;position: absolute;">
+ <div v-for="(box, index) in boxes" :key="index" class="box" :style="box.style"></div>
+ </div>
+ <div class="container" style="position: relative;width: 20px;height: 20px;top: 625px;left: 700px;border: 1px solid #000;position: absolute;">
+ <div v-for="(box, index) in boxes2" :key="index" class="box1" :style="box.style"></div>
+ </div>
+ <!-- 閽㈠寲杩愬姩鑹插潡 -->
+ <div class="container" style="position: relative;width: 20px;height: 20px;top: 438px;left: 196px;border: 1px solid #000;position: absolute;">
+ <div v-for="(box, index) in boxes3" :key="index" class="box1" :style="box.style"></div>
</div>
<!-- <div class="raw" style="width: 31px;height: 32px;top: 571px;left: 300px;position: absolute;background-color: red;">
<div v-for="(item,index) in rawGlassStorageDetailList.slice(0,7)" :key="index" :style='"width: "+item.remainQuantity+"px;height: 5px;background-color: red;"'></div>
@@ -117,7 +340,7 @@
style="position: relative;width: 110px;height: 140px;top: 603px;left: 297px;"></div>
</div>
<div style="height: 190px;width: 48%;float: right;">
- <el-table height="500" ref="table" @selection-change="handleSelectionChange" :data="tableDatac"
+ <el-table height="700" ref="table" :data="orderDTOS"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="orderId" align="center" :label="$t('large.orderId')" min-width="50" />
<el-table-column prop="customerName" align="center" :show-overflow-tooltip="true"
@@ -125,19 +348,20 @@
<el-table-column prop="project" align="center" :label="$t('large.project')" min-width="50" />
<el-table-column prop="area" align="center" :label="$t('large.are')" min-width="50" />
<el-table-column prop="quantity" align="center" :label="$t('large.quantity')" min-width="50" />
- <el-table-column align="center" :label="$t('large.warehousing')" min-width="50" prop="warehousing">
+ <el-table-column prop="percent" align="center" :label="$t('large.percent')" min-width="50" />
+ <!-- <el-table-column align="center" :label="$t('large.warehousing')" min-width="50" prop="warehousing">
<template #default="scope">
<el-tag :type="getStatusType(scope.row.warehousing)">
{{ getStatusText(scope.row.warehousing) }}
</el-tag>
</template>
- </el-table-column>
- <el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="100" />
+ </el-table-column> -->
+ <!-- <el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="100" />
<el-table-column fixed="right" :label="$t('large.operate')" align="center" width="100">
<template #default="scope">
<el-button size="mini" type="text" plain @click="handleBinda(scope.row)">{{ $t('large.mes') }}</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</div>
</div>
@@ -183,7 +407,7 @@
</el-table>
</el-dialog>
<el-dialog v-model="blinda" top="5vh" width="85%">
- <el-table height="650" ref="table" @selection-change="handleSelectionChange" :data="tableData"
+ <el-table height="650" ref="table" :data="tableData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="orderId" fixed align="center" :label="$t('large.orderId1')" min-width="110" />
<el-table-column prop="project" align="center" :label="$t('large.project')" min-width="110" />
@@ -277,4 +501,8 @@
/* .awatch{
height: 460px;
/* max-width: 100%; */
+
+.box {
+ transition: transform 0.016s linear;
+}
</style>
\ No newline at end of file
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index ffa1cc8..bf3275c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -45,7 +45,11 @@
@PostMapping("/submitDamage")
public Result submitDamage(@RequestBody List<Damage> damageList) {
damageService.submitDamage(damageList);
- damageList.forEach(damage -> damage.setStatus(3));
+ if(damageList.get(0).getStatus()==1){
+ damageList.forEach(damage -> damage.setStatus(3));
+ }else{
+ damageList.forEach(damage -> damage.setStatus(8));
+ }
damageService.updateBatchById(damageList);
return Result.build(200,"鎶ュ伐鎴愬姛",1);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index c1e4020..28371f7 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -55,8 +55,8 @@
WorkAssignmentMapper workAssignmentMapper;
- private final static String ERP_URL = "http://192.168.2.100:8086";
-// private final static String ERP_URL = "http://10.153.19.174:8086";
+ // private final static String ERP_URL = "http://192.168.2.100:8086";
+ private final static String ERP_URL = "http://10.153.19.174:8086";
/**
@@ -77,10 +77,10 @@
}
List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);
- for (Damage damage : damageList) {
- damage.setStatus(2);
- }
- return baseMapper.selectList(damageSelectWrapper);
+// for (Damage damage : damageList) {
+// damage.setStatus(2);
+// }
+ return damageList;
}
/**
@@ -140,11 +140,20 @@
damageDetails.setResponsibleEquipment(damagesdetails.get(0).getResponsibleEquipment());
damageDetails.setResponsibleTeam(damagesdetails.get(0).getResponsibleTeam());
damageDetails.setResponsiblePersonnel(null);
+ if (damagesdetails.get(0).getStatus() == 7) {
+ damageDetails.setQualityInspector("auto");
+ damageDetails.setPatchStatus(1);
+ damageDetails.setQualityInsStatus(2);
+ } else {
+ damageDetails.setQualityInspector("");
+ damageDetails.setPatchStatus(0);
+ damageDetails.setQualityInsStatus(0);
+ }
damageDetailses.add(damageDetails);
}
}
reportingWorkDetails.add(reportingWorkDetail);
- reportingWorkDetail.setDamageDetailsList(damageDetailses);
+ reportingWorkDetail.setDamageDetails(damageDetailses);
sendToERP(reportingWork, reportingWorkDetails, Boolean.FALSE);
}
}
@@ -199,6 +208,7 @@
damage1 = baseMapper.selectList(
new LambdaQueryWrapper<Damage>()
.in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .notIn(Damage::getStatus, 7, 8)
.eq(Damage::getGlassId, damage.getGlassId())
);
} else {
@@ -356,6 +366,11 @@
result.put("title", reportingWorkJson);
result.put("type", 0);
+ if (reportingWorkDetails.get(0).getDamageDetails().get(0).getPatchStatus() == 1) {
+ result.put("isPatch", 1);
+ } else {
+ result.put("isPatch", 0);
+ }
result.put("userId", "admin");
result.put("userName", "admin");
result.put("qualityInsStatus", 0);
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/dto/OrderDTO.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/dto/OrderDTO.java
new file mode 100644
index 0000000..7a3f2de
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/dto/OrderDTO.java
@@ -0,0 +1,62 @@
+package com.mes.order.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OrderDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 璁㈠崟Id
+ */
+ private String orderId;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ private String customerName;
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ private String project;
+
+ /**
+ * 璁㈠崟鏁伴噺
+ */
+ private String quantity;
+
+ /**
+ * 璁㈠崟闈㈢Н
+ */
+ private String area;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 璁㈠崟杩涘害鐧惧垎姣�
+ */
+ private String percent;
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java
index d7365d0..5a2cdf2 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java
@@ -1,6 +1,9 @@
package com.mes.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.order.entity.Orders;
+import com.mes.order.entity.dto.OrderDTO;
+
+import java.util.List;
/**
* <p>
@@ -12,4 +15,5 @@
*/
public interface OrdersMapper extends BaseMapper<Orders> {
+ List<OrderDTO> selectOrderPercent();
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml
index 39b3ea8..bc48fb2 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml
@@ -1,5 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.order.mapper.OrderMapper">
-
-</mapper>
+<!--<mapper namespace="com.mes.order.mapper.OrdersMapper">-->
+<!-- <resultMap id="baseMap" type="com.mes.order.entity.dto.OrderDTO">-->
+<!-- <result column="order_id" property="orderId"/>-->
+<!-- <result column="customer_name" property="customerName"/>-->
+<!-- <result column="project" property="project"/>-->
+<!-- <result column="area" property="area"/>-->
+<!-- <result column="quantity" property="quantity"/>-->
+<!-- <result column="create_time" property="createTime"/>-->
+<!-- <result column="percent" property="percent"/>-->
+<!-- </resultMap>-->
+<!-- <select id="selectOrderPercent" resultMap="baseMap">-->
+<!-- SELECT a.order_id,-->
+<!-- a.customer_name,-->
+<!-- a.project,-->
+<!-- a.area,-->
+<!-- a.quantity,-->
+<!-- a.create_time,-->
+<!-- round(ifnull(d.finishNum, 0) / a.quantity * 100) as 'percent'-->
+<!-- from sd.`order` as a-->
+<!-- LEFT JOIN (-->
+<!-- SELECT sum(c.reporting_work_num) as 'finishNum',order_id-->
+<!-- from sd.order_process_detail as c-->
+<!-- where c.id in (-->
+<!-- SELECT max(id) from sd.order_process_detail as b GROUP BY b.process_id, order_number-->
+<!-- )-->
+<!-- GROUP BY c.order_id-->
+<!-- ) as d-->
+<!-- on a.order_id = d.order_id-->
+<!-- where a.warehousing != 2-->
+<!-- </select>-->
+<!--</mapper>-->
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java
index 90702fa..e00a7c8 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java
@@ -4,6 +4,7 @@
import com.mes.order.entity.Order;
import com.mes.order.entity.Orderdetail;
import com.mes.order.entity.Orders;
+import com.mes.order.entity.dto.OrderDTO;
import java.util.List;
@@ -20,4 +21,6 @@
List<Orders> selectOrders();
List<Orderdetail> selectOrderdetail(Orders orders);
+
+ List<OrderDTO> selectOrderPercent();
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java
index 938d4bf..85d6f7c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.order.entity.Orderdetail;
import com.mes.order.entity.Orders;
+import com.mes.order.entity.dto.OrderDTO;
import com.mes.order.mapper.OrderdetailMapper;
import com.mes.order.mapper.OrdersMapper;
import com.mes.order.service.OrdersService;
@@ -41,4 +42,9 @@
queryWrapper.eq("order_id", orders.getOrderId());
return orderdetailMapper.selectList(queryWrapper);
}
+
+ @Override
+ public List<OrderDTO> selectOrderPercent(){
+ return baseMapper.selectOrderPercent();
+ }
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWorkDetail.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWorkDetail.java
index f2402c2..cb27704 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWorkDetail.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWorkDetail.java
@@ -149,6 +149,6 @@
*/
private LocalDateTime reworkUpdateTime;
- private List<DamageDetails> damageDetailsList;
+ private List<DamageDetails> damageDetails;
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/OrderDetail.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/OrderDetail.java
new file mode 100644
index 0000000..7c3035f
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/OrderDetail.java
@@ -0,0 +1,58 @@
+package com.mes.pp.entity.request;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author tao
+ * @since 2024-06-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OrderDetail implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+
+
+ /**
+ * 璁㈠崟鍙�
+ */
+ private String orderId;
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ private String customName;
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ private String project;
+
+ /**
+ * 璁㈠崟闈㈢Н
+ */
+ private String area;
+
+ /**
+ * 璁㈠崟鏁伴噺
+ */
+ private String quantity;
+
+ /**
+ * 璁㈠崟鍒涘缓鏃堕棿
+ */
+ private String createtime;
+
+ /**
+ * 杩涘害鐧惧垎姣�
+ */
+ private String percent;
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml
new file mode 100644
index 0000000..d959a4c
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mes.order.mapper.OrdersMapper">
+ <resultMap id="baseMap" type="com.mes.order.entity.dto.OrderDTO">
+ <result column="order_id" property="orderId"/>
+ <result column="customer_name" property="customerName"/>
+ <result column="project" property="project"/>
+ <result column="area" property="area"/>
+ <result column="quantity" property="quantity"/>
+ <result column="create_time" property="createTime"/>
+ <result column="percent" property="percent"/>
+ </resultMap>
+ <select id="selectOrderPercent" resultMap="baseMap">
+ SELECT a.order_id,
+ a.customer_name,
+ a.project,
+ a.area,
+ a.quantity,
+ a.create_time,
+ round(ifnull(d.finishNum, 0) / a.quantity * 100) as 'percent'
+ from sd.`order` as a
+ LEFT JOIN (
+ SELECT sum(c.reporting_work_num) as 'finishNum',order_id
+ from sd.order_process_detail as c
+ where c.id in (
+ SELECT max(id) from sd.order_process_detail as b GROUP BY b.process_id, order_number
+ )
+ GROUP BY c.order_id
+ ) as d
+ on a.order_id = d.order_id
+ where a.warehousing != 2
+ </select>
+</mapper>
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 97f8fef..bb5663f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -160,7 +160,7 @@
);
List<EdgStorageDeviceTaskHistory> edgTwoTasks = edgStorageDeviceTaskHistoryService.list(
new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
- .eq(EdgStorageDeviceTaskHistory::getDeviceId, 1)
+ .eq(EdgStorageDeviceTaskHistory::getDeviceId, 2)
.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)
);
jsonObject.append("edgOneTasks", edgOneTasks);
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
index ae005d6..b7e9966 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.common.config.Const;
+import com.mes.order.entity.dto.OrderDTO;
+import com.mes.order.service.OrdersService;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.rawglassstation.entity.RawGlassStorageStation;
@@ -37,6 +39,9 @@
@Resource
private RawGlassStorageDetailsService rawGlassStorageDetailsService;
+ @Resource
+ private OrdersService ordersService;
+
@Scheduled(fixedDelay = 2000)
public void sendRawGlassMessage() {
log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
@@ -66,6 +71,10 @@
.orderByAsc(RawGlassStorageStation::getSlot);
List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageDetailsService.list(wrapper);
jsonObject.append("rawGlassStorageDetailList", rawGlassStorageDetailList);
+
+ List<OrderDTO> orderDTOS = ordersService.selectOrderPercent();
+ jsonObject.append("orderDTOS", orderDTOS);
+
List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (CollectionUtil.isNotEmpty(sendwServer)) {
sendwServer.stream().forEach(e -> {
--
Gitblit v1.8.0