DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: DeXun:fb96148d1f0913f6174508154d679a633965cf62
Branches Tags
DeXun:0.8.X DeXun:test.X
..
compare: DeXun:test.X
Branches Tags
DeXun:0.8.X DeXun:test.X

2 Commits
fb96148d1f ... test.X

Author SHA1 Message Date
Joshi
75a2623d8b config: 更新生产环境和预发布环境页面标题 
- 将生产环境页面标题从"科伦普冷轧涂镀数智运营一体化平台"改为"MES一体化平台"
- 将预发布环境页面标题从"科伦普冷轧涂镀数智运营一体化平台"改为"MES一体化平台"
 2026-03-09 16:58:25 +08:00
Joshi
5d046be15b docs(app): 更新应用名称为MES一体化平台 
- 将VUE_APP_TITLE从"科伦普冷轧涂镀数智运营一体化平台"更改为"MES一体化平台"
- 修改Greeting组件中的平台描述为"欢迎使用MES数智一体化平台"
- 将favicon链接从png格式更改为ico格式
- 替换index.vue中的关于页面内容为MES平台相关介绍
- 更新登录页面中的平台描述和公司信息
- 修改侧边栏Logo组件中的平台标题为"MES一体化平台"
- 注释掉dashboard demo组件中的全屏功能代码
 2026-03-09 16:27:47 +08:00
55 changed files with 316 additions and 4393 deletions
Expand all files Collapse all files

2
klp-ui/.env.development
View File

@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 科伦普冷轧涂镀数智运营一体化平台
VUE_APP_TITLE = MES一体化平台
# 开发环境配置
ENV = 'development'

2
klp-ui/.env.production
View File

@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 科伦普冷轧涂镀数智运营一体化平台
VUE_APP_TITLE = MES一体化平台
# 生产环境配置
ENV = 'production'

2
klp-ui/.env.stage
View File

@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 科伦普冷轧涂镀数智运营一体化平台
VUE_APP_TITLE = MES一体化平台
# 开发环境配置
ENV = 'development'

2
klp-ui/public/index.html
View File

@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.png">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= webpackConfig.name %></title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>

13
klp-ui/src/api/system/oss.js
View File

@@ -27,16 +27,3 @@ export function delOss(ossId) {
})
}
/**
* 上传文件
*/
export function uploadFile(file) {
const form = new FormData()
form.append('file', file)
return request({
url: '/system/oss/upload',
method: 'post',
data: form,
})
}

26
klp-ui/src/api/wms/coil.js
View File

@@ -1,5 +1,4 @@
import request from '@/utils/request'
import { tansParams } from "@/utils/klp";
// 查询钢卷物料表列表
export function listMaterialCoil(query) {
@@ -203,14 +202,13 @@ export function cancelExportCoil(coilId) {
}
// 检查入场钢卷号或当前钢卷号是否合法（是否存在）
export function checkCoilNo({ currentCoilNo, enterCoilNo, coilId, supplierCoilNo }) {
export function checkCoilNo({ currentCoilNo, enterCoilNo, coilId }) {
return request({
url: '/wms/materialCoil/checkCoilNoDuplicate',
method: 'get',
params: {
currentCoilNo,
enterCoilNo,
supplierCoilNo,
coilId
}
})
@@ -254,19 +252,15 @@ export function restoreMaterialCoil(coilId) {
/**
* 开始分条，锁定钢卷
*/
export function startSpecialSplit(coilId, actionType) {
export function startSpecialSplit(coilId) {
if (!coilId) {
return Promise.reject(new Error('coilId is required'))
}
if (!actionType) {
return Promise.reject(new Error('actionType is required'))
}
return request({
url: '/wms/materialCoil/specialSplit/start',
method: 'post',
params: {
coilId,
actionType
coilId
}
})
}
@@ -351,18 +345,4 @@ export function categoryWidthStatistics() {
url: '/wms/materialCoil/statistics/categoryWidthStatistics',
method: 'get',
})
}
/**
* 导出钢卷的全部字段
*/
export function exportCoilWithAll(data) {
return request({
url: '/wms/materialCoil/exportAll',
method: 'post',
data: data,
transformRequest: [(params) => { return tansParams(params) }],
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
responseType: 'blob'
})
}

13
klp-ui/src/api/wms/coilStatisticsSummary.js
View File

@@ -42,16 +42,3 @@ export function delCoilStatisticsSummary(summaryId) {
method: 'delete'
})
}
// 检查今天是否已经创建过该类型的透视表
// 如果已经创建过，返回该透视表的id
// 如果没有创建过，返回null
export function checkCoilStatisticsSummaryExist(statType) {
return request({
url: '/wms/coilStatisticsSummary/checkToday',
method: 'get',
params: {
statType
}
})
}

BIN
klp-ui/src/assets/logo/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

54
klp-ui/src/components/CoilSelector/index.vue
View File

@@ -18,7 +18,7 @@
</div>
<el-dialog title="选择钢卷" :visible.sync="dialogVisible" :width="dialogWidth" :close-on-click-modal="false"
@close="handleClose" append-to-body :fullscreen="orderBy">
@close="handleClose" append-to-body>
<!-- 搜索区域 -->
<el-form v-if="!rangeMode" :model="queryParams" class="search-form">
<!-- <el-form-item label="类型">
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="实际库区" v-if="orderBy">
<actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库区" canSelectLevel2
canSelectDisabled @select="handleWarehouseChange" />
canSelectDisabled />
</el-form-item>
<el-form-item>
@@ -77,7 +77,6 @@
<!-- 自定义列 -->
<el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align" :prop="column.prop"
:width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
<el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
<el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
<el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
</el-table>
@@ -94,7 +93,6 @@
<!-- 自定义列 -->
<el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align"
:prop="column.prop" :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
<el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
<el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
<el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
</el-table>
@@ -107,7 +105,6 @@
<el-table v-if="multiple && selectedCoils.length > 0" :data="selectedCoils">
<el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align" :prop="column.prop"
:width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
<el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
@@ -120,36 +117,23 @@
<el-button type="primary" @click="handleConfirm">确认选择</el-button>
<el-button @click="handleClose">取消</el-button>
</div>
<!-- 一个可以拖拽和调节大小的浮层 -->
<DragResizeBox v-if="selectedNodeId" @size-change="handleSizeChange">
<div style="height: 100%; width: 100%; overflow-y: scroll;">
<warehouse-bird-mini ref="warehouseBirdMini" v-loading="warehouseLoading" :warehouseList="warehouseList" :id="selectedNodeId"
:canToggle="false" :canRelease="false" />
</div>
</DragResizeBox>
</el-dialog>
</div>
</template>
<script>
import { listMaterialCoil } from '@/api/wms/coil';
import { listActualWarehouse } from "@/api/wms/actualWarehouse";
import MemoInput from '@/components/MemoInput/index.vue';
import MutiSelect from '@/components/MutiSelect/index.vue';
import { defaultColumns } from './data';
import ActualWarehouseSelect from '@/components/KLPService/ActualWarehouseSelect/index.vue';
import WarehouseBirdMini from '@/views/wms/warehouse/components/WarehouseBirdMini.vue';
import DragResizeBox from '@/components/DragResizeBox/index.vue';
export default {
name: 'CoilSelector',
components: {
MemoInput,
MutiSelect,
ActualWarehouseSelect,
WarehouseBirdMini,
DragResizeBox
ActualWarehouseSelect
},
dicts: ['coil_itemname', 'coil_material', 'coil_manufacturer'],
props: {
@@ -239,9 +223,6 @@ export default {
columns: defaultColumns,
currentTab: 'my',
selectedCoils: [],
warehouseList: [],
selectedNodeId: null,
warehouseLoading: false,
};
},
computed: {
@@ -325,35 +306,6 @@ export default {
}
},
methods: {
// 获取库位列表
getWarehouseList(parentId) {
this.warehouseLoading = true;
return listActualWarehouse({ parentId })
.then((res) => { this.warehouseList = res.data || []; this.warehouseLoading = false; })
.catch((err) => {
this.$message.error("获取库位数据失败：" + err.message);
this.warehouseList = [];
this.warehouseLoading = false;
});
},
// 处理大小变化
handleSizeChange(size) {
console.log('size', size);
this.$refs.warehouseBirdMini.resize();
},
// 处理实际库区选择变化
handleWarehouseChange(val) {
console.log('val', val);
if (!val) {
this.selectedNodeId = null;
this.warehouseList = [];
return;
}
if (val.pathIds.length == 2) {
this.selectedNodeId = val;
this.getWarehouseList(val.id);
}
},
// 动态生成表格行类名 - 综合处理选中、禁用等状态
getRowClassName({ row }) {
const classNames = [];

231
klp-ui/src/components/DragResizeBox/index.vue
View File

@@ -1,231 +0,0 @@
<template>
<div class="drag-resize-container" ref="containerRef">
<!-- 可拖拽调整的元素 -->
<div
class="draggable-element"
ref="elementRef"
:style="{
left: `${position.x}px`,
top: `${position.y}px`,
width: `${size.width}px`,
height: `${size.height}px`
}"
@mousedown="startDrag"
>
<!-- 元素内容区 -->
<div class="element-content">
<slot>可拖拽调整的元素</slot>
</div>
<!-- 右下角调整大小的控制点 -->
<div class="resize-handle" @mousedown="startResize"></div>
</div>
</div>
</template>
<script>
export default {
name: 'DragResizeBox',
props: {
// 初始位置
initPosition: {
type: Object,
default: () => ({ x: 100, y: 100 })
},
// 初始尺寸
initSize: {
type: Object,
default: () => ({ width: 200, height: 150 })
},
// 移除容器尺寸限制（保留prop但默认值改为屏幕尺寸）
containerSize: {
type: Object,
default: () => ({
width: window.innerWidth,
height: window.innerHeight
})
},
// 元素最小尺寸
minSize: {
type: Object,
default: () => ({ width: 100, height: 80 })
}
},
data() {
return {
// 当前位置
position: { x: 0, y: 0 },
// 当前尺寸
size: { width: 0, height: 0 },
// 拖拽状态
isDragging: false,
// 调整大小状态
isResizing: false,
// 鼠标初始位置
startMouse: { x: 0, y: 0 },
// 元素初始状态
startState: { x: 0, y: 0, width: 0, height: 0 }
};
},
mounted() {
// 初始化位置和尺寸
this.position = { ...this.initPosition };
this.size = { ...this.initSize };
// 监听全局鼠标移动和松开事件
document.addEventListener('mousemove', this.handleMouseMove);
document.addEventListener('mouseup', this.handleMouseUp);
// 监听窗口大小变化，更新屏幕尺寸
window.addEventListener('resize', this.updateScreenSize);
},
beforeDestroy() {
// 移除全局事件监听，防止内存泄漏
document.removeEventListener('mousemove', this.handleMouseMove);
document.removeEventListener('mouseup', this.handleMouseUp);
window.removeEventListener('resize', this.updateScreenSize);
},
methods: {
/**
* 更新屏幕尺寸（窗口大小变化时）
*/
updateScreenSize() {
this.containerSize = {
width: window.innerWidth,
height: window.innerHeight
};
},
/**
* 开始拖拽（移动位置）
*/
startDrag(e) {
// 阻止事件冒泡，避免和调整大小冲突
if (e.target.classList.contains('resize-handle')) return;
this.isDragging = true;
// 记录鼠标初始位置
this.startMouse = { x: e.clientX, y: e.clientY };
// 记录元素初始位置
this.startState = {
x: this.position.x,
y: this.position.y,
width: this.size.width,
height: this.size.height
};
// 更改鼠标样式
document.body.style.cursor = 'move';
},
/**
* 开始调整大小
*/
startResize(e) {
e.stopPropagation(); // 阻止事件冒泡
this.isResizing = true;
// 记录鼠标初始位置
this.startMouse = { x: e.clientX, y: e.clientY };
// 记录元素初始尺寸
this.startState = {
x: this.position.x,
y: this.position.y,
width: this.size.width,
height: this.size.height
};
// 更改鼠标样式
document.body.style.cursor = 'se-resize';
},
/**
* 处理鼠标移动
*/
handleMouseMove(e) {
if (this.isDragging) {
// 计算鼠标移动的偏移量
const dx = e.clientX - this.startMouse.x;
const dy = e.clientY - this.startMouse.y;
// 核心修改：移除容器边界限制，仅限制不超出屏幕左侧/顶部（右侧/底部可任意移动）
this.position.x = Math.max(0, this.startState.x + dx);
this.position.y = Math.max(0, this.startState.y + dy);
// 触发位置变化事件
this.$emit('position-change', { ...this.position });
}
if (this.isResizing) {
// 计算鼠标移动的偏移量
const dx = e.clientX - this.startMouse.x;
const dy = e.clientY - this.startMouse.y;
// 调整大小仅限制最小尺寸，不限制屏幕边界
this.size.width = Math.max(this.minSize.width, this.startState.width + dx);
this.size.height = Math.max(this.minSize.height, this.startState.height + dy);
// 触发尺寸变化事件
this.$emit('size-change', { ...this.size });
}
},
/**
* 处理鼠标松开
*/
handleMouseUp() {
// 重置状态
this.isDragging = false;
this.isResizing = false;
// 恢复鼠标样式
document.body.style.cursor = 'default';
// 触发结束事件
this.$emit('drag-end', { position: { ...this.position }, size: { ...this.size } });
}
}
};
</script>
<style scoped>
/* 容器样式：改为全屏且无视觉样式 */
.drag-resize-container {
position: fixed; /* 固定定位覆盖整个屏幕 */
top: 0;
left: 0;
width: 100vw;
height: 100vh;
pointer-events: none; /* 容器不拦截鼠标事件，不影响页面其他元素 */
box-sizing: border-box;
}
/* 可拖拽元素样式：fixed定位确保基于屏幕移动 */
.draggable-element {
position: fixed;
border-radius: 4px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
user-select: none; /* 禁止文本选中 */
box-sizing: border-box;
overflow: hidden;
pointer-events: auto; /* 元素本身响应鼠标事件 */
z-index: 9999; /* 确保元素在最上层 */
}
/* 元素内容区 */
.element-content {
height: calc(100% - 20px);
padding: 10px;
cursor: move;
}
/* 调整大小控制点 */
.resize-handle {
position: absolute;
right: 0;
bottom: 0;
width: 20px;
height: 20px;
background-color: #1e88e5;
cursor: se-resize;
border-top-left-radius: 4px;
}
/* 控制点hover效果 */
.resize-handle:hover {
background-color: #1976d2;
}
</style>

2
klp-ui/src/layout/components/Sidebar/Logo.vue
View File

@@ -35,7 +35,7 @@ export default {
},
data() {
return {
title: '科伦普一体化平台',
title: 'MES一体化平台',
logo: logoImg
}
}

2
klp-ui/src/views/components/Greeting.vue
View File

@@ -3,7 +3,7 @@
<img :src="avatar" class="user-avatar" alt="头像" />
<div class="greeting-text">
<div class="greeting-title">{{ greeting }}，{{ name }}</div>
<div class="greeting-desc">欢迎使用科伦普冷轧涂渡数智一体化平台</div>
<div class="greeting-desc">欢迎使用MES数智一体化平台</div>
</div>
</div>
</template>

12
klp-ui/src/views/dashboard/demo.vue
View File

@@ -12,10 +12,10 @@ export default {
components: { Home },
mounted() {
// 确保容器DOM已渲染后，对容器执行全屏
this.$nextTick(() => {
this.enterFullscreen()
this.addFullscreenListener()
})
// this.$nextTick(() => {
// this.enterFullscreen()
// this.addFullscreenListener()
// })
},
beforeDestroy() {
// 移除监听，避免内存泄漏
@@ -60,7 +60,7 @@ export default {
!document.mozFullScreenElement &&
!document.webkitFullscreenElement &&
!document.msFullscreenElement
if (isExit) {
// 退出全屏后返回上一页
this.$router.back()
@@ -91,4 +91,4 @@ export default {
height: 100%;
/* 可根据需要添加其他样式（如背景色等） */
}
</style>
</style>

105
klp-ui/src/views/index.vue
View File

@@ -1,68 +1,71 @@
<template>
<div class="dashboard-editor-container">
<img src="http://kelunpuzhonggong.com/upload/img/20250427091033.jpg" alt="">
<div class="aboutus">
<el-row :gutter="30">
<!-- 左栏 -->
<el-col :span="12" :xs="24">
<div class="aboutus-title">
<h2>关于我们</h2>
<p>ABOUT US</p>
</div>
<div class="aboutus-left">
<p class="aboutus-desc">
嘉祥科伦普重工有限公司是山东省重点工程项目，是济宁市工程之一，也是科伦普产品结构调整重要的工程项目。工程采用了外方技术总负责、关键设备整体引进、点采集成、国内技术总成、自主创新、单体设备引进等多种建设方案，保证了技术先进和人才的培养，确保工程投产后达产达效。
</p>
<p class="aboutus-desc">
科伦普冷轧重工有限公司是设计年产量150万吨，能向广大用户提供热轧酸洗、热轧镀锌、冷硬、罩式退火、冷轧镀锌、铝锌合金、锌铝合金、锌铝镁、镀铬等各大类产品。产品覆盖东北、华北、华东、华南等地区。
</p>
</div>
<!-- <div class="dashboard-editor-container">-->
<!-- <img src="http://kelunpuzhonggong.com/upload/img/20250427091033.jpg" alt="">-->
<!-- -->
<!-- <div class="aboutus">-->
<!-- <el-row :gutter="30">-->
<!-- &lt;!&ndash; 左栏 &ndash;&gt;-->
<!-- <el-col :span="12" :xs="24">-->
<!-- <div class="aboutus-title">-->
<!-- <h2>关于我们</h2>-->
<!-- <p>ABOUT US</p>-->
<!-- </div>-->
<!-- <div class="aboutus-left">-->
<!-- <p class="aboutus-desc">-->
<!-- MES一体化平台是面向制造企业车间执行层的生产信息化管理系统，为企业提供包括制造数据管理、计划排程管理、生产调度管理、库存管理、质量管理、人力资源管理、工作中心管理等多项企业管理功能。-->
<!-- </p>-->
<!-- <p class="aboutus-desc">-->
<!-- 平台通过互联网技术实现企业数字化转型，提高生产效率、降低成本、提升产品质量，实现精益化生产管理，帮助企业实现智能制造目标。-->
<!-- </p>-->
<!-- </div>-->
<statistic-group />
</el-col>
<!-- <statistic-group />-->
<!-- </el-col>-->
<!-- 右栏 -->
<el-col :span="12" :xs="24">
<img src="http://kelunpuzhonggong.com/upload/img/20251015103934.jpg" alt="">
<!-- <div class="aboutus-right">
<p class="aboutus-detail">
嘉祥科伦普重工有限公司成立于2017年8月，注册资金33100万元，主要经营高铁设备、配件制造与销售，模具制造与销售，新材料技术研发，高性能有色金属及合金材料销售，机械零件、零部件加工与销售，金属材料制造与销售，锌铝镁新材料等。目前公司拥有10余项具有自主知识产权的发明专利技术，综合技术水平达国内领先，2024年公司主导产品国内市场占有率约占85%。2024年总资产5.98亿元，净资产4.49亿元，收入3.95亿元，公司现有员工238人，研究与试验发展人员57人，其中专职研究与试验发展人员52人，外聘专家5人。
</p>
<p class="aboutus-detail">
2024年公司新建科伦普合金新材料研发项目，占地290亩，采用国内先进的镀层核心技术和热处理工艺，专业生产锌铝镁板材和镀铬板材。致力于打造国内工艺链条最完善、产品型号最丰富的涂镀新材料生产企业。全部投产后可实现新增销售收入80亿元，利税4.7亿元，带动就业约500人。项目主要生产的冷轧板、锌铝镁涂层板、镀铬涂层板、镀锡涂层板等产品，涵盖0.08MM-6.0MM区间60多种产品，是国内单个企业产品种类最多的项目。产品因其防锈、耐氧化、耐腐蚀、高电导、高稳定的优秀特性，广泛应用于建筑结构件、汽车制造、轻工家电、食品包装、医疗器械、电子通讯、航空航天领域。
</p>
</div> -->
</el-col>
</el-row>
</div>
<!-- &lt;!&ndash; 右栏 &ndash;&gt;-->
<!-- <el-col :span="12" :xs="24">-->
<!-- <img src="http://kelunpuzhonggong.com/upload/img/20251015103934.jpg" alt="">-->
<!-- &lt;!&ndash; <div class="aboutus-right">-->
<!-- <p class="aboutus-detail">-->
<!-- 嘉祥科伦普重工有限公司成立于2017年8月，注册资金33100万元，主要经营高铁设备、配件制造与销售，模具制造与销售，新材料技术研发，高性能有色金属及合金材料销售，机械零件、零部件加工与销售，金属材料制造与销售，锌铝镁新材料等。目前公司拥有10余项具有自主知识产权的发明专利技术，综合技术水平达国内领先，2024年公司主导产品国内市场占有率约占85%。2024年总资产5.98亿元，净资产4.49亿元，收入3.95亿元，公司现有员工238人，研究与试验发展人员57人，其中专职研究与试验发展人员52人，外聘专家5人。-->
<!-- </p>-->
<!-- <p class="aboutus-detail">-->
<!-- 2024年公司新建科伦普合金新材料研发项目，占地290亩，采用国内先进的镀层核心技术和热处理工艺，专业生产锌铝镁板材和镀铬板材。致力于打造国内工艺链条最完善、产品型号最丰富的涂镀新材料生产企业。全部投产后可实现新增销售收入80亿元，利税4.7亿元，带动就业约500人。项目主要生产的冷轧板、锌铝镁涂层板、镀铬涂层板、镀锡涂层板等产品，涵盖0.08MM-6.0MM区间60多种产品，是国内单个企业产品种类最多的项目。产品因其防锈、耐氧化、耐腐蚀、高电导、高稳定的优秀特性，广泛应用于建筑结构件、汽车制造、轻工家电、食品包装、医疗器械、电子通讯、航空航天领域。-->
<!-- </p>-->
<!-- </div> &ndash;&gt;-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </div>-->
<!-- <div>
<statistic-group />
</div> -->
<!-- <AllApplications />
<el-row :gutter="10">
<el-col :span="18">
<el-empty description="办公模块定制开发中"></el-empty>
</el-col>
<el-col :span="6">
<mini-calendar />
</el-col>
</el-row> -->
</div>
<!-- &lt;!&ndash; <div>-->
<!-- <statistic-group />-->
<!-- </div> &ndash;&gt;-->
<!-- -->
<!-- &lt;!&ndash; <AllApplications /> -->
<!-- <el-row :gutter="10">-->
<!-- <el-col :span="18">-->
<!-- <el-empty description="办公模块定制开发中"></el-empty>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <mini-calendar />-->
<!-- </el-col>-->
<!-- </el-row> &ndash;&gt;-->
<!-- </div>-->
<Dashboard />
</template>
<script>
import StatisticGroup from '@/components/HomeModules/StatisticGroup.vue'
// import AllApplications from '@/components/HomeModules/AllApplications.vue'
// import MiniCalendar from '@/components/HomeModules/MiniCalendar.vue'
import Dashboard from '@/views/dashboard/demo.vue'
export default {
export default {
name: 'Index',
components: {
// PanelGroup,
StatisticGroup,
Dashboard,
// AllApplications,
// MiniCalendar,
},
@@ -193,4 +196,4 @@ export default {
}
}
}
</style>
</style>

11
klp-ui/src/views/login.vue
View File

@@ -3,15 +3,14 @@
<div class="login-box">
<div class="login-left">
<div class="login-title-welcome">
<img src="../assets/logo/logo.png" alt="logo" class="logo-img" />
<span class="login-title">欢迎使用科伦普冷轧涂镀数智一体化平台</span>
<!-- <img src="../assets/logo/logo.png" alt="logo" class="logo-img" />-->
<span class="login-title">欢迎使用MES一体化平台</span>
</div>
<p>
嘉祥科伦普重工有限公司是山东省重点工程项目，是济宁市工程之一，也是科伦普产品结构调整重要的工程项目。工程采用了外方技术总负责、关键设备整体引进、点采集成、国内技术总成、自主创新、单体设备引进等多种建设方
案，保证了技术先进和人才的培养，确保工程投产后达产达效。
MES一体化平台是面向制造企业车间执行层的生产信息化管理系统，为企业提供包括制造数据管理、计划排程管理、生产调度管理、库存管理、质量管理、人力资源管理、工作中心管理等多项企业管理功能。
</p>
<p>
科伦普冷轧重工有限公司是设计年产量150万 吨，能向广大用户提供热轧酸洗、热轧镀锌、冷硬、罩式退火、冷轧镀锌、铝锌合金、锌铝合金、锌铝镁、镀铬等各大类产品。产品覆盖东北、华北、华东、华南等地区。
平台通过互联网技术实现企业数字化转型，提高生产效率、降低成本、提升产品质量，实现精益化生产管理。
</p>
</div>
@@ -300,4 +299,4 @@ $--metal-gradient-light: linear-gradient(145deg, #f5f5f550, #ffffff50);
color: $--color-text-secondary; // 浅灰色文字
}
}
</style>
</style>

3
klp-ui/src/views/wms/coil/do/split.vue
View File

@@ -32,7 +32,6 @@
'镀锌工序': [
{value: '1988150263284953089', label: '镀锌原料库'},
{value: '1988150323162836993', label: '镀锌成品库'},
{value: '1988150487185289217', label: '镀锌纵剪分条原料库'},
],
'脱脂工序': [
{value: '1988150545175736322', label: '脱脂原料库'},
@@ -56,7 +55,7 @@
],
}
if (this.actionType === '镀锌工序' || this.actionType === '脱脂工序' || this.actionType === '拉矫平整工序' || this.actionType === '双机架工序' || this.actionType === '镀铬工序') {
if (this.actionType === '镀锌工序') {
this.useSpecialSplit = true
}
// 从map中获取默认的查询参数

25
klp-ui/src/views/wms/coil/do/warehousing.vue
View File

@@ -35,7 +35,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="厂家原料卷号" prop="supplierCoilNo">
<el-form-item v-if="!form.coilId" label="厂家原料卷号" prop="supplierCoilNo">
<el-input v-model="form.supplierCoilNo" placeholder="请输入厂家原料卷号" />
</el-form-item>
</el-col>
@@ -457,29 +457,6 @@ export default {
// }, trigger: 'blur'
// },
],
supplierCoilNo: [
{ required: true, message: "厂家原料卷号不能为空", trigger: "blur" },
// 远程校验，检查钢卷号是否存在
{
validator: (rule, value, callback) => {
if (this.form.coilId) {
// 新增时触发校验
console.log('编辑时不触发校验');
callback();
} else {
checkCoilNo({ supplierCoilNo: value }).then(res => {
const { duplicateType } = res.data;
if (duplicateType === 'supplier' || duplicateType === 'both') {
// alert('厂家原料卷号重复，请重新输入');
callback(new Error('厂家原料卷号重复，请重新输入'));
} else {
callback();
}
})
}
}, trigger: 'blur'
},
],
materialType: [
{ required: true, message: "材料类型不能为空", trigger: "change" }
],

724
klp-ui/src/views/wms/coil/docorrent.vue
View File

@@ -1,724 +0,0 @@
<template>
<div class="app-container">
<!-- 搜索栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="钢卷号" prop="currentCoilNo">
<el-input v-model="queryParams.currentCoilNo" placeholder="请输入钢卷号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="操作类型" prop="actionType">
<el-select v-model="queryParams.actionType" placeholder="请选择操作类型" clearable filterable>
<el-option v-for="item in dict.type.action_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<!-- <el-form-item label="只看待操作" prop="actionStatus">
<el-switch @change="switchActionStatus" v-model="queryParams.actionSwitch" />
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="handleRefresh"
:disabled="buttonLoading" v-loading="buttonLoading">刷新</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 数据表格 -->
<el-table v-loading="loading" :data="actionList" @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="序号" type="index" width="60" align="center" /> -->
<el-table-column label="钢卷号" align="center" prop="currentCoilNo">
<template slot-scope="scope">
<coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
</template>
</el-table-column>
<el-table-column label="操作类型" align="center" prop="actionType" width="160">
<template slot-scope="scope">
<span v-if="scope.row.actionType === 401">入库/收货操作</span>
<span v-else-if="scope.row.actionType === 402">发货操作</span>
<span v-else-if="scope.row.actionType === 403">移库操作</span>
<span v-else-if="scope.row.actionType === 404">通过库区编辑钢卷</span>
<span v-else-if="scope.row.actionType === 405">钢卷打包</span>
<dict-tag v-else :options='dict.type.action_type' :value="scope.row.actionType"></dict-tag>
</template>
</el-table-column>
<el-table-column label="操作状态" align="center" prop="actionStatus" width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.actionStatus === 0" type="info" size="small">待处理</el-tag>
<el-tag v-else-if="scope.row.actionStatus === 1" type="warning" size="small">处理中</el-tag>
<el-tag v-else-if="scope.row.actionStatus === 2" type="success" size="small">已完成</el-tag>
<el-tag v-else-if="scope.row.actionStatus === 3" type="danger" size="small">已取消</el-tag>
</template>
</el-table-column>
<el-table-column label="优先级" align="center" prop="priority" width="90">
<template slot-scope="scope">
<el-tag v-if="scope.row.priority === 0" type="info" size="mini">普通</el-tag>
<el-tag v-else-if="scope.row.priority === 1" type="warning" size="mini">重要</el-tag>
<el-tag v-else-if="scope.row.priority === 2" type="danger" size="mini">紧急</el-tag>
</template>
</el-table-column>
<el-table-column label="来源" align="center" prop="sourceType" width="80">
<template slot-scope="scope">
<el-tag v-if="scope.row.sourceType === 'scan'" type="success" size="mini">
<i class="el-icon-mobile"></i> 扫码
</el-tag>
<el-tag v-else type="info" size="mini">
<i class="el-icon-edit-outline"></i> 手动
</el-tag>
</template>
</el-table-column>
<el-table-column label="新增时间" align="center" prop="createTime" width="155" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
<el-table-column label="操作人" align="center" prop="updateBy" width="100" />
<el-table-column label="完成时间" align="center" prop="completeTime" width="220" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-date-picker @change="handleProcessTimeChange(scope.row)" value-format="yyyy-MM-dd HH:mm:ss" style="width: 200px" v-model="scope.row.completeTime" type="datetime" placeholder="选择完成时间" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<!-- 待处理状态显示操作按钮 -->
<!-- <template v-if="scope.row.actionStatus === 0">
<el-button size="mini" type="primary" icon="el-icon-edit" @click="handleProcess(scope.row)"
v-loading="buttonLoading" :disabled="buttonLoading">操作</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
</template> -->
<!-- 处理中状态显示继续按钮 -->
<!-- <template v-else-if="scope.row.actionStatus === 1">
<el-button size="mini" type="warning" icon="el-icon-edit" @click="handleProcess(scope.row)"
:disabled="buttonLoading" v-loading="buttonLoading">继续</el-button>
<el-button size="mini" type="info" icon="el-icon-close" @click="handleCancel(scope.row)">取消</el-button>
</template> -->
<!-- 已完成或已取消状态显示删除按钮 -->
<template v-if="scope.row.actionStatus === 2 || scope.row.actionStatus === 3">
<el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
</template>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="钢卷" prop="coilId">
<coil-selector v-model="form.coilId" :use-trigger="true" @select="handleCoilSelect" />
</el-form-item>
<el-form-item label="操作类型" prop="actionType">
<div class="action-type-cards">
<!-- 分条操作区 -->
<div class="card-section" v-if="splitTypes.length > 0">
<div class="section-title">分条操作</div>
<div class="action-cards-row">
<div v-for="item in splitTypes" :key="item.value" class="action-card split-card"
:class="{ 'active': form.actionType == item.value }" @click="form.actionType = parseInt(item.value)">
<div class="card-icon">
<i :class="getActionIcon(item.value)"></i>
</div>
<div class="card-content">
<div class="card-title">{{ item.label }}</div>
<div class="card-desc">{{ item.remark || '钢卷分条操作' }}</div>
</div>
</div>
</div>
</div>
<!-- 其他操作区 -->
<div class="card-section" v-if="otherTypes.length > 0">
<div class="section-title">其他操作</div>
<div class="action-cards-row">
<div v-for="item in otherTypes" :key="item.value" class="action-card"
:class="{ 'active': form.actionType == item.value }" @click="form.actionType = parseInt(item.value)">
<div class="card-icon">
<i :class="getActionIcon(item.value)"></i>
</div>
<div class="card-content">
<div class="card-title">{{ item.label }}</div>
<div class="card-desc">{{ item.remark || '钢卷操作' }}</div>
</div>
</div>
</div>
</div>
</div>
</el-form-item>
<el-form-item label="优先级" prop="priority">
<el-select v-model="form.priority" placeholder="请选择优先级">
<el-option label="普通" :value="0" />
<el-option label="重要" :value="1" />
<el-option label="紧急" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" :disabled="buttonLoading" v-loading="buttonLoading">确
定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listPendingAction,
getPendingAction,
delPendingAction,
addPendingAction,
updatePendingAction,
startProcess,
cancelAction
} from '@/api/wms/pendingAction';
import CoilSelector from '@/components/CoilSelector';
import CoilNo from '@/components/KLPService/Renderer/CoilNo.vue';
export default {
name: 'CoilActflow',
dicts: ['action_type'],
components: {
CoilSelector,
CoilNo
},
data() {
return {
// 遮罩层
loading: true,
buttonLoading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 待操作列表数据
actionList: [],
// 弹出层标题
title: '',
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
currentCoilNo: null,
actionType: null,
actionStatus: null, // 默认查询待处理
priority: null
},
// 表单参数
form: {},
// 表单校验
rules: {
coilId: [
{ required: true, message: '请选择钢卷', trigger: 'blur' }
],
actionType: [
{ required: true, message: '请选择操作类型', trigger: 'change' }
]
},
// 钢卷选择器可见性
coilSelectorVisible: false
};
},
computed: {
// 分条操作列表（100-199）
splitTypes() {
if (!this.dict.type.action_type) return [];
return this.dict.type.action_type.filter(item => {
const value = parseInt(item.value);
return value >= 100 && value <= 199;
});
},
// 其他操作列表（200-299等）
otherTypes() {
if (!this.dict.type.action_type) return [];
return this.dict.type.action_type.filter(item => {
const value = parseInt(item.value);
return value < 100 || value > 199;
});
}
},
created() {
this.getList();
// 设置定时刷新（可选，用于移动端扫码后自动刷新）
this.startAutoRefresh();
},
beforeDestroy() {
// 清除定时器
if (this.refreshTimer) {
clearInterval(this.refreshTimer);
}
},
methods: {
/** 查询待操作列表 */
getList() {
this.loading = true;
this.buttonLoading = true;
listPendingAction(this.queryParams).then(response => {
console.log('response.rows', response.rows);
this.actionList = response.rows;
this.total = response.total;
this.buttonLoading = false;
this.loading = false;
});
},
switchActionStatus(value) {
console.log(value)
if (!value) {
this.queryParams.actionStatus = null;
} else {
this.queryParams.actionStatus = '-1';
}
this.getList()
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
actionId: null,
coilId: null,
currentCoilNo: null,
actionType: null,
actionStatus: null,
priority: 0,
sourceType: 'manual',
remark: null
};
this.resetForm('form');
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm');
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.actionId);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = '添加待操作';
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const actionId = row.actionId || this.ids;
getPendingAction(actionId).then(response => {
this.form = response.data;
this.open = true;
this.title = '修改待操作';
});
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.actionId != null) {
updatePendingAction(this.form).then(response => {
this.$message.success('修改成功');
this.open = false;
this.getList();
this.buttonLoading = false;
});
} else {
addPendingAction(this.form).then(response => {
this.$message.success('新增成功');
this.open = false;
this.getList();
this.buttonLoading = false;
});
}
}
});
},
/** 完成时间改变时触发 */
handleProcessTimeChange(row) {
console.log('完成时间改变:', row);
updatePendingAction(row).then(response => {
this.$message.success('更新成功');
});
},
/** 删除按钮操作 */
handleDelete(row) {
const actionIds = row.actionId || this.ids;
this.$confirm('是否确认删除该待操作记录?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
return delPendingAction(actionIds);
}).then(() => {
this.getList();
this.$message.success('删除成功');
}).catch(() => { });
},
/** 处理操作 - 跳转到对应页面 */
handleProcess(row) {
console.log('=== 开始处理操作 ===');
console.log('待操作记录:', row);
console.log('操作类型:', row.actionType);
console.log('钢卷ID:', row.coilId);
this.buttonLoading = true;
this.$forceUpdate();
const actionType = parseInt(row.actionType);
// 特殊处理：发货和移库操作不需要跳转
if (actionType === 4 || actionType === 5 || actionType === 401 || actionType === 402) {
this.$message.info(actionType === 4 ? '发货操作已在移动端完成' : '移库操作已在移动端完成');
this.buttonLoading = false;
return;
}
// 根据操作类型跳转到不同页面
let path = '';
// 分条操作：100-199
if (actionType >= 100 && actionType <= 199) {
path = '/wms/split';
}
// 合卷操作：200-299
else if (actionType == 200) {
path = '/wms/merge';
}
else if (actionType < 100) {
path = '/wms/typing';
}
// 其他操作类型
else {
this.$message.error('特殊操作请到专门的页面进行处理');
this.buttonLoading = false;
return;
}
if (!path) {
this.$message.error('未知的操作类型: ' + row.actionType);
this.buttonLoading = false;
return;
}
// 更新状态为处理中
console.log('调用startProcess，actionId:', row.actionId);
startProcess(row.actionId).then(response => {
console.log('开始处理响应:', response);
if (response.code !== 200) {
this.$message.error(response.msg || '更新状态失败');
return;
}
// 跳转并传递参数
console.log('准备跳转到:', path, '参数:', { coilId: row.coilId, actionId: row.actionId });
this.$router.push({
path: path,
query: {
coilId: row.coilId,
actionId: row.actionId
}
});
this.buttonLoading = false;
}).catch(error => {
console.error('更新状态失败:', error);
this.$message.error('更新状态失败: ' + (error.message || error));
}).finally(() => {
this.buttonLoading = false;
});
},
/** 取消操作 */
handleCancel(row) {
this.$confirm('是否确认取消该操作?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
return cancelAction(row.actionId);
}).then(() => {
this.$message.success('操作已取消');
this.getList();
}).catch(() => { });
},
/** 刷新列表 */
handleRefresh() {
this.getList();
this.$message.success('刷新成功');
},
/** 自动刷新 */
startAutoRefresh() {
// 每30秒自动刷新一次（用于移动端扫码后自动更新列表）
this.refreshTimer = setInterval(() => {
// 只在查看待处理状态时自动刷新
this.getList();
}, 30000);
},
/** 表格行样式 */
tableRowClassName({ row }) {
if (row.priority === 2) {
return 'urgent-row';
} else if (row.priority === 1) {
return 'important-row';
}
return '';
},
/** 显示钢卷选择器 */
showCoilSelector() {
this.coilSelectorVisible = true;
},
/** 钢卷选择回调 */
handleCoilSelect(coil) {
this.form.coilId = coil.coilId;
this.form.currentCoilNo = coil.currentCoilNo;
},
/** 获取状态文本 */
getStatusText(status) {
const statusMap = {
0: '待处理',
1: '处理中',
2: '已完成',
3: '已取消'
};
return statusMap[status] || '未知';
},
/** 根据操作类型获取图标 */
getActionIcon(actionType) {
const value = parseInt(actionType);
const iconMap = {
1: 'el-icon-connection', // 合卷
2: 'el-icon-s-operation', // 分条
3: 'el-icon-edit', // 更新
4: 'el-icon-truck', // 发货
5: 'el-icon-s-grid', // 移库
101: 'el-icon-scissors', // 纵剪分条
102: 'el-icon-s-operation', // 横切分条
103: 'el-icon-s-unfold' // 开卷分条
};
return iconMap[value] || 'el-icon-s-operation';
}
}
};
</script>
<style scoped lang="scss">
.app-container {
::v-deep .urgent-row {
background: #fef0f0 !important;
}
::v-deep .important-row {
background: #fdf6ec !important;
}
// 优化按钮文字颜色
// 实心按钮：白色文字（在深色背景上清晰可见）
::v-deep .el-button--primary.el-button--mini:not(.is-plain) {
color: #fff;
}
::v-deep .el-button--danger.el-button--mini:not(.is-plain) {
color: #fff;
}
::v-deep .el-button--warning.el-button--mini:not(.is-plain) {
color: #fff;
}
::v-deep .el-button--info.el-button--mini:not(.is-plain) {
color: #fff;
}
::v-deep .el-button--success.el-button--mini:not(.is-plain) {
color: #fff;
}
// plain按钮：同色系深色文字（在浅色背景上）
::v-deep .el-button--primary.el-button--mini.is-plain {
color: #409eff;
}
::v-deep .el-button--danger.el-button--mini.is-plain {
color: #f56c6c;
}
::v-deep .el-button--warning.el-button--mini.is-plain {
color: #e6a23c;
}
}
/* 操作类型卡片样式 */
.action-type-cards {
width: 100%;
.card-section {
margin-bottom: 24px;
&:last-child {
margin-bottom: 0;
}
}
.section-title {
font-size: 14px;
font-weight: 600;
color: #303133;
margin-bottom: 12px;
padding-left: 8px;
border-left: 3px solid #409eff;
}
// 分条操作区域的特殊样式
.card-section:first-child .section-title {
border-left-color: #e6a23c;
}
.action-cards-row {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
gap: 12px;
}
.action-card {
min-width: 0;
padding: 16px;
border: 2px solid #dcdfe6;
border-radius: 8px;
cursor: pointer;
transition: all 0.3s ease;
background: #fff;
display: flex;
align-items: center;
gap: 12px;
&:hover {
border-color: #409eff;
box-shadow: 0 2px 12px 0 rgba(64, 158, 255, 0.15);
transform: translateY(-2px);
}
&.active {
border-color: #409eff;
background: linear-gradient(135deg, #e3f2fd 0%, #f0f7ff 100%);
box-shadow: 0 2px 12px 0 rgba(64, 158, 255, 0.3);
.card-icon {
background: linear-gradient(135deg, #409eff 0%, #66b1ff 100%);
color: #fff;
}
.card-title {
color: #409eff;
font-weight: 600;
}
}
&.split-card {
&.active {
background: linear-gradient(135deg, #fff3e0 0%, #fff8f0 100%);
border-color: #e6a23c;
.card-icon {
background: linear-gradient(135deg, #e6a23c 0%, #f0ad4e 100%);
}
.card-title {
color: #e6a23c;
}
}
&:hover {
border-color: #e6a23c;
box-shadow: 0 2px 12px 0 rgba(230, 162, 60, 0.15);
}
}
}
.card-icon {
width: 48px;
height: 48px;
border-radius: 8px;
background: #f5f7fa;
display: flex;
align-items: center;
justify-content: center;
font-size: 24px;
color: #909399;
transition: all 0.3s ease;
flex-shrink: 0;
}
.card-content {
flex: 1;
}
.card-title {
font-size: 16px;
font-weight: 500;
color: #303133;
margin-bottom: 4px;
transition: all 0.3s ease;
}
.card-desc {
font-size: 13px;
color: #909399;
line-height: 1.4;
}
}
</style>

2
klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
View File

@@ -114,7 +114,7 @@
Jiaxiang County,Jining City,Shandong Province</span>
<br />
<span>
TEL：19053728822 19053728835
TEL：0537-6625068 0537-6625067
</span>
</div>
<div class="contact-timestamp">

291
klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
View File

@@ -1,291 +0,0 @@
<template>
<div class="label-container" :style="{ '--print-scale': printScale }">
<div class="material-label-grid">
<!-- 公司名称行 -->
<div class="grid-cell company-cell">嘉祥科伦普重工有限公司</div>
<!-- 第一行：冷卷号、热卷号 -->
<div class="grid-cell label-cell">冷卷号</div>
<div class="grid-cell value-cell">
<div class="nob" contenteditable>{{ content.currentCoilNo || '' }}</div>
</div>
<div class="grid-cell label-cell">热卷号</div>
<div class="grid-cell value-cell">
<div class="nob" contenteditable>{{ content.enterCoilNo || '' }}</div>
</div>
<!-- 第二行：规格、钢种 -->
<div class="grid-cell label-cell">规格</div>
<div class="grid-cell value-cell">
<div class="nob" contenteditable>{{ content.specification || '' }}</div>
</div>
<div class="grid-cell label-cell">钢种</div>
<div class="grid-cell value-cell">
<div class="nob" contenteditable>{{ content.material || '' }}</div>
</div>
<!-- 第三行：净重、下工序 -->
<div class="grid-cell label-cell">净重</div>
<div class="grid-cell value-cell">
<div class="nob" contenteditable>{{ content.netWeight || '' }}</div>
</div>
<div class="grid-cell label-cell">下工序</div>
<div class="grid-cell value-cell">
<div class="nob" contenteditable>{{ content.nextProcess || '冷轧' }}</div>
</div>
<!-- 第四行：包装要求、切边要求 -->
<div class="grid-cell label-cell">包装要求</div>
<div class="grid-cell value-cell">
<div class="nob" contenteditable>{{ content.packagingRequirement || '' }}</div>
</div>
<div class="grid-cell label-cell">切边要求</div>
<div class="grid-cell value-cell">
<div class="nob" contenteditable>{{ content.trimmingRequirement || '' }}</div>
</div>
<!-- 第五行：班组、代码（二维码） -->
<div class="grid-cell label-cell">班组</div>
<div class="grid-cell value-cell">
<div class="nob" contenteditable>{{ content.team || '' }}</div>
</div>
<div class="grid-cell label-cell">代码</div>
<div class="grid-cell qrcode-cell">
<!-- 二维码容器 -->
<QRCode :content="content.qrcodeRecordId" :size="80"/>
</div>
<!-- 第六行：生产日期 -->
<div class="grid-cell label-cell">生产日期</div>
<div class="grid-cell value-cell date-cell">
<div class="nob" contenteditable>{{ content.createTime || '' }}</div>
</div>
</div>
</div>
</template>
<script>
import QRCode from '@/components/QRCode/index.vue';
export default {
name: 'ZincRawTag',
components: {
QRCode
},
props: {
content: {
type: Object,
default: () => ({
currentCoilNo: '',
entryCoilNo: '',
specification: '',
material: '',
netWeight: '',
nextProcess: '',
packagingRequirements: '',
trimmingRequirements: '',
team: '',
createTime: '',
qrcodeRecordId: '',
})
},
paperWidthMm: {
type: Number,
default: 100
},
paperHeightMm: {
type: Number,
default: 80
}
},
data() {
return {
printScale: 1,
printMediaQuery: null
}
},
mounted() {
this.printMediaQuery = window.matchMedia('print');
this.printMediaQuery.addListener(this.handlePrintMediaChange);
window.addEventListener('beforeprint', this.handleBeforePrint);
window.addEventListener('afterprint', this.handleAfterPrint);
this.$nextTick(() => {
this.calculatePrintScale();
});
},
beforeDestroy() {
if (this.printMediaQuery) {
this.printMediaQuery.removeListener(this.handlePrintMediaChange);
}
window.removeEventListener('beforeprint', this.handleBeforePrint);
window.removeEventListener('afterprint', this.handleAfterPrint);
},
methods: {
handlePrintMediaChange(mq) {
mq.matches ? this.calculatePrintScale() : this.resetPrintScale();
},
handleBeforePrint() {
setTimeout(() => this.calculatePrintScale(), 100);
},
handleAfterPrint() {
this.resetPrintScale();
},
calculatePrintScale() {
this.$nextTick(() => {
const container = this.$el;
if (!container) return;
const dpi = 96;
const mmToPx = dpi / 25.4;
const paperWidthPx = this.paperWidthMm * mmToPx;
const paperHeightPx = this.paperHeightMm * mmToPx;
const marginPx = 2 * mmToPx;
const rect = container.getBoundingClientRect();
const contentWidth = rect.width || container.scrollWidth;
const contentHeight = rect.height || container.scrollHeight;
const availableWidth = paperWidthPx - marginPx * 2;
const availableHeight = paperHeightPx - marginPx * 2;
const scaleX = contentWidth > 0 ? availableWidth / contentWidth : 1;
const scaleY = contentHeight > 0 ? availableHeight / contentHeight : 1;
this.printScale = Math.min(scaleX, scaleY, 1);
container.style.setProperty('--print-scale', this.printScale);
container.style.setProperty('--paper-width', `${this.paperWidthMm}mm`);
container.style.setProperty('--paper-height', `${this.paperHeightMm}mm`);
});
},
resetPrintScale() {
this.printScale = 1;
if (this.$el) {
this.$el.style.setProperty('--print-scale', 1);
this.$el.style.removeProperty('--paper-width');
this.$el.style.removeProperty('--paper-height');
}
}
}
}
</script>
<style scoped>
.label-container {
width: 45em;
height: 25em;
padding: 16px;
font-family: "SimSun", serif;
box-sizing: border-box;
}
/* 核心Grid布局 */
.material-label-grid {
display: grid;
grid-template-columns: repeat(4, 1fr); /* 4列等宽 */
grid-auto-rows: 1fr; /* 行高自适应 */
width: 100%;
height: 100%;
border: 1px solid #333;
box-sizing: border-box;
}
.grid-cell {
border: 1px solid #333;
padding: 4px;
font-size: 20px;
box-sizing: border-box;
text-align: center;
word-break: break-all;
overflow-wrap: break-word;
display: flex;
align-items: center;
justify-content: center;
}
/* 公司名称单元格 */
.company-cell {
grid-column: span 4; /* 跨4列 */
font-size: 24px;
font-weight: bold;
/* background-color: #f5f5f5; */
}
/* 标签单元格（左） */
.label-cell {
/* background-color: #f5f5f5; */
font-weight: bold;
}
/* 值单元格 */
.value-cell {
text-align: center;
font-weight: bold;
}
.date-cell {
grid-column: span 2;
}
/* 二维码单元格（跨2列+2行） */
.qrcode-cell {
grid-row: span 2; /* 跨2行 */
display: flex;
align-items: center;
justify-content: center;
}
.qrcode-container {
width: 80%;
height: 80%;
border: 1px dashed #999; /* 占位虚线 */
}
/* 内容可编辑区域 */
.nob {
width: 100%;
height: 100%;
border: none;
outline: none;
background: transparent;
text-align: center;
font-size: inherit;
word-break: break-all;
display: flex;
align-items: center;
justify-content: center;
}
/* 打印样式 */
@media print {
@page {
size: 100mm 80mm;
margin: 0 !important;
}
* {
-webkit-print-color-adjust: exact !important;
print-color-adjust: exact !important;
}
html,
body {
margin: 0 !important;
padding: 0 !important;
overflow: hidden !important;
}
body>*:not(.label-container) {
display: none !important;
}
.label-container {
page-break-inside: avoid !important;
break-inside: avoid !important;
transform: scale(var(--print-scale, 1)) !important;
transform-origin: top left !important;
max-width: var(--paper-width, 100mm) !important;
max-height: var(--paper-height, 80mm) !important;
overflow: hidden !important;
}
}
</style>

21
klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
View File

@@ -36,13 +36,7 @@
v-if="tagType === 'ge'"
:content="content"
:paperWidthMm="180"
:paperHeightMm="100"
/>
<TuoZhiTag
v-if="tagType === '6'"
:content="content"
:paperWidthMm="180"
:paperHeightMm="100"
:paperHeightMm="80"
/>
<!-- <SampleTagPreview v-if="labelType === '4'" :content="content" />
<ForgeTagPreview v-if="labelType === '5'" :content="content" />
@@ -67,8 +61,6 @@ import GalvanizedTag from './GalvanizedTag.vue';
import WhereTag from './WhereTag.vue';
import ZincRawTag from './ZincRawTag.vue';
import DuGeTag from './DuGeTag.vue';
import TuoZhiTag from './TuoZhiTag.vue';
// import SampleTagPreview from './SampleTagPreview.vue';
// import ForgeTagPreview from './ForgeTagPreview.vue';
@@ -83,7 +75,6 @@ export default {
WhereTag,
ZincRawTag,
DuGeTag,
TuoZhiTag,
// SampleTagPreview,
// ForgeTagPreview,
// SaltSprayTagPreview,
@@ -116,10 +107,6 @@ export default {
width: 180,
height: 100,
},
'6': {
width: 180,
height: 100,
},
}
}
},
@@ -154,12 +141,8 @@ export default {
handler(newVal) {
const { itemName, itemType, warehouseId } = newVal;
// 在镀锌颜料库的卷使用镀锌原料标签
if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) {
if (itemType == 'raw_material' && warehouseId == '1988150263284953089') {
this.labelType = '5';
}
// 脱脂原料库
else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) {
this.labelType = '6';
} else if (itemType == 'raw_material') {
this.labelType = '2';
} else if (itemType == 'product' && itemName == '冷硬卷') {

138
klp-ui/src/views/wms/coil/panels/Perspective/CategoryWidthStatistics.vue
View File

@@ -1,138 +0,0 @@
<template>
<div class="hot-zha-raw">
<!-- 使用 el-table 展示数据 -->
<el-table
v-loading="loading"
:data="processedData"
border
style="width: 100%;"
:header-cell-style="{background: '#f2f2f2', fontWeight: 600}"
>
<!-- 类别列 -->
<el-table-column
label="类别"
prop="category"
min-width="180"
align="left"
/>
<!-- 合并的净边表头 -->
<el-table-column
label="净边"
align="center"
>
<el-table-column
label="1000"
prop="width1000"
min-width="100"
align="center"
/>
<el-table-column
label="1200"
prop="width1200"
min-width="100"
align="center"
/>
<el-table-column
label="1220"
prop="width1220"
min-width="100"
align="center"
/>
<el-table-column
label="1250"
prop="width1250"
min-width="100"
align="center"
/>
</el-table-column>
<!-- 其他宽度及毛边列 -->
<el-table-column
label="其他宽度及毛边"
prop="otherWidth"
min-width="120"
align="center"
/>
<!-- 合计列 -->
<el-table-column
label="合计"
prop="total"
min-width="100"
align="center"
:cell-style="{fontWeight: 600, color: '#1890ff'}"
/>
</el-table>
<!-- 无数据提示（el-table 自带空数据提示，这里可保留统一样式） -->
<div v-if="!data || data.length === 0" class="empty-data">
暂无数据
</div>
</div>
</template>
<script>
export default {
name: 'HotZhaRaw',
props: {
data: {
type: Array,
default: () => []
}
},
data() {
return {
loading: false // 可根据实际需求控制加载状态
};
},
computed: {
processedData() {
if (!this.data || !Array.isArray(this.data)) {
return [];
}
console.log(this.data);
// 深拷贝避免修改原数据
return this.data;
}
},
methods: {
// el-table 专用的数字格式化方法
formatTableNumber(row, column) {
const num = row[column.prop];
if (num === null || num === undefined || num === '') return '0.000';
return Number(num).toFixed(3);
}
}
};
</script>
<style scoped>
.hot-zha-raw {
width: 100%;
min-height: 200px;
padding: 10px;
box-sizing: border-box;
}
.empty-data {
text-align: center;
padding: 40px;
color: #999;
font-size: 14px;
}
/* 覆盖 el-table 样式，保持视觉统一 */
:deep(.el-table) {
--el-table-header-text-color: #303133;
--el-table-row-hover-bg-color: #f8f9fa;
}
:deep(.el-table th) {
border-right: 1px solid #ddd;
}
:deep(.el-table td) {
border-right: 1px solid #ddd;
}
</style>

243
klp-ui/src/views/wms/coil/panels/Perspective/TrimStatistics.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="trim-statistics-table">
<el-table
:data="filteredTableData"
:data="tableData"
border
stripe
:span-method="objectSpanMethod"
@@ -15,7 +15,7 @@
align="center"
/>
<!-- 冷硬卷板净边料现货库存 独立表头组 -->
<!-- 冷硬卷板净边料现货库存 表头组 -->
<el-table-column
label="冷硬卷板净边料现货库存"
align="center"
@@ -27,19 +27,18 @@
<el-table-column label="数量(件)" prop="trimmedTotalCount" width="80" align="center" />
<el-table-column label="重量(吨)" prop="trimmedTotalWeight" width="80" align="center" />
</el-table-column>
<!-- 净边料独立宽度列（合并后的分组） -->
<el-table-column
v-for="group in trimmedWidthGroups"
:key="'trimmed-' + group.key"
:label="group.label"
v-for="width in widthList"
:key="'trimmed-' + width"
:label="width"
align="center"
>
<el-table-column label="数量(件)" :prop="`trimmed_${group.key}_count`" width="80" align="center" />
<el-table-column label="重量(吨)" :prop="`trimmed_${group.key}_weight`" width="80" align="center" />
<el-table-column label="数量(件)" :prop="`trimmed_${width}_count`" width="80" align="center" />
<el-table-column label="重量(吨)" :prop="`trimmed_${width}_weight`" width="80" align="center" />
</el-table-column>
</el-table-column>
<!-- 冷硬卷板毛边料现货库存 独立表头组 -->
<!-- 冷硬卷板毛边料现货库存 表头组 -->
<el-table-column
label="冷硬卷板毛边料现货库存"
align="center"
@@ -51,15 +50,14 @@
<el-table-column label="数量(件)" prop="untrimmedTotalCount" width="80" align="center" />
<el-table-column label="重量(吨)" prop="untrimmedTotalWeight" width="80" align="center" />
</el-table-column>
<!-- 毛边料独立宽度列（合并后的分组） -->
<el-table-column
v-for="group in untrimmedWidthGroups"
:key="'untrimmed-' + group.key"
:label="group.label"
v-for="width in widthList"
:key="'untrimmed-' + width"
:label="width"
align="center"
>
<el-table-column label="数量(件)" :prop="`untrimmed_${group.key}_count`" width="80" align="center" />
<el-table-column label="重量(吨)" :prop="`untrimmed_${group.key}_weight`" width="80" align="center" />
<el-table-column label="数量(件)" :prop="`untrimmed_${width}_count`" width="80" align="center" />
<el-table-column label="重量(吨)" :prop="`untrimmed_${width}_weight`" width="80" align="center" />
</el-table-column>
</el-table-column>
</el-table>
@@ -73,202 +71,69 @@ export default {
data: {
type: Array,
default: () => []
},
// 可配置的宽度分组规则（支持自定义）
widthGroupRules: {
type: Object,
default: () => ({
'1000系列': ['1000', '1000~1005', '1010/1015'],
'1200基础系列': ['1200/1202', '1200~1215'],
'1218基础系列': ['1218/1220', '1218~1235', '1210/1215'],
'1240系列': ['1240/1252'],
'1225系列': ['1225/1235'],
'1250+系列': ['1250~1265', '1260-1265']
})
}
},
computed: {
// ========== 净边料相关计算 ==========
// 提取净边料所有原始宽度
rawTrimmedWidths() {
const widthSet = new Set();
this.data?.forEach(item => {
item.trimmedList?.forEach(trimmed => {
if (trimmed.width) widthSet.add(trimmed.width);
});
});
return Array.from(widthSet);
// 定义表格中需要展示的宽度规格（与图片中一致）
widthList() {
return [
'1000', '1200/1202', '1218/1220', '1240/1252',
'1010/1015', '1210/1215', '1225/1235', '1260-1265',
'1000~1005', '1200~1215', '1218~1235', '1250~1265'
];
},
// 净边料宽度分组（合并相近宽度）
trimmedWidthGroups() {
return this.generateWidthGroups(this.rawTrimmedWidths);
},
// ========== 毛边料相关计算 ==========
// 提取毛边料所有原始宽度
rawUntrimmedWidths() {
const widthSet = new Set();
this.data?.forEach(item => {
item.untrimmedList?.forEach(untrimmed => {
if (untrimmed.width) widthSet.add(untrimmed.width);
});
});
return Array.from(widthSet);
},
// 毛边料宽度分组（合并相近宽度）
untrimmedWidthGroups() {
return this.generateWidthGroups(this.rawUntrimmedWidths);
},
// 处理后的原始表格数据
// 处理后的数据（适配表格列结构）
tableData() {
return this.data.map(item => {
const row = {
thickness: item.thickness,
trimmedTotalCount: 0,
trimmedTotalWeight: 0,
untrimmedTotalCount: 0,
untrimmedTotalWeight: 0
trimmedTotalCount: 0, // 净边料总计数量
trimmedTotalWeight: 0, // 净边料总计重量
untrimmedTotalCount: 0, // 毛边料总计数量
untrimmedTotalWeight: 0 // 毛边料总计重量
};
// 初始化净边料分组数据
this.trimmedWidthGroups?.forEach(group => {
row[`trimmed_${group.key}_count`] = 0;
row[`trimmed_${group.key}_weight`] = 0;
// 初始化所有宽度的数量和重量为0
this.widthList.forEach(width => {
row[`trimmed_${width}_count`] = 0;
row[`trimmed_${width}_weight`] = 0;
row[`untrimmed_${width}_count`] = 0;
row[`untrimmed_${width}_weight`] = 0;
});
// 初始化毛边料分组数据
this.untrimmedWidthGroups?.forEach(group => {
row[`untrimmed_${group.key}_count`] = 0;
row[`untrimmed_${group.key}_weight`] = 0;
// 处理净边料数据
item.trimmedList.forEach(trimmed => {
const widthKey = trimmed.width;
if (this.widthList.includes(widthKey)) {
row[`trimmed_${widthKey}_count`] = trimmed.coilCount;
row[`trimmed_${widthKey}_weight`] = trimmed.totalWeight;
// 累加总计
row.trimmedTotalCount += trimmed.coilCount;
row.trimmedTotalWeight = (Number(row.trimmedTotalWeight) + Number(trimmed.totalWeight)).toFixed(3);
}
});
// 处理净边料数据（按分组求和）
item.trimmedList?.forEach(trimmed => {
const width = trimmed.width;
const count = Number(trimmed.coilCount) || 0;
const weight = Number(trimmed.totalWeight) || 0;
// 找到宽度所属的分组并累加
this.trimmedWidthGroups?.forEach(group => {
if (group.includesWidth(width)) {
row[`trimmed_${group.key}_count`] += count;
row[`trimmed_${group.key}_weight`] = (row[`trimmed_${group.key}_weight`] + weight).toFixed(3);
}
});
// 累加总计
row.trimmedTotalCount += count;
row.trimmedTotalWeight = (Number(row.trimmedTotalWeight) + weight).toFixed(3);
});
// 处理毛边料数据（按分组求和）
item.untrimmedList?.forEach(untrimmed => {
const width = untrimmed.width;
const count = Number(untrimmed.coilCount) || 0;
const weight = Number(untrimmed.totalWeight) || 0;
// 找到宽度所属的分组并累加
this.untrimmedWidthGroups?.forEach(group => {
if (group.includesWidth(width)) {
row[`untrimmed_${group.key}_count`] += count;
row[`untrimmed_${group.key}_weight`] = (row[`untrimmed_${group.key}_weight`] + weight).toFixed(3);
}
});
// 累加总计
row.untrimmedTotalCount += count;
row.untrimmedTotalWeight = (Number(row.untrimmedTotalWeight) + weight).toFixed(3);
// 处理毛边料数据
item.untrimmedList.forEach(untrimmed => {
const widthKey = untrimmed.width;
if (this.widthList.includes(widthKey)) {
row[`untrimmed_${widthKey}_count`] = untrimmed.coilCount;
row[`untrimmed_${widthKey}_weight`] = untrimmed.totalWeight;
// 累加总计
row.untrimmedTotalCount += untrimmed.coilCount;
row.untrimmedTotalWeight = (Number(row.untrimmedTotalWeight) + Number(untrimmed.totalWeight)).toFixed(3);
}
});
return row;
});
},
// 过滤掉全0的行
filteredTableData() {
return this.tableData.filter(row => {
let hasNonZeroData = false;
// 检查净边料总计
if (Number(row.trimmedTotalCount) > 0 || Number(row.trimmedTotalWeight) > 0) {
hasNonZeroData = true;
}
// 检查毛边料总计
if (Number(row.untrimmedTotalCount) > 0 || Number(row.untrimmedTotalWeight) > 0) {
hasNonZeroData = true;
}
// 检查净边料分组列
if (!hasNonZeroData) {
this.trimmedWidthGroups?.forEach(group => {
if (Number(row[`trimmed_${group.key}_count`]) > 0 || Number(row[`trimmed_${group.key}_weight`]) > 0) {
hasNonZeroData = true;
}
});
}
// 检查毛边料分组列
if (!hasNonZeroData) {
this.untrimmedWidthGroups?.forEach(group => {
if (Number(row[`untrimmed_${group.key}_count`]) > 0 || Number(row[`untrimmed_${group.key}_weight`]) > 0) {
hasNonZeroData = true;
}
});
}
return hasNonZeroData;
});
}
},
methods: {
// 生成宽度分组（核心方法）
generateWidthGroups(rawWidths) {
const groups = [];
const usedWidths = new Set();
// 遍历分组规则，匹配原始宽度
Object.entries(this.widthGroupRules)?.forEach(([groupLabel, widthList]) => {
// 筛选出当前分组包含的原始宽度
const matchedWidths = rawWidths.filter(width => widthList.includes(width));
if (matchedWidths.length === 0) return;
// 创建分组对象
const groupKey = groupLabel.replace(/[^a-zA-Z0-9]/g, '_');
groups.push({
key: groupKey,
label: groupLabel,
widths: matchedWidths,
includesWidth: function(width) {
return this.widths.includes(width);
}
});
// 标记已使用的宽度
matchedWidths?.forEach(width => usedWidths.add(width));
});
// 处理未匹配到分组的宽度（单独成组）
rawWidths?.forEach(width => {
if (!usedWidths.has(width)) {
const groupKey = width.replace(/[^a-zA-Z0-9]/g, '_');
groups.push({
key: groupKey,
label: width,
widths: [width],
includesWidth: function(width) {
return this.widths.includes(width);
}
});
}
});
return groups;
},
// 合并表头的跨度方法
// 合并表头的跨度方法（可选，若需要合并行/列可扩展）
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
// 可根据需求实现行/列合并逻辑，例如合并重复的厚度行
// 示例：若需合并相同厚度的行，可在此处返回 { rowspan: n, colspan: m }
return { rowspan: 1, colspan: 1 };
}
}

77
klp-ui/src/views/wms/coil/panels/base.vue
View File

@@ -51,7 +51,6 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button icon="el-icon-download" size="mini" @click="handleNewExport" v-if="showNewExport">导出</el-button>
</el-form-item>
</el-form>
@@ -74,9 +73,6 @@
<el-button type="info" plain icon="el-icon-printer" size="mini" :disabled="multiple"
@click="handleBatchPrintLabel">批量打印标签</el-button>
</el-col>
<el-col :span="1.5" v-if="showOrderBy">
<el-checkbox v-model="queryParams.orderBy" v-loading="loading" @change="getList" label="orderBy">按实际库区排序</el-checkbox>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -181,8 +177,7 @@
<el-table-column label="关联订单" align="center" prop="relatedToOrder" v-if="showRelatedToOrder" width="150">
<template slot-scope="scope">
<el-switch @change="handleRelatedToOrderChange(scope.row)" v-model="scope.row.isRelatedToOrder"
:active-value="1" :inactive-value="0" />
<el-switch @change="handleRelatedToOrderChange(scope.row)" v-model="scope.row.isRelatedToOrder" :active-value="1" :inactive-value="0" />
</template>
</el-table-column>
@@ -409,7 +404,7 @@ import {
exportCoil,
cancelExportCoil,
checkCoilNo,
returnCoil,
returnCoil
} from "@/api/wms/coil";
import { listBoundCoil } from "@/api/wms/deliveryWaybillDetail";
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
@@ -534,14 +529,6 @@ export default {
showRelatedToOrder: {
type: Boolean,
default: false,
},
showOrderBy: {
type: Boolean,
default: false,
},
showNewExport: {
type: Boolean,
default: false,
}
},
data() {
@@ -590,7 +577,6 @@ export default {
itemIds: undefined,
status: undefined,
updateTime: undefined,
orderBy: false,
...this.querys,
},
// 表单参数
@@ -801,31 +787,8 @@ export default {
handlePrintLabel(row) {
const item = row.itemType === 'product' ? row.product : row.rawMaterial;
const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
const itemType = row.itemType || '';
const warehouseId = row.warehouseId || '';
// 在镀锌颜料库的卷使用镀锌原料标签
if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) {
this.labelRender.type = '5';
}
// 脱脂原料库
else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) {
this.labelRender.type = '6';
}
else if (itemType == 'raw_material') {
this.labelRender.type = '2';
} else if (itemType == 'product' && itemName == '冷硬卷') {
this.labelRender.type = '3';
} else if (itemType == 'product' && itemName == '热轧卷板') {
this.labelRender.type = '3';
} else if (itemType == 'product' && itemName == '镀锌卷') {
this.labelRender.type = '4';
} else if (itemType == 'product' && itemName == '冷轧卷') {
this.labelRender.type = '3';
} else if (itemType == 'product' && itemName == '镀铬卷') {
this.labelRender.type = 'ge';
} else {
this.labelRender.type = '3';
}
this.labelRender.type = row.itemType === 'product' ? '3' : '2';
this.labelRender.data = {
...row,
itemName: itemName,
@@ -935,6 +898,12 @@ export default {
}
},
handleAbnormal(row) {
// this.$router.push({
// path: '/quality/detail',
// query: {
// coilId: row.coilId,
// }
// })
this.currentCoilId = row.coilId;
this.abnormalOpen = true;
},
@@ -1051,31 +1020,6 @@ export default {
this.$modal.msgError("发货失败");
});
},
async handleNewExport(row) {
this.loading = true
let coilIds = ''
const query = {
...this.queryParams,
selectType: 'product',
pageSize: 9999,
pageNum: 1,
}
if (this.showWaybill) {
const res = await listBoundCoil(query)
coilIds = res.rows.map(item => item.coilId).join(',')
this.loading = false
this.download('/wms/materialCoil/exportDelivery', {
coilIds,
}, 'coil.xlsx')
} else {
const { rows: coils } = await listMaterialCoil(query)
coilIds = coils.map(item => item.coilId).join(',')
this.loading = false
this.download('wms/materialCoil/exportAll', {
coilIds,
}, 'coil.xlsx')
}
},
handleCheck(row) {
this.isCheck = true;
this.loading = true;
@@ -1209,6 +1153,7 @@ export default {
...this.queryParams
}, `materialCoil_${new Date().getTime()}.xlsx`)
},
/** 批量打印标签按钮 */
handleBatchPrintLabel() {
if (!this.ids || this.ids.length === 0) {

67
klp-ui/src/views/wms/coil/panels/do.vue
View File

@@ -199,7 +199,7 @@
</div>
<div class="card-footer">
<el-button v-if="useSpecialSplit" :style="splitButtonStyle" icon="el-icon-scissors" size="mini"
<el-button v-if="useSpecialSplit" type="success" icon="el-icon-scissors" size="mini"
@click="handleStartSplit(item)" :loading="buttonLoading" class="action-btn">加工</el-button>
<el-button v-else type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
:loading="buttonLoading" class="action-btn">领料</el-button>
@@ -223,7 +223,7 @@
<div class="section-card action-section" v-if="useSpecialSplit" style="margin-bottom: 20px;"
v-loading="stepSpilt.loading">
<div class="section-header ">
<h3 class="section-title">进行中的{{ label }}</h3>
<h3 class="section-title">进行中的镀锌工序</h3>
<el-button size="mini" icon="el-icon-refresh" @click="getStepSplitList">刷新</el-button>
</div>
<div v-if="stepSpilt.list.length > 0" style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
@@ -552,7 +552,7 @@ export default {
degree: null,
remark: null
},
tagSizeMap: {
tagSizeMap: {
'2': {
width: 100,
height: 80,
@@ -577,10 +577,6 @@ export default {
width: 180,
height: 100,
},
'6': {
width: 180,
height: 100,
},
},
stepSpilt: {
list: [],
@@ -602,42 +598,6 @@ export default {
})
return acidAction ? parseInt(acidAction.value) : null
},
splitButtonStyle() {
if (this.acidRollingActionType == 501) {
return {
backgroundColor: '#2cb867',
border: '1px solid #2cb867',
color: '#111'
}
} else if (this.acidRollingActionType == 502) {
return {
backgroundColor: 'purple',
border: '1px solid purple',
color: '#fff'
}
} else if (this.acidRollingActionType == 503) {
return {
backgroundColor: '#f56c6c',
border: '1px solid #f56c6c',
color: '#fff'
}
} else if (this.acidRollingActionType == 504) {
return {
backgroundColor: 'orange',
border: '1px solid orange',
color: '#111'
}
} else if (this.acidRollingActionType == 505) {
return {
// 青色
backgroundColor: 'blue',
border: '1px solid blue',
color: '#fff'
}
} else {
return {}
}
}
},
watch: {
// 监听字典数据加载，当acidRollingActionType有值时自动加载待操作列表
@@ -679,11 +639,9 @@ export default {
if (this.acidRollingActionType) {
this.actionQueryParams.actionType = this.acidRollingActionType
this.getPendingAction()
if (this.useSpecialSplit) {
this.getStepSplitList()
}
}
})
this.getStepSplitList()
},
mounted() {
// 确保在mounted时也尝试加载（字典数据可能此时才加载完成）
@@ -703,14 +661,9 @@ export default {
const itemType = row.itemType || '';
const warehouseId = row.warehouseId || '';
// 在镀锌颜料库的卷使用镀锌原料标签
if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) {
if (itemType == 'raw_material' && warehouseId == '1988150263284953089') {
this.labelRender.type = '5';
}
// 脱脂原料库
else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) {
this.labelRender.type = '6';
}
else if (itemType == 'raw_material') {
} else if (itemType == 'raw_material') {
this.labelRender.type = '2';
} else if (itemType == 'product' && itemName == '冷硬卷') {
this.labelRender.type = '3';
@@ -737,11 +690,7 @@ export default {
getStepSplitList() {
this.stepSpilt.loading = true
if (!this.acidRollingActionType) {
this.$message.error(`未找到${this.label}操作类型，请检查字典配置`)
return
}
listPendingAction({ actionType: this.acidRollingActionType, actionStatus: 0 }).then(response => {
listPendingAction({ actionType: 501, actionStatus: 0 }).then(response => {
this.stepSpilt.list = response.rows || []
this.stepSpilt.loading = false
})
@@ -1006,7 +955,7 @@ export default {
try {
await this.$modal.confirm('是否确认领料开始分步加工操作？')
this.stepSpilt.loading = true
await startSpecialSplit(row.coilId, this.acidRollingActionType);
await startSpecialSplit(row.coilId);
// await addPendingAction({
// coilId: row.coilId,
// currentCoilNo: row.currentCoilNo,

27
klp-ui/src/views/wms/coil/perspective/components/LeftList.vue
View File

@@ -17,9 +17,6 @@
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" class="add-btn">
新增
</el-button>
<el-button type="primary" plain icon="el-icon-refresh" size="mini" @click="getList" class="add-btn">
刷新
</el-button>
</div>
<!-- 自定义列表（替代表格） -->
@@ -35,16 +32,11 @@
<!-- 内容区域 -->
<div class="item-content">
<el-tag type="info">{{ item.statType }}</el-tag>
<div style="display: flex; flex-direction: column;">
<div style="display: flex;">
<!-- 双击后变成输入框，输入框失去焦点触发更新 -->
<div class="value">
{{ item.title }}
<el-icons title="本次汇总保存了汇总时使用的钢卷明细" v-if="item.attachmentInfo" class="el-icon-link"></el-icons>
</div>
<div>
<span class="value" style="margin-right: 5px;">{{ item.createBy }}</span>
<span class="value">{{ item.createTime }}</span>
</div>
<div class="value">{{ item.title }}</div>
<!-- <span class="value">{{ item.createTime }}</span>
<span class="value">{{ item.createBy }}</span> -->
</div>
</div>
@@ -63,10 +55,12 @@
<!-- 添加或修改钢卷生产统计对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<div v-for="item in tableType" :key="item.statType" @click="handleCreate(item)" class="type-item">
<div class="type-title">{{ item.title }}</div>
<div class="type-desc">{{ item.description }}</div>
</div>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<div v-for="item in tableType" :key="item.statType" @click="handleCreate(item)" class="type-item">
<div class="type-title">{{ item.title }}</div>
<div class="type-desc">{{ item.description }}</div>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
@@ -269,7 +263,6 @@ export default {
.item-content {
flex: 1;
display: flex;
align-items: flex-start;
gap: 5px;
}

174
klp-ui/src/views/wms/coil/perspective/index.vue
View File

@@ -5,53 +5,32 @@
<LeftList ref="leftList" @add="handleAdd" @select="handleSelect" />
</el-col>
<el-col :span="18" style="position: relative;">
<ul style="float: right; position: absolute; right: 0; top: 0; z-index: 100;">
<li v-show="currentRow.attachmentInfo" @click="handleDownload(currentRow)"><el-button
icon="el-icon-download">下载明细</el-button></li>
</ul>
<el-col :span="18">
<div style="height: calc(100vh - 124px); overflow-y: scroll; overflow-x: hidden;">
<div v-if="currentRow.summaryId">
<Preview :data="currentRow.statJson" :statType="currentRow.statType" />
</div>
<div v-else>
<div>
<el-empty description="请点击左侧列表查看或创建透视表" />
</div>
<div>钢卷生产统计详情</div>
</div>
</div>
</el-col>
</el-row>
<el-dialog v-loading="previewLoading" title="效果预览" :visible.sync="previewOpen" width="80vw" append-to-body>
<div>
<el-button type="primary" @click="handleSave" :loading="buttonLoading">保存</el-button>
<!-- <el-button type="primary" @click="handleDetail" :loading="buttonLoading">查看明细</el-button> -->
<el-checkbox style="margin-left: 10px;" v-model="saveDetail"
label="orderBy">保存透视表时保存明细，勾选后在保存时会消耗更长的时间且会占用更多内存和存储</el-checkbox>
</div>
<div style="height: calc(100vh - 300px); overflow-y: scroll; overflow-x: hidden;">
<div v-if="liveData">
<Preview :data="liveData" :statType="form.statType" />
</div>
<div v-else>
<div>
<el-empty description="未知的透视表" />
</div>
</div>
</div>
<el-dialog v-loading="previewLoading" title="效果预览" :visible.sync="previewOpen" width="100vw" fullscreen append-to-body>
<Preview :data="liveData" :statType="form.statType" />
<el-button type="primary" @click="handleSave">保存</el-button>
</el-dialog>
</div>
</template>
<script>
import { getCoilStatisticsSummary, delCoilStatisticsSummary, addCoilStatisticsSummary, updateCoilStatisticsSummary, checkCoilStatisticsSummaryExist } from "@/api/wms/coilStatisticsSummary";
import { getCoilStatisticsSummary, delCoilStatisticsSummary, addCoilStatisticsSummary, updateCoilStatisticsSummary } from "@/api/wms/coilStatisticsSummary";
import LeftList from "./components/LeftList.vue";
import Preview from "@/views/wms/coil/panels/Perspective/index.vue";
import { listRawMaterialPerspective } from "@/api/wms/rawMaterial";
import { uploadFile } from "@/api/system/oss";
import { listCoilTrimStatistics, categoryWidthStatistics, listMaterialCoil, exportCoilWithAll } from "@/api/wms/coil";
import { listCoilTrimStatistics, categoryWidthStatistics } from "@/api/wms/coil";
export default {
name: "CoilStatisticsSummary",
@@ -88,7 +67,6 @@ export default {
title: undefined,
statType: undefined,
},
saveDetail: false,
// 表单参数
form: {},
// 表单校验
@@ -100,7 +78,19 @@ export default {
currentRow: {},
};
},
created() {
this.getList();
},
methods: {
/** 查询钢卷生产统计列表 */
getList() {
this.loading = true;
listCoilStatisticsSummary(this.queryParams).then(response => {
this.coilStatisticsSummaryList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
@@ -140,39 +130,9 @@ export default {
};
},
/** 新增按钮操作 */
async handleAdd(form) {
this.form = form;
// 先检查今天是否已经创建过该类型的透视表
const {data: existingSummary} = await checkCoilStatisticsSummaryExist(form.statType);
// 如果已经创建过
if (existingSummary) {
// 先提示是否继续创建
try {
await this.$confirm('该类型已存在透视表，是否继续创建？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
});
} catch (error) {
return;
}
// 如果要继续创建，则提示是否要覆盖已经存在的透视表
try {
await this.$confirm('是否覆盖已存在的透视表？', '提示', {
confirmButtonText: '删除并重新创建',
cancelButtonText: '保留已有透视表',
type: 'warning'
});
delCoilStatisticsSummary(existingSummary).then(() => {
this.$modal.msgSuccess("删除成功");
this.getList();
});
} catch (error) {
}
}
handleAdd(form) {
this.previewOpen = true;
this.form = form;
if (form.statType == '热轧原料') {
this.previewLoading = true;
listRawMaterialPerspective().then(response => {
@@ -223,97 +183,19 @@ export default {
}
this.previewLoading = false;
},
async handleSave() {
const loading = this.$loading({
lock: true,
text: '保存中...',
background: 'rgba(0, 0, 0, 0.7)'
})
try {
this.buttonLoading = true;
const { data: summary } = await addCoilStatisticsSummary({
...this.form,
statJson: JSON.stringify(this.liveData)
})
if (this.saveDetail) {
// 获取原始数据，组装coilIds，
let coilIds = ''
if (this.form.statType == '热轧原料') {
const { rows: coils } = await listMaterialCoil({
pageNum: 1,
pageSize: 9999,
selectType: 'raw_material',
dataType: 1,
status: 0,
itemName: '热轧卷板',
itemType: 'raw_material',
})
coilIds = coils.map(item => item.coilId).join(',')
} else if (this.form.statType == '冷硬卷板') {
const { rows: coils1 } = await listMaterialCoil({
pageNum: 1,
pageSize: 9999,
selectType: 'raw_material',
dataType: 1,
status: 0,
itemName: '冷硬卷',
itemType: 'raw_material',
})
const { rows: coils2 } = await listMaterialCoil({
pageNum: 1,
pageSize: 9999,
selectType: 'product',
dataType: 1,
status: 0,
itemName: '冷硬卷',
itemType: 'product',
})
coilIds = coils1.concat(coils2).map(item => item.coilId).join(',')
} else if (this.form.statType == '汇总') {
const { rows: coils } = await listMaterialCoil({
pageNum: 1,
pageSize: 9999,
dataType: 1,
status: 0,
})
coilIds = coils.map(item => item.coilId).join(',')
}
// 使用exportCoilWithAll接口传入coilIds获取二进制文件数据
const response = await exportCoilWithAll({
coilIds: coilIds,
})
const file = new Blob([response], { type: 'application/vnd.ms-excel' })
const fileName = this.form.statType + '明细.xlsx'
// 通过new File构建出excel文件
const excelFile = new File([file], fileName, { type: 'application/vnd.ms-excel' })
console.log(excelFile)
// 上传文件到minio
const uploadResponse = await uploadFile(excelFile)
console.log(uploadResponse)
// 关联附件信息
await updateCoilStatisticsSummary({
...summary,
attachmentInfo: uploadResponse.data.ossId,
});
}
handleSave() {
addCoilStatisticsSummary({
...this.form,
statJson: JSON.stringify(this.liveData)
}).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.previewOpen = false;
this.liveData = [];
this.form = {};
this.$refs.leftList.getList();
} finally {
}).finally(() => {
this.buttonLoading = false;
loading.close();
}
},
handleDownload(row) {
this.$download.oss(row.attachmentInfo)
});
},
/** 修改按钮操作 */
handleUpdate(row) {

3
klp-ui/src/views/wms/coil/product.vue
View File

@@ -29,8 +29,7 @@ export default {
showStatus: true,
hideType: true,
showLength: true,
canExportAll: true,
showOrderBy: true,
canExportAll: true
}
}
}

8
klp-ui/src/views/wms/coil/views/scrap.vue
View File

@@ -8,10 +8,6 @@
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
:hideType="hideType" />
</el-tab-pane>
<el-tab-pane label="次品" name="third">
<BasePage :qrcode="qrcode" :querys="query3" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
:hideType="hideType" />
</el-tab-pane>
</el-tabs>
</template>
@@ -38,10 +34,6 @@ export default {
nextWarehouseId: '2019583429955104769', // 废品仓
// materialType: '废品'
},
query3: {
dataType: 1,
OnlyScrap: true,
},
hideWarehouseQuery: true,
showAbnormal: true,
labelType: '2',

2
klp-ui/src/views/wms/coil/waybill.vue
View File

@@ -2,7 +2,6 @@
<BasePage
:qrcode="qrcode"
:showWaybill="showWaybill"
:showNewExport="showNewExport"
:querys="querys" :labelType="labelType" :showStatus="showStatus" :hideType="hideType" :showControl="showControl" :showExportTime="showExportTime" />
</template>
@@ -28,7 +27,6 @@ export default {
hideType: false,
showExportTime: false,
showWaybill: true,
showNewExport: true,
}
}
}

38
klp-ui/src/views/wms/delivery/canuse/index.vue
View File

@@ -1,38 +0,0 @@
<template>
<BasePage :qrcode="qrcode"
:querys="querys"
:labelType="labelType"
:showStatus="showStatus"
:hideType="hideType"
:showLength="showLength"
:canExportAll="canExportAll"
/>
</template>
<script>
import BasePage from '@/views/wms/coil/panels/base.vue';
export default {
components: {
BasePage
},
data() {
return {
qrcode: false,
querys: {
dataType: 1,
materialType: '成品',
itemType: 'product',
status: 0,
orderBy: true
},
labelType: '3',
showStatus: true,
hideType: true,
showLength: true,
canExportAll: true,
showOrderBy: false,
}
}
}
</script>

1389
klp-ui/src/views/wms/delivery/components/wayBill2.vue
View File

File diff suppressed because it is too large Load Diff

94
klp-ui/src/views/wms/delivery/waybill/index.vue
View File

@@ -43,20 +43,13 @@
<el-table-column label="车牌" align="center" prop="licensePlate" width="100" />
<el-table-column label="收货单位" align="center" prop="consigneeUnit" />
<!-- <el-table-column label="发货单位" align="center" prop="senderUnit" /> -->
<el-table-column label="订单编号" align="center" prop="orderNo">
<template slot-scope="scope">
<span v-if="scope.row.orderId">{{ scope.row.orderCode }}</span>
<span v-else>{{ scope.row.principalPhone }}</span>
</template>
</el-table-column>
<el-table-column label="订单编号" align="center" prop="orderNo" />
<el-table-column label="发货时间" align="center" prop="deliveryTime" width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.deliveryTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="负责人" align="center" prop="principal" width="60" />
<el-table-column label="备注" align="center" prop="remark" width="100" show-overflow-tooltip/>
<!-- <el-table-column label="负责人电话" align="center" prop="principalPhone" width="100" /> -->
<el-table-column label="完成状态" align="center" prop="status" width="120">
<template slot-scope="scope">
@@ -72,8 +65,6 @@
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-view"
@click.stop="handlePrint(scope.row)">打印发货单</el-button>
<el-button size="mini" type="text" icon="el-icon-view"
@click.stop="handlePrintSimple(scope.row)">简单打印</el-button>
<el-button size="mini" type="text" icon="el-icon-copy"
@click.stop="handleCopy(scope.row)">复制新增</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" :disabled="scope.row.status === 1"
@@ -118,12 +109,9 @@
<el-form-item label="负责人" prop="principal">
<el-input v-model="form.principal" placeholder="请输入负责人" />
</el-form-item>
<el-form-item label="订单编号" prop="principalPhone" v-if="!form.orderId">
<el-input v-model="form.principalPhone" placeholder="请输入订单编号"/>
</el-form-item>
<el-form-item label="订单编号" prop="principalPhone" v-else title="当前发货单已绑定订单">
<el-input v-model="form.orderCode" placeholder="请输入订单编号" readonly disabled/>
</el-form-item>
<!-- <el-form-item label="负责人电话" prop="principalPhone">
<el-input v-model="form.principalPhone" placeholder="请输入负责人电话" />
</el-form-item> -->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
@@ -136,8 +124,7 @@
<!-- 打印发货单对话框 -->
<el-dialog title="打印发货单" :visible.sync="printDialogVisible" width="1000px" append-to-body center>
<WayBill v-if="printType === 0" :waybill="currentWaybill" :waybillDetails="currentWaybillDetails" />
<WayBill2 v-else :waybill="currentWaybill" :waybillDetails="currentWaybillDetails" />
<WayBill :waybill="currentWaybill" :waybillDetails="currentWaybillDetails" />
</el-dialog>
</div>
</template>
@@ -151,8 +138,6 @@ import MemoInput from "@/components/MemoInput";
import DeliveryWaybillDetail from "../components/detailTable.vue";
import WayBill from "../components/wayBill.vue";
import PlanList from "../components/planList.vue";
import WayBill2 from "../components/wayBill2.vue";
export default {
name: "DeliveryWaybill",
@@ -160,8 +145,7 @@ export default {
MemoInput,
DeliveryWaybillDetail,
WayBill,
PlanList,
WayBill2
PlanList
},
data() {
return {
@@ -188,8 +172,6 @@ export default {
currentWaybillDetails: [],
// 弹出层标题
title: "",
// 打印类型
printType: 0,
// 是否显示弹出层
open: false,
// 查询参数
@@ -356,10 +338,7 @@ export default {
const waybillId = row.waybillId || this.ids
getDeliveryWaybill(waybillId).then(response => {
this.loading = false;
this.form = {
...response.data,
orderCode: row.orderCode
};
this.form = response.data;
this.open = true;
this.title = "修改发货单";
});
@@ -430,65 +409,6 @@ export default {
/** 打印发货单 */
handlePrint(row) {
this.loading = true;
this.printType = 0;
// 获取发货单明细
listDeliveryWaybillDetail({
waybillId: row.waybillId,
pageNum: 1,
pageSize: 1000 // 获取所有明细
}).then(response => {
// 处理字段映射，确保与wayBill组件使用的字段名一致
this.currentWaybillDetails = response.rows.map(item => ({
coilId: item.coilId,
productName: item.productName,
edgeType: item.edgeType,
packageType: item.packaging, // 映射packaging到packageType
settlementType: item.settlementType,
rawMaterialFactory: item.rawMaterialFactory,
coilNumber: item.coilNo, // 映射coilNo到coilNumber
specification: item.specification,
material: item.material,
quantity: item.quantity,
weight: item.weight,
unitPrice: item.unitPrice || '',
// 单价为空时，显示为空字符串
remark: item.remark
}));
const coils = this.currentWaybillDetails.map(item => item.coilId).join(',');
if (coils) {
listCoilByIds(coils).then(response => {
// 取前三位, 然后去抽后用;连接
// 设置当前发货单
const actualWahouseNames = [...new Set(response.rows.filter(item => Boolean(item.actualWarehouseName)).map(item => item.actualWarehouseName.slice(0, 3)))].join(';');
this.currentWaybill = {
...row,
pickupLocation: actualWahouseNames || '',
};
this.currentWaybillDetails = this.currentWaybillDetails.map(item => {
const actualWarehouseName = response.rows.find(detail => detail.coilId === item.coilId)?.actualWarehouseName || '';
return {
...item,
actualWarehouseName: actualWarehouseName,
};
});
});
}
this.currentWaybill = {
...row,
};
this.printDialogVisible = true;
this.loading = false;
}).catch(error => {
console.error('获取发货单明细失败:', error);
this.$modal.msgError('获取发货单明细失败');
this.loading = false;
});
},
/** 打印发货单 */
handlePrintSimple(row) {
this.loading = true;
this.printType = 1;
// 获取发货单明细
listDeliveryWaybillDetail({
waybillId: row.waybillId,

405
klp-ui/src/views/wms/warehouse/components/WarehouseBirdMini.vue
View File

@@ -1,405 +0,0 @@
<template>
<div class="bird-container">
<!-- 图例 -->
<div class="legend-container">
<div class="legend-item">
<div class="legend-color layer-1"></div>
<span class="legend-text">一层</span>
</div>
<div class="legend-item">
<div class="legend-color layer-2"></div>
<span class="legend-text">二层</span>
</div>
<div class="legend-item">
<div class="legend-color occupied"></div>
<span class="legend-text">已占用</span>
</div>
<div class="legend-item">
<div class="legend-color error"></div>
<span class="legend-text">异常</span>
</div>
</div>
<!-- 分列库位容器 -->
<div class="layers-container">
<!-- 无数据提示 -->
<div class="empty-tip" v-if="Object.keys(columns).length === 0 && warehouseList.length > 0">
暂无解析到有效的库位分列数据
</div>
<div class="empty-tip" v-else-if="warehouseList.length === 0">
<el-empty description="暂无库位数据"></el-empty>
</div>
<warehouse-interlaced ref="warehouseInterlaced" v-else="warehouseList.length" :id="id" :columns="columns" :canToggle="canToggle"
:canRelease="canRelease" @split-warehouse="handleSplitWarehouse" @merge-warehouse="handleMergeWarehouse"
@release-warehouse="handleReleaseWarehouse" />
</div>
</div>
</template>
<script>
import WarehouseInterlaced from './WarehouseInterlaced.vue';
export default {
name: "WarehouseBirdMini",
components: { WarehouseInterlaced },
props: {
// 原始库位列表
warehouseList: {
type: Array,
default: () => []
},
id: {
type: String,
default: ''
},
canToggle: {
default: true,
type: Boolean
},
canRelease: {
default: false,
type: Boolean
}
},
data() {
return {
// 分列库位数据（核心修改：从layers改为columns）
columns: {},
// 统计信息（适配分列逻辑）
statistics: {
total: 0,
columnCount: 0,
columnDetail: {},
// 占用情况
// 每一列每一层的总数和已占用数量
layerDetail: {}
},
tableData: []
};
},
watch: {
// 监听库位列表变化，重新构建分列数据
warehouseList: {
immediate: true,
handler(newVal) {
this.buildWarehouseBox(newVal);
}
}
},
methods: {
// 处理分列数据调整
resize() {
this.$refs.warehouseInterlaced.handleResize();
},
handleSplitWarehouse(warehouse) {
this.$emit('split-warehouse', warehouse);
},
// 1. 转换layerDetail为表格所需的数组格式
formatTableData() {
const layerDetail = this.statistics.layerDetail;
this.tableData = Object.keys(layerDetail).map(column => {
const layer1 = layerDetail[column].layer1;
const layer2 = layerDetail[column].layer2;
return {
column: column, // 列号
// 第一层数据
layer1_total: layer1.total,
layer1_occupied: layer1.occupied,
layer1_free: layer1.free,
// 第二层数据
layer2_total: layer2.total,
layer2_occupied: layer2.occupied,
layer2_free: layer2.free,
// 该列总计
column_total: layer1.total + layer2.total,
column_occupied: layer1.occupied + layer2.occupied,
column_free: layer1.free + layer2.free
};
});
},
handleMergeWarehouse(warehouse) {
this.$emit('merge-warehouse', warehouse);
},
handleReleaseWarehouse(warehouse) {
this.$emit('release-warehouse', warehouse);
},
/**
* 解析第三级库位编码
* 新规则：
* 1. 前三位：数字或字母的任意组合
* 2. column：从第五位开始到第一个"-"为止（支持多位数）
* 3. 保留 row（两位数字）、layer（数字）的解析规则
*/
parseWarehouseCode(code) {
if (!code) return null;
// 新正则表达式解析规则
// ^([A-Za-z0-9]{3}) ：匹配前3位（数字/字母）
// . ：匹配第4位（任意单个字符）
// ([^-]+) ：匹配column（到第一个"-"为止，至少1位）
// -(\d{2}) ：匹配row（两位数字）
// -(\d+) ：匹配layer（一位或多位数字）
const reg = /^([A-Za-z0-9]{3})([^-]+)-(\d{2})-(\d+)$/;
const match = code.match(reg);
if (!match) {
console.warn(`库位编码解析失败：${code}，格式不符合规范`);
return null;
}
return {
level: 3,
warehousePrefix: match[1], // 前三位（数字/字母），替代原warehouseFirst/warehouseSecond
warehouseFirst: match[1].slice(0, 2), // 前三位的前两个字符
warehouseSecond: match[1].slice(2, 3), // 前三位的第三个字符
column: Number(match[2]), // 第五位到第一个"-"的内容（多位数）
row: Number(match[3]), // 两位数字的行号
layer: match[4] // 层级数字（可多位数）
};
},
/**
* 解析第四级库位编码，格式为F2A1-X01-1
*/
parseWarehouseCodeFourth(code) {
if (!code) return null;
const reg = /^([A-Za-z0-9]{3})([^-]+)-X(\d{2})-(\d+)$/;
const match = code.match(reg);
if (!match) {
console.warn(`库位编码解析失败：${code}，格式不符合规范`);
return null;
}
// console.log('match:', match);
return {
level: 4,
warehousePrefix: match[1],
warehouseFirst: match[1].slice(0, 2), // 前三位的前两个字符
warehouseSecond: match[1].slice(2, 3), // 前三位的第三个字符
// warehouseSecond: match[2],
column: Number(match[2]),
row: Number(match[3]),
layer: match[4],
};
},
buildWarehouseBox(list) {
const columnMap = {}; // 按列分组的核心对象
const statistics = {
total: list.length,
columnCount: 0,
columnDetail: {},
// 占用情况：每一列每一层的总数、已占用、未占用数量
layerDetail: {}
};
// 1. 按列分组，每列内部分为layer1和layer2两个数组
list.forEach((warehouse) => {
let codeInfo = {}
if (warehouse.actualWarehouseType == 4) {
codeInfo = this.parseWarehouseCodeFourth(warehouse.actualWarehouseCode);
} else {
codeInfo = this.parseWarehouseCode(warehouse.actualWarehouseCode);
}
if (!codeInfo) return;
const { layer, row, column } = codeInfo;
warehouse.parsedInfo = codeInfo;
// 初始化列数据结构：每列包含layer1、layer2数组，以及最大行号
if (!columnMap[column]) {
columnMap[column] = {
maxRow: 0,
layer1: [], // 第一层库位数组
layer2: [], // 第二层库位数组
total: 0 // 该列总库位数
};
}
// 更新列的最大行号
columnMap[column].maxRow = Math.max(columnMap[column].maxRow, row);
// 根据层数将库位放入对应数组
if (layer === '1' || layer === 1) {
columnMap[column].layer1.push(warehouse);
} else if (layer === '2' || layer === 2) {
columnMap[column].layer2.push(warehouse);
}
// 更新该列总库位数
columnMap[column].total = columnMap[column].layer1.length + columnMap[column].layer2.length;
});
// 2. 对每列的两层数据分别按行号排序
Object.keys(columnMap).forEach((column) => {
const columnData = columnMap[column];
// 按行号排序（保证展示顺序正确）
columnData.layer1.sort((a, b) => a.parsedInfo.row - b.parsedInfo.row);
columnData.layer2.sort((a, b) => a.parsedInfo.row - b.parsedInfo.row);
});
// 3. 更新统计信息（适配分列逻辑）
statistics.columnCount = Object.keys(columnMap).length;
Object.keys(columnMap).forEach((column) => {
const columnData = columnMap[column];
// 列维度总数量
statistics.columnDetail[column] = columnData.total;
// ========== 新增：layerDetail 层级统计逻辑 ==========
// 初始化当前列的层级统计结构
statistics.layerDetail[column] = {
layer1: {
total: 0, // 该层总库位数
occupied: 0, // 已占用（isEnabled=0）
free: 0 // 未占用（isEnabled=1）
},
layer2: {
total: 0,
occupied: 0,
free: 0
}
};
// 统计第一层
const layer1Data = columnData.layer1;
statistics.layerDetail[column].layer1.total = layer1Data.length;
statistics.layerDetail[column].layer1.occupied = layer1Data.filter(item => item.isEnabled === 0).length;
statistics.layerDetail[column].layer1.free = layer1Data.filter(item => item.isEnabled === 1).length;
// 统计第二层
const layer2Data = columnData.layer2;
statistics.layerDetail[column].layer2.total = layer2Data.length;
statistics.layerDetail[column].layer2.occupied = layer2Data.filter(item => item.isEnabled === 0).length;
statistics.layerDetail[column].layer2.free = layer2Data.filter(item => item.isEnabled === 1).length;
});
// 4. 赋值到响应式数据
this.columns = columnMap;
this.statistics = statistics;
this.formatTableData();
},
/**
* 打开初始化弹窗（透传至根组件）
*/
openInitDialog() {
this.$emit('open-init-dialog');
}
},
};
</script>
<style scoped lang="scss">
.bird-container {
width: 100%;
height: 100%;
}
// 统计卡片样式
.statistics-card {
margin-bottom: 16px;
.statistics-item {
margin-bottom: 8px;
&:last-child {
margin-bottom: 0;
}
.label {
color: #606266;
font-size: 14px;
}
.value {
color: #303133;
font-size: 14px;
font-weight: 500;
margin-left: 8px;
}
}
}
// 图例样式
.legend-container {
display: flex;
align-items: center;
margin-bottom: 16px;
padding: 8px 12px;
background: #f8f9fa;
border-radius: 4px;
.legend-item {
display: flex;
align-items: center;
margin-right: 24px;
&:last-child {
margin-right: 0;
}
.legend-color {
width: 16px;
height: 16px;
border-radius: 2px;
margin-right: 8px;
border: 1px solid #e6e6e6;
}
.normal {
background-color: #ffffff;
}
.layer-1 {
background-color: #fff3e0;
}
.layer-2 {
background-color: #e8f5e9;
}
.occupied {
background-color: #fafafa;
}
.error {
background-color: #fdecea;
}
.legend-text {
font-size: 14px;
color: #606266;
}
}
}
// 分列容器样式
.layers-container {
display: flex;
.layer-section {
flex: 1;
max-width: 50%;
margin-bottom: 24px;
}
.empty-tip {
text-align: center;
padding: 32px;
color: #909399;
font-size: 14px;
background: #fff;
border-radius: 8px;
.empty-text {
margin-bottom: 16px;
}
}
}
</style>

2
klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue
View File

@@ -125,7 +125,7 @@ export default {
canRelease: {
default: false,
type: Boolean
},
}
},
data() {
return {

15
klp-wms/src/main/java/com/klp/controller/WmsCoilStatisticsSummaryController.java
View File

@@ -71,8 +71,8 @@ public class WmsCoilStatisticsSummaryController extends BaseController {
@Log(title = "钢卷生产统计汇总（数据透视结果持久化）", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<WmsCoilStatisticsSummaryVo> add(@Validated(AddGroup.class) @RequestBody WmsCoilStatisticsSummaryBo bo) {
return R.ok(iWmsCoilStatisticsSummaryService.insertByBo(bo));
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsCoilStatisticsSummaryBo bo) {
return toAjax(iWmsCoilStatisticsSummaryService.insertByBo(bo));
}
/**
@@ -96,15 +96,4 @@ public class WmsCoilStatisticsSummaryController extends BaseController {
@PathVariable Long[] summaryIds) {
return toAjax(iWmsCoilStatisticsSummaryService.deleteWithValidByIds(Arrays.asList(summaryIds), true));
}
/**
* 检查当天是否存在指定类型的统计记录
*
* @param statType 统计类型
* @return 存在的记录ID，不存在则返回null
*/
@GetMapping("/checkToday")
public R<Long> checkTodayExists(@RequestParam String statType) {
return R.ok(iWmsCoilStatisticsSummaryService.checkExistsByStatTypeToday(statType));
}
}

38
klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
View File

@@ -1,15 +1,13 @@
package com.klp.controller;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Arrays;
import java.util.stream.Collectors;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.klp.domain.vo.*;
import com.klp.domain.vo.WmsMaterialCoilExportVo;
import com.klp.domain.vo.WmsMaterialCoilDeliveryExportVo;
import com.klp.domain.vo.WmsMaterialCoilLocationGridVo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
@@ -24,6 +22,7 @@ import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.domain.vo.dashboard.CoilTrimStatisticsVo;
import com.klp.domain.vo.dashboard.CategoryWidthStatisticsVo;
@@ -67,7 +66,7 @@ public class WmsMaterialCoilController extends BaseController {
}
/**
* 导出钢卷物料表列表（精简字段版本）
* 导出钢卷物料表列表（完整字段版本）
*/
@Log(title = "钢卷物料表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@@ -75,16 +74,6 @@ public class WmsMaterialCoilController extends BaseController {
List<WmsMaterialCoilExportVo> list = iWmsMaterialCoilService.queryExportList(bo);
ExcelUtil.exportExcel(list, "钢卷物料表", WmsMaterialCoilExportVo.class, response);
}
/**
* 导出钢卷物料表列表（完整字段版本）
* 导出全部字段
*/
@Log(title = "钢卷物料表", businessType = BusinessType.EXPORT)
@PostMapping("/exportAll")
public void exportSimple(WmsMaterialCoilBo bo, HttpServletResponse response) {
List<WmsMaterialCoilAllExportVo> list = iWmsMaterialCoilService.queryExportListAll(bo);
ExcelUtil.exportExcel(list, "钢卷物料表", WmsMaterialCoilAllExportVo.class, response);
}
/**
* 导出发货报表（按 coilIds，联查发货单明细/主表/发货计划）
@@ -296,23 +285,19 @@ public class WmsMaterialCoilController extends BaseController {
* 检查钢卷号是否重复
* 前端传入入场钢卷号和当前钢卷号，返回哪个钢卷号重复
*
* @param coilId 钢卷ID（修改时传入，用于排除自身）
* @param enterCoilNo 入场钢卷号
* @param currentCoilNo 当前钢卷号
* @param supplierCoilNo 厂家原料卷号
* @return 返回结果，包含：
* - duplicateType: "enter" (入场钢卷号重复), "current" (当前钢卷号重复), "supplier" (厂家原料卷号重复), "both" (都重复), "none" (都不重复)
* - duplicateType: "enter" (入场钢卷号重复), "current" (当前钢卷号重复), "both" (都重复), "none" (都不重复)
* - enterCoilNoDuplicate: 入场钢卷号是否重复
* - currentCoilNoDuplicate: 当前钢卷号是否重复
* - supplierCoilNoDuplicate: 厂家原料卷号是否重复
*/
@GetMapping("/checkCoilNoDuplicate")
public R<Map<String, Object>> checkCoilNoDuplicate(
@RequestParam(required = false) Long coilId,
@RequestParam(required = false) String enterCoilNo,
@RequestParam(required = false) String currentCoilNo,
@RequestParam(required = false) String supplierCoilNo) {
Map<String, Object> result = iWmsMaterialCoilService.checkCoilNoDuplicate(coilId, enterCoilNo, currentCoilNo, supplierCoilNo);
@RequestParam(required = false) String currentCoilNo) {
Map<String, Object> result = iWmsMaterialCoilService.checkCoilNoDuplicate(coilId,enterCoilNo, currentCoilNo);
return R.ok(result);
}
@@ -375,12 +360,9 @@ public class WmsMaterialCoilController extends BaseController {
@PostMapping("/specialSplit/start")
public R<Long> startSpecialSplit(
@NotNull(message = "钢卷ID不能为空")
@RequestParam Long coilId,
@NotNull(message = "操作类型不能为空")
@RequestParam Integer actionType
) {
@RequestParam Long coilId) {
try {
Boolean result = iWmsMaterialCoilService.startSpecialSplit(coilId, actionType);
Boolean result = iWmsMaterialCoilService.startSpecialSplit(coilId);
if (Boolean.TRUE.equals(result)) {
return R.ok();
}

3
klp-wms/src/main/java/com/klp/domain/WmsCoilStatisticsSummary.java
View File

@@ -46,7 +46,4 @@ public class WmsCoilStatisticsSummary extends BaseEntity {
@TableLogic
private Long delFlag;
// 新增附件字段
private String attachmentInfo;
}

4
klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
View File

@@ -82,10 +82,6 @@ public class WmsEmployeeInfo extends BaseEntity {
* 紧急联系人电话
*/
private String emergencyContactPhone;
/**
* 社保类型（三险/五险）
*/
private String socialInsuranceType;
/**
* 逻辑删除标识：0=正常，1=已删
*/

4
klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java
View File

@@ -89,13 +89,13 @@ public class WmsCoilPendingActionBo extends BaseEntity {
/**
* 处理时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8")
private Date processTime;
/**
* 完成时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8")
private Date completeTime;
//开始时间和结束时间

3
klp-wms/src/main/java/com/klp/domain/bo/WmsCoilStatisticsSummaryBo.java
View File

@@ -42,8 +42,5 @@ public class WmsCoilStatisticsSummaryBo extends BaseEntity {
*/
private String remark;
// 新增附件字段
private String attachmentInfo;
}

5
klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java
View File

@@ -94,11 +94,6 @@ public class WmsEmployeeInfoBo extends BaseEntity {
*/
private String emergencyContactPhone;
/**
* 社保类型（三险/五险）
*/
private String socialInsuranceType;
/**
* 备注
*/

5
klp-wms/src/main/java/com/klp/domain/vo/WmsCoilStatisticsSummaryVo.java
View File

@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
@@ -16,7 +15,7 @@ import lombok.Data;
*/
@Data
@ExcelIgnoreUnannotated
public class WmsCoilStatisticsSummaryVo extends BaseEntity {
public class WmsCoilStatisticsSummaryVo {
private static final long serialVersionUID = 1L;
@@ -53,7 +52,5 @@ public class WmsCoilStatisticsSummaryVo extends BaseEntity {
@ExcelProperty(value = "备注")
private String remark;
// 新增附件字段
private String attachmentInfo;
}

5
klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java
View File

@@ -112,11 +112,6 @@ public class WmsEmployeeInfoVo {
@ExcelProperty(value = "紧急联系人电话")
private String emergencyContactPhone;
/**
* 社保类型（三险/五险）
*/
private String socialInsuranceType;
/**
* 备注
*/

193
klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
View File

@@ -1,193 +0,0 @@
package com.klp.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* 钢卷物料导出VO
*
* @author klp
* @date 2025-11-27
*/
@Data
@ExcelIgnoreUnannotated
public class WmsMaterialCoilAllExportVo {
/**
* 类型（成品/原料）
*/
@ExcelProperty(value = "类型")
private String itemTypeDesc;
/**
* 逻辑库区
*/
@ExcelProperty(value = "逻辑库区")
private String warehouseName;
/**
* 实际库区
*/
@ExcelProperty(value = "实际库区")
private String actualWarehouseName;
/**
* 入场卷号
*/
@ExcelProperty(value = "入场卷号")
private String enterCoilNo;
/**
* 厂家卷号
*/
@ExcelProperty(value = "厂家卷号")
private String supplierCoilNo;
/**
* 成品卷号
*/
@ExcelProperty(value = "成品卷号")
private String currentCoilNo;
/**
* 日期
*/
@ExcelProperty(value = "日期")
private Date createTime;
/**
* 发货时间（仅临时存储，不导出）
*/
@ExcelProperty(value = "发货时间")
private Date exportTime;
// 发货人
@ExcelProperty(value = "发货人")
private String exportBy;
/**
* 重量（kg）
*/
@ExcelProperty(value = "重量")
private BigDecimal netWeight;
// 班组
private String team;
/**
* 用途
*/
@ExcelProperty(value = "用途")
private String purpose;
/**
* 切边要求
*/
@ExcelProperty(value = "切边要求")
private String trimmingRequirement;
/**
* 包装种类
*/
@ExcelProperty(value = "包装种类")
private String packagingRequirement;
/**
* 产品状态
*/
@ExcelProperty(value = "产品质量")
private String qualityStatus;
/**
* 打包状态
*/
@ExcelProperty(value = "打包状态")
private String packingStatus;
/**
* 库存状态
*/
@ExcelProperty(value = "库存状态")
private String statusDesc;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 名称
*/
@ExcelProperty(value = "名称")
private String itemName;
@ExcelProperty(value = "长度")
private BigDecimal length;
/**
* 规格
*/
@ExcelProperty(value = "规格")
private String specification;
/**
* 材质
*/
@ExcelProperty(value = "材质")
private String material;
/**
* 厂家
*/
@ExcelProperty(value = "厂家")
private String manufacturer;
/**
* 表面处理
*/
@ExcelProperty(value = "表面处理")
private String surfaceTreatmentDesc;
/**
* 锌层
*/
@ExcelProperty(value = "锌层")
private String zincLayer;
/**
* 物品ID
*/
@ExcelProperty(value = "物品ID")
private Long itemId;
/**
* 更新时间（仅临时存储，不导出，用于发货时间为空时兜底）
*/
private Date updateTime;
// 数据类型
@Excel(name = "数据类型", readConverterExp = "0=历史,1=当前")
private Integer dataType;
// 调制度
@ExcelProperty(value = "调制度")
private String temperGrade;
// 镀层种类
@ExcelProperty(value = "镀层种类")
private String coatingType;
// 业务用途
@ExcelProperty(value = "业务用途")
private String businessPurpose;
// 是否与订单相关 readConverterExp
@Excel(name = "是否与订单相关", readConverterExp = "0=否,1=是")
private Integer isRelatedToOrder;
}

10
klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
View File

@@ -2,7 +2,6 @@ package com.klp.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.Excel;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import lombok.Data;
@@ -175,13 +174,4 @@ public class WmsMaterialCoilExportVo {
private String temperGrade;
// 镀层种类
private String coatingType;
// 班组
private String team;
// 业务用途
private String businessPurpose;
// 是否与订单相关 readConverterExp
private Integer isRelatedToOrder;
}

9
klp-wms/src/main/java/com/klp/service/IWmsCoilStatisticsSummaryService.java
View File

@@ -35,7 +35,7 @@ public interface IWmsCoilStatisticsSummaryService {
/**
* 新增钢卷生产统计汇总（数据透视结果持久化）
*/
WmsCoilStatisticsSummaryVo insertByBo(WmsCoilStatisticsSummaryBo bo);
Boolean insertByBo(WmsCoilStatisticsSummaryBo bo);
/**
* 修改钢卷生产统计汇总（数据透视结果持久化）
@@ -46,11 +46,4 @@ public interface IWmsCoilStatisticsSummaryService {
* 校验并批量删除钢卷生产统计汇总（数据透视结果持久化）信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 检查当天是否存在指定类型的统计记录
* @param statType 统计类型
* @return 存在的记录ID，不存在则返回null
*/
Long checkExistsByStatTypeToday(String statType);
}

17
klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java
View File

@@ -1,6 +1,8 @@
package com.klp.service;
import com.klp.domain.vo.*;
import com.klp.domain.vo.WmsMaterialCoilDeliveryExportVo;
import com.klp.domain.vo.WmsMaterialCoilLocationGridVo;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
@@ -139,19 +141,16 @@ public interface IWmsMaterialCoilService {
/**
* 检查钢卷号是否重复
* 根据入场钢卷号、当前钢卷号和厂家原料卷号查询数据库，判断哪个钢卷号重复
* 根据入场钢卷号和当前钢卷号查询数据库，判断哪个钢卷号重复
*
* @param coilId 钢卷ID（修改时传入，用于排除自身）
* @param enterCoilNo 入场钢卷号
* @param currentCoilNo 当前钢卷号
* @param supplierCoilNo 厂家原料卷号
* @return 返回结果Map，包含：
* - duplicateType: "enter" (入场钢卷号重复), "current" (当前钢卷号重复), "supplier" (厂家原料卷号重复), "both" (都重复), "none" (都不重复)
* - duplicateType: "enter" (入场钢卷号重复), "current" (当前钢卷号重复), "both" (都重复), "none" (都不重复)
* - enterCoilNoDuplicate: 入场钢卷号是否重复 (true/false)
* - currentCoilNoDuplicate: 当前钢卷号是否重复 (true/false)
* - supplierCoilNoDuplicate: 厂家原料卷号是否重复 (true/false)
*/
Map<String, Object> checkCoilNoDuplicate(Long coilId, String enterCoilNo, String currentCoilNo, String supplierCoilNo);
Map<String, Object> checkCoilNoDuplicate(Long coilId, String enterCoilNo, String currentCoilNo);
/**
* 根据入场钢卷号前缀查询最大的入场钢卷号
@@ -192,7 +191,7 @@ public interface IWmsMaterialCoilService {
* @param coilId 被分卷的钢卷ID
* @return 待操作记录ID
*/
Boolean startSpecialSplit(@NotNull(message = "钢卷ID不能为空") Long coilId, Integer actionType);
Boolean startSpecialSplit(@NotNull(message = "钢卷ID不能为空") Long coilId);
/**
* 特殊分卷 - 第二步：逐个创建子钢卷
@@ -232,7 +231,5 @@ public interface IWmsMaterialCoilService {
String enterCoilNo,
String currentCoilNo,
String manufacturer);
List<WmsMaterialCoilAllExportVo> queryExportListAll(WmsMaterialCoilBo bo);
}

4
klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
View File

@@ -108,8 +108,8 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
qw.orderByDesc("wcpa.create_time");
qw.orderByDesc("wcpa.scan_time");
//根据开始时间和结束时间筛选修改时间
qw.ge(bo.getStartTime() != null, "wcpa.complete_time", bo.getStartTime());
qw.le(bo.getEndTime() != null, "wcpa.complete_time", bo.getEndTime());
qw.ge(bo.getStartTime() != null, "wcpa.update_time", bo.getStartTime());
qw.le(bo.getEndTime() != null, "wcpa.update_time", bo.getEndTime());
// 根据更新人查询
qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "wcpa.update_by", bo.getUpdateBy());
//逻辑删除

22
klp-wms/src/main/java/com/klp/service/impl/WmsCoilStatisticsSummaryServiceImpl.java
View File

@@ -71,14 +71,14 @@ public class WmsCoilStatisticsSummaryServiceImpl implements IWmsCoilStatisticsSu
* 新增钢卷生产统计汇总（数据透视结果持久化）
*/
@Override
public WmsCoilStatisticsSummaryVo insertByBo(WmsCoilStatisticsSummaryBo bo) {
public Boolean insertByBo(WmsCoilStatisticsSummaryBo bo) {
WmsCoilStatisticsSummary add = BeanUtil.toBean(bo, WmsCoilStatisticsSummary.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setSummaryId(add.getSummaryId());
}
return queryById(add.getSummaryId());
return flag;
}
/**
@@ -108,22 +108,4 @@ public class WmsCoilStatisticsSummaryServiceImpl implements IWmsCoilStatisticsSu
}
return baseMapper.deleteBatchIds(ids) > 0;
}
/**
* 检查当天是否存在指定类型的统计记录
*/
@Override
public Long checkExistsByStatTypeToday(String statType) {
if (StringUtils.isBlank(statType)) {
return null;
}
LambdaQueryWrapper<WmsCoilStatisticsSummary> lqw = Wrappers.lambdaQuery();
lqw.eq(WmsCoilStatisticsSummary::getStatType, statType);
lqw.eq(WmsCoilStatisticsSummary::getDelFlag, 0);
lqw.apply("DATE(create_time) = CURDATE()");
lqw.select(WmsCoilStatisticsSummary::getSummaryId);
lqw.last("LIMIT 1");
WmsCoilStatisticsSummary one = baseMapper.selectOne(lqw);
return one != null ? one.getSummaryId() : null;
}
}

1
klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
View File

@@ -75,7 +75,6 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContact()), WmsEmployeeInfo::getEmergencyContact, bo.getEmergencyContact());
lqw.eq(StringUtils.isNotBlank(bo.getRelationship()), WmsEmployeeInfo::getRelationship, bo.getRelationship());
lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContactPhone()), WmsEmployeeInfo::getEmergencyContactPhone, bo.getEmergencyContactPhone());
lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType());
return lqw;
}

155
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -2348,7 +2348,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
*/
@Override
public List<WmsMaterialCoilExportVo> queryExportList(WmsMaterialCoilBo bo) {
QueryWrapper<WmsMaterialCoil> lqw = buildQueryWrapperPlus(bo);
QueryWrapper<WmsMaterialCoil> lqw = buildQueryWrapper(bo);
List<WmsMaterialCoilExportVo> wmsMaterialCoilExportVos = baseMapper.selectExportList(lqw);
// 遍历数据，根据状态替换日期字段，并处理空值兜底
wmsMaterialCoilExportVos.stream().forEach(vo -> {
@@ -2379,25 +2379,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
});
return wmsMaterialCoilExportVos;
}
/**
* 查询钢卷导出数据列表(完整版)
*/
@Override
@Transactional(readOnly = true)
public List<WmsMaterialCoilAllExportVo> queryExportListAll(WmsMaterialCoilBo bo) {
QueryWrapper<WmsMaterialCoil> lqw = buildQueryWrapperPlus(bo);
List<WmsMaterialCoilExportVo> wmsMaterialCoilVos = baseMapper.selectExportList(lqw);
List<WmsMaterialCoilAllExportVo> exportVoList = BeanUtil.copyToList(wmsMaterialCoilVos, WmsMaterialCoilAllExportVo.class);
if (CollectionUtils.isNotEmpty(exportVoList)) {
for (WmsMaterialCoilAllExportVo vo : exportVoList) {
if (Objects.equals(vo.getDataType(), 0)) {
vo.setActualWarehouseName(null);
}
}
}
return exportVoList;
}
/**
* 发货报表导出：按 coilIds 查询钢卷 + 发货单明细/主表/计划联查数据
*/
@@ -2550,6 +2532,86 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
}
/**
* 构建查询条件
*/
private QueryWrapper<WmsMaterialCoil> buildQueryWrapper(WmsMaterialCoilBo bo) {
QueryWrapper<WmsMaterialCoil> lqw = Wrappers.query();
// 基础字段筛选
lqw.eq(bo.getCoilId() != null, "mc.coil_id", bo.getCoilId());
lqw.eq(StringUtils.isNotBlank(bo.getEnterCoilNo()), "mc.enter_coil_no", bo.getEnterCoilNo());
lqw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), "mc.current_coil_no", bo.getCurrentCoilNo());
lqw.like(StringUtils.isNotBlank(bo.getSupplierCoilNo()), "mc.supplier_coil_no", bo.getSupplierCoilNo());
lqw.eq(bo.getDataType() != null, "mc.data_type", bo.getDataType());
lqw.eq(bo.getWarehouseId() != null, "mc.warehouse_id", bo.getWarehouseId());
lqw.eq(bo.getActualWarehouseId() != null, "mc.actual_warehouse_id", bo.getActualWarehouseId());
lqw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType());
lqw.eq(bo.getHasMergeSplit() != null, "mc.has_merge_split", bo.getHasMergeSplit());
// 修改itemId筛选逻辑，支持逗号分隔的多个ID查询
if (StringUtils.isNotBlank(bo.getItemIds())) {
String[] itemIdArray = bo.getItemIds().split(",");
List<Long> itemIdList = new ArrayList<>();
for (String itemIdStr : itemIdArray) {
if (StringUtils.isNotBlank(itemIdStr)) {
try {
itemIdList.add(Long.parseLong(itemIdStr.trim()));
} catch (NumberFormatException e) {
// 忽略无效的ID格式
}
}
}
if (!itemIdList.isEmpty()) {
lqw.in("mc.item_id", itemIdList);
}
} else if (bo.getItemId() != null) {
// 兼容原来的itemId单值查询
lqw.eq("mc.item_id", bo.getItemId());
}
// 添加coilIds查询条件，支持逗号分隔的多个coilId查询
if (StringUtils.isNotBlank(bo.getCoilIds())) {
String[] coilIdArray = bo.getCoilIds().split(",");
List<Long> coilIdList = new ArrayList<>();
for (String coilIdStr : coilIdArray) {
if (StringUtils.isNotBlank(coilIdStr)) {
try {
coilIdList.add(Long.parseLong(coilIdStr.trim()));
} catch (NumberFormatException e) {
// 忽略无效的ID格式
}
}
}
if (!coilIdList.isEmpty()) {
lqw.in("mc.coil_id", coilIdList);
}
}
lqw.eq(bo.getStatus() != null, "mc.status", bo.getStatus());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialType()), "mc.material_type", bo.getMaterialType());
lqw.eq(StringUtils.isNotBlank(bo.getQualityStatus()), "mc.quality_status", bo.getQualityStatus());
lqw.eq(StringUtils.isNotBlank(bo.getPackingStatus()), "mc.packing_status", bo.getPackingStatus());
// 把team字段作为筛选条件
lqw.eq(StringUtils.isNotBlank(bo.getTeam()), "mc.team", bo.getTeam());
// 根据开始时间和结束时间筛选修改时间
lqw.ge(bo.getStartTime() != null, "mc.update_time", bo.getStartTime());
lqw.le(bo.getEndTime() != null, "mc.update_time", bo.getEndTime());
// 根据发货开始和结束筛选发货时间
lqw.ge(bo.getByExportTimeStart() != null, "mc.export_time", bo.getByExportTimeStart());
lqw.le(bo.getByExportTimeEnd() != null, "mc.export_time", bo.getByExportTimeEnd());
// 逻辑删除
lqw.eq("mc.del_flag", 0);
// 根据创建时间倒序
lqw.orderByDesc("mc.create_time");
return lqw;
}
/**
* 批量更新钢卷发货状态
*
@@ -2784,11 +2846,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
/**
* 检查钢卷号是否重复
* 根据入场钢卷号、当前钢卷号和厂家原料卷号查询数据库，判断哪个钢卷号重复
* 根据入场钢卷号和当前钢卷号查询数据库，判断哪个钢卷号重复
* 新增逻辑：修改历史记录时不检查重复
*/
@Override
public Map<String, Object> checkCoilNoDuplicate(Long coilId, String enterCoilNo, String currentCoilNo, String supplierCoilNo) {
public Map<String, Object> checkCoilNoDuplicate(Long coilId, String enterCoilNo, String currentCoilNo) {
Map<String, Object> result = new HashMap<>();
// 新增核心逻辑：先判断是否操作的是历史记录
@@ -2800,14 +2862,12 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
result.put("duplicateType", "none");
result.put("enterCoilNoDuplicate", false);
result.put("currentCoilNoDuplicate", false);
result.put("supplierCoilNoDuplicate", false);
return result; // 直接返回，不执行后续检查
}
}
boolean enterCoilNoDuplicate = false;
boolean currentCoilNoDuplicate = false;
boolean supplierCoilNoDuplicate = false;
// 检查入场钢卷号是否重复
if (StringUtils.isNotBlank(enterCoilNo)) {
@@ -2838,31 +2898,14 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
currentCoilNoDuplicate = currentCount > 0;
}
// 检查厂家原料卷号是否重复
if (StringUtils.isNotBlank(supplierCoilNo)) {
LambdaQueryWrapper<WmsMaterialCoil> supplierWrapper = Wrappers.lambdaQuery();
supplierWrapper.eq(WmsMaterialCoil::getSupplierCoilNo, supplierCoilNo)
.eq(WmsMaterialCoil::getDelFlag, 0)
.eq(WmsMaterialCoil::getDataType, 1);
// 如果是修改操作，排除自身
if (coilId != null) {
supplierWrapper.ne(WmsMaterialCoil::getCoilId, coilId);
}
long supplierCount = baseMapper.selectCount(supplierWrapper);
supplierCoilNoDuplicate = supplierCount > 0;
}
// 判断重复类型
String duplicateType;
if (enterCoilNoDuplicate && currentCoilNoDuplicate && supplierCoilNoDuplicate) {
if (enterCoilNoDuplicate && currentCoilNoDuplicate) {
duplicateType = "both";
} else if (enterCoilNoDuplicate) {
duplicateType = "enter";
} else if (currentCoilNoDuplicate) {
duplicateType = "current";
} else if (supplierCoilNoDuplicate) {
duplicateType = "supplier";
} else {
duplicateType = "none";
}
@@ -2870,7 +2913,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
result.put("duplicateType", duplicateType);
result.put("enterCoilNoDuplicate", enterCoilNoDuplicate);
result.put("currentCoilNoDuplicate", currentCoilNoDuplicate);
result.put("supplierCoilNoDuplicate", supplierCoilNoDuplicate);
return result;
}
@@ -3230,14 +3272,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
actualWarehouseService.updateByBo(releaseBo);
}
// 将被删除的合卷钢卷的二维码设置为失效
if (currentCoil.getQrcodeRecordId() != null) {
WmsGenerateRecordBo deleteQrBo = new WmsGenerateRecordBo();
deleteQrBo.setRecordId(currentCoil.getQrcodeRecordId());
deleteQrBo.setStatus(0); // 0=失效
generateRecordService.updateByBo(deleteQrBo);
}
// 删除当前合卷钢卷
baseMapper.deleteById(currentCoil.getCoilId());
@@ -3356,13 +3390,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
releaseBo.setIsEnabled(1);
actualWarehouseService.updateByBo(releaseBo);
}
// 将被删除的子钢卷的二维码设置为失效
if (childCoil.getQrcodeRecordId() != null) {
WmsGenerateRecordBo deleteQrBo = new WmsGenerateRecordBo();
deleteQrBo.setRecordId(childCoil.getQrcodeRecordId());
deleteQrBo.setStatus(0); // 0=失效
generateRecordService.updateByBo(deleteQrBo);
}
baseMapper.deleteById(childCoil.getCoilId());
}
@@ -3468,15 +3495,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
actualWarehouseService.updateByBo(releaseBo);
}
// 2. 将被删除的当前钢卷的二维码设置为失效
if (currentCoil.getQrcodeRecordId() != null) {
WmsGenerateRecordBo deleteQrBo = new WmsGenerateRecordBo();
deleteQrBo.setRecordId(currentCoil.getQrcodeRecordId());
deleteQrBo.setStatus(0); // 0=失效
generateRecordService.updateByBo(deleteQrBo);
}
// 3. 删除当前钢卷
// 2. 删除当前钢卷
baseMapper.deleteById(currentCoil.getCoilId());
// 3. 删除操作记录
@@ -3886,7 +3905,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean startSpecialSplit(Long coilId, Integer actionType) {
public Boolean startSpecialSplit(Long coilId) {
// 1. 查询钢卷信息
WmsMaterialCoil coil = baseMapper.selectById(coilId);
if (coil == null) {
@@ -3923,7 +3942,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
WmsCoilPendingActionBo pendingActionBo = new WmsCoilPendingActionBo();
pendingActionBo.setCoilId(coilId);
pendingActionBo.setCurrentCoilNo(coil.getCurrentCoilNo());
pendingActionBo.setActionType(actionType); // 领料操作类型
pendingActionBo.setActionType(501); // 领料操作类型
pendingActionBo.setActionStatus(0); // 待处理
pendingActionBo.setSourceType("manual"); // 手动创建
pendingActionBo.setPriority(0); // 默认普通优先级

1
klp-wms/src/main/resources/mapper/klp/WmsCoilStatisticsSummaryMapper.xml
View File

@@ -10,7 +10,6 @@
<result property="statType" column="stat_type"/>
<result property="statJson" column="stat_json"/>
<result property="remark" column="remark"/>
<result property="attachmentInfo" column="attachment_info"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>

1
klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
View File

@@ -20,7 +20,6 @@
<result property="emergencyContact" column="emergency_contact"/>
<result property="relationship" column="relationship"/>
<result property="emergencyContactPhone" column="emergency_contact_phone"/>
<result property="socialInsuranceType" column="social_insurance_type"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>

4
klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
View File

@@ -373,14 +373,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.current_coil_no AS currentCoilNo,
-- 日期
mc.create_time AS createTime,
-- 班组
mc.team AS team,
-- 发货时间
mc.export_time AS exportTime,
-- 新增：更新时间（用于发货时间为空时兜底）
mc.update_time AS updateTime,
-- 发货人
mc.export_by AS exportBy,
-- 重量
mc.net_weight AS netWeight,
-- 长度