diff --git a/src/api/automatedWarehouse/palletPacking.js b/src/api/automatedWarehouse/palletPacking.js
index 3623029..fd15029 100644
--- a/src/api/automatedWarehouse/palletPacking.js
+++ b/src/api/automatedWarehouse/palletPacking.js
@@ -83,8 +83,8 @@ export const finishSortingNoAgv = data => createAPI(`/wcsIntegration/finishSorti
// 根据栈板站点获取分拣明细RFID列表 - rqrq
export const getSortingList = data => createAPI(`/wcsIntegration/getSortingList`,'post',data)
-// 获取栈板上被预留的标签列表 - rqrq
+// 获取栈板上被预定的标签列表 - rqrq
export const getPalletReservedLabels = data => createAPI(`/wcsIntegration/getPalletReservedLabels`,'post',data)
-// 批量取消栈板上的预留标签 - rqrq
+// 批量取消栈板上的预定标签 - rqrq
export const batchCancelReserve = data => createAPI(`/wcsIntegration/batchCancelReserve`,'post',data)
diff --git a/src/api/haianAutoWarehouse/palletPacking.js b/src/api/haianAutoWarehouse/palletPacking.js
index 756e601..8219ad1 100644
--- a/src/api/haianAutoWarehouse/palletPacking.js
+++ b/src/api/haianAutoWarehouse/palletPacking.js
@@ -51,7 +51,7 @@ export const callPalletToStationWithUpdateZuPan = data => createAPI(`/haiAnWcsIn
// 海安-调用空托盘 - rqrq
export const callEmptyPalletToStation = data => createAPI(`/haiAnWcsIntegration/callEmptyPalletToStation`, 'post', data)
-// 海安手工分拣拆分特例：复用老PDA标签拆分接口，新标签由后端去掉预留，原标签数量回写栈板明细 - rqrq
+// 海安手工分拣拆分特例：复用老PDA标签拆分接口，新标签由后端去掉预定，原标签数量回写栈板明细 - rqrq
export const splitLabel = data => createAPI(`/pda/label/split`, 'post', data)
// 海安-结束分拣 - rqrq
@@ -60,10 +60,10 @@ export const finishSorting = data => createAPI(`/haiAnWcsIntegration/finishSorti
// 海安-查询分拣清单 - rqrq
export const getSortingList = data => createAPI(`/haiAnWcsIntegration/getSortingList`, 'post', data)
-// 海安-查看托盘预留标签列表 - rqrq
+// 海安-查看托盘预定标签列表 - rqrq
export const getPalletReservedLabels = data => createAPI(`/haiAnWcsIntegration/getPalletReservedLabels`, 'post', data)
-// 海安-一键取消托盘预留 - rqrq
+// 海安-一键取消托盘预定 - rqrq
export const batchCancelReserve = data => createAPI(`/haiAnWcsIntegration/batchCancelReserve`, 'post', data)
// 海安-旧页面兼容占位（当前无需调用）- rqrq
diff --git a/src/api/haianAutoWarehouse/wmsCancelReserve.js b/src/api/haianAutoWarehouse/wmsCancelReserve.js
index 1fe323e..3bbe43e 100644
--- a/src/api/haianAutoWarehouse/wmsCancelReserve.js
+++ b/src/api/haianAutoWarehouse/wmsCancelReserve.js
@@ -1,7 +1,7 @@
import { createAPI } from "@/utils/httpRequest.js";
-// 海安-取消预留：查询标签信息 - rqrq
+// 海安-取消预定：查询标签信息 - rqrq
export const queryLabelInfo = data => createAPI(`/haiAnWcsIntegration/queryLabelInfo`, 'post', data)
-// 海安-取消预留：取消单标签预留 - rqrq
+// 海安-取消预定：取消单标签预定 - rqrq
export const cancelReserve = data => createAPI(`/haiAnWcsIntegration/cancelReserve`, 'post', data)
diff --git a/src/api/inventory/label.js b/src/api/inventory/label.js
index 9b4351e..6f1c218 100644
--- a/src/api/inventory/label.js
+++ b/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)
-// 取消预留扫码独立校验在盘状态，不修改标签查询/拆分使用的queryLabelInfo - rqrq
+// 取消预定扫码独立校验在盘状态，不修改标签查询/拆分使用的queryLabelInfo - rqrq
export const queryLabelForCancelReserve = data => createAPI(`/handlingunit/scanLabelForCancelReserve`, 'post', {
site: data.site,
unitId: data.labelCode
})
-// 取消WMS预留 - rqrq
+// 取消WMS预定 - rqrq
export const cancelReserve = data => createAPI(`/pda/label/cancelReserve`,'post',data)
// 标签拆分
diff --git a/src/views/main.vue b/src/views/main.vue
index d02c518..23a18e7 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -211,7 +211,8 @@
-
+
+
-
+
@@ -174,12 +174,12 @@
:disabled="cancelReserveLoading || reservedLabels.length === 0 || locationCode === '1101'"
v-if="reservedLabels.length > 0"
>
- {{ cancelReserveLoading ? '取消中...' : '一键取消预留' }}
+ {{ cancelReserveLoading ? '取消中...' : '一键取消预定' }}
- 栈板在立库异常位上，不允许取消预留
+ 栈板在立库异常位上，不允许取消预定
@@ -211,7 +211,7 @@ export default {
// 栈板库位 - rqrq
locationCode: '',
- // 预留清单相关 - rqrq
+ // 预定清单相关 - rqrq
reserveModalVisible: false,
reservedLabels: [],
reserveCount: 0,
@@ -264,7 +264,7 @@ export default {
this.positionOptions = data.positions || [];
this.locationCode = data.locationCode || '';
this.refreshTable();
- this.loadReservedLabels(); // 加载预留标签数量 - rqrq
+ this.loadReservedLabels(); // 加载预定标签数量 - rqrq
} else {
let errorMsg = data.msg || '栈板不存在';
if (errorMsg.length > 100) {
@@ -327,13 +327,13 @@ export default {
this.detailModalVisible = true;
},
- // 显示预留清单弹窗 - rqrq
+ // 显示预定清单弹窗 - rqrq
showReserveModal() {
this.loadReservedLabels();
this.reserveModalVisible = true;
},
- // 加载预留标签列表 - rqrq
+ // 加载预定标签列表 - rqrq
loadReservedLabels() {
getPalletReservedLabels({
site: this.site,
@@ -348,20 +348,20 @@ export default {
this.reserveCount = 0;
}
}).catch(error => {
- console.error('获取预留标签列表失败:', error);
+ console.error('获取预定标签列表失败:', error);
this.reservedLabels = [];
this.reserveCount = 0;
});
},
- // 一键取消预留 - rqrq
+ // 一键取消预定 - rqrq
handleBatchCancelReserve() {
if (this.locationCode === '1101') {
- this.$alert('栈板在库位1101上，不允许取消预留', '错误', { confirmButtonText: '确定' });
+ this.$alert('栈板在库位1101上，不允许取消预定', '错误', { confirmButtonText: '确定' });
return;
}
- this.$confirm('确定要取消所有预留标签吗？', '提示', {
+ this.$confirm('确定要取消所有预定标签吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -372,7 +372,7 @@ export default {
});
},
- // 执行批量取消预留 - rqrq
+ // 执行批量取消预定 - rqrq
doBatchCancelReserve() {
this.cancelReserveLoading = true;
@@ -381,16 +381,16 @@ export default {
palletId: this.palletCode
}).then(({ data }) => {
if (data.code === 0) {
- this.$message.success('取消预留成功');
+ this.$message.success('取消预定成功');
this.reserveModalVisible = false;
- // 重新加载预留标签列表 - rqrq
+ // 重新加载预定标签列表 - rqrq
this.loadReservedLabels();
} else {
- this.$alert(data.msg || '取消预留失败', '错误', { confirmButtonText: '确定' });
+ this.$alert(data.msg || '取消预定失败', '错误', { confirmButtonText: '确定' });
}
}).catch(error => {
- console.error('批量取消预留失败:', error);
- this.$alert('取消预留异常', '错误', { confirmButtonText: '确定' });
+ console.error('批量取消预定失败:', error);
+ this.$alert('取消预定异常', '错误', { confirmButtonText: '确定' });
}).finally(() => {
this.cancelReserveLoading = false;
});
@@ -521,7 +521,7 @@ export default {
width: 100%;
}
-/* 预留清单相关样式 - rqrq */
+/* 预定清单相关样式 - rqrq */
.action-btn.warning {
background: #E6A23C;
color: white;
diff --git a/src/views/modules/haianAutoWarehouse/haianPalletSearch.vue b/src/views/modules/haianAutoWarehouse/haianPalletSearch.vue
index db8d6f4..6cda127 100644
--- a/src/views/modules/haianAutoWarehouse/haianPalletSearch.vue
+++ b/src/views/modules/haianAutoWarehouse/haianPalletSearch.vue
@@ -62,13 +62,13 @@
{{ '浏览明细' }}
-
+
@@ -133,9 +133,9 @@
-
+
@@ -174,12 +174,12 @@
:disabled="cancelReserveLoading || reservedLabels.length === 0 || errorStationFlag"
v-if="reservedLabels.length > 0"
>
- {{ cancelReserveLoading ? '取消中...' : '一键取消预留' }}
+ {{ cancelReserveLoading ? '取消中...' : '一键取消预定' }}
- 栈板在立库异常位上，不允许取消预留
+ 栈板在立库异常位上，不允许取消预定
@@ -214,7 +214,7 @@ export default {
// 是否异常位：由后端 ERROR_STATIONS 判定，禁止前端写死 1101 - rqrq
errorStationFlag: false,
- // 预留清单相关 - rqrq
+ // 预定清单相关 - rqrq
reserveModalVisible: false,
reservedLabels: [],
reserveCount: 0,
@@ -279,7 +279,7 @@ export default {
this.positionOptions = data.positions || [];
this.locationCode = data.locationCode || '';
this.refreshTable();
- this.loadReservedLabels(); // 加载预留标签数量 - rqrq
+ this.loadReservedLabels(); // 加载预定标签数量 - rqrq
} else {
let errorMsg = data.msg || '栈板不存在';
if (errorMsg.length > 100) {
@@ -342,13 +342,13 @@ export default {
this.detailModalVisible = true;
},
- // 显示预留清单弹窗 - rqrq
+ // 显示预定清单弹窗 - rqrq
showReserveModal() {
this.loadReservedLabels();
this.reserveModalVisible = true;
},
- // 加载预留标签列表 - rqrq
+ // 加载预定标签列表 - rqrq
loadReservedLabels() {
getPalletReservedLabels({
site: this.site,
@@ -365,21 +365,21 @@ export default {
this.errorStationFlag = false;
}
}).catch(error => {
- console.error('获取预留标签列表失败:', error);
+ console.error('获取预定标签列表失败:', error);
this.reservedLabels = [];
this.reserveCount = 0;
this.errorStationFlag = false;
});
},
- // 一键取消预留 - rqrq
+ // 一键取消预定 - rqrq
handleBatchCancelReserve() {
if (this.errorStationFlag) {
- this.$alert('栈板在立库异常位上，不允许取消预留', '错误', { confirmButtonText: '确定' });
+ this.$alert('栈板在立库异常位上，不允许取消预定', '错误', { confirmButtonText: '确定' });
return;
}
- this.$confirm('确定要取消所有预留标签吗？', '提示', {
+ this.$confirm('确定要取消所有预定标签吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -390,7 +390,7 @@ export default {
});
},
- // 执行批量取消预留 - rqrq
+ // 执行批量取消预定 - rqrq
doBatchCancelReserve() {
this.cancelReserveLoading = true;
@@ -399,16 +399,16 @@ export default {
palletId: this.palletCode
}).then(({ data }) => {
if (data.code === 0) {
- this.$message.success('取消预留成功');
+ this.$message.success('取消预定成功');
this.reserveModalVisible = false;
- // 重新加载预留标签列表 - rqrq
+ // 重新加载预定标签列表 - rqrq
this.loadReservedLabels();
} else {
- this.$alert(data.msg || '取消预留失败', '错误', { confirmButtonText: '确定' });
+ this.$alert(data.msg || '取消预定失败', '错误', { confirmButtonText: '确定' });
}
}).catch(error => {
- console.error('批量取消预留失败:', error);
- this.$alert('取消预留异常', '错误', { confirmButtonText: '确定' });
+ console.error('批量取消预定失败:', error);
+ this.$alert('取消预定异常', '错误', { confirmButtonText: '确定' });
}).finally(() => {
this.cancelReserveLoading = false;
});
@@ -544,7 +544,7 @@ export default {
width: 100%;
}
-/* 预留清单相关样式 - rqrq */
+/* 预定清单相关样式 - rqrq */
.action-btn.warning {
background: #E6A23C;
color: white;
diff --git a/src/views/modules/haianAutoWarehouse/haianWmsCancelReserve.vue b/src/views/modules/haianAutoWarehouse/haianWmsCancelReserve.vue
index eec5af7..20b7543 100644
--- a/src/views/modules/haianAutoWarehouse/haianWmsCancelReserve.vue
+++ b/src/views/modules/haianAutoWarehouse/haianWmsCancelReserve.vue
@@ -4,7 +4,8 @@
@@ -89,7 +90,7 @@
@click="handleCancelReserve"
:disabled="cancelReserveLoading || labelInfo.reserveFlag !== 'Y'"
>
- {{ cancelReserveLoading ? '取消中...' : '取消预留' }}
+ {{ cancelReserveLoading ? '取消中...' : '取消预定' }}
@@ -173,10 +174,10 @@ export default {
},
handleCancelReserve() {
if (!this.labelInfo || this.labelInfo.reserveFlag !== 'Y') {
- this.$message.warning('当前标签未被预留')
+ this.$message.warning('当前标签未被预定')
return
}
- this.$confirm('确定要取消该标签的WMS预留吗？', '提示', {
+ this.$confirm('确定要取消该标签的WMS预定吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -193,13 +194,13 @@ export default {
serialNo: this.labelInfo.unitId
}).then(({ data }) => {
if (data && data.code === 0) {
- this.$message.success('取消预留成功')
+ this.$message.success('取消预定成功')
this.clearData()
} else {
- this.$message.error((data && data.msg) || '取消预留失败')
+ this.$message.error((data && data.msg) || '取消预定失败')
}
}).catch(() => {
- this.$message.error('取消预留异常')
+ this.$message.error('取消预定异常')
}).finally(() => {
this.cancelReserveLoading = false
})
diff --git a/src/views/modules/inventory/label-query.vue b/src/views/modules/inventory/label-query.vue
index eb7d271..22454fe 100644
--- a/src/views/modules/inventory/label-query.vue
+++ b/src/views/modules/inventory/label-query.vue
@@ -106,15 +106,15 @@
{{ formatDate(labelInfo.lastCountDate) }}
-
+
- 预留申请单号:
+ 预定申请单号:
{{ labelInfo.reserveOrderRef1 || '-' }}
-
+
- 预留订单号:
+ 预定订单号:
{{ labelInfo.reserveOrderRef3 || '-' }}
diff --git a/src/views/modules/inventory/wms-cancel-reserve.vue b/src/views/modules/inventory/wms-cancel-reserve.vue
index e84ba2e..3536dd0 100644
--- a/src/views/modules/inventory/wms-cancel-reserve.vue
+++ b/src/views/modules/inventory/wms-cancel-reserve.vue
@@ -5,7 +5,7 @@
@@ -107,7 +107,7 @@
@click="handleCancelReserve"
:disabled="cancelReserveLoading || labelInfo.reserveFlag !== 'Y'"
>
- {{ cancelReserveLoading ? '取消中...' : '取消预留' }}
+ {{ cancelReserveLoading ? '取消中...' : '取消预定' }}
@@ -117,7 +117,7 @@