feat(mes): 添加定时同步可生产数量到WMS及BOM项相关标准字段
- 在main.go中添加定时任务每10分钟同步可生产数量到WMS系统 - 为BomItem实体添加relatedStandard字段及相关CRUD方法 - 为InspectionRecord实体添加reportNo、materialCode、materialName等字段 - 更新ent schema确保新字段的验证和默认值设置 - 添加必要的数据库迁移和字段映射逻辑
This commit is contained in:
@@ -38,6 +38,13 @@
|
||||
</div>
|
||||
<div class="spacer"></div>
|
||||
<div class="header-right">
|
||||
<el-badge :value="unreadAlerts" :hidden="unreadAlerts === 0" :max="99" class="alert-badge">
|
||||
<el-tooltip content="预警中心" placement="bottom">
|
||||
<el-button class="alert-btn" text @click="goAlertCenter">
|
||||
<el-icon :size="18" :class="{ 'alert-ring': unreadAlerts > 0 }"><Bell /></el-icon>
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
</el-badge>
|
||||
<el-button class="help-btn" text @click="openHelp">帮助</el-button>
|
||||
<el-dropdown trigger="click" @command="onUserCmd">
|
||||
<span class="user-name">{{ userName }} <span class="caret">▾</span></span>
|
||||
@@ -63,8 +70,9 @@ import { useRouter } from 'vue-router'
|
||||
import {
|
||||
Document, Calendar, Box, Goods, ShoppingCart, Monitor, Tools,
|
||||
Operation, Link, DataLine, EditPen, Search, CircleCheck, Clock, User,
|
||||
Key, Fold, Expand, Warning, Paperclip, Tickets
|
||||
Key, Fold, Expand, Warning, Paperclip, Tickets, Bell
|
||||
} from '@element-plus/icons-vue'
|
||||
import { ElNotification } from 'element-plus'
|
||||
import { getUser, logout } from '../utils/auth'
|
||||
import request from '../utils/request'
|
||||
|
||||
@@ -100,7 +108,10 @@ onMounted(() => {
|
||||
onScreenChange()
|
||||
window.addEventListener('resize', onScreenChange)
|
||||
})
|
||||
onBeforeUnmount(() => window.removeEventListener('resize', onScreenChange))
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('resize', onScreenChange)
|
||||
if (alertTimer) clearInterval(alertTimer)
|
||||
})
|
||||
|
||||
const menus = computed(() => {
|
||||
const me = getUser()
|
||||
@@ -119,15 +130,17 @@ const menuGroups = [
|
||||
title: '生产管理', icon: Document, children: [
|
||||
{ code: 'produce.workorder', name: '工单管理', path: '/work-order', icon: Document },
|
||||
{ code: 'produce.dailyplan', name: '日排产', path: '/daily-plan', icon: Calendar },
|
||||
{ code: 'produce.bom', name: '物料清单', path: '/bom', icon: Goods },
|
||||
{ code: 'produce.bom', name: '产品物料清单', path: '/bom', icon: Goods },
|
||||
{ code: 'produce.material', name: '备料单', path: '/material-request', icon: ShoppingCart },
|
||||
{ code: 'produce.performance', name: '绩效报表', path: '/performance', icon: DataLine }
|
||||
{ code: 'produce.performance', name: '绩效报表', path: '/performance', icon: DataLine },
|
||||
{ code: 'produce.quality', name: '质量检验', path: '/quality', icon: CircleCheck }
|
||||
]
|
||||
},
|
||||
{
|
||||
title: '现场作业', icon: Monitor, children: [
|
||||
{ code: 'produce.plc', name: '工位组合下发', path: '/plc-send', icon: Monitor },
|
||||
{ code: 'produce.scan', name: '手动报工', path: '/scan', icon: EditPen },
|
||||
{ code: 'produce.wip', name: '在制品', path: '/wip', icon: Clock },
|
||||
{ code: 'produce.trace', name: '工件追溯', path: '/trace', icon: Search },
|
||||
{ code: 'produce.processcard', name: '生产流程卡', path: '/process-card', icon: Tickets },
|
||||
{ code: 'produce.torque', name: '拧紧查询', path: '/torque', icon: Tools },
|
||||
@@ -179,8 +192,40 @@ onMounted(async () => {
|
||||
const u = await request.get('/userinfo')
|
||||
localStorage.setItem('user', JSON.stringify(u))
|
||||
} catch { /* ignore */ }
|
||||
|
||||
// 顶部预警铃铛:立即拉一次未读数,随后每 30s 轮询
|
||||
pollAlerts()
|
||||
alertTimer = setInterval(pollAlerts, 30000)
|
||||
})
|
||||
|
||||
// ===== 顶部预警铃铛(plan 4.10):未读角标 + 30s 轮询 + 新增弹提示 =====
|
||||
const unreadAlerts = ref(0)
|
||||
let alertTimer = null
|
||||
let alertInited = false
|
||||
|
||||
async function pollAlerts() {
|
||||
try {
|
||||
const list = await request.get('/alerts', { params: { status: 'UNREAD' } })
|
||||
const n = Array.isArray(list) ? list.length : 0
|
||||
// 首轮仅初始化角标;之后未读数增加时弹提示,避免反复骚扰
|
||||
if (alertInited && n > unreadAlerts.value) {
|
||||
ElNotification({
|
||||
title: '新预警',
|
||||
message: `有 ${n - unreadAlerts.value} 条新的未读预警,请及时处理`,
|
||||
type: 'warning',
|
||||
duration: 5000,
|
||||
position: 'bottom-right'
|
||||
})
|
||||
}
|
||||
unreadAlerts.value = n
|
||||
alertInited = true
|
||||
} catch { /* 忽略轮询异常 */ }
|
||||
}
|
||||
|
||||
function goAlertCenter() {
|
||||
router.push('/alert-center')
|
||||
}
|
||||
|
||||
function doLogout() {
|
||||
// 尽力通知后端记录"退出登录"操作日志,失败不阻塞本地退出
|
||||
request.post('/logout').catch(() => {})
|
||||
@@ -217,6 +262,18 @@ function onUserCmd(cmd) {
|
||||
.page-title { font-size: 16px; font-weight: 600; color: #303133; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
||||
.spacer { flex: 1; }
|
||||
.header-right { display: flex; align-items: center; gap: 6px; flex-shrink: 0; }
|
||||
.alert-badge { margin-right: 4px; }
|
||||
.alert-btn { color: #606266; padding: 4px 6px; }
|
||||
.alert-btn:hover { color: #1668dc; background: #f2f6fc; }
|
||||
.alert-ring { color: #e6a23c; animation: alert-ring 1.1s ease-in-out infinite; transform-origin: top center; }
|
||||
@keyframes alert-ring {
|
||||
0%, 60%, 100% { transform: rotate(0); }
|
||||
10% { transform: rotate(14deg); }
|
||||
20% { transform: rotate(-12deg); }
|
||||
30% { transform: rotate(9deg); }
|
||||
40% { transform: rotate(-6deg); }
|
||||
50% { transform: rotate(0); }
|
||||
}
|
||||
.help-btn { font-size: 13px; color: #606266; }
|
||||
.user-name { display: inline-flex; align-items: center; gap: 4px; cursor: pointer; font-size: 14px; color: #303133; outline: none; padding: 4px 6px; border-radius: 4px; }
|
||||
.user-name:hover { color: #1668dc; background: #f2f6fc; }
|
||||
|
||||
Reference in New Issue
Block a user