diff --git a/src/views/modules/automatedWarehouse/emptyPalletAssembly.vue b/src/views/modules/automatedWarehouse/emptyPalletAssembly.vue
index cf87905..78d97f9 100644
--- a/src/views/modules/automatedWarehouse/emptyPalletAssembly.vue
+++ b/src/views/modules/automatedWarehouse/emptyPalletAssembly.vue
@@ -47,6 +47,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -107,7 +119,7 @@ export default {
// 托盘类型 - rqrq
currentPalletType: '',
palletTypeOptions: [],
-
+ count: 1,
// 加载状态 - rqrq
notifyLoading: false,
transportLoading: false
@@ -135,7 +147,7 @@ export default {
if (data.code === 0) {
// 后端返回正确的6位栈板码,赋值给输入框 - rqrq
this.palletCode = data.row.palletId;
-
+
// 托盘信息 - rqrq
this.palletInfo = data.row;
this.currentPalletType = data.row.palletType || '';
@@ -237,7 +249,8 @@ export default {
notifyEmptyPalletInbound({
site: this.site,
palletId: this.palletCode,
- transportFlag: 'N'
+ transportFlag: 'N',
+ count: Number(this.count),
}).then(({ data }) => {
if (data && data.code === 0) {
this.$message.success('通知入库成功');
@@ -280,7 +293,8 @@ export default {
notifyEmptyPalletInbound({
site: this.site,
palletId: this.palletCode,
- transportFlag: 'Y'
+ transportFlag: 'Y',
+ count: Number(this.count),
}).then(({ data }) => {
if (data && data.code === 0) {
this.$message.success('入库并运输成功');
diff --git a/src/views/modules/automatedWarehouse/palletSorting.vue b/src/views/modules/automatedWarehouse/palletSorting.vue
index 40283a3..3033e9f 100644
--- a/src/views/modules/automatedWarehouse/palletSorting.vue
+++ b/src/views/modules/automatedWarehouse/palletSorting.vue
@@ -416,7 +416,6 @@ import {
getPalletDetails,
getLayersByPosition,
savePalletDetail,
- deletePalletDetail,
restorePalletDetail,
getLabelInfo,
getLayersForEdit,
@@ -1119,7 +1118,7 @@ export default {
if (this.sortingList.length === 0) {
// 如果sortingList为空,先获取分拣明细 - rqrq
console.log('sortingList为空,开始获取分拣明细 - rqrq');
-
+
getSortingList({
site: this.site,
palletId: this.palletCode
@@ -1127,7 +1126,7 @@ export default {
if (data && data.code === 0) {
this.sortingList = data.rfidList || [];
console.log('分拣明细获取成功 - rqrq,共' + this.sortingList.length + '条');
-
+
// 获取成功后,继续校验标签 - rqrq
this.validateAndScanIn();
} else {
@@ -1160,16 +1159,16 @@ export default {
});
return;
}
-
+
// sortingList有数据,直接校验 - rqrq
this.validateAndScanIn();
-
+
} else {
// 扫回操作(不需要校验分拣明细)- rqrq
this.handleScanOut();
}
},
-
+
// 校验标签并执行扫进操作 - rqrq
validateAndScanIn() {
// 校验sortingList是否为空 - rqrq
@@ -1187,7 +1186,7 @@ export default {
});
return;
}
-
+
// 校验标签是否在sortingList中 - rqrq
if (!this.sortingList.includes(this.scanCode)) {
this.$alert('该物料不在分拣明细中', '错误', {
@@ -1203,9 +1202,9 @@ export default {
});
return;
}
-
+
console.log('标签校验通过,开始扫进 - rqrq');
-
+
// 校验通过,执行原有的扫进逻辑 - rqrq
// 先查询这个标签的原始数据(扫进之前的数据)- rqrq
getLabelInfo({
@@ -1295,7 +1294,7 @@ export default {
console.log('无法查询标签原始信息,将不缓存 - rqrq');
});
},
-
+
// 扫回操作 - rqrq
handleScanOut() {
// 扫回操作(恢复到原栈板)- rqrq
diff --git a/src/views/modules/automatedWarehouse/palletSortingNoAgv.vue b/src/views/modules/automatedWarehouse/palletSortingNoAgv.vue
index bce0141..acb1b8c 100644
--- a/src/views/modules/automatedWarehouse/palletSortingNoAgv.vue
+++ b/src/views/modules/automatedWarehouse/palletSortingNoAgv.vue
@@ -416,7 +416,6 @@ import {
getPalletDetails,
getLayersByPosition,
savePalletDetail,
- deletePalletDetail,
restorePalletDetail,
getLabelInfo,
getLayersForEdit,