diff --git a/src/api/materialManagement/mmMrpManagement.js b/src/api/materialManagement/mmMrpManagement.js
new file mode 100644
index 0000000..20b80df
--- /dev/null
+++ b/src/api/materialManagement/mmMrpManagement.js
@@ -0,0 +1,75 @@
+import request from '@/utils/request'
+
+// 特殊请求:对接总成MES数据
+let baseUrl = "/assembly-api/"
+
+
+/**
+ * 生产工单分页查询
+ * @param {查询条件} data
+ */
+export function listProWorkorder(data) {
+ return request({
+ url: baseUrl + 'mes/productManagement/ProWorkorder/list',
+ method: 'post',
+ data: data
+ })
+}
+
+/**
+ * 生产工单(不校验)分页查询
+ * @param {查询条件} data
+ */
+export function listProWorkorderNoCheck(data) {
+ return request({
+ url: baseUrl + 'mes/productManagement/ProWorkorder/list_nocheck',
+ method: 'post',
+ data: data
+ })
+}
+
+/**
+ * 获取全部工艺路线
+ * @param {查询条件} params
+ */
+export function GetAllRoute() {
+ return request({
+ url: baseUrl + 'mes/productManagement/ProWorkorder/get_all_route',
+ method: 'get'
+ })
+}
+
+/**
+ * 获取全部组
+ * @param {查询条件} params
+ */
+export function GetAllGroup() {
+ return request({
+ url: baseUrl + 'mes/productManagement/ProWorkorder/get_groups',
+ method: 'get'
+ })
+}
+
+/**
+ * 根据线别生成油漆件MRP
+ * @param {查询条件} data
+ */
+export function GenerateLineMmMrp(query) {
+ return request({
+ url: baseUrl + 'mes/materialManagement/paintedparts_call/mmcall/GenerateLineMmCallMRP',
+ method: 'post',
+ data: query
+ })
+}
+
+/**
+ * MRP清单分页查询
+ * @param {查询条件} data
+ */
+export function listMmMrp(query) {
+ return request({
+ url: baseUrl + 'mes/materialManagement/paintedparts_call/mmcall/list',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 4499bb6..47eafe8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,6 +23,7 @@ import './permission' // permission control 动态路由
import { getDicts } from '@/api/system/dict/data'
import { getConfigKey } from '@/api/system/config'
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree, handleDict } from '@/utils/ruoyi'
+
//分页组件
import Pagination from '@/components/Pagination'
//自定义表格工具扩展
diff --git a/src/views/materialManagement/mmMrpManagement/MrpList.vue b/src/views/materialManagement/mmMrpManagement/MrpList.vue
new file mode 100644
index 0000000..7ff7cca
--- /dev/null
+++ b/src/views/materialManagement/mmMrpManagement/MrpList.vue
@@ -0,0 +1,203 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 手动更新MRP清单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/materialManagement/mmMrpManagement/WorkOrder.vue b/src/views/materialManagement/mmMrpManagement/WorkOrder.vue
new file mode 100644
index 0000000..93295d7
--- /dev/null
+++ b/src/views/materialManagement/mmMrpManagement/WorkOrder.vue
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $dayjs(scope.row.workorderDate).format('YYYY-MM-DD') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/productManagement/production_track.vue b/src/views/productManagement/production_track.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/vue.config.js b/vue.config.js
index 9afc017..81a19cf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,11 +37,28 @@ module.exports = {
port: 8887, // 项目启动port,
open: true,
proxy: {
+ '/dev-api/assembly-api': {
+ target: 'http://localhost:7000', // 后端接口地址
+ changeOrigin: true,
+ logLevel: 'debug',
+ onProxyReq: (proxyReq, req) => {
+ // http请求
+ console.log('[HPM] %s %s %s %s', req.method, req.originalUrl, '->', req.url);
+ },
+ pathRewrite: {
+ '^/dev-api/assembly-api': '', //需要rewrite的
+ },
+ },
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: 'http://localhost:8888', // 后端接口地址
// target: 'http://192.168.0.31:8888/', // 后端接口地址
changeOrigin: true,
+ logLevel: 'debug',
+ onProxyReq: (proxyReq, req) => {
+ // http请求
+ console.log('[HPM] %s %s %s %s', req.method, req.originalUrl, '->', req.url);
+ },
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '', //需要rewrite的
},
@@ -128,10 +145,10 @@ module.exports = {
},
})
config.optimization.runtimeChunk('single'),
- {
- from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
- to: './', //到根目录下
- }
+ {
+ from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+ to: './', //到根目录下
+ }
})
},
}