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

src/api/mes/workstation/index.ts

@@ -170,34 +170,34 @@ export const getOperstepsPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/mes/workstation-process/senior', data })
+    return await request.post({ url: '/mes/workstation-opersteps/senior', data })
   } else {
-    return await request.get({ url: `/mes/workstation-process/pageListByWorkstationCode`, params })
+    return await request.get({ url: `/mes/workstation-opersteps/pageListByWorkstationCode`, params })
   }
 }
 export const checkOperstepsPageList = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/mes/workstation-process/senior', data })
+    return await request.post({ url: '/mes/workstation-opersteps/senior', data })
   } else {
-    return await request.get({ url: `/mes/workstation-process/pageCheckListByWorkstationCode`, params })
+    return await request.get({ url: `/mes/workstation-opersteps/pageCheckListByWorkstationCode`, params })
   }
 }
-// 添加工序关联
+// 添加操作步骤关联
 export const createOperstepsRelation = async (processCodes:string[]) => {
   const data = {
     workstationCode : goalParams.workstationCode,
     processCodes : processCodes
   }
-  return await request.post({ url: `/mes/workstation-process/createRelation`, data })
+  return await request.post({ url: `/mes/workstation-opersteps/createRelation`, data })
 }
 
-// 删除工序关联
+// 删除操作步骤关联
 export const deleteOperstepsRelation = async (processCodes:string[]) => {
   const data = {
     workstationCode : goalParams.workstationCode,
     processCodes : processCodes
   }
-  return await request.post({ url: `/mes/workstation-process/deleteRelation`, data })
+  return await request.post({ url: `/mes/workstation-opersteps/deleteRelation`, data })
 }

src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@@ -135,6 +135,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         setV['outPackUnit'] = val[0]['packUnit']
       }else  if(formField == 'itemCode') {
         setV['itemCode'] = val[0]['code']
+      }else  if(formField == 'repleinshFromArea') {
+        setV['repleinshFromArea'] = val[0]['code']
       }else{ 
         setV[formField] = setV[0][searchField]
       }

src/views/wms/buttMesManage/mesBarCode/index.vue

@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #plnt="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.plnt)">
+          <span>{{ row.plnt }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -154,17 +154,6 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-  var isHave =MesBarCode.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
     await MesBarCodeApi.createMesBarCode(data)
     message.success(t('common.createSuccess'))

src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts

@@ -9,7 +9,7 @@ export const MesBarCodeRules = reactive({
 export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: 'Plnt',
-    field: 'plat',
+    field: 'plnt',
     sort: 'custom',
     table: {
       width: 120
@@ -26,6 +26,7 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
   table: {
       width: 150
     },
+    isSearch:true
   },
   {
     label: 'SIGN',
@@ -74,9 +75,6 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
   table: {
       width: 120
     },
-                form: {
-                  component: 'SelectV2'
-                },
   },
   {
     label: 'Length BC',

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@@ -9,10 +9,10 @@ import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMa
 
 import * as  locationApi from '@/api/wms/location'
 import { Location } from '../../../basicDataManage/factoryModeling/location/location.data'
-
+import * as confgiApi  from '@/api/infra/config'
 import * as  ItemBasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '../../../basicDataManage/itemManage/itembasic/itembasic.data'
-
+import * as WorkstationApi from '@/api/wms/workstation'
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -23,10 +23,9 @@ const queryParams = {
 }
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
-
+ const confgiDataOne = await confgiApi.queryByKey("Stockup-areaType")
   // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
-import { ItemBasic } from '@/utils/disposition/formFields'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到
@@ -679,11 +678,16 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'location',
       searchTitle: '库位基础信息',
       searchAllSchemas: Location.allSchemas,
-      searchPage: locationApi.getLocationPage,
+      searchPage: WorkstationApi.selectAreaTypeToLocation,
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
         isMainValue: false
+      },
+      {
+        key: 'areaType',
+        value: confgiDataOne.areaType,
+        isMainValue: false
       }]
     },
     form: {
@@ -693,11 +697,16 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'location',
         searchTitle: '库位基础信息',
         searchAllSchemas: Location.allSchemas,
-        searchPage: locationApi.getLocationPage,
+        searchPage: WorkstationApi.selectAreaTypeToLocation,
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        },
+        {
+          key: 'areaType',
+          value: confgiDataOne.areaType,
+          isMainValue: false
         }]
       }
     }