diff --git a/manifest.json b/manifest.json
index bee6638..0c32c8c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "MES",
"appid" : "__UNI__66F7FE2",
"description" : "",
- "versionName" : "3.4.7",
- "versionCode" : 347,
+ "versionName" : "3.4.9",
+ "versionCode" : 349,
"transformPx" : false,
"sassImplementationName" : "node-sass",
"app-plus" : {
diff --git a/pages/wms/pdcIn/directRk.vue b/pages/wms/pdcIn/directRk.vue
index 275c371..5d2b8a8 100644
--- a/pages/wms/pdcIn/directRk.vue
+++ b/pages/wms/pdcIn/directRk.vue
@@ -8,8 +8,7 @@
v-model="workOrderCode" type="text" />
-
+
@@ -106,13 +105,6 @@ import { listLocation } from '@/api/basic/location';
export default {
mounted() {
- // 获取任务单编码列表
- listTask({
- pageNum: 1,
- pageSize: 25
- }).then(res => {
- this.productInTaskCodeList = res.rows.map(item => item.productInTaskCode);
- });
// 获取部门列表
listDepartment().then((res) => {
this.dptList = res.rows
@@ -133,7 +125,6 @@ export default {
show: false,
materialLabel: null,
workOrderCode: '',
- productInTaskCodeList: [],
legalLocation: true,
dptList: [],
empList: [],
@@ -190,27 +181,10 @@ export default {
methods: {
// 工单改变
handleChangeWorkOrderCode() {
- // 重置任务单列表
- this.productInTaskCodeList = [];
// 重置任务单编码
this.formData.productInTaskCode = '';
// 重置明细
this.formData.wmsProductInDetailList = [];
-
- // 获取任务单列表
- this.fetchTaskList();
- },
- // 获取任务单列表
- fetchTaskList() {
- if (!this.workOrderCode) return;
-
- listTask({
- workOrderCode: this.workOrderCode
- }).then(async res => {
- this.productInTaskCodeList = res.rows.map(item => item.productInTaskCode);
- }).catch(err => {
- console.error(`获取工单号为${this.workOrderCode}的产品入库任务单列表失败,详情:${err}`);
- });
},
// 扫描工单号
scanWorkOrderCode() {
@@ -337,16 +311,6 @@ export default {
}
});
},
- selectTypeList() {
- listTask({
- pageNum: 1,
- pageSize: 25
- }).then(async res => {
- for (var i in res.rows) {
- this.productInTaskCodeList.push(res.rows[i].productInTaskCode);
- }
- });
- },
// 依次获取推荐库位
async fetchLocation(taskDetail) {
const promises = taskDetail.map(async (item) => {
@@ -389,7 +353,7 @@ export default {
// 根据任务单 id 获取任务单明细
await getTask(taskId).then(res => {
- taskDetail = res.data.wmsProductInTaskDetailList
+ taskDetail = res.data.wmsProductInTaskDetailList.filter(item => item.notInNumber);
}).catch(err => {
console.error(`获取入库任务单 id 为${taskId}的任务单明细失败,详情:${err}`);
})
diff --git a/pages/wms/purchase/quickStorage.vue b/pages/wms/purchase/quickStorage.vue
index 28c6076..1b7259f 100644
--- a/pages/wms/purchase/quickStorage.vue
+++ b/pages/wms/purchase/quickStorage.vue
@@ -3,7 +3,7 @@