diff --git a/hb_client/src/api/mtm.js b/hb_client/src/api/mtm.js
index 317cbcb..940a086 100644
--- a/hb_client/src/api/mtm.js
+++ b/hb_client/src/api/mtm.js
@@ -1,5 +1,6 @@
import request from '@/utils/request'
//物料
+
export function getMaterialList(query) {
return request({
url: '/mtm/material/',
@@ -34,6 +35,36 @@ export function deleteMaterial(id, data) {
data
})
}
+//产品分解
+export function getsubproducationList(query) {
+ return request({
+ url: '/mtm/subproducation/',
+ method: 'get',
+ params: query
+ })
+}
+export function createsubproducation(data) {
+ return request({
+ url: '/mtm/subproducation/',
+ method: 'post',
+ data
+ })
+}
+
+export function updatesubproducation(id, data) {
+ return request({
+ url: `/mtm/subproducation/${id}/`,
+ method: 'put',
+ data
+ })
+}
+export function deletesubproducation(id, data) {
+ return request({
+ url: `/mtm/subproducation/${id}/`,
+ method: 'delete',
+ data
+ })
+}
//工序
export function getProcessList(query) {
return request({
@@ -64,7 +95,16 @@ export function deleteProcess(id, data) {
})
}
//子工序
-export function getStepList(id) {
+export function getStepList(query) {
+ return request({
+ url: `/mtm/step/`,
+ method: 'get',
+ params: query
+ })
+}
+
+
+export function getStepLists(id) {
return request({
url: `/mtm/process/${id}/steps/`,
method: 'get'
diff --git a/hb_client/src/api/pm.js b/hb_client/src/api/pm.js
new file mode 100644
index 0000000..4f3365d
--- /dev/null
+++ b/hb_client/src/api/pm.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+//生产排程
+export function getProductionplanList(query) {
+ return request({
+ url: 'pm/productionplan/',
+ method: 'get',
+ params: query
+ })
+}
+export function createProductionplan(data) {
+ return request({
+ url: 'pm/productionplan/',
+ method: 'post',
+ data
+ })
+}
+
diff --git a/hb_client/src/api/sam.js b/hb_client/src/api/sam.js
index 451942a..cc378cd 100644
--- a/hb_client/src/api/sam.js
+++ b/hb_client/src/api/sam.js
@@ -87,3 +87,10 @@ export function deleteOrder(id, data) {
data
})
}
+
+export function getordertoplan() {
+ return request({
+ url: '/sam/order/toplan/',
+ method: 'get',
+ })
+}
\ No newline at end of file
diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js
index 7befda0..4b8ad23 100644
--- a/hb_client/src/router/index.js
+++ b/hb_client/src/router/index.js
@@ -130,6 +130,34 @@ export const asyncRoutes = [
meta: { title: '产品管理', icon: 'example', perms: ['vendor_manage'] }
},
]
+ }
+ ,
+ {
+ path: '/pm',
+ component: Layout,
+ redirect: '/pm/plan',
+ name: 'pm',
+ meta: { title: '生产管理', icon: 'example', perms: ['equipment_set'] },
+ children: [
+ {
+ path: 'plan',
+ name: 'plan',
+ component: () => import('@/views/pm/plan'),
+ meta: { title: '生产计划管理', icon: 'example', perms: ['index_manage'] }
+ },
+ {
+ path: 'resources',
+ name: 'resources',
+ component: () => import('@/views/pm/resources'),
+ meta: { title: '生产资源配置', icon: 'example', perms: ['index_manage'] }
+ },
+ {
+ path: 'testitem',
+ name: 'testitem',
+ component: () => import('@/views/pm/plan'),
+ meta: { title: '生产作业管理', icon: 'example', perms: ['index_manage'] }
+ }
+ ]
},
{
path: '/em',
@@ -233,6 +261,13 @@ export const asyncRoutes = [
name: 'warehouse',
component: () => import('@/views/inm/warehouse'),
meta: { title: '仓库', icon: 'example', perms: ['index_manage'] }
+ },
+ {
+ path: 'materialbatch/:id',
+ name: 'MaterialBatch',
+ component: () => import('@/views/inm/materialbatch'),
+ meta: { title: '仓库物料', perms: ['vendor_manage'] },
+ hidden: true
}
,
{
diff --git a/hb_client/src/views/inm/materialbatch.vue b/hb_client/src/views/inm/materialbatch.vue
new file mode 100644
index 0000000..939f3dc
--- /dev/null
+++ b/hb_client/src/views/inm/materialbatch.vue
@@ -0,0 +1,178 @@
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+ {{ scope.row.number }}
+
+
+ {{ scope.row.place }}
+
+
+ {{ scope.row.place }}
+
+
+ {{ scope.row.create_time }}
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 过程记录表
+
+ 新增
+
+
+
+ {{ scope.row.name }}
+
+
+
+ 查看
+ 编辑
+ 删除
+
+
+
+
+
-
-
-
-
-
-
- 新增
-
-
-
-
- {{ scope.row.name }}
+
+
+
+
-
-
+
+ 取消
+ 确认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 记录字段
+
+ 新增
+
+
+
+
+ {{ options_[scope.row.field_type] }}
+
+
+
+ {{ scope.row.field_name }}
+
+
+
+ {{ scope.row.field_key }}
+
+
+
+ {{ scope.row.field_choice }}
+
+
+
+
+
+
+ 编辑
-
-
- 编辑
- 删除
-
-
-
-
-
- 删除
+
+
-
-
-
-
-
-
-
-
-
- 取消
- 确认
-
-
-
-
-
-
-
- 新增
-
-
-
-
- {{ options_[scope.row.field_type] }}
-
-
-
- {{ scope.row.field_name }}
-
-
-
- {{ scope.row.field_key }}
-
-
- {{ scope.row.boolean_field_display }}
-
-
- {{ scope.row.field_choice }}
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确认
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+
-
+
+
+
+
+ 合同订单列表
+
+
+
+
+
+
+ {{ scope.row.number }}
+
+
+ {{ scope.row.customer_.name }}
+
+
+ {{ scope.row.contract_.name }}
+
+
+ {{ scope.row.product_.name }}
+
+
+ {{ scope.row.product_.specification }}
+
+
+ {{ scope.row.count }}
+
+
+ {{ scope.row.planed_count }}
+
+
+
+ {{ scope.row.delivery_date }}
+
+
+ {{ scope.row.create_time }}
+
+
+
+
+ 排产
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 物料配置
+
+
+
+
+
+
+ {{ scope.row.number }}
+
+
+ {{ scope.row.customer_.name }}
+
+
+ {{ scope.row.contract_.name }}
+
+
+ {{ scope.row.product_.name }}
+
+
+ {{ scope.row.product_.specification }}
+
+
+ {{ scope.row.count }}
+
+
+ {{ scope.row.planed_count }}
+
+
+
+ {{ scope.row.delivery_date }}
+
+
+ {{ scope.row.create_time }}
+
+
+
+
+ 排产
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备配置
+
+
+
+
+
+
+ {{ scope.row.number }}
+
+
+ {{ scope.row.customer_.name }}
+
+
+ {{ scope.row.contract_.name }}
+
+
+ {{ scope.row.product_.name }}
+
+
+ {{ scope.row.product_.specification }}
+
+
+ {{ scope.row.count }}
+
+
+ {{ scope.row.planed_count }}
+
+
+
+ {{ scope.row.delivery_date }}
+
+
+ {{ scope.row.create_time }}
+
+
+
+
+ 排产
+
+
+
+
+
+
+
+
+
+
+
+
+