From fa954bbbbee9388a0b9570c410eb6b09b59eb2cc Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Wed, 6 Jul 2022 18:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E3=80=81=E7=BB=84=E7=9B=98?=
=?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
wms/qd/src/api/wms/sch/point.js | 10 +-
.../src/views/wms/database/material/index.vue | 111 +++++++++++++++-
wms/qd/src/views/wms/sch/point/index.vue | 45 +++++--
.../views/wms/st/buss/vehiclegroup/index.vue | 118 ++++++++++++++++++
4 files changed, 265 insertions(+), 19 deletions(-)
create mode 100644 wms/qd/src/views/wms/st/buss/vehiclegroup/index.vue
diff --git a/wms/qd/src/api/wms/sch/point.js b/wms/qd/src/api/wms/sch/point.js
index 929de14..e198670 100644
--- a/wms/qd/src/api/wms/sch/point.js
+++ b/wms/qd/src/api/wms/sch/point.js
@@ -39,4 +39,12 @@ export function syncStruct() {
})
}
-export default { add, edit, del, changeActive, syncStruct }
+export function getPointStatu(data) {
+ return request({
+ url: 'api/point/getPointStatu',
+ method: 'post',
+ data
+ })
+}
+
+export default { add, edit, del, changeActive, syncStruct, getPointStatu }
diff --git a/wms/qd/src/views/wms/database/material/index.vue b/wms/qd/src/views/wms/database/material/index.vue
index 7d33117..11a1b2c 100644
--- a/wms/qd/src/views/wms/database/material/index.vue
+++ b/wms/qd/src/views/wms/database/material/index.vue
@@ -11,8 +11,8 @@
-
-
+
+
@@ -36,6 +36,29 @@
{{ item.label }}
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
@@ -73,6 +96,24 @@
/>
+
+
+
+
+
+
+
+
+ {{ dict.label.MD_EVEHICLE_TYPE[scope.row.vehicle_type] }}
+
+
@@ -97,12 +138,32 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
-const defaultForm = { material_id: null, material_code: null, material_name: null, material_spec: null, material_model: null, english_name: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_used: '1', is_delete: null, ext_id: null, stewing_time: null }
+const defaultForm = {
+ material_id: null,
+ material_code: null,
+ material_name: null,
+ material_spec: null,
+ material_model: null,
+ english_name: null,
+ create_id: null,
+ create_name: null,
+ create_time: null,
+ update_optid: null,
+ update_optname: null,
+ update_time: null,
+ is_used: '1',
+ is_delete: null,
+ is_manmade: '1',
+ vehicle_type: null,
+ palletize_num: '1',
+ ext_id: null,
+ stewing_time: null
+}
export default {
name: 'MdMeMaterial',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
- dicts: ['is_active', 'is_used'],
+ dicts: ['is_active', 'is_used', 'MD_EVEHICLE_TYPE'],
cruds() {
return CRUD({ title: '物料', url: 'api/mdMeMaterial', idField: 'material_id', sort: 'material_id,desc', crudMethod: { ...crudMdMeMaterial },
optShow: {
@@ -117,7 +178,7 @@ export default {
return {
permission: {
},
- rules: {
+ rules: { // 表单验证
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'blur' }
],
@@ -127,6 +188,15 @@ export default {
is_used: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
],
+ is_manmade: [
+ { required: true, message: '是否人工打包不能为空', trigger: 'blur' }
+ ],
+ palletize_num: [
+ { required: true, message: '码垛数量不能为空', trigger: 'blur' }
+ ],
+ vehicle_type: [
+ { required: true, message: '托盘类型不能为空', trigger: 'blur' }
+ ],
stewing_time: [
{ required: true, message: '静止时间不能为空', trigger: 'blur' }
]
@@ -168,6 +238,37 @@ export default {
}
})
},
+ // 改变人工打包状态
+ changeEnabledManmade(data, val) {
+ debugger
+ this.$confirm('此操作将 "' + (val === 1 ? '切换人工打包' : '切换机器打包') + '"' + data.material_code + ', 是否继续？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ crudMdMeMaterial.edit(data).then(res => {
+ this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+ }).catch(() => {
+ debugger
+ if (data.is_manmade === '0') {
+ data.is_manmade = '1'
+ return
+ }
+ if (data.is_manmade === '1') {
+ data.is_manmade = '0'
+ }
+ })
+ }).catch(() => {
+ debugger
+ if (data.is_manmade === '0') {
+ data.is_manmade = '1'
+ return
+ }
+ if (data.is_manmade === '1') {
+ data.is_manmade = '0'
+ }
+ })
+ },
handleChange(value) {
console.log(value)
}
diff --git a/wms/qd/src/views/wms/sch/point/index.vue b/wms/qd/src/views/wms/sch/point/index.vue
index 3011fd1..0b64c55 100644
--- a/wms/qd/src/views/wms/sch/point/index.vue
+++ b/wms/qd/src/views/wms/sch/point/index.vue
@@ -121,17 +121,31 @@
-
- 仓位同步
-
+
+
+ 仓位同步
+
+
+ 更新状态
+
+
- {{ dict.label.sch_area_type[scope.row.area_type] }}
+ {{ dict.label.sch_area_type[scope.row.area_type] }}
@@ -288,7 +302,7 @@
+
+