Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

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 })

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 })
   }
 }

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 })
 }
 

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 }

src/components/workstationBind/src/Detail.vue

@@ -12,72 +12,109 @@
           {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
         </div>
       </template>
-      <ContentWrap>
-        <!-- 默认单表展现 -->
+      <ContentWrap v-if="!isBasic">
         <Descriptions
           :data="detailData"
+          labelClassName="label-class-name"
+          label-align="left"
+          direction="vertical"
+          :column="8"
           :schema="allSchemas.detailSchema"
           :columns="2"
+          width="200px"
         />
       </ContentWrap>
 
-      <Tabs :tabsList="TabsList" :current="current" @change="change" />
+      <Tabs :tabsList="tabsList" :current="current" @change="change" />
       <div class="flex">
         <!-- 详情 -->
-        <ContentWrap class="w-[100%]">
+        <ContentWrap class="w-[73%]">
+          <!-- 列表头部 -->
+          <TableHead
+            v-if="!isBasic"
+            :HeadButttondata="HeadButttondata"
+            :masterId="masterParmas.masterId"
+            @button-base-click="buttonBaseClick"
+            :routeName="routeName"
+            @searchFormClick="searchFormClick"
+            :allSchemas="detailAllSchemas"
+          />
+          <!-- 默认单表展现 -->
+          <Descriptions
+            v-if="isBasic && !tabsExtend"
+            :data="detailData"
+            :schema="allSchemas.detailSchema"
+            :columns="2"
+          />
           <!-- 单表切换tabs 展现table -->
           <Table
             v-if="isBasic && tabsExtend"
-            :columns="teamSchemasRef.tableColumns"
-            :data="teamObjectRef.tableList"
-            :loading="teamObjectRef.loading"
-            :pagination="{ total: teamObjectRef.total }"
-            v-model:pageSize="teamObjectRef.pageSize"
-            v-model:currentPage="teamObjectRef.currentPage"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
           >
-            <template>
-              <div>1</div>
-            </template>
+            <!-- <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template> -->
           </Table>
           <Table
-            v-if="!isBasic && fromeWhere != 'Equipment'"
-            :columns="teamSchemasRef.tableColumns"
-            :data="teamObjectRef.tableList"
-            :loading="teamObjectRef.loading"
-            :pagination="{ total: teamObjectRef.total }"
-            v-model:pageSize="teamObjectRef.pageSize"
-            v-model:currentPage="teamObjectRef.currentPage"
+            v-if="!isBasic && fromeWhere != 'countPlan'"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
           >
-            <template>
-              <div>1</div>
+          <template #photos="{ row }">
+             <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>
             </template>
-          </Table>
-          <Table
-            v-if="!isBasic && fromeWhere != 'Process'"
-            :columns="teamSchemasRef.tableColumns"
-            :data="teamObjectRef.tableList"
-            :loading="teamObjectRef.loading"
-            :pagination="{ total: teamObjectRef.total }"
-            v-model:pageSize="teamObjectRef.pageSize"
-            v-model:currentPage="teamObjectRef.currentPage"
-          >
-            <template>
-              <div>1</div>
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
             </template>
           </Table>
           <DetailTable
-            v-if="!isBasic && fromeWhere == 'Production' && isShowDrawer"
-            :columns="teamSchemasRef.tableColumns"
-            :data="teamObjectRef.tableList"
+            v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
             :allList="allList"
             :countScopeType="countScopeType"
             :key="updateKey"
           >
-            <template>
-              <div>1</div>
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
             </template>
           </DetailTable>
         </ContentWrap>
+        <ContentWrap class="w-[27%] ml-16px">
+          <!-- 附件组件 -->
+          <Annex
+            :annexData="annexData"
+            @handleAnnexSuccess="handleAnnexSuccess"
+            @deleteAnnexSuccess="deleteAnnexSuccess"
+            :upData="remarksData.data"
+          />
+          <!-- 备注组件 -->
+          <Remarks
+            :remarksData="remarksData"
+            class="mt-20px"
+            @remarksSubmitScuess="remarksSubmitScuess"
+          />
+          <!-- 变更记录组件 -->
+          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
+        </ContentWrap>
       </div>
     </el-drawer>
     <!-- 表单弹窗：添加/修改 -->
@@ -105,19 +142,16 @@
 </template>
 
 <script lang="ts" setup>
+import Annex from '@/components/Annex/src/Annex.vue'
+import Remarks from '@/components/Remarks/src/Remarks.vue'
+import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
+import Tabs from '@/components/Tabs/src/Tabs.vue'
 import * as RemarkApi from '@/api/wms/remark'
 import * as FileApi from '@/api/wms/file'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import Detail from "@/components/workstationBind/src/Detail.vue";
-import {TabsList} from "@/views/mes/workstation/workstation.data";
-import DetailTable from "@/components/DetailTable/src/DetailTable.vue";
-import Tabs from "@/components/Tabs/src/Tabs.vue";
-import Annex from "@/components/Annex/src/Annex.vue";
-import Remarks from "@/components/Remarks/src/Remarks.vue";
-import BasicForm from "@/components/BasicForm/src/BasicForm.vue";
-import TableHead from "@/components/TableHead/src/TableHead.vue";
-import ChangeRecord from "@/components/ChangeRecord/src/ChangeRecord.vue";
-import {Team} from "@/utils/disposition/formFields";
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
 
 defineOptions({ name: 'Detail' })
 
@@ -143,12 +177,6 @@ const props = defineProps({
     required: false,
     default: false
   },
-  // 列表 相关信息
-  tableAllSchemas: {
-    type: Array,
-    required: true,
-    default: null
-  },
   // 表单，列表 相关信息
   allSchemas: {
     type: Object,
@@ -270,11 +298,6 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: true
-  },
-  teamSchemas:{
-    type: Boolean,
-    required: false,
-    default: true
   }
 })
 const isShowDrawer = ref(false)
@@ -374,7 +397,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     masterParmas.value.masterId = row.id
     masterParmas.value.number = row.number
     masterParmas.value.status = row.status
-    teamObjectRef.value.params = {
+    tableObjectRef.value.params = {
       masterId: row.id
     }
     await getList()
@@ -439,10 +462,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
   }
 }
 defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗
-// tabs 切换事件
-const changeTabs = (item) => {
-  alert(item.value)
-}
+
 // 获取备注列表
 const getRemarkList = async () => {
   detailLoading.value = true
@@ -462,19 +482,18 @@ const remarksSubmitScuess = async (remark) => {
 const getChangeRecordList = async () => {
   changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
 }
+
+const tableObjectRef = ref()
+const tableMethodsRef = ref()
 const detailAllSchemasRef = ref()
-detailAllSchemasRef.value = props.detailAllSchemas
-const teamObjectRef = ref()
-const teamMethodsRef = ref()
-const teamSchemasRef = ref()
 
 const { tableObject, tableMethods } = useTable({
   getListApi: props.apiPage // 分页接口
 })
 
-teamObjectRef.value = tableObject
-teamMethodsRef.value = tableMethods
-teamSchemasRef.value = props.teamSchemas
+tableObjectRef.value = tableObject
+tableMethodsRef.value = tableMethods
+detailAllSchemasRef.value = props.detailAllSchemas
 
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row, val) => {
@@ -486,8 +505,29 @@ const isShowMainButton = (row, val) => {
 }
 
 // 获得表格的各种操作
-const { getList } = teamMethodsRef.value
+const { getList } = tableMethodsRef.value
 
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
 
 // 字段设置 更新主列表字段
 // const updataTableColumns = (val) => {
@@ -576,9 +616,9 @@ const searchFormClick = async (searchData) => {
       : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
   }
   detailAllSchemasRef.value = props.detailAllSchemas
-  teamObjectRef.value = tableObject
-  teamMethodsRef.value = tableMethods
-  teamObjectRef.value.tableList = []
+  tableObjectRef.value = tableObject
+  tableMethodsRef.value = tableMethods
+  tableObjectRef.value.tableList = []
   const { getList } = tableMethods
   await getList()
   updateKey.value += 1
@@ -603,7 +643,7 @@ const openImage=(item)=>{
  * @param field 当前操作字段
  * @param cur 改变后值
  */
-const detailBasicFormOnChange = (field, cur) => {
+ const detailBasicFormOnChange = (field, cur) => {
   emit('detailBasicFormOnChange', field, cur)
 }
 
@@ -612,7 +652,7 @@ const detailBasicFormOnChange = (field, cur) => {
  * @param field 当前操作字段
  * @param e 
  */
-const onBlur = (field, e) => {
+ const onBlur = (field, e) => {
   emit('onBlur', field, e)
 }
 
@@ -634,8 +674,8 @@ watch(
         tableObject.params[item.key] = item.value
       })
     }
-    teamObjectRef.value = tableObject
-    teamMethodsRef.value = tableMethods
+    tableObjectRef.value = tableObject
+    tableMethodsRef.value = tableMethods
     const { getList } = tableMethods
     getList()
   }

src/views/infra/config/ConfigForm.vue

@@ -19,6 +19,21 @@
       <el-form-item label="参数键值" prop="value">
         <el-input v-model="formData.value" placeholder="请输入参数键值" />
       </el-form-item>
+      <el-form-item label="物料类型">
+        <el-select v-model="formData.itemTypeList" multiple placeholder="配置物料类型">
+          <el-option v-for="item in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="库区类型">
+        <el-select v-model="formData.areaTypeList" multiple placeholder="库区类型">
+          <el-option v-for="item in getStrDictOptions(DICT_TYPE.AREA_TYPE)" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="库存状态">
+        <el-select v-model="formData.inventoryStatusList" multiple placeholder="库存状态">
+          <el-option v-for="item in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="是否可见" prop="visible">
         <el-radio-group v-model="formData.visible">
           <el-radio
@@ -41,7 +56,7 @@
   </Dialog>
 </template>
 <script lang="ts" setup>
-import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getBoolDictOptions,getStrDictOptions } from '@/utils/dict'
 import * as ConfigApi from '@/api/infra/config'
 
 defineOptions({ name: 'InfraConfigForm' })
@@ -59,6 +74,9 @@ const formData = ref({
   name: '',
   key: '',
   value: '',
+  itemTypeList:'',
+  areaTypeList:'',
+  inventoryStatusList:'',
   visible: true,
   remark: ''
 })
@@ -70,6 +88,9 @@ const formRules = reactive({
   visible: [{ required: true, message: '是否可见不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
+// const itemTypeList = ref([]) // 物料类型列表
+
+
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -123,6 +144,9 @@ const resetForm = () => {
     name: '',
     key: '',
     value: '',
+    itemTypeList:'',
+    areaTypeList:'',
+    inventoryStatusList:'',
     visible: true,
     remark: ''
   }

src/views/infra/config/index.vue

@@ -40,22 +40,37 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="参数主键" align="center" prop="id" />
-      <el-table-column label="参数分类" align="center" prop="category" />
-      <el-table-column label="参数名称" align="center" prop="name" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键名" align="center" prop="key" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键值" align="center" prop="value" />
+      <el-table-column label="参数主键" align="left" prop="id"  :width="100"/>
+      <el-table-column label="参数分类" align="left" prop="category" :width="150"/>
+      <el-table-column label="参数名称" align="left" prop="name" :show-overflow-tooltip="true" :width="200"/>
+      <el-table-column label="参数键名" align="left" prop="key" :show-overflow-tooltip="true" :width="250"/>
+      <el-table-column label="参数键值" align="left" prop="value" :width="200"/>
+      <el-table-column label="物料类型" align="left" prop="itemType" :width="250">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ITEM_TYPE" :value="scope.row.itemType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="库区类型" align="left" prop="areaType" :width="250">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.AREA_TYPE" :value="scope.row.areaType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="库存状态" align="left" prop="inventoryStatus" :width="250">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INVENTORY_STATUS" :value="scope.row.inventoryStatus" />
+        </template>
+      </el-table-column>  
       <el-table-column label="是否可见" align="center" prop="visible">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.visible" />
         </template>
       </el-table-column>
-      <el-table-column label="系统内置" align="center" prop="type">
+      <el-table-column label="系统内置" align="center" prop="type" :width="150">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_CONFIG_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" :width="150"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
       <el-table-column label="操作" align="center" fixed="right" width="180">
         <template #default="scope">

src/views/mes/workstation/index.vue

@@ -58,6 +58,8 @@
           :detailAllSchemasRules="WorkstationRules"
           :apiPage="apiPage"
           :tabs="TabsList"
+          :detailButtonIsShowAdd = "true"
+          :detailButtonIsShowDelete="true"
           @changeTabs="changeTabs"
   />
   <!-- 导入 -->
@@ -66,19 +68,26 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import {TabsList, Team, Workstation, WorkstationRules} from './workstation.data'
+import {
+  Equipment,
+  Process,
+  Production,
+  TabsList,
+  Team,
+  Workstation,
+  WorkstationRules
+} from './workstation.data'
 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 {
-  PurchasereceiptRecordDetail,
-  PurchasereceiptRecordDetailRules,
-  PurchasereceiptRecordMain
-} from "@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data";
-import {PurchasereceiptRequestTabsList} from "@/utils/disposition/tabsList";
-import * as PurchasereceiptRecordDetailApi from "@/api/wms/purchasereceiptRecordDetail";
-import {getEquipmentPage, getProcessPage, getProductionPage} from "@/api/mes/workstation";
+  getEquipmentPage,
+  getProcessPage,
+  getProductionPage,
+  goalParams,
+  params
+} from "@/api/mes/workstation";
 defineOptions({ name: 'Workstation' })
 
 const message = useMessage() // 消息弹窗
@@ -188,11 +197,6 @@ const formsSuccess = async (formType,data) => {
   getList()
 }
 
-/** 绑定操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
-}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -252,31 +256,31 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await WorkstationApi.importTemplate()
 })
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  goalParams.workstationCode = row.code
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
+}
 // 子包装数据
-const teamRef = ref()
-const { tableObject: teamData, tableMethods: teamMethods } = useTable({
-  getListApi: WorkstationApi.getTeamPage
-})
-const { getList:teamList } = teamMethods
 const detailAllSchemas = ref(Team.allSchemas)
 const apiPage = ref(WorkstationApi.getTeamPage)
-const tabeKey = ref("workstationDetail");
+const tableKey = ref("workstationDetail");
 // tabs 切换事件
 const changeTabs = (data) =>{
+  tableKey.value = data.prop
   if(data.prop == 'Team'){
-    console.log(data)
     apiPage.value = WorkstationApi.getTeamPage
     detailAllSchemas.value = Team.allSchemas
   }else if(data.prop == 'Equipment'){
     apiPage.value = WorkstationApi.getEquipmentPage
-    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    detailAllSchemas.value = Equipment.allSchemas
   }else if(data.prop == 'Process'){
     apiPage.value = WorkstationApi.getProcessPage
-    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    detailAllSchemas.value = Process.allSchemas
   }else if(data.prop == 'Production'){
     apiPage.value = WorkstationApi.getProductionPage
-    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    detailAllSchemas.value = Production.allSchemas
   }
-  tabeKey.value = data.prop
 }
 </script>

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<CrudSchema[]>([
         },
         {
           key: 'areaType',
-          value: businesstypeData.outAreaTypes,
+          value: confgiDataOne.areaType,
           isMainValue: false
         }]
       }
@@ -166,7 +162,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
         },
         {
           key: 'areaType',
-          value: businesstypeData.outAreaTypes,
+          value: confgiDataTwo.areaType,
           isMainValue: false
         }]
       }

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<CrudSchema[]>([
         },
         {
           key:'type',
-          value:businesstypeData.itemTypes,
+          value:confgiData.itemType,
           action: 'notin',
           isSearch: true,
           isMainValue: false