From aa918b58bb9d08b0e49d65b92fb31f56d971c2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=A4=E9=94=A6=E7=A7=91?= <32996823@qq.com>
Date: Tue, 17 Dec 2024 17:48:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=A5=E5=BA=93=E8=AE=A1?=
=?UTF-8?q?=E5=88=92=E6=98=BE=E7=A4=BA=E5=BA=93=E4=BD=8D=E7=89=A9=E6=96=99?=
=?UTF-8?q?=E5=8F=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/md/mditem/index.vue | 29 ++++++++
.../wm/inPlan/wmsInPlanKnifeBackFormCmps.vue | 68 ++++++++++++++++---
2 files changed, 89 insertions(+), 8 deletions(-)
diff --git a/src/views/mes/md/mditem/index.vue b/src/views/mes/md/mditem/index.vue
index 6554b4d..eeee1e0 100644
--- a/src/views/mes/md/mditem/index.vue
+++ b/src/views/mes/md/mditem/index.vue
@@ -393,6 +393,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mes/wm/inPlan/wmsInPlanKnifeBackFormCmps.vue b/src/views/mes/wm/inPlan/wmsInPlanKnifeBackFormCmps.vue
index 0fbc1d0..dbb0047 100644
--- a/src/views/mes/wm/inPlan/wmsInPlanKnifeBackFormCmps.vue
+++ b/src/views/mes/wm/inPlan/wmsInPlanKnifeBackFormCmps.vue
@@ -4,10 +4,11 @@ import WmsInPlanDetailEntityTableCmps from "@/views/mes/wm/inPlan/wmsInPlanDetai
import {addPLAN, updatePLAN} from "@/api/wm/PLAN";
import {listMdItem} from "@/api/mes/md/mdItem";
import {listTYPE} from "@/api/md/TYPE";
-import {isDuplicateRfid} from "@/api/mes/md/baseKnife";
+import {isDuplicateRfid, listBaseKnife} from "@/api/mes/md/baseKnife";
export default {
name: "wmsInPlanKnifeBackFormCmps",
+ dicts: ['sys_yes_no', 'mes_item_product', 'is_locked', 'knife_fine_status', 'plan_source_type', 'in_plan_state'],
components: {WmsInPlanDetailEntityTableCmps},
props: {
dataForm: {
@@ -25,6 +26,8 @@ export default {
wmsInPlanDetailForm: {},
// 库位列表
areaList: [],
+ BaseKnifeList: [],
+ total: 0,
// 入库计划明细实例 列表
wmsInPlanDetailEntityList: [],
// 表单校验
@@ -34,7 +37,12 @@ export default {
localVisible: this.visible,
// 入库计划类型
inPlanTypeList: [],
- mdItemList: []
+ mdItemList: [],
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ areaCode: ""
+ }
}
},
computed: {
@@ -45,7 +53,6 @@ export default {
methods: {
/** 获取库位列表 */
getAreaList(areaName = "") {
- this.loading = true;
const params = {
pageNum: 1,
pageSize: 100,
@@ -124,6 +131,15 @@ export default {
this.inPlanTypeList = response.rows;
});
},
+ handleAreaSelectChange(){
+ let result = this.areaList.filter(item => item.areaId == this.wmsInPlanDetailForm.cellId)
+ this.queryParams.areaCode = result[0].areaCode
+
+ listBaseKnife(this.queryParams).then(response => {
+ this.BaseKnifeList = response.rows;
+ this.total = response.total;
+ });
+ },
handlePlanTypeSelectChange(typeId) {
this.$emit("planTypeSelectChange", typeId)
},
@@ -194,20 +210,17 @@ export default {
-
-
-
-
+ :remote-method="getAreaList" clearable @change="handleAreaSelectChange">
{{ item.areaName }}
@@ -232,6 +245,45 @@ export default {
:planTypeId="localDataForm.planTypeId"
:planTypeCode="localDataForm.planTypeCode"
>
+
+ 库位包含物料
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.resetCount }}
+
+
+
+