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

web，app，后端更改二维码唯一

Browse Source
This commit is contained in:
86156
2025-11-05 22:18:10 +08:00
parent f7dad6a1f4
commit 8117421531
6 changed files with 466 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
klp-ui/src/views/wms/coil/merge.vue
View File

@@ -44,13 +44,32 @@
<span class="detail-value">{{ item.enterCoilNo || '—' }}</span>
</div>
<div class="source-detail-row">
<span class="detail-label">当前库区：</span>
<span class="detail-value">{{ item.warehouseName || '未分配' }}</span>
<span class="detail-label">逻辑库区：</span>
<span class="detail-value">{{ item.warehouseName || '—' }}</span>
</div>
<div class="source-detail-row" v-if="item.materialName || item.productName">
<div class="source-detail-row">
<span class="detail-label">真实库区：</span>
<span class="detail-value">{{ item.actualWarehouseName || '—' }}</span>
</div>
<div class="source-detail-row">
<span class="detail-label">物料名称：</span>
<span class="detail-value">{{ item.materialName || item.productName || '—' }}</span>
</div>
<div class="source-detail-row" v-if="item.specification">
<span class="detail-label">物料规格：</span>
<span class="detail-value">{{ item.specification }}</span>
</div>
<!-- BOM参数展示 -->
<template v-if="item.bomItems && item.bomItems.length > 0">
<div class="source-detail-divider">BOM参数</div>
<div class="source-bom-params">
<div class="source-bom-item" v-for="(param, idx) in item.bomItems.slice(0, 3)" :key="idx">
<span class="bom-key">{{ param.attrKey }}：</span>
<span class="bom-value">{{ param.attrValue }}</span>
</div>
</div>
</template>
</template>
<!-- 第二个位置：显示待合卷列表 -->
@@ -128,8 +147,31 @@
<el-form-item label="班组">
<el-input v-model="targetCoil.team" placeholder="请输入班组名称" :disabled="readonly"></el-input>
</el-form-item>
<MaterialSelect :hideType="hideType" :itemId.sync="targetCoil.itemId" :itemType.sync="targetCoil.itemType" />
<el-form-item label="物品类型">
<el-select v-model="targetCoil.itemType" placeholder="请选择物品类型" style="width: 100%" :disabled="readonly">
<el-option label="原材料" value="raw_material" />
<el-option label="产品" value="product" />
</el-select>
</el-form-item>
<el-form-item label="物品">
<el-select
v-model="targetCoil.itemId"
placeholder="请选择物品"
filterable
remote
:remote-method="searchItems"
:loading="itemSearchLoading"
style="width: 100%"
:disabled="readonly"
>
<el-option
v-for="item in currentItemList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="毛重(t)">
<el-input
@@ -153,8 +195,8 @@
<template slot="append">吨</template>
</el-input>
</el-form-item>
<el-form-item label="目标库位">
<el-select v-model="targetCoil.warehouseId" placeholder="请选择" style="width: 100%" clearable :disabled="readonly">
<el-form-item label="逻辑库区">
<el-select v-model="targetCoil.warehouseId" placeholder="请选择逻辑库区" style="width: 100%" filterable :disabled="readonly">
<el-option
v-for="warehouse in warehouseList"
:key="warehouse.warehouseId"
@@ -207,14 +249,12 @@ import { listProduct } from '@/api/wms/product';
import { listPendingAction, completeAction } from '@/api/wms/pendingAction';
import CoilSelector from '@/components/CoilSelector';
import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
import MaterialSelect from "@/components/KLPService/MaterialSelect";
export default {
name: 'MergeCoil',
components: {
CoilSelector,
ActualWarehouseSelect,
MaterialSelect
ActualWarehouseSelect
},
data() {
return {
@@ -255,12 +295,12 @@ export default {
if (this.targetCoil.itemType === 'raw_material') {
return this.rawMaterialList.map(item => ({
id: item.rawMaterialId,
name: item.rawMaterialName
name: this.formatItemName(item)
}));
} else if (this.targetCoil.itemType === 'product') {
return this.productList.map(item => ({
id: item.productId,
name: item.productName
name: this.formatItemName(item)
}));
}
return [];
@@ -309,8 +349,11 @@ export default {
itemType: null,
itemId: null,
warehouseName: '',
actualWarehouseName: '',
materialName: '',
productName: ''
productName: '',
specification: '',
bomItems: []
},
{
coilId: null,
@@ -319,8 +362,11 @@ export default {
itemType: null,
itemId: null,
warehouseName: '',
actualWarehouseName: '',
materialName: '',
productName: ''
productName: '',
specification: '',
bomItems: []
}
];
}
@@ -343,8 +389,11 @@ export default {
itemType: data.itemType,
itemId: data.itemId,
warehouseName: data.warehouseName || (data.warehouse ? data.warehouse.warehouseName : ''),
actualWarehouseName: data.actualWarehouseName || (data.actualWarehouse ? data.actualWarehouse.warehouseName : ''),
materialName: data.materialName || (data.rawMaterial ? data.rawMaterial.rawMaterialName : ''),
productName: data.productName || (data.product ? data.product.productName : '')
productName: data.productName || (data.product ? data.product.productName : ''),
specification: data.rawMaterial?.specification || data.product?.specification || '',
bomItems: data.bomItemList || []
},
{
coilId: null,
@@ -353,8 +402,11 @@ export default {
itemType: null,
itemId: null,
warehouseName: '',
actualWarehouseName: '',
materialName: '',
productName: ''
productName: '',
specification: '',
bomItems: []
}
];
@@ -377,22 +429,47 @@ export default {
}
},
// 加载待合卷列表
// 加载待合卷列表（查询待处理和处理中的记录）
async loadPendingMergeList() {
try {
this.pendingLoading = true;
const response = await listPendingAction({
actionType: 1, // 1=合卷
actionStatus: 0, // 0=待处理
pageNum: 1,
pageSize: 50
});
if (response.code === 200) {
// 排除当前钢卷
const currentCoilId = this.sourceCoils[0].coilId;
this.pendingMergeList = (response.rows || []).filter(item => item.coilId !== currentCoilId);
}
console.log('=== 开始加载待合卷列表 ===');
// 分别查询待处理和处理中的记录
const responses = await Promise.all([
listPendingAction({
actionType: 1, // 1=合卷
actionStatus: 0, // 0=待处理
pageNum: 1,
pageSize: 50
}),
listPendingAction({
actionType: 1, // 1=合卷
actionStatus: 1, // 1=处理中
pageNum: 1,
pageSize: 50
})
]);
console.log('待处理响应:', responses[0]);
console.log('处理中响应:', responses[1]);
// 合并两个列表
const allPending = [
...(responses[0].rows || []),
...(responses[1].rows || [])
];
console.log('所有待合卷记录数量:', allPending.length);
console.log('所有待合卷记录:', allPending);
// 排除当前钢卷
const currentCoilId = this.sourceCoils[0] ? this.sourceCoils[0].coilId : null;
console.log('当前钢卷ID:', currentCoilId);
this.pendingMergeList = allPending.filter(item => item.coilId !== currentCoilId);
console.log('过滤后的待合卷列表数量:', this.pendingMergeList.length);
console.log('过滤后的待合卷列表:', this.pendingMergeList);
} catch (error) {
console.error('加载待合卷列表失败', error);
} finally {
@@ -414,8 +491,11 @@ export default {
itemType: data.itemType,
itemId: data.itemId,
warehouseName: data.warehouseName || (data.warehouse ? data.warehouse.warehouseName : ''),
actualWarehouseName: data.actualWarehouseName || (data.actualWarehouse ? data.actualWarehouse.warehouseName : ''),
materialName: data.materialName || (data.rawMaterial ? data.rawMaterial.rawMaterialName : ''),
productName: data.productName || (data.product ? data.product.productName : ''),
specification: data.rawMaterial?.specification || data.product?.specification || '',
bomItems: data.bomItemList || [],
actionId: pending.actionId // 保存待操作ID，用于后续完成操作
});
@@ -440,6 +520,41 @@ export default {
return `${month}-${day} ${hour}:${minute}`;
},
// 格式化物品名称（添加规格和BOM信息）
formatItemName(item) {
if (!item) return '';
// 获取名称（原材料或产品）
const name = item.rawMaterialName || item.productName || '';
if (!name) return '';
let displayName = name;
const specs = [];
// 1. 优先显示规格（从对象的specification字段）
if (item.specification) {
specs.push(item.specification);
}
// 2. 添加BOM参数（最多2个）
if (item.bomItems && item.bomItems.length > 0) {
const bomParams = item.bomItems
.filter(bomItem => bomItem.attrKey && bomItem.attrValue)
.slice(0, 2); // 最多2个BOM参数
bomParams.forEach(param => {
specs.push(`${param.attrKey}:${param.attrValue}`);
});
}
// 3. 拼接成最终格式
if (specs.length > 0) {
displayName += `（${specs.join(' ')}）`;
}
return displayName;
},
// 加载库区列表
async loadWarehouses() {
try {
@@ -455,16 +570,24 @@ export default {
// 加载物品列表（根据类型）
async loadItemList(itemType) {
if (!itemType) return;
try {
this.itemSearchLoading = true;
if (itemType === 'raw_material') {
const response = await listRawMaterial({ pageNum: 1, pageSize: 100 });
const response = await listRawMaterial({
pageNum: 1,
pageSize: 100,
withBom: true
});
if (response.code === 200) {
this.rawMaterialList = response.rows || [];
}
} else if (itemType === 'product') {
const response = await listProduct({ pageNum: 1, pageSize: 100 });
const response = await listProduct({
pageNum: 1,
pageSize: 100,
withBom: true
});
if (response.code === 200) {
this.productList = response.rows || [];
}
@@ -482,23 +605,30 @@ export default {
this.$message.warning('请先选择物品类型');
return;
}
if (!query || query.trim() === '') {
this.loadItemList(this.targetCoil.itemType);
return;
}
try {
this.itemSearchLoading = true;
if (this.targetCoil.itemType === 'raw_material') {
const response = await listRawMaterial({
const response = await listRawMaterial({
rawMaterialName: query,
pageNum: 1,
pageSize: 50
pageNum: 1,
pageSize: 50,
withBom: true
});
if (response.code === 200) {
this.rawMaterialList = response.rows || [];
}
} else if (this.targetCoil.itemType === 'product') {
const response = await listProduct({
const response = await listProduct({
productName: query,
pageNum: 1,
pageSize: 50
pageNum: 1,
pageSize: 50,
withBom: true
});
if (response.code === 200) {
this.productList = response.rows || [];
@@ -520,8 +650,11 @@ export default {
itemType: null,
itemId: null,
warehouseName: '',
actualWarehouseName: '',
materialName: '',
productName: ''
productName: '',
specification: '',
bomItems: []
});
},
@@ -550,8 +683,11 @@ export default {
itemType: coil.itemType,
itemId: coil.itemId,
warehouseName: coil.warehouseName || '',
actualWarehouseName: coil.actualWarehouseName || '',
materialName: coil.materialName || '',
productName: coil.productName || ''
productName: coil.productName || '',
specification: coil.rawMaterial?.specification || coil.product?.specification || '',
bomItems: coil.bomItemList || []
});
// 如果是第一个源卷，自动填充目标卷信息
@@ -915,17 +1051,17 @@ export default {
align-items: flex-start;
margin-bottom: 8px;
font-size: 13px;
&:last-child {
margin-bottom: 0;
}
.detail-label {
color: #909399;
min-width: 90px;
flex-shrink: 0;
}
.detail-value {
color: #303133;
flex: 1;
@@ -933,6 +1069,36 @@ export default {
}
}
.source-detail-divider {
margin: 10px 0 8px;
padding: 5px 0;
font-size: 12px;
font-weight: 500;
color: #606266;
border-bottom: 1px solid #e4e7ed;
}
.source-bom-params {
margin-top: 8px;
}
.source-bom-item {
display: flex;
align-items: center;
margin-bottom: 6px;
font-size: 12px;
.bom-key {
color: #909399;
min-width: 60px;
}
.bom-value {
color: #303133;
flex: 1;
}
}
.btn-remove {
color: #f56c6c;
padding: 0;