From d07e209936e29a2aa708abd5e6a76110178eb1b1 Mon Sep 17 00:00:00 2001 From: zwq Date: Mon, 17 Jan 2022 15:18:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basicData/Warehouse/StorageBoxInfo.js | 46 ++++- src/api/orderManage/00A.js | 47 +++++ src/filters/basicData/warehouse.js | 33 ++++ src/lang/i18n/en/module/basicData.js | 12 +- src/lang/i18n/zh/module/basicData.js | 12 +- .../basicData/Warehouse/StorageBoxInfo.vue | 109 +++++------ .../basicData/Warehouse/StorageBoxRack.vue | 112 ++++++++--- .../components/StorageBoxInfoDetail.vue | 78 +------- .../components/StorageBoxRack-add.vue | 125 ++++++++---- src/views/orderManage/ExecutionInfo.vue | 171 ++++++++++++++++- src/views/orderManage/ProcessInfo.vue | 178 +++++++++++++++++- .../components/ExecutionInfoDetail.vue | 116 ++++++++++++ .../components/ProcessInfoDetail.vue | 116 ++++++++++++ .../orderManage/components/processLinkBtn.vue | 64 +++++++ 14 files changed, 1019 insertions(+), 200 deletions(-) create mode 100644 src/api/orderManage/00A.js create mode 100644 src/filters/basicData/warehouse.js create mode 100644 src/views/orderManage/components/ExecutionInfoDetail.vue create mode 100644 src/views/orderManage/components/ProcessInfoDetail.vue create mode 100644 src/views/orderManage/components/processLinkBtn.vue diff --git a/src/api/basicData/Warehouse/StorageBoxInfo.js b/src/api/basicData/Warehouse/StorageBoxInfo.js index b2ed3a7..aff83f9 100644 --- a/src/api/basicData/Warehouse/StorageBoxInfo.js +++ b/src/api/basicData/Warehouse/StorageBoxInfo.js @@ -2,20 +2,47 @@ * @Author: zwq * @Date: 2020-12-29 16:00:14 * @LastEditors: zwq - * @LastEditTime: 2022-01-14 16:25:25 + * @LastEditTime: 2022-01-17 13:59:54 * @Description: */ import request from '@/utils/request' export function StorageBoxInfoList(data) { // 获取存储箱使用情况 return request({ - url: '/api/wms/storage/box/circ/info/page', + url: '/api/wms/storage/box/circ/info/his/page/by/code', method: 'post', data }) } -export function StorageBoxInfoDetail(id) { // 获取工厂单条数据 +export function StorageBoxInfoDetail(id) { // 获取存储箱单条数据 + const data = { + 'id': id + } + return request({ + url: '/api/wms/storage/box/get', + method: 'post', + data + }) +} + +export function StorageBoxRackList(data) { // 获取存储箱上架列表 + return request({ + url: '/api/wms/storage/box/circ/info/page/for/bind', + method: 'post', + data + }) +} + +export function locationList(data) { // 获取库位列表 + return request({ + url: '/api/wms/location/list', + method: 'post', + data + }) +} + +export function StorageBoxRackDetail(id) { // 获取存储箱上架单条数据 const data = { 'id': id } @@ -26,7 +53,7 @@ export function StorageBoxInfoDetail(id) { // 获取工厂单条数据 }) } -export function factoryUpdate(data) { // 更新工厂单条数据 +export function StorageBoxRackUpdate(data) { // 更新存储箱上架单条数据 return request({ url: '/api/wms/storage/box/circ/info/update', method: 'post', @@ -34,7 +61,7 @@ export function factoryUpdate(data) { // 更新工厂单条数据 }) } -export function factoryAdd(data) { // 新增工厂单条数据 +export function StorageBoxRackAdd(data) { // 新增存储箱上架单条数据 return request({ url: '/api/wms/storage/box/circ/info/add', method: 'post', @@ -42,14 +69,15 @@ export function factoryAdd(data) { // 新增工厂单条数据 }) } -export function factoryCode() { // 获取工厂code +export function StorageBoxRackCode(data) { // 获取存储箱上架code return request({ - url: '/api/wms/storage/box/circ/info/get-code', - method: 'post' + url: '/api/wms/storagebox/page', + method: 'post', + data }) } -export function factoryDelete(id) { // 删除工厂单条数据 +export function StorageBoxRackDelete(id) { // 删除存储箱上架单条数据 return request({ url: '/api/wms/storage/box/circ/info/delete', method: 'post', diff --git a/src/api/orderManage/00A.js b/src/api/orderManage/00A.js new file mode 100644 index 0000000..1c62726 --- /dev/null +++ b/src/api/orderManage/00A.js @@ -0,0 +1,47 @@ +/* + * @Author: zwq + * @Date: 2022-01-17 14:55:09 + * @LastEditors: zwq + * @LastEditTime: 2022-01-17 14:59:07 + * @Description: + */ + +import request from '@/utils/request' + +export function ProcessInfoList(data) { // 获取工单工艺列表 + return request({ + url: '/api/wms/work/order/page', + method: 'post', + data + }) +} + +export function ProcessInfoDetail(id) { // 获取工单工艺单条数据 + const data = { + 'id': id + } + return request({ + url: '/api/wms/work/order/get', + method: 'post', + data + }) +} + +export function ExecutionInfoList(data) { // 获取工单执行列表 + return request({ + url: '/api/wms/work/order/execute/page', + method: 'post', + data + }) +} + +export function ExecutionInfoDetail(id) { // 获取工单执行单条数据 + const data = { + 'id': id + } + return request({ + url: '/api/wms/work/order/execute/get', + method: 'post', + data + }) +} diff --git a/src/filters/basicData/warehouse.js b/src/filters/basicData/warehouse.js new file mode 100644 index 0000000..c1ec9f1 --- /dev/null +++ b/src/filters/basicData/warehouse.js @@ -0,0 +1,33 @@ +/* + * @Author: zwq + * @Date: 2022-01-17 11:30:41 + * @LastEditors: zwq + * @LastEditTime: 2022-01-17 11:33:29 + * @Description: + */ +/* + * @Date: 2020-12-29 16:49:28 + * @LastEditors: gtz + * @LastEditTime: 2021-04-13 13:49:51 + * @FilePath: \basic-admin\src\filters\DataDict\index.js + * @Description: 部分常量的数据字典定义 + */ + +import i18n from '@/lang' + +const table = { + yesOrNo: { + '0': i18n.t('baseDict.yesOrNo.no'), + '1': i18n.t('baseDict.yesOrNo.yes') + }, + enableState: { + '0': i18n.t('basicDataFilter.enableState.disable'), + '1': i18n.t('basicDataFilter.enableState.enable') + } +} + +export default function(dictTable) { + return function(val) { + return table?.[dictTable]?.[val] + } +} diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js index 272f948..eda59a7 100644 --- a/src/lang/i18n/en/module/basicData.js +++ b/src/lang/i18n/en/module/basicData.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2021-03-04 16:13:51 * @LastEditors: zwq - * @LastEditTime: 2022-01-14 16:34:25 + * @LastEditTime: 2022-01-17 15:12:18 * @Description: file content */ export default { @@ -293,6 +293,16 @@ export default { TaskLocation: 'Task Location', TargetLocation: 'Target Location', OrderName: 'Order Name', + OrderCode: 'Order Code', + IssueOrderTime: 'Issue Order Time', + TotalProcessName: 'Total Process Name', + Priority: 'Priority', + OrderStatus: 'Order Status', + ProcessOrNot: 'Process Or Not', + Unit: 'Unit', + RelateProcess: 'Relate Process', + PlanProcessQuantity: 'Plan Process Quantity', + SubProcessName: 'Sub Process Name', TaskBoxNumber: 'Task Box Number', FullBoxNumber: 'Full Box Number', EmptyFork: 'Empty Fork', diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js index 568a5aa..368d9d2 100644 --- a/src/lang/i18n/zh/module/basicData.js +++ b/src/lang/i18n/zh/module/basicData.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2021-03-04 16:13:51 * @LastEditors: zwq - * @LastEditTime: 2022-01-14 16:34:19 + * @LastEditTime: 2022-01-17 15:12:12 * @Description: file content */ export default { @@ -293,6 +293,16 @@ export default { TaskLocation: '任务库位', TargetLocation: '目标库位', OrderName: '工单名', + OrderCode: '工单编码', + IssueOrderTime: '下发工单时间', + TotalProcessName: '总工艺名称', + Priority: '优先级', + OrderStatus: '工单状态', + ProcessOrNot: '是否关联工艺', + Unit: '单位', + RelateProcess: '关联工艺', + PlanProcessQuantity: '计划加工数量', + SubProcessName: '分工艺', TaskBoxNumber: '任务箱号', FullBoxNumber: '空箱号', EmptyFork: '空箱货叉', diff --git a/src/views/basicData/Warehouse/StorageBoxInfo.vue b/src/views/basicData/Warehouse/StorageBoxInfo.vue index 8e53a4e..485061c 100644 --- a/src/views/basicData/Warehouse/StorageBoxInfo.vue +++ b/src/views/basicData/Warehouse/StorageBoxInfo.vue @@ -2,51 +2,53 @@ * @Author: zwq * @Date: 2020-12-29 15:41:11 * @LastEditors: zwq - * @LastEditTime: 2022-01-14 16:29:02 + * @LastEditTime: 2022-01-17 14:03:24 * @Description: --> + + diff --git a/src/views/orderManage/ProcessInfo.vue b/src/views/orderManage/ProcessInfo.vue index 1a9482e..af0ce94 100644 --- a/src/views/orderManage/ProcessInfo.vue +++ b/src/views/orderManage/ProcessInfo.vue @@ -1,7 +1,181 @@ + + + + + diff --git a/src/views/orderManage/components/ExecutionInfoDetail.vue b/src/views/orderManage/components/ExecutionInfoDetail.vue new file mode 100644 index 0000000..7b1275c --- /dev/null +++ b/src/views/orderManage/components/ExecutionInfoDetail.vue @@ -0,0 +1,116 @@ + + + + diff --git a/src/views/orderManage/components/ProcessInfoDetail.vue b/src/views/orderManage/components/ProcessInfoDetail.vue new file mode 100644 index 0000000..e9df784 --- /dev/null +++ b/src/views/orderManage/components/ProcessInfoDetail.vue @@ -0,0 +1,116 @@ + + + + diff --git a/src/views/orderManage/components/processLinkBtn.vue b/src/views/orderManage/components/processLinkBtn.vue new file mode 100644 index 0000000..fcadba0 --- /dev/null +++ b/src/views/orderManage/components/processLinkBtn.vue @@ -0,0 +1,64 @@ + + + +