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

将每一步的钢卷二维码进行保存，新步骤采用新码

Browse Source
This commit is contained in:
86156
2025-10-30 17:07:02 +08:00
parent 7ea75aef84
commit 20481d28a6
3 changed files with 509 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

222
apps/hand-factory/components/panels/code/typing.vue
View File

@@ -44,21 +44,12 @@
</view>
</view>
<!-- 历史码提示 -->
<view class="warning-card" v-if="form.coilId && qrcodeStatus === 0">
<view class="warning-icon">⚠️</view>
<view class="warning-content">
<text class="warning-title">历史二维码</text>
<text class="warning-desc">此二维码已失效，已为您加载最新物料信息，仅可查看，无法修改</text>
</view>
</view>
<!-- 历史数据提示 -->
<view class="warning-card" v-if="form.coilId && coilDetail.dataType === 0 && qrcodeStatus !== 0">
<view class="warning-card" v-if="form.coilId && coilDetail.dataType === 0">
<view class="warning-icon">⚠️</view>
<view class="warning-content">
<text class="warning-title">历史数据</text>
<text class="warning-desc">此钢卷为历史数据，仅可查看，无法修改</text>
<text class="warning-desc">此为历史记录，仅供查看，不允许进行修改操作</text>
</view>
</view>
@@ -76,8 +67,8 @@
v-model="form.currentCoilNo"
placeholder="请输入当前钢卷号"
class="form-input"
:disabled="coilDetail.dataType === 0 || qrcodeStatus === 0"
:class="{ 'form-input-disabled': coilDetail.dataType === 0 || qrcodeStatus === 0 }"
:disabled="coilDetail.dataType === 0"
:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
/>
</view>
@@ -88,8 +79,8 @@
v-model="form.team"
placeholder="请输入班组名称"
class="form-input"
:disabled="coilDetail.dataType === 0 || qrcodeStatus === 0"
:class="{ 'form-input-disabled': coilDetail.dataType === 0 || qrcodeStatus === 0 }"
:disabled="coilDetail.dataType === 0"
:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
/>
</view>
@@ -98,13 +89,28 @@
<text class="form-label-optional">目标库区</text>
<view
class="picker-input"
@click="(coilDetail.dataType !== 0 && qrcodeStatus !== 0) && showWarehousePicker()"
:class="{ 'picker-input-disabled': coilDetail.dataType === 0 || qrcodeStatus === 0 }"
@click="coilDetail.dataType !== 0 && showWarehousePicker()"
:class="{ 'picker-input-disabled': coilDetail.dataType === 0 }"
>
<text class="picker-text" :class="{ 'picker-placeholder': !currentWarehouseName }">
{{ currentWarehouseName || '请选择目标库区' }}
</text>
<text class="picker-arrow" v-if="coilDetail.dataType !== 0 && qrcodeStatus !== 0">▼</text>
<text class="picker-arrow" v-if="coilDetail.dataType !== 0">▼</text>
</view>
</view>
<!-- 产品选择（仅当选择了成品库区时显示） -->
<view class="form-item form-item-optional" v-if="form.itemType === 'product'">
<text class="form-label-optional">选择产品</text>
<view
class="picker-input"
@click="coilDetail.dataType !== 0 && showProductPicker()"
:class="{ 'picker-input-disabled': coilDetail.dataType === 0 }"
>
<text class="picker-text" :class="{ 'picker-placeholder': !selectedProductName }">
{{ selectedProductName || '请选择产品' }}
</text>
<text class="picker-arrow" v-if="coilDetail.dataType !== 0">▼</text>
</view>
</view>
@@ -113,11 +119,11 @@
<text class="form-label-optional">毛重 (kg)</text>
<input
v-model="form.grossWeight"
type="digit"
type="digit"
placeholder="请输入毛重（选填）"
class="form-input"
:disabled="coilDetail.dataType === 0 || qrcodeStatus === 0"
:class="{ 'form-input-disabled': coilDetail.dataType === 0 || qrcodeStatus === 0 }"
:disabled="coilDetail.dataType === 0"
:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
/>
</view>
@@ -126,11 +132,11 @@
<text class="form-label-optional">净重 (kg)</text>
<input
v-model="form.netWeight"
type="digit"
type="digit"
placeholder="请输入净重（选填）"
class="form-input"
:disabled="coilDetail.dataType === 0 || qrcodeStatus === 0"
:class="{ 'form-input-disabled': coilDetail.dataType === 0 || qrcodeStatus === 0 }"
:disabled="coilDetail.dataType === 0"
:class="{ 'form-input-disabled': coilDetail.dataType === 0 }"
/>
</view>
@@ -144,7 +150,7 @@
<view class="action-buttons">
<button class="btn btn-secondary" @click="handleReset">重新扫码</button>
<button
v-if="coilDetail.dataType === 1 && qrcodeStatus === 1"
v-if="coilDetail.dataType === 1"
class="btn btn-primary"
@click="handleConfirm"
:disabled="loading"
@@ -186,6 +192,38 @@
</view>
</uni-popup>
<!-- 产品选择弹窗 -->
<uni-popup ref="productPopup" type="bottom">
<view class="warehouse-popup">
<view class="popup-header">
<text class="popup-title">选择产品</text>
<text class="popup-close" @click="closeProductPicker">✕</text>
</view>
<view class="popup-search">
<input
v-model="productSearchKeyword"
@input="filterProductsInPicker"
placeholder="搜索产品名称"
class="search-input"
/>
</view>
<scroll-view scroll-y class="popup-body">
<view
class="warehouse-item"
v-for="product in filteredProductsInPicker"
:key="product.productId"
@click="selectProductFromPicker(product)"
>
<text class="warehouse-name">{{ product.productName }}</text>
<text class="warehouse-check" v-if="form.itemId === product.productId">✓</text>
</view>
<view class="empty-tip" v-if="!filteredProductsInPicker || filteredProductsInPicker.length === 0">
<text>未找到匹配的产品</text>
</view>
</scroll-view>
</view>
</uni-popup>
<!-- BOM弹窗 -->
<uni-popup ref="bomPopup" type="bottom">
<view class="bom-popup">
@@ -221,6 +259,7 @@
import { updateMaterialCoil, getMaterialCoil, getMaterialCoilTrace } from '@/api/wms/coil.js'
import { listWarehouse } from '@/api/wms/warehouse.js'
import { getRawMaterial } from '@/api/wms/rawMaterial.js'
import { listProduct } from '@/api/wms/product.js'
export default {
data() {
@@ -246,6 +285,10 @@ import { getRawMaterial } from '@/api/wms/rawMaterial.js'
currentWarehouseName: '',
warehouseSearchKeyword: '',
filteredWarehousesInPicker: [],
products: [], // 产品列表
productSearchKeyword: '',
filteredProductsInPicker: [],
selectedProductName: '', // 已选择的产品名称
loading: false,
qrcodeStatus: 1 // 二维码状态：0=历史码，1=当前有效码
}
@@ -285,6 +328,62 @@ import { getRawMaterial } from '@/api/wms/rawMaterial.js'
}
},
// 加载产品列表
async loadProducts() {
console.log('开始加载产品列表...');
try {
const res = await listProduct({ pageNum: 1, pageSize: 1000 });
console.log("产品返回值", res);
if (res.code === 200) {
this.products = res.rows || res.data || [];
this.filteredProductsInPicker = this.products;
console.log('产品加载成功，数量:', this.products.length);
} else {
console.error('产品加载失败:', res.msg);
}
} catch (err) {
console.error('加载产品异常:', err);
}
},
// 显示产品选择器
showProductPicker() {
this.productSearchKeyword = '';
this.filteredProductsInPicker = [...this.products];
this.$refs.productPopup.open();
},
// 关闭产品选择器
closeProductPicker() {
this.$refs.productPopup.close();
},
// 过滤产品（在选择器中）
filterProductsInPicker() {
console.log('过滤产品，关键词:', this.productSearchKeyword);
const keyword = this.productSearchKeyword.trim().toLowerCase();
if (!keyword) {
this.filteredProductsInPicker = [...this.products];
} else {
this.filteredProductsInPicker = this.products.filter(product => {
const name = (product.productName || '').toLowerCase();
return name.includes(keyword);
});
}
},
// 从选择器中选择产品
selectProductFromPicker(product) {
this.form.itemId = product.productId;
this.form.itemType = 'product';
this.selectedProductName = product.productName;
uni.showToast({
title: `已选择产品：${product.productName}`,
icon: 'success'
});
this.closeProductPicker();
},
// 过滤库区
filterWarehouses() {
console.log('过滤库区，关键词:', this.warehouseKeyword);
@@ -339,11 +438,21 @@ import { getRawMaterial } from '@/api/wms/rawMaterial.js'
},
// 从选择器中选择库区
selectWarehouseFromPicker(warehouse) {
async selectWarehouseFromPicker(warehouse) {
this.form.warehouseId = warehouse.warehouseId;
this.form.warehouseName = warehouse.warehouseName;
this.currentWarehouseName = warehouse.warehouseName;
this.closeWarehousePicker();
// 检查是否选择了成品库区
if (warehouse.warehouseName && warehouse.warehouseName.includes('成品')) {
// 切换为产品类型
this.form.itemType = 'product';
// 加载产品列表
await this.loadProducts();
// 弹出产品选择框
this.showProductPicker();
}
},
// 扫码
@@ -361,11 +470,12 @@ import { getRawMaterial } from '@/api/wms/rawMaterial.js'
throw new Error('未找到二维码记录');
}
// 2. 解析二维码的content，获取enter_coil_no和current_coil_no
// 2. 解析二维码的content，获取enter_coil_no、current_coil_no和coil_id
const qrcodeRecord = qrcodeRes.data;
const content = JSON.parse(qrcodeRecord.content);
const enterCoilNo = content.enter_coil_no;
const currentCoilNo = content.current_coil_no;
const coilId = content.coil_id && content.coil_id !== 'null' ? content.coil_id : null;
// 保存二维码状态（0=历史码，1=当前有效码）
this.qrcodeStatus = qrcodeRecord.status || 1;
@@ -374,55 +484,42 @@ import { getRawMaterial } from '@/api/wms/rawMaterial.js'
throw new Error('二维码中未包含有效的入场钢卷号');
}
// 3. 如果是历史码，提示用户并加载最新数据
// 3. 如果是历史码，提示用户
if (this.qrcodeStatus === 0) {
uni.showToast({
title: '历史二维码，已加载最新信息',
title: '历史二维码，仅供查看',
icon: 'none',
duration: 2000
});
}
// 4. 通过入场钢卷号查询最新的钢卷详情（不传currentCoilNo，获取所有相关钢卷）
// 如果是历史码，查询该入场钢卷号的最新数据
const traceRes = await getMaterialCoilTrace(enterCoilNo, this.qrcodeStatus === 0 ? null : currentCoilNo);
// 4. 通过入场钢卷号查询钢卷追溯信息
const traceRes = await getMaterialCoilTrace(enterCoilNo, currentCoilNo);
if (traceRes.code !== 200 || !traceRes.data || !traceRes.data.records || traceRes.data.records.length === 0) {
throw new Error('未找到钢卷信息');
}
// 5. 从追溯结果中找到当前数据（dataType = 1）
// 5. 根据二维码内容匹配对应的钢卷数据
let coilData = null;
if (this.qrcodeStatus === 0) {
// 历史码：找到最新的当前数据（dataType = 1）
for (const record of traceRes.data.records) {
if (record.dataType === 1) {
coilData = record;
break;
}
}
} else {
// 当前码：找到匹配当前钢卷号的记录
for (const record of traceRes.data.records) {
if (record.dataType === 1 && record.currentCoilNo === currentCoilNo) {
coilData = record;
break;
}
}
const records = traceRes.data.records;
// 优先使用coil_id精确匹配
if (coilId) {
coilData = records.find(record => String(record.coilId) === String(coilId));
}
// 如果没有找到精确匹配的，取第一个当前数据
if (!coilData) {
for (const record of traceRes.data.records) {
if (record.dataType === 1) {
coilData = record;
break;
}
}
// 如果没找到，使用currentCoilNo匹配
if (!coilData && currentCoilNo) {
coilData = records.find(record => record.currentCoilNo === currentCoilNo);
}
// 如果还是没找到，取第一条记录
if (!coilData && records.length > 0) {
coilData = records[0];
}
// 如果还是没有找到，取第一个记录（可能是历史数据）
if (!coilData) {
coilData = traceRes.data.records[0];
throw new Error('未找到对应的钢卷数据');
}
// 保存钢卷详情
@@ -515,6 +612,7 @@ import { getRawMaterial } from '@/api/wms/rawMaterial.js'
this.bomItemList = [];
this.warehouseKeyword = '';
this.currentWarehouseName = '';
this.selectedProductName = '';
this.filteredWarehouses = this.warehouses;
this.qrcodeStatus = 1; // 重置二维码状态
}
@@ -530,12 +628,6 @@ import { getRawMaterial } from '@/api/wms/rawMaterial.js'
return;
}
// 历史二维码不允许修改
if (this.qrcodeStatus === 0) {
uni.showToast({ title: '历史二维码不允许修改', icon: 'none' });
return;
}
// 验证必填项
if (!this.form.currentCoilNo) {
uni.showToast({ title: '请输入当前钢卷号', icon: 'none' });