diff --git a/klp-ui/src/App.vue b/klp-ui/src/App.vue index 4804eb47..b6a18560 100644 --- a/klp-ui/src/App.vue +++ b/klp-ui/src/App.vue @@ -19,6 +19,7 @@ export default { this.$store.dispatch('category/getRawMaterialMap'); this.$store.dispatch('category/getBomMap'); this.$store.dispatch('finance/getFinancialAccounts'); + this.$store.dispatch('craft/getProcessList'); } }, metaInfo() { diff --git a/klp-ui/src/api/wms/batch.js b/klp-ui/src/api/wms/batch.js new file mode 100644 index 00000000..b9036fea --- /dev/null +++ b/klp-ui/src/api/wms/batch.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询批次（合并相同工艺的任务）列表 +export function listBatch(query) { + return request({ + url: '/klp/batch/list', + method: 'get', + params: query + }) +} + +// 查询批次（合并相同工艺的任务）详细 +export function getBatch(batchId) { + return request({ + url: '/klp/batch/' + batchId, + method: 'get' + }) +} + +// 新增批次（合并相同工艺的任务） +export function addBatch(data) { + return request({ + url: '/klp/batch', + method: 'post', + data: data + }) +} + +// 修改批次（合并相同工艺的任务） +export function updateBatch(data) { + return request({ + url: '/klp/batch', + method: 'put', + data: data + }) +} + +// 删除批次（合并相同工艺的任务） +export function delBatch(batchId) { + return request({ + url: '/klp/batch/' + batchId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/craft.js b/klp-ui/src/api/wms/craft.js new file mode 100644 index 00000000..9fe12f8b --- /dev/null +++ b/klp-ui/src/api/wms/craft.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询工艺列表 +export function listProcesse(query) { + return request({ + url: '/klp/processe/list', + method: 'get', + params: query + }) +} + +// 查询工艺详细 +export function getProcesse(processId) { + return request({ + url: '/klp/processe/' + processId, + method: 'get' + }) +} + +// 新增工艺 +export function addProcesse(data) { + return request({ + url: '/klp/processe', + method: 'post', + data: data + }) +} + +// 修改工艺 +export function updateProcesse(data) { + return request({ + url: '/klp/processe', + method: 'put', + data: data + }) +} + +// 删除工艺 +export function delProcesse(processId) { + return request({ + url: '/klp/processe/' + processId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/processTask.js b/klp-ui/src/api/wms/processTask.js new file mode 100644 index 00000000..e0ec3456 --- /dev/null +++ b/klp-ui/src/api/wms/processTask.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询工艺任务（生产计划所需工艺任务）列表 +export function listProcessTask(query) { + return request({ + url: '/klp/processTask/list', + method: 'get', + params: query + }) +} + +// 查询工艺任务（生产计划所需工艺任务）详细 +export function getProcessTask(taskId) { + return request({ + url: '/klp/processTask/' + taskId, + method: 'get' + }) +} + +// 新增工艺任务（生产计划所需工艺任务） +export function addProcessTask(data) { + return request({ + url: '/klp/processTask', + method: 'post', + data: data + }) +} + +// 修改工艺任务（生产计划所需工艺任务） +export function updateProcessTask(data) { + return request({ + url: '/klp/processTask', + method: 'put', + data: data + }) +} + +// 删除工艺任务（生产计划所需工艺任务） +export function delProcessTask(taskId) { + return request({ + url: '/klp/processTask/' + taskId, + method: 'delete' + }) +} diff --git a/klp-ui/src/components/KLPService/CraftSelect/index.vue b/klp-ui/src/components/KLPService/CraftSelect/index.vue new file mode 100644 index 00000000..91ecf0f7 --- /dev/null +++ b/klp-ui/src/components/KLPService/CraftSelect/index.vue @@ -0,0 +1,45 @@ + + + \ No newline at end of file diff --git a/klp-ui/src/store/getters.js b/klp-ui/src/store/getters.js index ee1a9b21..7af8f383 100644 --- a/klp-ui/src/store/getters.js +++ b/klp-ui/src/store/getters.js @@ -20,5 +20,6 @@ const getters = { rawMaterialList: state => state.category.rawMaterialList, bomMap: state => state.category.bomMap, financialAccounts: state => state.finance.financialAccounts, + processList: state => state.craft.processList, } export default getters diff --git a/klp-ui/src/store/index.js b/klp-ui/src/store/index.js index ea914faf..e8554aad 100644 --- a/klp-ui/src/store/index.js +++ b/klp-ui/src/store/index.js @@ -8,6 +8,7 @@ import permission from './modules/permission' import settings from './modules/settings' import category from './modules/category' import finance from './modules/finance' +import craft from './modules/craft' import getters from './getters' Vue.use(Vuex) @@ -21,7 +22,8 @@ const store = new Vuex.Store({ permission, settings, category, - finance + finance, + craft }, getters }) diff --git a/klp-ui/src/store/modules/craft.js b/klp-ui/src/store/modules/craft.js new file mode 100644 index 00000000..5b6c5f64 --- /dev/null +++ b/klp-ui/src/store/modules/craft.js @@ -0,0 +1,26 @@ +import { listProcesse } from "@/api/wms/craft"; + +const state = { + processList: [], +} + +const mutations = { + SET_PROCESS_LIST(state, processList) { + state.processList = processList; + }, +} + +const actions = { + getProcessList({ commit }) { + listProcesse({ pageSize: 1000 }).then(response => { + commit('SET_PROCESS_LIST', response.rows); + }); + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} \ No newline at end of file diff --git a/klp-ui/src/store/modules/finance.js b/klp-ui/src/store/modules/finance.js index 1174f9f3..2129f5dc 100644 --- a/klp-ui/src/store/modules/finance.js +++ b/klp-ui/src/store/modules/finance.js @@ -12,8 +12,8 @@ const mutations = { const actions = { getFinancialAccounts({ commit }) { - listAccount().then(response => { - commit('SET_FINANCIAL_ACCOUNTS', response.data); + listAccount({ pageSize: 1000 }).then(response => { + commit('SET_FINANCIAL_ACCOUNTS', response.rows); }); } } diff --git a/klp-ui/src/views/finance/order/index.vue b/klp-ui/src/views/finance/order/index.vue index 50ff073b..0bd4aae6 100644 --- a/klp-ui/src/views/finance/order/index.vue +++ b/klp-ui/src/views/finance/order/index.vue @@ -120,7 +120,7 @@ export default { currentOrder: null, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, orderCode: undefined }, orderListLoading: false, diff --git a/klp-ui/src/views/login.vue b/klp-ui/src/views/login.vue index 5338e651..bd3cf0b0 100644 --- a/klp-ui/src/views/login.vue +++ b/klp-ui/src/views/login.vue @@ -137,6 +137,7 @@ export default { this.$store.dispatch('category/getRawMaterialMap'); this.$store.dispatch('category/getBomMap'); this.$store.dispatch('finance/getFinancialAccounts'); + this.$store.dispatch('craft/getProcessList'); this.$router.push({ path: this.redirect || "/" }).catch(() => { }); }).catch(() => { this.loading = false; diff --git a/klp-ui/src/views/wms/work/craft.vue b/klp-ui/src/views/wms/work/craft.vue new file mode 100644 index 00000000..6d2ccb3f --- /dev/null +++ b/klp-ui/src/views/wms/work/craft.vue @@ -0,0 +1,319 @@ + + + diff --git a/klp-ui/src/views/wms/productionLine/GanttChartEcharts.vue b/klp-ui/src/views/wms/work/productionLine/GanttChartEcharts.vue similarity index 100% rename from klp-ui/src/views/wms/productionLine/GanttChartEcharts.vue rename to klp-ui/src/views/wms/work/productionLine/GanttChartEcharts.vue diff --git a/klp-ui/src/views/wms/productionLine/index.vue b/klp-ui/src/views/wms/work/productionLine/index.vue similarity index 100% rename from klp-ui/src/views/wms/productionLine/index.vue rename to klp-ui/src/views/wms/work/productionLine/index.vue diff --git a/klp-ui/src/views/wms/schedulePlan/detail.vue b/klp-ui/src/views/wms/work/schedulePlan/detail.vue similarity index 68% rename from klp-ui/src/views/wms/schedulePlan/detail.vue rename to klp-ui/src/views/wms/work/schedulePlan/detail.vue index b48a9e86..15bb0d6d 100644 --- a/klp-ui/src/views/wms/schedulePlan/detail.vue +++ b/klp-ui/src/views/wms/work/schedulePlan/detail.vue @@ -1,79 +1,89 @@