From 92bb7fb9a689513aafaf397888237f313f03a078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
<8702040+cai-ling@user.noreply.gitee.com>
Date: Wed, 27 Nov 2024 13:27:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=AF=81=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 8 ++
pages/entry/group-to-store.vue | 29 +++--
pages/entry/qualified-to-store.vue | 170 +++++++++++++++++++++++++++++
pages/home/home.vue | 2 +-
utils/getData2.js | 11 +-
5 files changed, 206 insertions(+), 14 deletions(-)
create mode 100644 pages/entry/qualified-to-store.vue
diff --git a/pages.json b/pages.json
index 97ed336..f541877 100644
--- a/pages.json
+++ b/pages.json
@@ -240,6 +240,14 @@
}
}
+ ,{
+ "path" : "pages/entry/qualified-to-store",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/entry/group-to-store.vue b/pages/entry/group-to-store.vue
index da91c13..85b133b 100644
--- a/pages/entry/group-to-store.vue
+++ b/pages/entry/group-to-store.vue
@@ -31,6 +31,14 @@
订单号
{{currentData.MONumber}}
+
+ 组织
+ {{currentData.StockOrgId}}
+
+
+ 货主
+ {{currentData.OwnerId_Id}}
+
物料编码
{{currentData.material_code}}
@@ -50,17 +58,9 @@
物料数量
-
+
-
- 组织
- {{currentData.StockOrgId}}
-
-
- 货主
- {{currentData.OwnerId_Id}}
-
仓库编码
@@ -71,7 +71,7 @@
-
+
@@ -90,6 +90,7 @@
title: '',
val1: '',
val2: '',
+ val3: '',
currentData: {},
options: [],
index: '',
@@ -116,22 +117,26 @@
async _getCertificateInfo (e) {
let res = await getCertificateInfo(e)
this.currentData = res
+ if (JSON.stringify(this.currentData) !== '{}') {
+ this.val3 = this.currentData.qty
+ }
},
toEmpty () {
this.val1 = ''
this.val2 = ''
+ this.val3 = ''
this.currentData = {}
this.index = ''
this.disabled = false
},
async _inStorageConfirm () {
this.disabled = true
- if (!this.val1 || !this.val2 || !this.index) {
+ if (!this.val2 || !this.val3 || !this.index) {
this.disabled = false
return
}
try {
- let obj = Object.assign(this.currentData, {vehicle_code: this.val2, stor_code: this.index})
+ let obj = Object.assign(this.currentData, {vehicle_code: this.val2, stor_code: this.index, qty: this.val3})
let res = await inStorageConfirm(obj)
if (res.code === '200') {
this.toEmpty()
diff --git a/pages/entry/qualified-to-store.vue b/pages/entry/qualified-to-store.vue
new file mode 100644
index 0000000..7df4d47
--- /dev/null
+++ b/pages/entry/qualified-to-store.vue
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+ 合格证编码
+
+
+
+
+
+
+
+ 载具编码
+
+
+
+
+
+
+
+
+ 订单号
+ {{currentData.MONumber}}
+
+
+ 组织
+ {{currentData.StockOrgId}}
+
+
+ 货主
+ {{currentData.OwnerId_Id}}
+
+
+ 物料编码
+ {{currentData.material_code}}
+
+
+ 物料名称
+ {{currentData.material_name}}
+
+
+ 物料规格
+ {{currentData.material_spec}}
+
+
+ 单位
+ {{currentData.unit_name}}
+
+
+ 单重
+
+
+
+
+
+ 批次
+
+
+
+
+
+ 物料数量
+
+
+
+
+
+ 仓库编码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 9d59614..704a2fc 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -41,7 +41,7 @@
return {
userName: '',
menuList: [
- {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '单据入库', path: '/pages/entry/group-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
+ {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
{title: '出库管理', path: 'RF02', sonTree: [{title: '托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-out-store'}]},
{title: '在库管理', path: 'RF03', sonTree: [{title: '库存信息', active: false, path: '/pages/in/store-info'}]},
{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
diff --git a/utils/getData2.js b/utils/getData2.js
index d9d7d60..46cf958 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -28,6 +28,13 @@ export const storList = () => request({
url:'api/pda/common/storList',
data: {}
})
+// export const storList = () => {
+// let res = {
+// code: '200',
+// content: [{value: '1', label: 'aaaa'}]
+// }
+// return res
+// }
export const groupMaterList = (page, size, search) => request({
url:'api/groupMater/maters',
data: {page: page, size: size, search: search}
@@ -229,7 +236,9 @@ export const getCertificateInfo = (id) => request({
// unit_name: 'unit_name',
// qty: '100',
// StockOrgId: 'StockOrgId',
-// OwnerId_Id: 'OwnerId_Id'
+// OwnerId_Id: 'OwnerId_Id',
+// single_weight: '500',
+// pcsn: 'pcsn'
// }
// return res
// }