Browse Source

标签预留描述

dev
常熟吴彦祖 2 weeks ago
parent
commit
66f0eeab74
  1. 4
      src/api/automatedWarehouse/palletPacking.js
  2. 6
      src/api/haianAutoWarehouse/palletPacking.js
  3. 4
      src/api/haianAutoWarehouse/wmsCancelReserve.js
  4. 4
      src/api/inventory/label.js
  5. 5
      src/views/main.vue
  6. 44
      src/views/modules/automatedWarehouse/palletSearch.vue
  7. 44
      src/views/modules/haianAutoWarehouse/haianPalletSearch.vue
  8. 21
      src/views/modules/haianAutoWarehouse/haianWmsCancelReserve.vue
  9. 8
      src/views/modules/inventory/label-query.vue
  10. 34
      src/views/modules/inventory/wms-cancel-reserve.vue

4
src/api/automatedWarehouse/palletPacking.js

@ -83,8 +83,8 @@ export const finishSortingNoAgv = data => createAPI(`/wcsIntegration/finishSorti
// 根据栈板站点获取分拣明细RFID列表 - rqrq // 根据栈板站点获取分拣明细RFID列表 - rqrq
export const getSortingList = data => createAPI(`/wcsIntegration/getSortingList`,'post',data) export const getSortingList = data => createAPI(`/wcsIntegration/getSortingList`,'post',data)
// 获取栈板上被预留的标签列表 - rqrq
// 获取栈板上被预定的标签列表 - rqrq
export const getPalletReservedLabels = data => createAPI(`/wcsIntegration/getPalletReservedLabels`,'post',data) export const getPalletReservedLabels = data => createAPI(`/wcsIntegration/getPalletReservedLabels`,'post',data)
// 批量取消栈板上的预留标签 - rqrq
// 批量取消栈板上的预定标签 - rqrq
export const batchCancelReserve = data => createAPI(`/wcsIntegration/batchCancelReserve`,'post',data) export const batchCancelReserve = data => createAPI(`/wcsIntegration/batchCancelReserve`,'post',data)

6
src/api/haianAutoWarehouse/palletPacking.js

@ -51,7 +51,7 @@ export const callPalletToStationWithUpdateZuPan = data => createAPI(`/haiAnWcsIn
// 海安-调用空托盘 - rqrq // 海安-调用空托盘 - rqrq
export const callEmptyPalletToStation = data => createAPI(`/haiAnWcsIntegration/callEmptyPalletToStation`, 'post', data) export const callEmptyPalletToStation = data => createAPI(`/haiAnWcsIntegration/callEmptyPalletToStation`, 'post', data)
// 海安手工分拣拆分特例:复用老PDA标签拆分接口,新标签由后端去掉预留,原标签数量回写栈板明细 - rqrq
// 海安手工分拣拆分特例:复用老PDA标签拆分接口,新标签由后端去掉预定,原标签数量回写栈板明细 - rqrq
export const splitLabel = data => createAPI(`/pda/label/split`, 'post', data) export const splitLabel = data => createAPI(`/pda/label/split`, 'post', data)
// 海安-结束分拣 - rqrq // 海安-结束分拣 - rqrq
@ -60,10 +60,10 @@ export const finishSorting = data => createAPI(`/haiAnWcsIntegration/finishSorti
// 海安-查询分拣清单 - rqrq // 海安-查询分拣清单 - rqrq
export const getSortingList = data => createAPI(`/haiAnWcsIntegration/getSortingList`, 'post', data) export const getSortingList = data => createAPI(`/haiAnWcsIntegration/getSortingList`, 'post', data)
// 海安-查看托盘预留标签列表 - rqrq
// 海安-查看托盘预定标签列表 - rqrq
export const getPalletReservedLabels = data => createAPI(`/haiAnWcsIntegration/getPalletReservedLabels`, 'post', data) export const getPalletReservedLabels = data => createAPI(`/haiAnWcsIntegration/getPalletReservedLabels`, 'post', data)
// 海安-一键取消托盘预留 - rqrq
// 海安-一键取消托盘预定 - rqrq
export const batchCancelReserve = data => createAPI(`/haiAnWcsIntegration/batchCancelReserve`, 'post', data) export const batchCancelReserve = data => createAPI(`/haiAnWcsIntegration/batchCancelReserve`, 'post', data)
// 海安-旧页面兼容占位(当前无需调用)- rqrq // 海安-旧页面兼容占位(当前无需调用)- rqrq

4
src/api/haianAutoWarehouse/wmsCancelReserve.js

@ -1,7 +1,7 @@
import { createAPI } from "@/utils/httpRequest.js"; import { createAPI } from "@/utils/httpRequest.js";
// 海安-取消预留:查询标签信息 - rqrq
// 海安-取消预定:查询标签信息 - rqrq
export const queryLabelInfo = data => createAPI(`/haiAnWcsIntegration/queryLabelInfo`, 'post', data) export const queryLabelInfo = data => createAPI(`/haiAnWcsIntegration/queryLabelInfo`, 'post', data)
// 海安-取消预留:取消单标签预留 - rqrq
// 海安-取消预定:取消单标签预定 - rqrq
export const cancelReserve = data => createAPI(`/haiAnWcsIntegration/cancelReserve`, 'post', data) export const cancelReserve = data => createAPI(`/haiAnWcsIntegration/cancelReserve`, 'post', data)

4
src/api/inventory/label.js

@ -2,13 +2,13 @@ import { createAPI } from "@/utils/httpRequest.js";
export const queryLabelInfo = data => createAPI(`/pda/label/query`,'post',data) export const queryLabelInfo = data => createAPI(`/pda/label/query`,'post',data)
// 取消预留扫码独立校验在盘状态,不修改标签查询/拆分使用的queryLabelInfo - rqrq
// 取消预定扫码独立校验在盘状态,不修改标签查询/拆分使用的queryLabelInfo - rqrq
export const queryLabelForCancelReserve = data => createAPI(`/handlingunit/scanLabelForCancelReserve`, 'post', { export const queryLabelForCancelReserve = data => createAPI(`/handlingunit/scanLabelForCancelReserve`, 'post', {
site: data.site, site: data.site,
unitId: data.labelCode unitId: data.labelCode
}) })
// 取消WMS预留 - rqrq
// 取消WMS预定 - rqrq
export const cancelReserve = data => createAPI(`/pda/label/cancelReserve`,'post',data) export const cancelReserve = data => createAPI(`/pda/label/cancelReserve`,'post',data)
// 标签拆分 // 标签拆分

5
src/views/main.vue

@ -211,7 +211,8 @@
<div class="menu-icon inventory"> <div class="menu-icon inventory">
<van-icon name="orders-o" size="24" /> <van-icon name="orders-o" size="24" />
</div> </div>
<div class="menu-text">取消预留</div>
<!-- WMS标签状态统一展示为预定,reserve字段和Y/N判断保持原有业务含义 - rqrq -->
<div class="menu-text">取消预定</div>
</div> </div>
<div class="menu-item" v-site-auth="'54'" @click="navigateWithWarehouseCheck('haianManualCount54')"> <div class="menu-item" v-site-auth="'54'" @click="navigateWithWarehouseCheck('haianManualCount54')">
<div class="menu-icon purchase"> <div class="menu-icon purchase">
@ -311,7 +312,7 @@
<div class="menu-icon inventory"> <div class="menu-icon inventory">
<van-icon name="orders-o" size="24" /> <van-icon name="orders-o" size="24" />
</div> </div>
<div class="menu-text">取消预留</div>
<div class="menu-text">取消预定</div>
</div> </div>
<div class="menu-item" v-site-auth="'55'" @click="navigateWithWarehouseCheck('palletSortingNoAgv')"> <div class="menu-item" v-site-auth="'55'" @click="navigateWithWarehouseCheck('palletSortingNoAgv')">
<div class="menu-icon purchase"> <div class="menu-icon purchase">

44
src/views/modules/automatedWarehouse/palletSearch.vue

@ -62,13 +62,13 @@
{{ '浏览明细' }} {{ '浏览明细' }}
</button> </button>
<label style="margin-left: 5px;">条码数:{{detailList.length}}</label> <label style="margin-left: 5px;">条码数:{{detailList.length}}</label>
<!-- 预留清单按钮 - rqrq -->
<!-- 预定清单按钮 - rqrq -->
<button <button
class="action-btn" class="action-btn"
:class="reserveCount > 0 ? 'warning' : 'secondary'" :class="reserveCount > 0 ? 'warning' : 'secondary'"
style="margin: 0; margin-left: 10px;" style="margin: 0; margin-left: 10px;"
@click="showReserveModal"> @click="showReserveModal">
预留清单({{ reserveCount }})
预定清单({{ reserveCount }})
</button> </button>
</div> </div>
</div> </div>
@ -133,9 +133,9 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 预留清单弹窗 - rqrq -->
<!-- 预定清单弹窗 - rqrq -->
<el-dialog <el-dialog
:title="'预留清单 (共'+reserveCount+'条)'"
:title="'预定清单 (共'+reserveCount+'条)'"
:visible.sync="reserveModalVisible" :visible.sync="reserveModalVisible"
width="95%" width="95%"
:close-on-click-modal="false" :close-on-click-modal="false"
@ -162,7 +162,7 @@
</div> </div>
<!-- 暂无数据提示 --> <!-- 暂无数据提示 -->
<div v-if="reservedLabels.length === 0" class="table-row empty-row"> <div v-if="reservedLabels.length === 0" class="table-row empty-row">
<div class="empty-hint">暂无预留标签</div>
<div class="empty-hint">暂无预定标签</div>
</div> </div>
</div> </div>
</div> </div>
@ -174,12 +174,12 @@
:disabled="cancelReserveLoading || reservedLabels.length === 0 || locationCode === '1101'" :disabled="cancelReserveLoading || reservedLabels.length === 0 || locationCode === '1101'"
v-if="reservedLabels.length > 0" v-if="reservedLabels.length > 0"
> >
{{ cancelReserveLoading ? '取消中...' : '一键取消预留' }}
{{ cancelReserveLoading ? '取消中...' : '一键取消预定' }}
</button> </button>
</div> </div>
<!-- 库位1101提示 - rqrq --> <!-- 库位1101提示 - rqrq -->
<div v-if="locationCode === '1101'" class="reserve-warning"> <div v-if="locationCode === '1101'" class="reserve-warning">
<i class="el-icon-warning"></i> 栈板在立库异常位上,不允许取消预留
<i class="el-icon-warning"></i> 栈板在立库异常位上,不允许取消预定
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -211,7 +211,7 @@ export default {
// 栈板库位 - rqrq // 栈板库位 - rqrq
locationCode: '', locationCode: '',
// 预留清单相关 - rqrq
// 预定清单相关 - rqrq
reserveModalVisible: false, reserveModalVisible: false,
reservedLabels: [], reservedLabels: [],
reserveCount: 0, reserveCount: 0,
@ -264,7 +264,7 @@ export default {
this.positionOptions = data.positions || []; this.positionOptions = data.positions || [];
this.locationCode = data.locationCode || ''; this.locationCode = data.locationCode || '';
this.refreshTable(); this.refreshTable();
this.loadReservedLabels(); // 加载预留标签数量 - rqrq
this.loadReservedLabels(); // 加载预定标签数量 - rqrq
} else { } else {
let errorMsg = data.msg || '栈板不存在'; let errorMsg = data.msg || '栈板不存在';
if (errorMsg.length > 100) { if (errorMsg.length > 100) {
@ -327,13 +327,13 @@ export default {
this.detailModalVisible = true; this.detailModalVisible = true;
}, },
// 显示预留清单弹窗 - rqrq
// 显示预定清单弹窗 - rqrq
showReserveModal() { showReserveModal() {
this.loadReservedLabels(); this.loadReservedLabels();
this.reserveModalVisible = true; this.reserveModalVisible = true;
}, },
// 加载预留标签列表 - rqrq
// 加载预定标签列表 - rqrq
loadReservedLabels() { loadReservedLabels() {
getPalletReservedLabels({ getPalletReservedLabels({
site: this.site, site: this.site,
@ -348,20 +348,20 @@ export default {
this.reserveCount = 0; this.reserveCount = 0;
} }
}).catch(error => { }).catch(error => {
console.error('获取预留标签列表失败:', error);
console.error('获取预定标签列表失败:', error);
this.reservedLabels = []; this.reservedLabels = [];
this.reserveCount = 0; this.reserveCount = 0;
}); });
}, },
// 一键取消预留 - rqrq
// 一键取消预定 - rqrq
handleBatchCancelReserve() { handleBatchCancelReserve() {
if (this.locationCode === '1101') { if (this.locationCode === '1101') {
this.$alert('栈板在库位1101上,不允许取消预留', '错误', { confirmButtonText: '确定' });
this.$alert('栈板在库位1101上,不允许取消预定', '错误', { confirmButtonText: '确定' });
return; return;
} }
this.$confirm('确定要取消所有预留标签吗?', '提示', {
this.$confirm('确定要取消所有预定标签吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
@ -372,7 +372,7 @@ export default {
}); });
}, },
// 执行批量取消预留 - rqrq
// 执行批量取消预定 - rqrq
doBatchCancelReserve() { doBatchCancelReserve() {
this.cancelReserveLoading = true; this.cancelReserveLoading = true;
@ -381,16 +381,16 @@ export default {
palletId: this.palletCode palletId: this.palletCode
}).then(({ data }) => { }).then(({ data }) => {
if (data.code === 0) { if (data.code === 0) {
this.$message.success('取消预留成功');
this.$message.success('取消预定成功');
this.reserveModalVisible = false; this.reserveModalVisible = false;
// 重新加载预留标签列表 - rqrq
// 重新加载预定标签列表 - rqrq
this.loadReservedLabels(); this.loadReservedLabels();
} else { } else {
this.$alert(data.msg || '取消预留失败', '错误', { confirmButtonText: '确定' });
this.$alert(data.msg || '取消预定失败', '错误', { confirmButtonText: '确定' });
} }
}).catch(error => { }).catch(error => {
console.error('批量取消预留失败:', error);
this.$alert('取消预留异常', '错误', { confirmButtonText: '确定' });
console.error('批量取消预定失败:', error);
this.$alert('取消预定异常', '错误', { confirmButtonText: '确定' });
}).finally(() => { }).finally(() => {
this.cancelReserveLoading = false; this.cancelReserveLoading = false;
}); });
@ -521,7 +521,7 @@ export default {
width: 100%; width: 100%;
} }
/* 预留清单相关样式 - rqrq */
/* 预定清单相关样式 - rqrq */
.action-btn.warning { .action-btn.warning {
background: #E6A23C; background: #E6A23C;
color: white; color: white;

44
src/views/modules/haianAutoWarehouse/haianPalletSearch.vue

@ -62,13 +62,13 @@
{{ '浏览明细' }} {{ '浏览明细' }}
</button> </button>
<label style="margin-left: 5px;">条码数:{{detailList.length}}</label> <label style="margin-left: 5px;">条码数:{{detailList.length}}</label>
<!-- 预留清单按钮 - rqrq -->
<!-- 预定清单按钮 - rqrq -->
<button <button
class="action-btn" class="action-btn"
:class="reserveCount > 0 ? 'warning' : 'secondary'" :class="reserveCount > 0 ? 'warning' : 'secondary'"
style="margin: 0; margin-left: 10px;" style="margin: 0; margin-left: 10px;"
@click="showReserveModal"> @click="showReserveModal">
预留清单({{ reserveCount }})
预定清单({{ reserveCount }})
</button> </button>
</div> </div>
</div> </div>
@ -133,9 +133,9 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 预留清单弹窗 - rqrq -->
<!-- 预定清单弹窗 - rqrq -->
<el-dialog <el-dialog
:title="'预留清单 (共'+reserveCount+'条)'"
:title="'预定清单 (共'+reserveCount+'条)'"
:visible.sync="reserveModalVisible" :visible.sync="reserveModalVisible"
width="95%" width="95%"
:close-on-click-modal="false" :close-on-click-modal="false"
@ -162,7 +162,7 @@
</div> </div>
<!-- 暂无数据提示 --> <!-- 暂无数据提示 -->
<div v-if="reservedLabels.length === 0" class="table-row empty-row"> <div v-if="reservedLabels.length === 0" class="table-row empty-row">
<div class="empty-hint">暂无预留标签</div>
<div class="empty-hint">暂无预定标签</div>
</div> </div>
</div> </div>
</div> </div>
@ -174,12 +174,12 @@
:disabled="cancelReserveLoading || reservedLabels.length === 0 || errorStationFlag" :disabled="cancelReserveLoading || reservedLabels.length === 0 || errorStationFlag"
v-if="reservedLabels.length > 0" v-if="reservedLabels.length > 0"
> >
{{ cancelReserveLoading ? '取消中...' : '一键取消预留' }}
{{ cancelReserveLoading ? '取消中...' : '一键取消预定' }}
</button> </button>
</div> </div>
<!-- 异常位提示:以后端 errorStationFlag 为准,不再写死 1101 - rqrq --> <!-- 异常位提示:以后端 errorStationFlag 为准,不再写死 1101 - rqrq -->
<div v-if="errorStationFlag" class="reserve-warning"> <div v-if="errorStationFlag" class="reserve-warning">
<i class="el-icon-warning"></i> 栈板在立库异常位上,不允许取消预留
<i class="el-icon-warning"></i> 栈板在立库异常位上,不允许取消预定
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -214,7 +214,7 @@ export default {
// 是否异常位:由后端 ERROR_STATIONS 判定,禁止前端写死 1101 - rqrq // 是否异常位:由后端 ERROR_STATIONS 判定,禁止前端写死 1101 - rqrq
errorStationFlag: false, errorStationFlag: false,
// 预留清单相关 - rqrq
// 预定清单相关 - rqrq
reserveModalVisible: false, reserveModalVisible: false,
reservedLabels: [], reservedLabels: [],
reserveCount: 0, reserveCount: 0,
@ -279,7 +279,7 @@ export default {
this.positionOptions = data.positions || []; this.positionOptions = data.positions || [];
this.locationCode = data.locationCode || ''; this.locationCode = data.locationCode || '';
this.refreshTable(); this.refreshTable();
this.loadReservedLabels(); // 加载预留标签数量 - rqrq
this.loadReservedLabels(); // 加载预定标签数量 - rqrq
} else { } else {
let errorMsg = data.msg || '栈板不存在'; let errorMsg = data.msg || '栈板不存在';
if (errorMsg.length > 100) { if (errorMsg.length > 100) {
@ -342,13 +342,13 @@ export default {
this.detailModalVisible = true; this.detailModalVisible = true;
}, },
// 显示预留清单弹窗 - rqrq
// 显示预定清单弹窗 - rqrq
showReserveModal() { showReserveModal() {
this.loadReservedLabels(); this.loadReservedLabels();
this.reserveModalVisible = true; this.reserveModalVisible = true;
}, },
// 加载预留标签列表 - rqrq
// 加载预定标签列表 - rqrq
loadReservedLabels() { loadReservedLabels() {
getPalletReservedLabels({ getPalletReservedLabels({
site: this.site, site: this.site,
@ -365,21 +365,21 @@ export default {
this.errorStationFlag = false; this.errorStationFlag = false;
} }
}).catch(error => { }).catch(error => {
console.error('获取预留标签列表失败:', error);
console.error('获取预定标签列表失败:', error);
this.reservedLabels = []; this.reservedLabels = [];
this.reserveCount = 0; this.reserveCount = 0;
this.errorStationFlag = false; this.errorStationFlag = false;
}); });
}, },
// 一键取消预留 - rqrq
// 一键取消预定 - rqrq
handleBatchCancelReserve() { handleBatchCancelReserve() {
if (this.errorStationFlag) { if (this.errorStationFlag) {
this.$alert('栈板在立库异常位上,不允许取消预留', '错误', { confirmButtonText: '确定' });
this.$alert('栈板在立库异常位上,不允许取消预定', '错误', { confirmButtonText: '确定' });
return; return;
} }
this.$confirm('确定要取消所有预留标签吗?', '提示', {
this.$confirm('确定要取消所有预定标签吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
@ -390,7 +390,7 @@ export default {
}); });
}, },
// 执行批量取消预留 - rqrq
// 执行批量取消预定 - rqrq
doBatchCancelReserve() { doBatchCancelReserve() {
this.cancelReserveLoading = true; this.cancelReserveLoading = true;
@ -399,16 +399,16 @@ export default {
palletId: this.palletCode palletId: this.palletCode
}).then(({ data }) => { }).then(({ data }) => {
if (data.code === 0) { if (data.code === 0) {
this.$message.success('取消预留成功');
this.$message.success('取消预定成功');
this.reserveModalVisible = false; this.reserveModalVisible = false;
// 重新加载预留标签列表 - rqrq
// 重新加载预定标签列表 - rqrq
this.loadReservedLabels(); this.loadReservedLabels();
} else { } else {
this.$alert(data.msg || '取消预留失败', '错误', { confirmButtonText: '确定' });
this.$alert(data.msg || '取消预定失败', '错误', { confirmButtonText: '确定' });
} }
}).catch(error => { }).catch(error => {
console.error('批量取消预留失败:', error);
this.$alert('取消预留异常', '错误', { confirmButtonText: '确定' });
console.error('批量取消预定失败:', error);
this.$alert('取消预定异常', '错误', { confirmButtonText: '确定' });
}).finally(() => { }).finally(() => {
this.cancelReserveLoading = false; this.cancelReserveLoading = false;
}); });
@ -544,7 +544,7 @@ export default {
width: 100%; width: 100%;
} }
/* 预留清单相关样式 - rqrq */
/* 预定清单相关样式 - rqrq */
.action-btn.warning { .action-btn.warning {
background: #E6A23C; background: #E6A23C;
color: white; color: white;

21
src/views/modules/haianAutoWarehouse/haianWmsCancelReserve.vue

@ -4,7 +4,8 @@
<div class="header-bar"> <div class="header-bar">
<div class="header-left" :class="{ 'header-action-disabled': pageBusy }" @click="handleBack"> <div class="header-left" :class="{ 'header-action-disabled': pageBusy }" @click="handleBack">
<i class="el-icon-arrow-left"></i> <i class="el-icon-arrow-left"></i>
<span>取消预留</span>
<!-- WMS标签状态统一展示为预定,reserve字段和Y/N判断保持原有业务含义 - rqrq -->
<span>取消预定</span>
</div> </div>
<div class="header-right" :class="{ 'header-action-disabled': pageBusy }" @click="goHome"> <div class="header-right" :class="{ 'header-action-disabled': pageBusy }" @click="goHome">
首页 首页
@ -67,17 +68,17 @@
<span class="info-value">{{ labelInfo.wdr || '-' }}</span> <span class="info-value">{{ labelInfo.wdr || '-' }}</span>
</div> </div>
<div class="info-row"> <div class="info-row">
<span class="info-label">是否被WMS预留:</span>
<span class="info-label">是否被WMS预定:</span>
<span class="info-value" :style="{ color: labelInfo.reserveFlag === 'Y' ? '#F56C6C' : '#67C23A' }"> <span class="info-value" :style="{ color: labelInfo.reserveFlag === 'Y' ? '#F56C6C' : '#67C23A' }">
{{ labelInfo.reserveFlag === 'Y' ? '是' : '否' }} {{ labelInfo.reserveFlag === 'Y' ? '是' : '否' }}
</span> </span>
</div> </div>
<div class="info-row" v-if="labelInfo.reserveOrderRef1"> <div class="info-row" v-if="labelInfo.reserveOrderRef1">
<span class="info-label">预留申请单号:</span>
<span class="info-label">预定申请单号:</span>
<span class="info-value">{{ labelInfo.reserveOrderRef1 || '-' }}</span> <span class="info-value">{{ labelInfo.reserveOrderRef1 || '-' }}</span>
</div> </div>
<div class="info-row" v-if="labelInfo.reserveOrderRef3"> <div class="info-row" v-if="labelInfo.reserveOrderRef3">
<span class="info-label">预留订单号:</span>
<span class="info-label">预定订单号:</span>
<span class="info-value">{{ labelInfo.reserveOrderRef3 || '-' }}</span> <span class="info-value">{{ labelInfo.reserveOrderRef3 || '-' }}</span>
</div> </div>
</div> </div>
@ -89,7 +90,7 @@
@click="handleCancelReserve" @click="handleCancelReserve"
:disabled="cancelReserveLoading || labelInfo.reserveFlag !== 'Y'" :disabled="cancelReserveLoading || labelInfo.reserveFlag !== 'Y'"
> >
{{ cancelReserveLoading ? '取消中...' : '取消预留' }}
{{ cancelReserveLoading ? '取消中...' : '取消预定' }}
</button> </button>
</div> </div>
</div> </div>
@ -173,10 +174,10 @@ export default {
}, },
handleCancelReserve() { handleCancelReserve() {
if (!this.labelInfo || this.labelInfo.reserveFlag !== 'Y') { if (!this.labelInfo || this.labelInfo.reserveFlag !== 'Y') {
this.$message.warning('当前标签未被预留')
this.$message.warning('当前标签未被预定')
return return
} }
this.$confirm('确定要取消该标签的WMS预留吗?', '提示', {
this.$confirm('确定要取消该标签的WMS预定吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
@ -193,13 +194,13 @@ export default {
serialNo: this.labelInfo.unitId serialNo: this.labelInfo.unitId
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message.success('取消预留成功')
this.$message.success('取消预定成功')
this.clearData() this.clearData()
} else { } else {
this.$message.error((data && data.msg) || '取消预留失败')
this.$message.error((data && data.msg) || '取消预定失败')
} }
}).catch(() => { }).catch(() => {
this.$message.error('取消预留异常')
this.$message.error('取消预定异常')
}).finally(() => { }).finally(() => {
this.cancelReserveLoading = false this.cancelReserveLoading = false
}) })

8
src/views/modules/inventory/label-query.vue

@ -106,15 +106,15 @@
<span class="info-value">{{ formatDate(labelInfo.lastCountDate) }}</span> <span class="info-value">{{ formatDate(labelInfo.lastCountDate) }}</span>
</div> </div>
<!-- 预留申请单号 - rqrq -->
<!-- 预定申请单号 - rqrq -->
<div class="info-row" v-if="labelInfo.reserveOrderRef1"> <div class="info-row" v-if="labelInfo.reserveOrderRef1">
<span class="info-label">预留申请单号:</span>
<span class="info-label">预定申请单号:</span>
<span class="info-value">{{ labelInfo.reserveOrderRef1 || '-' }}</span> <span class="info-value">{{ labelInfo.reserveOrderRef1 || '-' }}</span>
</div> </div>
<!-- 预留订单号 - rqrq -->
<!-- 预定订单号 - rqrq -->
<div class="info-row" v-if="labelInfo.reserveOrderRef3"> <div class="info-row" v-if="labelInfo.reserveOrderRef3">
<span class="info-label">预留订单号:</span>
<span class="info-label">预定订单号:</span>
<span class="info-value">{{ labelInfo.reserveOrderRef3 || '-' }}</span> <span class="info-value">{{ labelInfo.reserveOrderRef3 || '-' }}</span>
</div> </div>
</div> </div>

34
src/views/modules/inventory/wms-cancel-reserve.vue

@ -5,7 +5,7 @@
<div class="header-bar"> <div class="header-bar">
<div class="header-left" @click="handleBack"> <div class="header-left" @click="handleBack">
<i class="el-icon-arrow-left"></i> <i class="el-icon-arrow-left"></i>
<span>WMS取消预留</span>
<span>WMS取消预定</span>
</div> </div>
<div class="header-right" @click="$router.push({ path: '/' })"> <div class="header-right" @click="$router.push({ path: '/' })">
首页 首页
@ -73,23 +73,23 @@
<span class="info-value">{{ labelInfo.wdr || '-' }}</span> <span class="info-value">{{ labelInfo.wdr || '-' }}</span>
</div> </div>
<!-- 是否被WMS预留 - rqrq -->
<!-- 是否被WMS预定 - rqrq -->
<div class="info-row"> <div class="info-row">
<span class="info-label">是否被WMS预留:</span>
<span class="info-label">是否被WMS预定:</span>
<span class="info-value" :style="{ color: labelInfo.reserveFlag === 'Y' ? '#F56C6C' : '#67C23A' }"> <span class="info-value" :style="{ color: labelInfo.reserveFlag === 'Y' ? '#F56C6C' : '#67C23A' }">
{{ labelInfo.reserveFlag === 'Y' ? '是' : '否' }} {{ labelInfo.reserveFlag === 'Y' ? '是' : '否' }}
</span> </span>
</div> </div>
<!-- 预留申请单号 - rqrq -->
<!-- 预定申请单号 - rqrq -->
<div class="info-row" v-if="labelInfo.reserveOrderRef1"> <div class="info-row" v-if="labelInfo.reserveOrderRef1">
<span class="info-label">预留申请单号:</span>
<span class="info-label">预定申请单号:</span>
<span class="info-value">{{ labelInfo.reserveOrderRef1 || '-' }}</span> <span class="info-value">{{ labelInfo.reserveOrderRef1 || '-' }}</span>
</div> </div>
<!-- 预留订单号 - rqrq -->
<!-- 预定订单号 - rqrq -->
<div class="info-row" v-if="labelInfo.reserveOrderRef3"> <div class="info-row" v-if="labelInfo.reserveOrderRef3">
<span class="info-label">预留订单号:</span>
<span class="info-label">预定订单号:</span>
<span class="info-value">{{ labelInfo.reserveOrderRef3 || '-' }}</span> <span class="info-value">{{ labelInfo.reserveOrderRef3 || '-' }}</span>
</div> </div>
</div> </div>
@ -107,7 +107,7 @@
@click="handleCancelReserve" @click="handleCancelReserve"
:disabled="cancelReserveLoading || labelInfo.reserveFlag !== 'Y'" :disabled="cancelReserveLoading || labelInfo.reserveFlag !== 'Y'"
> >
{{ cancelReserveLoading ? '取消中...' : '取消预留' }}
{{ cancelReserveLoading ? '取消中...' : '取消预定' }}
</button> </button>
</div> </div>
</div> </div>
@ -117,7 +117,7 @@
</template> </template>
<script> <script>
// 取消预留的扫码使用绑定校验入口,标签拆分页面仍使用原queryLabelInfo - rqrq
// 取消预定的扫码使用绑定校验入口,标签拆分页面仍使用原queryLabelInfo - rqrq
import { queryLabelForCancelReserve, cancelReserve } from '@/api/inventory/label' import { queryLabelForCancelReserve, cancelReserve } from '@/api/inventory/label'
export default { export default {
@ -179,15 +179,15 @@ export default {
}, },
/** /**
* 处理取消预留 - rqrq
* 处理取消预定 - rqrq
*/ */
handleCancelReserve() { handleCancelReserve() {
if (!this.labelInfo || this.labelInfo.reserveFlag !== 'Y') { if (!this.labelInfo || this.labelInfo.reserveFlag !== 'Y') {
this.$message.warning('当前标签未被预留');
this.$message.warning('当前标签未被预定');
return; return;
} }
this.$confirm('确定要取消该标签的WMS预留吗?', '提示', {
this.$confirm('确定要取消该标签的WMS预定吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
@ -199,7 +199,7 @@ export default {
}, },
/** /**
* 执行取消预留操作 - rqrq
* 执行取消预定操作 - rqrq
*/ */
doCancelReserve() { doCancelReserve() {
this.cancelReserveLoading = true; this.cancelReserveLoading = true;
@ -209,16 +209,16 @@ export default {
unitId: this.labelInfo.unitId unitId: this.labelInfo.unitId
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message.success('取消预留成功');
this.$message.success('取消预定成功');
this.clearData(); this.clearData();
// 重新查询标签信息 // 重新查询标签信息
// this.handleLabelScan(); // this.handleLabelScan();
} else { } else {
this.$message.error(data.msg || '取消预留失败');
this.$message.error(data.msg || '取消预定失败');
} }
}).catch(error => { }).catch(error => {
console.error('取消预留失败:', error);
this.$message.error('取消预留异常');
console.error('取消预定失败:', error);
this.$message.error('取消预定异常');
}).finally(() => { }).finally(() => {
this.cancelReserveLoading = false; this.cancelReserveLoading = false;
}); });

Loading…
Cancel
Save