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

src/api/wms/productputawayRecordMain/index.ts

@@ -61,8 +61,14 @@ export const deleteProductputawayRecordMain = async (id: number) => {
 
 // 导出制品上架记录主 Excel
 export const exportProductputawayRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data })
+  } else {
     return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/api/wms/productreceiptRecordMain/index.ts

@@ -60,8 +60,14 @@ export const deleteProductreceiptRecordMain = async (id: number) => {
 
 // 导出制品收货记录主 Excel
 export const exportProductreceiptRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
+  } else {
     return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/api/wms/productrepairRecordMain/index.ts

@@ -58,8 +58,14 @@ export const deleteProductrepairRecordMain = async (id: number) => {
 
 // 导出制品返修记录主 Excel
 export const exportProductrepairRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productrepair-record-main/export-excel-senior', data })
+  } else {
     return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/api/wms/productscrapRecordMain/index.ts

@@ -57,8 +57,14 @@ export const deleteProductscrapRecordMain = async (id: number) => {
 
 // 导出制品报废记录主 Excel
 export const exportProductscrapRecordMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-record-main/export-excel-senior', data })
+  } else {
     return await request.download({ url: `/wms/productscrap-record-main/export-excel`, params })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/api/wms/productscrapRequestMain/index.ts

@@ -54,8 +54,14 @@ export const deleteProductscrapRequestMain = async (id: number) => {
 
 // 导出制品报废申请主 Excel
 export const exportProductscrapRequestMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-request-main/export-excel-senior', data })
+  } else {
     return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/views/wms/basicDataManage/factoryModeling/workstation/index.vue

@@ -210,10 +210,11 @@ const formsSuccess = async (formType,data) => {
 Workstation.allSchemas.tableFormColumns.map(item => {
   if(item.field == 'rawLocationCode') {
       item.form.componentProps.searchCondition = [
+      // {
+      //   key: 'areaType',
+      //   value: 'RAW',
+      // },
       {
-        key: 'areaType',
-        value: 'RAW',
-      },{
           key: 'available',
           value: 'TRUE',
         }
@@ -221,10 +222,11 @@ Workstation.allSchemas.tableFormColumns.map(item => {
     }
     if(item.field == 'fgLocationCode') {
       item.form.componentProps.searchCondition = [
+      // {
+      //   key: 'areaType',
+      //   value: 'FG',
+      // },
       {
-        key: 'areaType',
-        value: 'FG',
-      },{
           key: 'available',
           value: 'TRUE',
         }

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

@@ -27,10 +27,11 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #itemCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
-          <span>{{ row.code }}</span>
+          <span>{{ row.itemCode }}</span>
         </el-button>
+        
       </template>
       <template #action="{ row }">
         <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />

src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@@ -318,6 +318,172 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '出库后剩余库存自动转换为出库包装规格',
+    field: 'surplusToOutpackunit',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '超过高储是否允许叫料',
+    field: 'allowIssueRequest',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '优先空库位',
+    field: 'emptyLocationFirst',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '优先非空库位',
+    field: 'notEmptyLocationFirst',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混批次',
+    field: 'enableMixLot',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混物品',
+    field: 'enableMixItem',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混状态',
+    field: 'enableMixStatus',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '巷道排序方向',
+    field: 'aisleOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货架排序方向',
+    field: 'sheIfOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '行排序方向',
+    field: 'rowOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '列排序方向',
+    field: 'columOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
   {
     label: '生效时间',
     field: 'activeTime',

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

@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #itemCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
-          <span>{{ row.code }}</span>
+          <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">

src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@@ -379,7 +379,7 @@
             <el-col :span="24">
               <el-form-item label="数量排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.QtyOrder">
+                  <el-radio-group v-model="formData.configuration.QtyOrderDirection">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
@@ -606,7 +606,7 @@ const formData = ref({
     // 库位代码
     LocationCode: '',
     // 数量排序方向
-    QtyOrder: 'ASC',
+    QtyOrderDirection: 'ASC',
     // 巷道排序方向
     AisleOrder: 'ASC',
     // 货架排序方向
@@ -953,7 +953,7 @@ const resetForm = () => {
       // 库位代码
       LocationCode: '',
       // 数量排序方向
-      QtyOrder: 'ASC',
+      QtyOrderDirection: 'ASC',
       // 巷道排序方向
       AisleOrder: 'ASC',
       // 货架排序方向