From 085c894a019c02bb8a440286448450c1d9e6beef Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 22 Mar 2024 15:38:22 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/dict/dict.data.ts | 7 ++++++-
src/views/infra/config/ConfigForm.vue | 26 +++++++++++++++++++++++-
src/views/infra/config/index.vue | 29 ++++++++++++++++++++-------
3 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/src/api/system/dict/dict.data.ts b/src/api/system/dict/dict.data.ts
index 87e7dce71..faa0dca0f 100644
--- a/src/api/system/dict/dict.data.ts
+++ b/src/api/system/dict/dict.data.ts
@@ -23,8 +23,13 @@ export const getDictDataPage = (params: PageParam) => {
return request.get({ url: '/system/dict-data/page', params })
}
+// 查询字典数据列表根据类型
+export const queryByDictType = (dictType: number) => {
+ return request.get({ url: '/system/dict-data/queryByDictType?dictType=' + dictType })
+}
+
// 查询字典数据详情
-export const getDictData = (id: number) => {
+export const getDictData = (id: string) => {
return request.get({ url: '/system/dict-data/get?id=' + id })
}
diff --git a/src/views/infra/config/ConfigForm.vue b/src/views/infra/config/ConfigForm.vue
index 19b5bf1ea..e8a7bac26 100644
--- a/src/views/infra/config/ConfigForm.vue
+++ b/src/views/infra/config/ConfigForm.vue
@@ -19,6 +19,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From d7ed368eb938bc5c189206b6cc064d493aa7ae66 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 22 Mar 2024 16:28:08 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=8E=E9=85=8D=E7=BD=AE=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/infra/config/index.ts | 8 ++++++++
.../workstation/workstation.data.ts | 18 +++++++-----------
.../productionlineitem.data.ts | 13 ++++---------
3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/api/infra/config/index.ts b/src/api/infra/config/index.ts
index 5ef59f33d..8942cde25 100644
--- a/src/api/infra/config/index.ts
+++ b/src/api/infra/config/index.ts
@@ -6,6 +6,9 @@ export interface ConfigVO {
name: string
key: string
value: string
+ itemType: string
+ areaType: string
+ inventoryStatus: string
type: number
visible: boolean
remark: string
@@ -27,6 +30,11 @@ export const getConfigKey = (configKey: string) => {
return request.get({ url: '/infra/config/get-value-by-key?key=' + configKey })
}
+// 根据参数键名查询参数值
+export const queryByKey = (configKey: string) => {
+ return request.get({ url: '/infra/config/queryByKey?key=' + configKey })
+}
+
// 新增参数
export const createConfig = (data: ConfigVO) => {
return request.post({ url: '/infra/config/create', data })
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index 6c6b6ee73..3b96a657c 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -1,7 +1,6 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
-import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
import * as ProductionlineApi from '@/api/wms/productionline'
@@ -10,20 +9,17 @@ import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/prod
import * as WorkshopApi from '@/api/wms/workshop'
import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
-import * as getBusinesstypeApi from '@/api/wms/businesstype/index'
+import * as confgiApi from '@/api/infra/config'
import * as WorkstationApi from '@/api/wms/workstation'
import { validateYS } from '@/utils/validator'
-const queryParams = {
- pageSize:10,
- pageNo:1,
- code:'WorkStation'
-}
+
const { t } = useI18n() // 国际化
-const data = await getBusinesstypeApi.getBusinesstypePage(queryParams)
-const businesstypeData =data?.list[0]||{}
+const confgiDataOne = await confgiApi.queryByKey("WorkStation-IN")
+const confgiDataTwo = await confgiApi.queryByKey("WorkStation-OUT")
+
/**
* @returns {Array} 工位
*/
@@ -137,7 +133,7 @@ export const Workstation = useCrudSchemas(reactive([
},
{
key: 'areaType',
- value: businesstypeData.outAreaTypes,
+ value: confgiDataOne.areaType,
isMainValue: false
}]
}
@@ -166,7 +162,7 @@ export const Workstation = useCrudSchemas(reactive([
},
{
key: 'areaType',
- value: businesstypeData.outAreaTypes,
+ value: confgiDataTwo.areaType,
isMainValue: false
}]
}
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
index 15e0c440d..1d3ce0f67 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
@@ -5,16 +5,11 @@ import { Productionline } from './../../factoryModeling/productionline/productio
import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from './../itembasic/itembasic.data'
-import * as getBusinesstypeApi from '@/api/wms/businesstype/index'
+import * as confgiApi from '@/api/infra/config'
const { t } = useI18n() // 国际化
-const queryParams = {
- pageSize:10,
- pageNo:1,
- code:'Productionlineitem'
-}
-const data = await getBusinesstypeApi.getBusinesstypePage(queryParams)
-const businesstypeData =data?.list[0]||{}
+
+const confgiData = await confgiApi.queryByKey("Productionlineitem")
/**
* @returns {Array} 生产线物料关系
@@ -115,7 +110,7 @@ export const Productionlineitem = useCrudSchemas(reactive([
},
{
key:'type',
- value:businesstypeData.itemTypes,
+ value:confgiData.itemType,
action: 'notin',
isSearch: true,
isMainValue: false
From 479f3e2753f7aac89d152372486f13e06a211d53 Mon Sep 17 00:00:00 2001
From: bjang03
Date: Fri, 22 Mar 2024 17:29:29 +0800
Subject: [PATCH 5/5] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E4=BD=8D=E5=85=B3?=
=?UTF-8?q?=E8=81=94=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/mes/workstation/index.ts | 8 ++++----
src/views/mes/workstation/index.vue | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index b950fd776..7fe301a2d 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -76,17 +76,17 @@ export const getProcessPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
- return await request.post({ url: '/wms/process/senior', data })
+ return await request.post({ url: '/mes/production-process/senior', data })
} else {
- return await request.get({ url: `/wms/process/pageListByWorkstationCode`, params })
+ return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
}
}
export const getProductionPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
- return await request.post({ url: '/wms/production/senior', data })
+ return await request.post({ url: '/mes/production-process/senior', data })
} else {
- return await request.get({ url: `/wms/production/pageListByWorkstationCode`, params })
+ return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
}
}
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 6cf463a0f..1aa880115 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -58,6 +58,8 @@
:detailAllSchemasRules="WorkstationRules"
:apiPage="apiPage"
:tabs="TabsList"
+ :detailButtonIsShowAdd = "true"
+ :detailButtonIsShowDelete="true"
@changeTabs="changeTabs"
/>
@@ -79,7 +81,6 @@ import * as WorkstationApi from '@/api/mes/workstation'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import * as PurchasereceiptRecordDetailApi from "@/api/wms/purchasereceiptRecordDetail";
import {
getEquipmentPage,
getProcessPage,