+
- + +
+ + +
栈板号: {{ pallet.palletId }} - 物料: {{ pallet.partNo }} | 数量: {{ pallet.qty }} + + + 物料: {{ pallet.partNo }} | 数量: {{ pallet.qty }} + + + | 批号: {{ pallet.batchNo }} + + + | WDR: {{ pallet.wdr }} + + + | 失效日期: {{ pallet.expiredDate }} +
@@ -117,6 +139,7 @@ export default { loading: false, // 查询物料明细的loading状态 lastPartNo: '', // 记录最后查询的物料编码，避免重复查询 formData: { + palletId: '', // 栈板编码 - rqrq partNo: '', partDesc: '', batchNo: '', @@ -178,19 +201,30 @@ export default { }, - // 查询栈板列表 + // 查询栈板列表 - rqrq 修改校验逻辑：物料编码和栈板码至少填一个 confirmDo() { - if(this.formData.partNo==null||this.formData.partNo===''){ - this.$message.error('请输入物料编码'); + // 校验：物料编码和栈板码至少填一个 - rqrq + if((!this.formData.partNo || this.formData.partNo === '') && + (!this.formData.palletId || this.formData.palletId === '')){ + this.$message.error('请输入物料编码或栈板编码'); return; } - // 构建查询参数 + // 构建查询参数 - rqrq const queryParams = { - site: this.formData.site, - partNo: this.formData.partNo + site: this.formData.site }; + // 添加栈板码到查询参数 - rqrq + if (this.formData.palletId && this.formData.palletId.trim()) { + queryParams.palletId = this.formData.palletId.trim(); + } + + // 添加物料编码到查询参数 - rqrq + if (this.formData.partNo && this.formData.partNo.trim()) { + queryParams.partNo = this.formData.partNo.trim(); + } + // 如果有批号，添加到查询参数 if (this.formData.batchNo && this.formData.batchNo.trim()) { queryParams.batchNo = this.formData.batchNo.trim(); @@ -205,9 +239,6 @@ export default { } else { this.$message.success(`找到 ${this.palletList.length} 个栈板`); } - for (let i = 0; i item.palletId === pallet.palletId); + const palletId = pallet.palletId; + const index = this.selectedPallets.findIndex(item => item.palletId === palletId); + if (index > -1) { + // 如果已选中，取消选择（移除该栈板）- rqrq this.selectedPallets.splice(index, 1); this.$message.success('已取消选择栈板'); } else { - this.selectedPallets.push(pallet); - this.$message.success(`已选择栈板: ${pallet.palletId}`); + // 如果未选中，选择该栈板（只添加一条记录用于Call）- rqrq + this.selectedPallets.push({ + site: pallet.site, + palletId: pallet.palletId, + partNo: pallet.partNo || '', // 如果没有物料，传空字符串 + qty: pallet.qty || 0, + batchNo: pallet.batchNo || this.formData.batchNo || '' + }); + this.$message.success(`已选择栈板: ${palletId}`); } }, - // 判断栈板是否被选中 + // 判断栈板是否被选中 - rqrq isSelected(pallet) { return this.selectedPallets.some(item => item.palletId === pallet.palletId); }, @@ -306,8 +347,9 @@ export default { }, cleanData(){ - // 更安全的清空方式 + // 更安全的清空方式 - rqrq this.formData = { + palletId: '', // 栈板编码 - rqrq partNo: '', partDesc: '', batchNo: '', diff --git a/src/views/modules/automatedWarehouse/cancelWcsPallet.vue b/src/views/modules/automatedWarehouse/cancelWcsPallet.vue new file mode 100644 index 0000000..f3bb981 --- /dev/null +++ b/src/views/modules/automatedWarehouse/cancelWcsPallet.vue @@ -0,0 +1,468 @@ + + + + + + + diff --git a/src/views/modules/automatedWarehouse/emptyPalletAssembly.vue b/src/views/modules/automatedWarehouse/emptyPalletAssembly.vue index 0bf261d..a9f0121 100644 --- a/src/views/modules/automatedWarehouse/emptyPalletAssembly.vue +++ b/src/views/modules/automatedWarehouse/emptyPalletAssembly.vue @@ -131,6 +131,9 @@ export default { palletId: this.palletCode }).then(({ data }) => { if (data.code === 0) { + // 后端返回正确的6位栈板码，赋值给输入框 - rqrq + this.palletCode = data.row.palletId; + // 托盘信息 - rqrq this.palletInfo = data.row; this.currentPalletType = data.row.palletType || ''; diff --git a/src/views/modules/automatedWarehouse/palletChangeStation.vue b/src/views/modules/automatedWarehouse/palletChangeStation.vue index 7d1ddf7..f3a8710 100644 --- a/src/views/modules/automatedWarehouse/palletChangeStation.vue +++ b/src/views/modules/automatedWarehouse/palletChangeStation.vue @@ -23,6 +23,10 @@ class="form-input" clearable @keyup.enter.native="handlePalletScan" + inputmode="none" + autocomplete="off" + autocorrect="off" + spellcheck="false" ref="palletInput" />
@@ -202,6 +206,9 @@ export default { palletId: this.palletCode }).then(({ data }) => { if (data.code === 0) { + // 后端返回正确的6位栈板码，赋值给输入框 - rqrq + this.palletCode = data.row.palletId; + // 如果栈板被调用，提示并清空 - rqrq if (data.row.callingFlag === 'Y') { this.$alert('栈板被调用，请选择其他栈板', '提示', { diff --git a/src/views/modules/automatedWarehouse/palletManualMove.vue b/src/views/modules/automatedWarehouse/palletManualMove.vue index 704d78e..66137c0 100644 --- a/src/views/modules/automatedWarehouse/palletManualMove.vue +++ b/src/views/modules/automatedWarehouse/palletManualMove.vue @@ -23,6 +23,10 @@ class="form-input" clearable @keyup.enter.native="handlePalletScan" + inputmode="none" + autocomplete="off" + autocorrect="off" + spellcheck="false" ref="palletInput" />
@@ -250,6 +254,9 @@ export default { palletId: this.palletCode }).then(({ data }) => { if (data.code === 0) { + // 后端返回正确的6位栈板码，赋值给输入框 - rqrq + this.palletCode = data.row.palletId; + // 如果托盘被调用，提示用户 - rqrq if (data.row.callingFlag === 'Y') { this.$alert('托盘被调用，无法进行移动操作', '提示', {