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/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index cc75e6142..7fe301a2d 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -6,7 +6,9 @@ export interface WorkstationVO {
expireTime: Date
name: string
}
-
+export const goalParams = {
+ workstationCode:null
+}
// 查询工位列表
export const getWorkstationPage = async (params) => {
if (params.isSearch) {
@@ -49,38 +51,42 @@ export const importTemplate = () => {
}
// 查询班组列表
export const getTeamPage = async (params) => {
+ console.log(goalParams.workstationCode)
+ params.workstationCode = goalParams.workstationCode
if (params.isSearch) {
delete params.isSearch
const data = {...params}
- return await request.post({ url: '/wms/team/senior', data })
+ return await request.post({ url: '/mes/team/senior', data })
} else {
- return await request.get({ url: `/wms/team/page`, params })
+ return await request.get({ url: `/mes/team/pageListByWorkstationCode`, params })
}
}
export const getEquipmentPage = async (params) => {
+ console.log(goalParams.workstationCode)
+ params.workstationCode = goalParams.workstationCode
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/mes/equipment/senior', data })
} else {
- return await request.get({ url: `/mes/equipment/page`, params })
+ return await request.get({ url: `/mes/equipment/pageListByWorkstationCode`, params })
}
}
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/page`, 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/page`, params })
+ return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
}
}
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/components/workstationBind/index.ts b/src/components/workstationBind/index.ts
index e7d199c89..d3fcb5cad 100644
--- a/src/components/workstationBind/index.ts
+++ b/src/components/workstationBind/index.ts
@@ -1,2 +1,3 @@
-import detail from './src/Detail.vue'
-export {detail }
+import Detail from './src/Detail.vue'
+
+export { Detail }
diff --git a/src/components/workstationBind/src/Detail.vue b/src/components/workstationBind/src/Detail.vue
index 5b39f255b..899d5fc31 100644
--- a/src/components/workstationBind/src/Detail.vue
+++ b/src/components/workstationBind/src/Detail.vue
@@ -12,72 +12,109 @@
{{ titleValueRef }} {{ titleNameRef }}
-
-
+
-
+
-
+
+
+
+
+
-
-
- 1
+
+
+
+
+
+
+
+
+
+
@@ -105,19 +142,16 @@
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