Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWare...

payne

2024-04-23 b15f41265e6059136c991f85e77942a6ddb5c7c6

Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

 iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsFactoryManage.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,114 @@
import { axios } from '@/utils/request'

/**
 * æŸ¥è¯¢å·¥åŽ‚信息表
 *
 * @author ly
 */
export function WmsFactoryPage (parameter) {
  return axios({
    url: '/WmsFactory/page',
    method: 'get',
    params: parameter
  })
}

/**
 * å·¥åŽ‚信息表列表
 *
 * @author ly
 */
export function WmsFactoryList (parameter) {
  return axios({
    url: '/WmsFactory/list',
    method: 'get',
    params: parameter
  })
}

/**
 * æ·»åŠ å·¥åŽ‚信息表
 *
 * @author ly
 */
export function WmsFactoryAdd (parameter) {
  return axios({
    url: '/WmsFactory/add',
    method: 'post',
    data: parameter
  })
}

/**
 * ç¼–辑工厂信息表
 *
 * @author ly
 */
export function WmsFactoryEdit (parameter) {
  return axios({
    url: '/WmsFactory/edit',
    method: 'post',
    data: parameter
  })
}

/**
 * åˆ é™¤å·¥åŽ‚信息表
 *
 * @author ly
 */
export function WmsFactoryDelete (parameter) {
  return axios({
    url: '/WmsFactory/delete',
    method: 'post',
    data: parameter
  })
}


/**
 * å¯¼å‡ºå·¥åŽ‚信息表的Excel文件
 *
 * @author ly
 */
export function WmsFactoryToExcel (parameter) {
  return axios({
    url: '/WmsFactory/toExcel',
    method: 'get',
    params: parameter,
    responseType: 'blob'
  })
}

/**
 * å¯¼å…¥å·¥åŽ‚信息表的Excel文件
 *
 * @author ly
 */
export function WmsFactoryImportExcel (data, parameter) {
  return axios({
    url: '/WmsFactory/importExcel',
    method: 'post',
    data: data,
    params: parameter

  })
}


/**
 * ä¸‹è½½å·¥åŽ‚信息表的Excel导入模板
 *
 * @author ly
 */
export function WmsFactoryDownloadExcelTemplate(parameter) {
  return axios({
    url: '/WmsFactory/downloadExcelTemplate',
    method: 'get',
    params: parameter,
    responseType: 'blob'
  })
}




 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/addForm.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,94 @@
<template>
  <a-modal
    title="新增工厂信息表"
    :width="900"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
        <a-form :form="form">
        <a-form-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入编号" v-decorator="['factoryCode', {rules: [{required: true, message: '请输入编号！'}]}]" />
        </a-form-item>
        <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入名称" v-decorator="['factoryName', {rules: [{required: true, message: '请输入名称！'}]}]" />
        </a-form-item>
        <a-form-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入地址" v-decorator="['factoryAddress']" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
        </a-form-item>
      </a-form>
    </a-spin>
  </a-modal>
</template>

<script>
  import moment from 'moment'
  import {
  WmsFactoryAdd
  } from '@/api/modular/main/WmsBase/WmsFactoryManage'
  export default {
  data () {
  return {
  labelCol: {
  xs: { span: 24 },
  sm: { span: 5 }
  },
  wrapperCol: {
  xs: { span: 24 },
  sm: { span: 15 }
  },
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
      }
    },
    methods: {
    moment,
      // åˆå§‹åŒ–方法
      add (record) {
        this.visible = true
        this.$nextTick(() => {

        });
      },
      /**
       * æäº¤è¡¨å•
       */
      handleSubmit () {
        const { form: { validateFields } } = this
        this.confirmLoading = true
        validateFields((errors, values) => {
          if (!errors) {
            for (const key in values) {
              if (typeof (values[key]) === 'object') {
                values[key] = JSON.stringify(values[key])
              }
            }
            WmsFactoryAdd(values).then((res) => {
              if (res.success) {
                this.$message.success('新增成功')
                this.confirmLoading = false
                this.$emit('ok', values)
                this.handleCancel()
              } else {
                this.$message.error('新增失败：' + JSON.stringify(res.message))
              }
            }).finally((res) => {
              this.confirmLoading = false
            })
          } else {
            this.confirmLoading = false
          }
        })
      },
      handleCancel () {
        this.form.resetFields()
        this.visible = false
      }
    }
  }
</script>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/editForm.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,111 @@
<template>
  <a-modal
    title="编辑工厂信息表"
    :width="900"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-form-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入编号" v-decorator="['factoryCode', {rules: [{required: true, message: '请输入编号！'}]}]" />
        </a-form-item>
        <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入名称" v-decorator="['factoryName', {rules: [{required: true, message: '请输入名称！'}]}]" />
        </a-form-item>
        <a-form-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入地址" v-decorator="['factoryAddress']" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
      </a-form>
    </a-spin>
  </a-modal>
</template>

<script>
import moment from 'moment'
  import {
  WmsFactoryEdit
  } from '@/api/modular/main/WmsBase/WmsFactoryManage'
  export default {
  data () {
  return {
  Id: 0,
  labelCol: {
  xs: { span: 24 },
  sm: { span: 5 }
  },
  wrapperCol: {
  xs: { span: 24 },
  sm: { span: 15 }
  },
  record: {},
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
      }
    },
    methods: {
    moment,
      // åˆå§‹åŒ–方法
      edit (record) {
        this.visible = true;
        this.Id = record.id;
        this.$nextTick(() => {
        });
        //深度拷贝 ç§»é™¤VUE的监听，防止INDEX页面值变动
        this.record = JSON.parse(JSON.stringify(record))
        this.$nextTick(() => {
          this.form.setFieldsValue(
            {
              id: record.id,
              factoryCode: record.factoryCode,
              factoryName: record.factoryName,
              factoryAddress: record.factoryAddress,
              isDisabled: record.isDisabled
            }
          )
        })
      },
      handleSubmit () {
        const { form: { validateFields } } = this
        this.confirmLoading = true
        validateFields((errors, values) => {
          if (!errors) {
            for (const key in values) {
              if (values[key] == null) continue
              if (typeof (values[key]) === 'object') {
                values[key] = JSON.stringify(values[key])
                 this.record[key] = values[key]
              } else {
                 this.record[key] = values[key]
              }
            }
            WmsFactoryEdit(this.record).then((res) => {
              if (res.success) {
                this.$message.success('编辑成功')
                this.confirmLoading = false
                this.$emit('ok', this.record)
                this.handleCancel()
              } else {
                this.$message.error('编辑失败：' + JSON.stringify(res.message))
              }
            }).finally((res) => {
              this.confirmLoading = false
            })
          }else{
            this.confirmLoading = false
          } 
        });
      },
      handleCancel () {
        this.form.resetFields()
        this.visible = false
      }
    }
  }
</script>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/excelForm.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,181 @@
<template>
  <a-modal
    :width="850"
    :destroyOnClose="true"
    :visible="visible"
    :forceRender="true"
    title="批量导入"
    cancelText="取消上传"
    okText="开始上传"
    @cancel="handleCancel"
    @ok="handleSubmit">
    <a-spin :spinning="confirmLoading">
      <a-row :span="24">
        <span>请选择要导入的数据文件（Excel格式）</span>
      </a-row>
      <p></p>
      <a-row>
        <a-col :span="16">
          <a-upload-dragger accept=".xlsx,.xls" :multiple="false" :customRequest="customRequest" @change="handleChange" :beforeUpload="beforeUpload">
            <a-icon style="font-size: 40px;" type="cloud-upload" />
          </a-upload-dragger>
        </a-col>
        <!--<a-col :span="8">
          <span>导入模式：</span>
          <a-select
            style="width: 130px"
            placeholder="请选择导入模式"
            v-model="importExcelType">
            <a-select-option
              v-for="(item,index) in importExcelTypeData"
              :key="index"
              :value="item.code">{{ item.name }}
            </a-select-option>
          </a-select>
        </a-col>-->
      </a-row>
      <a-row :span="24">
        <!--<a-button @click="showDemand" style="width: 150px;text-align: left;" type="link" v-show="!detailed">
          ç‚¹å‡»æŸ¥çœ‹æ–‡ä»¶ä¸Šä¼ è¦æ±‚
        </a-button>-->
        <span>【</span>
        <a-button style="width: 90px;text-align: left;" @click="wmsFactoryDownloadExcelTemplate" type="link">下载导入模板</a-button>，填写并上传
        <span>】</span>
        <a-button @click="showDemand" style="width: 150px;text-align: left;" type="link" v-show="detailed">
          æ”¶èµ·
        </a-button>
      </a-row>
      <a-row v-show="detailed" style="background: #fef4e8; height: 30px;" :span="24">
        <a-breadcrumb>
          <a-breadcrumb-item style="line-height: 30px;color: #faad14;margin-left: 18px;">文件上传要求</a-breadcrumb-item>
        </a-breadcrumb>
      </a-row>
      <pre v-show="detailed">
        <div v-html="demandText"></div>
      </pre>
      <a-table v-show="detailed" :columns="columns" :data-source="dataList" :rowKey="(record) => record.processID" :pagination="false"></a-table>
      <pre v-show="detailed">
        <div v-html="columnText"></div>
      </pre>
    </a-spin>
  </a-modal>
</template>

<script>
  import { downloadFile, checkFile, parseExcelFieldText, parseDemandText } from '@/utils/util'

  import { WmsFactoryImportExcel, WmsFactoryDownloadExcelTemplate} from '@/api/modular/main/WmsBase/WmsFactoryManage'
  import { sysExcelTemplateGetColumnList } from '@/api/modular/system/excelTemplateManage'
  export default {
  components: {
  },
  data() {
  return {
  visible: false,
  detailed: false,
  confirmLoading: false,
  fileList: [],
  importExcelTypeData: [],
  importExcelType: '1',
  uploadFile: null,
  columns: [],
  dataList: [],
  demandText:'',
  columnText: ''
  }
  },
  methods: {
  index() {
  this.visible = true;
  this.importExcelTypeData = this.$options.filters['dictData']('import_excel_type')
  this.demandText = parseDemandText("wmsFactoryDownloadExcelTemplate")
  window.downloadFile = this.wmsFactoryDownloadExcelTemplate;
  this.getTable();
  },
  showDemand() {
  this.detailed = !this.detailed;
  },
  customRequest(document) {
  this.uploadFile = document
  },
  getTable() {
  sysExcelTemplateGetColumnList({className: "WmsFactory"}).then(res =>
  {
  if (res.success) {
  this.columns =[];
  this.dataList = [{}];
  res.data.forEach(x => {
  this.columns.push({
  dataIndex: x.columnName,
  key: x.columnName,
  title: x.columnComment
  });
  this.dataList[0][x.columnName] = x.isRequired ? "必填" : "非必填"
  });
  this.columnText = parseExcelFieldText(res.data);
  }
  });
  },
  beforeUpload(fileInfo) {
  let res = checkFile(fileInfo, 1073741824, ['.xlsx', '.xls']);
  if (!res.success) {
  this.$message.warning(res.msg)
  return false
  }
  setTimeout(() => {this.uploadFile.onSuccess(this.uploadFile.file)}, 1000)
  },
  handleChange(fileInfo) {
  if (fileInfo.file.status === 'error') {
  fileInfo.fileList.splice(0, 1)
  }
  if (fileInfo.file.status === 'done') {
  if (fileInfo.fileList.length > 1) {
  fileInfo.fileList.splice(0, 1)
  }
  this.fileList = fileInfo.file
  }
  },
  handleSubmit() {
  this.confirmLoading = true
  const formData = new FormData()
  formData.append('file', this.uploadFile.file)
  WmsFactoryImportExcel(formData, {importExcelType: this.importExcelType}).then(res => {
  this.$message.success('操作成功')
  this.confirmLoading = false
  this.$emit('ok', [])
  this.handleCancel()
  }).finally((res)=>{this.confirmLoading = false})
  },
  handleCancel() {
  this.visible = false
  this.detailed = false
  },
  wmsFactoryDownloadExcelTemplate() {
  WmsFactoryDownloadExcelTemplate({version: "v2"}).then((res) => {
  downloadFile(res);
  }).catch((err) => {
  this.$message.error('下载错误：获取文件流错误' + err)
  })
  }
  }
  }
</script>

<style scoped>
::v-deep .ant-upload.ant-upload-drag {
  position: relative;
  width: 140px;
  height: 135px;
  text-align: center;
  background: #fafafa;
  border: 1px dashed #d9d9d9;
  border-radius: 2px;
  cursor: pointer;
  -webkit-transition: border-color 0.3s;
  transition: border-color 0.3s;
}
::v-deep .ant-btn:focus:not(.ant-btn-primary):not(.ant-btn-danger), .ant-btn:hover:not(.ant-btn-primary):not(.ant-btn-danger) {
  color: #ffc53d;
  border-color: white;
}
</style>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,463 @@
<template>
  <div ref="boxOutWrap" class="boxOutWrap">
    <div ref="boxForm" class="boxForm">  
    <a-card :bordered="false" :bodyStyle="tstyle">

      <div class="table-page-search-wrapper" v-if="hasPerm('WmsFactory:page')">
        <a-form layout="inline">
          <a-row :gutter="48">
            <a-col :md="8" :sm="24">
              <a-form-item label="编号">
                <a-input v-model="queryParam.factoryCode" allow-clear placeholder="请输入编号"/>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="24">
              <a-form-item label="名称">
                <a-input v-model="queryParam.factoryName" allow-clear placeholder="请输入名称"/>
              </a-form-item>
            </a-col><template v-if="advanced">
              <a-col :md="8" :sm="24">
                <a-form-item label="地址">
                  <a-input v-model="queryParam.factoryAddress" allow-clear placeholder="请输入地址"/>
                </a-form-item>
              </a-col>
            <a-col :md="8" :sm="24">
                <a-form-item label="是否禁用">
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled" placeholder="请选择是否禁用">
                        <a-select-option v-for="(item,index) in isDisabledData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                    </a-select>
                </a-form-item>
            </a-col>
                  <!--年月日时分秒-->
            <!--时间范围-->

                <a-col :md="8" :sm="24">
                    <a-form-item label="创建时间">
                        <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']"  :show-time="{
format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.createdTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangecreatedTime"/>

                    </a-form-item>
                </a-col>
                      <!--年月日时分秒-->
            <!--时间范围-->

                <a-col :md="8" :sm="24">
                    <a-form-item label="更新时间">
                        <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']"  :show-time="{
format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.updatedTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangeupdatedTime"/>

                    </a-form-item>
                </a-col>
			
              <a-col :md="8" :sm="24">
                <a-form-item label="创建者名称">
                  <a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建者名称"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="修改者名称">
                  <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改者名称"/>
                </a-form-item>
              </a-col>    </template>

            <a-col :md="8" :sm="24" >
              <span class="table-page-search-submitButtons">
                <a-button type="primary" @click="$refs.table.refresh(true)" >查询</a-button>
                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
                <a @click="toggleAdvanced" style="margin-left: 8px"> {{ advanced ? '收起' : '展开' }}
                  <a-icon :type="advanced ? 'up' : 'down'"/>
                </a>
              </span>
            </a-col>

          </a-row>
        </a-form>
      </div>
    </a-card>
    </div>
    <a-card :bordered="false">
      <s-table
        ref="table"
        :columns="columns"
        :data="loadData"
        :alert="true"
        @changeTablePage="pageInfo = $event"
        :scroll="{x: true,y:tableHeight}"
        :rowKey="(record) => record.id"
        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
        <template class="table-operator" slot="operator" v-if="hasPerm('WmsFactory:add')" >
        <div ref="actionBar" class="actionBar">
            <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
            å¯¼å…¥
          </a-button>
          <a-button type="info" v-if="hasPerm('WmsFactory:exportExcel')" icon="download" @click="WmsFactoryToExcel()">
            å¯¼å‡º
          </a-button>
            <a-button type="primary" v-if="hasPerm('WmsFactory:add')" icon="plus" @click="$refs.addForm.add()">新增工厂信息表</a-button>
        </div>
        </template>
          <span slot="isDisabledscopedSlots" slot-scope="text">
            <div v-if="text===true ">
                <a-tag color="green">是</a-tag>
            </div>
            <div v-else-if="text==false">
                <a-tag color="volcano">否</a-tag>
            </div>
            <div v-else=""></div>
            </span>
          <span slot="action" slot-scope="text, record">
			
            <a v-if="hasPerm('WmsFactory:edit')" @click="$refs.editForm.edit(record)">编辑</a>
          <a-divider type="vertical" v-if="hasPerm('WmsFactory:edit') & hasPerm('WmsFactory:delete')"/>
          <a-popconfirm v-if="hasPerm('WmsFactory:delete')" placement="topRight" title="确认删除？" @confirm="() => WmsFactoryDelete(record)">
            <a>删除</a>
          </a-popconfirm>
        </span>
      </s-table>
      <add-form ref="addForm" @ok="handleOk" />
      <edit-form ref="editForm" @ok="handleOk" />
      <excel-form ref="excelForm" @ok="handleOk" />
    </a-card>
  </div>
</template>
<script>
    import { STable } from '@/components'
    import moment from 'moment'
    import { WmsFactoryPage, WmsFactoryDelete, WmsFactoryToExcel } from '@/api/modular/main/WmsBase/WmsFactoryManage'
    //自定义table高度
    import setTableHtMixin from '@/mixins/handleTableHt.js'
    import addForm from './addForm.vue'
    import { exportExcel } from '@/utils/exportToExcel'
    import { downloadFile } from '@/utils/util'
    import editForm from './editForm.vue'
    import excelForm from './excelForm.vue'
    export default {
    mixins: [setTableHtMixin],
    components: {
    STable,
    addForm,
    editForm,
    excelForm
    },
    data () {
    return {
    advanced: false, // é«˜çº§æœç´¢ å±•å¼€/关闭
    queryParam: {},
     pageInfo: {
        current: 1,
        pageSize: 10
      },
    columns: [
    {
    title:'序号',
    width: '60px',
    align: 'center',
    customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
    },
    {
    title: '编号',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'factoryCode'
    },
    {
    title: '名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'factoryName'
    },
    {
    title: '地址',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'factoryAddress'
    },
    {
    title: '是否禁用',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'isDisabled',
    scopedSlots: { customRender: 'isDisabledscopedSlots' }
    },
    {
    title: '创建时间',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'createdTime'
    },
    {
    title: '更新时间',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'updatedTime'
    },
    {
    title: '创建者名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'createdUserName'
    },
    {
    title: '修改者名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'updatedUserName'
    }
    ],
    tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
    // åŠ è½½æ•°æ®æ–¹æ³• å¿…须为 Promise å¯¹è±¡
    loadData: parameter => {
    return WmsFactoryPage(Object.assign(parameter, this.switchingDate())).then((res) => {
    return res.data
    })
    },
    selectedRowKeys: [],
    selectedRows: []
    }
    },
    created () {
    if (this.hasPerm('WmsFactory:edit') || this.hasPerm('WmsFactory:delete')) {
    this.columns.push({
    title: '操作',
    width: '150px',
    dataIndex: 'action',
    scopedSlots: { customRender: 'action' }
    })
    }
    const path = this.$route.path
    const columnStr = window.localStorage.getItem(path)
    if(columnStr) {
    var _columns = JSON.parse(columnStr)
    this.columns.forEach(element => {
    var fObj = _columns.find((item, index) => {
    return item.dataIndex === element.dataIndex;
    })
    if(fObj!=undefined && fObj!=null){
    element.checked=fObj.checked;
    }
    });
    }
    const isDisabledOption = this.$options
    this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')

    this.handleTableHt() //设置主表表格高度
    window.addEventListener(
    'resize',
    () => {
    this.handleTableHt() // ç›‘听屏幕大小改变表格高度
    },
    false
    )
	
    },
    methods: {
    moment,
    /**
    * æŸ¥è¯¢å‚数组装
    */
    switchingDate () {
    const obj = JSON.parse(JSON.stringify(this.queryParam))
    return obj
    },
    WmsFactoryDelete (record) {
    WmsFactoryDelete(record).then((res) => {
    if (res.success) {
    this.$message.success('删除成功')
    this.$refs.table.refresh()
    } else {
    this.$message.error('删除失败') // + res.message
    }
    })
    },


    WmsFactoryToExcel() {
    this.loading = true
    let entozh = {};
    const path = this.$route.path;
    if (window.localStorage.getItem(path)) {
    JSON.parse(window.localStorage.getItem(path)).forEach(item => {
    if (item.dataIndex != 'action' && item.checked) {
    entozh[item.dataIndex] = item.title
    }
    })
    } else { //直接点导出
    this.columns.forEach(item => {
    if (item.dataIndex != 'action') {
    entozh[item.dataIndex] = item.title
    }
    })
    }
    WmsFactoryPage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
    this.loading = false;
    //需要截取日期的字段
    var arrDataCutout = this.columns.filter(v => v.customCutout == true);
    res.data.rows.forEach(item => {
    var arrKeys = Object.keys(item);
    arrKeys.forEach(key => {
    var strFieldDic = key + 'Data';
    //枚举转值
    if (this[strFieldDic] && this[strFieldDic].length > 0) {
    let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
    if (arrFieldDic.length > 0) {
    item[key] = arrFieldDic[0]?.name || '没有枚举值';
    }
    }
    // æ—¥æœŸæˆªå–
    if (arrDataCutout.length > 0) {
    arrDataCutout.forEach(itemIn => {
    if (key == itemIn.dataIndex && item[key]) {
    item[key] = item[key].split(" ")[0]
    }
    })
    }
    });
    })
    exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
    }).catch((err) => {
    this.loading = false
    this.$message.error('下载错误：获取文件流错误' + err)
    })
    },


    toggleAdvanced () {
    this.advanced = !this.advanced
    this.handleTableHt() //设置主表表格高度
    },
    onChangecreatedTime(date, dateString) {
      this.queryParam.createdTime = dateString
    },
    onChangeupdatedTime(date, dateString) {
      this.queryParam.updatedTime = dateString
    },
    handleOk () {
    this.$refs.table.refresh()
    },
    onSelectChange (selectedRowKeys, selectedRows) {
    this.selectedRowKeys = selectedRowKeys
    this.selectedRows = selectedRows
    }
    }
    }
</script>
<style lang="less">
  .table-operator {
    margin-bottom: 18px;
  }
  button {
    margin-right: 8px;
  }
</style>

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml

@@ -4866,7 +4866,7 @@
            ä»£ç ç”Ÿæˆå™¨æœåŠ¡
            </summary>
        </member>
        <member name="M:Admin.NET.Application.CodeGen.CodeGenerateService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysCodeGen},Furion.DatabaseAccessor.IRepository{Furion.Extras.Admin.NET.Entity.SysLowCode},Admin.NET.Application.ICodeGenConfigService,Furion.ViewEngine.IViewEngine,Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysMenu},Admin.NET.Application.ISysExcelTemplateService)">
        <member name="M:Admin.NET.Application.CodeGen.CodeGenerateService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysCodeGen},Furion.DatabaseAccessor.IRepository{Furion.Extras.Admin.NET.Entity.SysLowCode},Admin.NET.Application.ICodeGenConfigService,Furion.ViewEngine.IViewEngine,Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysMenu},Admin.NET.Application.ISysEnumDataService)">
            <summary>
            æž„造函数
            </summary>
@@ -4875,6 +4875,7 @@
            <param name="codeGenConfigService"></param>
            <param name="viewEngine"></param>
            <param name="sysMenuRep"></param>
            <param name="sysEnumDataService"></param>
        </member>
        <member name="M:Admin.NET.Application.CodeGen.CodeGenerateService.QueryCodeGenPageList(Admin.NET.Application.CodeGenPageInput)">
            <summary>
@@ -7117,6 +7118,20 @@
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.ISysEnumDataService.GetEnumDataListStrAsync(Admin.NET.Application.EnumDataInput)">
            <summary>
            é€šè¿‡æžšä¸¾ç±»åž‹èŽ·å–枚举值字符串集合
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.ISysEnumDataService.GetEnumDataListStr(Admin.NET.Application.EnumDataInput)">
            <summary>
            é€šè¿‡æžšä¸¾ç±»åž‹èŽ·å–枚举值字符串集合
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.ISysEnumDataService.GetEnumDataListByField(Admin.NET.Application.QueryEnumDataInput)">
            <summary>
            
@@ -7132,6 +7147,20 @@
        <member name="M:Admin.NET.Application.SysEnumDataService.GetEnumDataList(Admin.NET.Application.EnumDataInput)">
            <summary>
            é€šè¿‡æžšä¸¾ç±»åž‹èŽ·å–枚举值集合
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.SysEnumDataService.GetEnumDataListStrAsync(Admin.NET.Application.EnumDataInput)">
            <summary>
            é€šè¿‡æžšä¸¾ç±»åž‹èŽ·å–枚举值字符串集合
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.SysEnumDataService.GetEnumDataListStr(Admin.NET.Application.EnumDataInput)">
            <summary>
            é€šè¿‡æžšä¸¾ç±»åž‹èŽ·å–枚举值字符串集合
            </summary>
            <param name="input"></param>
            <returns></returns>
@@ -15339,6 +15368,287 @@
            <param name="Aisle"></param>
            <returns></returns>
        </member>
        <member name="T:Admin.NET.Application.WmsFactorySearch">
            <summary>
            å·¥åŽ‚信息表查询参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearch.FactoryCode">
            <summary>
            ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearch.FactoryName">
            <summary>
            åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearch.FactoryAddress">
            <summary>
            åœ°å€
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearch.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearch.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearch.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearch.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearch.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsFactorySearchNonPage">
            <summary>
            å·¥åŽ‚信息表不分页查询参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.FactoryCode">
            <summary>
            ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.FactoryName">
            <summary>
            åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.FactoryAddress">
            <summary>
            åœ°å€
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactorySearchNonPage.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsFactoryInput">
            <summary>
            å·¥åŽ‚信息表输入参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryInput.FactoryCode">
            <summary>
            ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryInput.FactoryName">
            <summary>
            åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryInput.FactoryAddress">
            <summary>
            åœ°å€
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryInput.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="T:Admin.NET.Application.AddWmsFactoryInput">
            <summary>
            å·¥åŽ‚信息表新增参数
            </summary>
        </member>
        <member name="T:Admin.NET.Application.DeleteWmsFactoryInput">
            <summary>
            å·¥åŽ‚信息表删除参数
            </summary>
        </member>
        <member name="T:Admin.NET.Application.UpdateWmsFactoryInput">
            <summary>
            å·¥åŽ‚信息表更新参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.UpdateWmsFactoryInput.Id">
            <summary>
            Id主键
            </summary>
        </member>
        <member name="T:Admin.NET.Application.QueryeWmsFactoryInput">
            <summary>
            å·¥åŽ‚信息表获取单个参数
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsFactoryOutput">
            <summary>
            å·¥åŽ‚信息表输出参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryOutput.FactoryCode">
            <summary>
            ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryOutput.FactoryName">
            <summary>
            åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryOutput.FactoryAddress">
            <summary>
            åœ°å€
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryOutput.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryOutput.Id">
            <summary>
            Id主键
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryOutput.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryOutput.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryOutput.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsFactoryOutput.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsFactoryService">
            <summary>
            å·¥åŽ‚信息表服务
            </summary>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.Page(Admin.NET.Application.WmsFactorySearch)">
            <summary>
            åˆ†é¡µæŸ¥è¯¢å·¥åŽ‚信息表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.ListNonPageAsync(Admin.NET.Application.WmsFactorySearchNonPage)">
            <summary>
            ä¸åˆ†é¡µæŸ¥è¯¢å·¥åŽ‚信息表列表
            </summary>
            <param name="input">工厂信息表查询参数</param>
            <returns>(工厂信息表)实例列表</returns>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.Get(Admin.NET.Application.QueryeWmsFactoryInput)">
            <summary>
            èŽ·å–工厂信息表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.List(Admin.NET.Application.WmsFactoryInput)">
            <summary>
            èŽ·å–工厂信息表列表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.Add(Admin.NET.Application.AddWmsFactoryInput)">
            <summary>
            å¢žåŠ å·¥åŽ‚信息表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.Delete(Admin.NET.Application.DeleteWmsFactoryInput)">
            <summary>
            åˆ é™¤å·¥åŽ‚信息表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.Update(Admin.NET.Application.UpdateWmsFactoryInput)">
            <summary>
            æ›´æ–°å·¥åŽ‚信息表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.ImportExcelAsync(Microsoft.AspNetCore.Http.IFormFile)">
            <summary>
            Excel模板导入工厂信息表功能
            </summary>
            <param name="file">Excel模板文件</param>
            <returns>导入的记录数</returns>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.CommonImport(System.Data.DataTable,System.Int32)">
            <summary>
             DataTable转换实体对象列表
            </summary>
            <param name="dataTable"></param>
            <param name="dataStartLine">模版列名开始行</param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.DownloadExcelTemplate(System.String)">
            <summary>
            æ ¹æ®ç‰ˆæœ¬ä¸‹è½½å·¥åŽ‚信息表的Excel导入模板
            </summary>
            <param name="version">模板版本</param>
            <returns>下载的模板文件</returns>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.CheckExisit(Admin.NET.Core.WmsFactory,System.Boolean)">
            <summary>
            æ ¹æ®è”合主键验证数据是否已存在-数据库
            </summary>
            <param name="input"></param>
            <param name="isEdit"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsFactoryService.CheckExisitForImport(System.Collections.Generic.List{Admin.NET.Core.WmsFactory})">
            <summary>
            æ ¹æ®è”合主键验证数据是否已存在-导入时验证
            </summary>
            <param name="inputs"></param>
            <returns></returns>
        </member>
        <member name="T:Admin.NET.Application.WmsMaterialSearch">
            <summary>
            ç‰©æ–™ä¿¡æ¯è¡¨æŸ¥è¯¢å‚æ•°

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenService.cs

@@ -16,23 +16,11 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Newtonsoft.Json;
using OfficeOpenXml.Drawing;
using OfficeOpenXml;
using System;
using StackExchange.Profiling.Internal;
using System.Reflection;
using System.Text;
using System.Web;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using OfficeOpenXml.Style;
using System.Net.WebSockets;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using System.Reflection;
using NetTopologySuite.Noding;
using System.Xml.Linq;
using static Npgsql.Replication.PgOutput.Messages.RelationMessage;
using StackExchange.Profiling.Internal;
using System.Collections.Generic;
using System.Data.SqlTypes;

namespace Admin.NET.Application.CodeGen
{
@@ -47,7 +35,7 @@
        private readonly IRepository<SysLowCode> _sysLowCodeRep; // ä»£ç ç”Ÿæˆå™¨ä»“储
        private readonly ICodeGenConfigService _codeGenConfigService;
        private readonly IViewEngine _viewEngine;
        private readonly ISysExcelTemplateService _sysExcelTemplateService;
        private readonly ISysEnumDataService _sysEnumDataService;
        private readonly IRepository<SysMenu> _sysMenuRep; // èœå•è¡¨ä»“储

        /// <summary>
@@ -58,19 +46,20 @@
        /// <param name="codeGenConfigService"></param>
        /// <param name="viewEngine"></param>
        /// <param name="sysMenuRep"></param>
        /// <param name="sysEnumDataService"></param>
        public CodeGenerateService(IRepository<SysCodeGen> sysCodeGenRep,
                              IRepository<SysLowCode> sysLowCodeRep,
                              ICodeGenConfigService codeGenConfigService,
                              IViewEngine viewEngine,
                              IRepository<SysMenu> sysMenuRep,
            ISysExcelTemplateService sysExcelTemplateService)
            ISysEnumDataService sysEnumDataService)
        {
            _sysCodeGenRep = sysCodeGenRep;
            _sysLowCodeRep = sysLowCodeRep;
            _codeGenConfigService = codeGenConfigService;
            _viewEngine = viewEngine;
            _sysMenuRep = sysMenuRep;
            _sysExcelTemplateService = sysExcelTemplateService;
            _sysEnumDataService = sysEnumDataService;
        }

        /// <summary>
@@ -1041,6 +1030,7 @@

                    //获取要处理的代码生成配置的是增改的模版字段
                    var showCodeGenConfigs = tableFieldList.Where(w => w.WhetherAddUpdate.Equals("Y")).ToList();
                    showCodeGenConfigs = showCodeGenConfigs.Where(x => x.ColumnKey.ToLower() == "false").ToList();
                    int _mergeCellsCount = showCodeGenConfigs.Count();//合并列（模版赋值的标题列数）
                                                                      //获取必填字段

@@ -1102,26 +1092,26 @@
            StringBuilder _remarkContentBuilder = new StringBuilder();
            _remarkContentBuilder.AppendLine("");
            _remarkContentBuilder.AppendLine("1.支持Excel2007及以上版本文件。");
            _remarkContentBuilder.AppendLine("2.导入新增数据时不能超过5000行。");
            _remarkContentBuilder.AppendLine("3.导入更新数据时不能超过2000行。");
            _remarkContentBuilder.AppendLine("2.导入数据时不能超过5000行。");
            _remarkContentBuilder.AppendLine("");
            _remarkContentBuilder.AppendLine("");

            Dictionary<string, string> typeNameDict = new()
            {
                { "string", "文本。"},
                { "int", "数字。"},
                { "long", "数字。"},
                { "decimal", "小数。"},
                { "bool", "布尔。示例：是、否。"},
                { "string", "输入文本。"},
                { "int", "输入数字。"},
                { "long", "输入数字。"},
                { "decimal", "输入小数。"},
                { "bool", "是,否。"},

            };
            Dictionary<string, string> effectTypeDict = new()
            {
                { "datepicker", "日期。 ç¤ºä¾‹: 2023/3/1"},
                { "datetimepicker", "日期时间。示例: 2023/3/1 12:00:00"},
                { "datepicker", "日期。 ç¤ºä¾‹: 2023/3/1。"},
                { "datetimepicker", "日期时间。示例: 2023/3/1 12:00:00。"},

            };

            requiredTableFieldList.ForEach(x =>
            {
                string text = "";
@@ -1134,6 +1124,12 @@
                {
                    text += typeNameDict[x.DtoNetType];
                }
                else if (x.EffectType == "select")
                {
                    var queryValue = x.DtoNetType.Split('.').Last();
                    var enumStr = _sysEnumDataService.GetEnumDataListStr(new EnumDataInput() { EnumName = queryValue });
                    text += enumStr + "。";
                }
                else
                {
                    text += ("注意：类型未能识别出来，需要自己维护！！！。");

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/ISysEnumDataService.cs

@@ -15,6 +15,20 @@
        Task<dynamic> GetEnumDataList([FromQuery] EnumDataInput input);

        /// <summary>
        /// é€šè¿‡æžšä¸¾ç±»åž‹èŽ·å–枚举值字符串集合
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        Task<string> GetEnumDataListStrAsync([FromQuery] EnumDataInput input);

        /// <summary>
        /// é€šè¿‡æžšä¸¾ç±»åž‹èŽ·å–枚举值字符串集合
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        string GetEnumDataListStr([FromQuery] EnumDataInput input);

        /// <summary>
        /// 
        /// </summary>
        /// <param name="input"></param>

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/SysEnumDataService.cs

@@ -6,6 +6,7 @@
using Furion.FriendlyException;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System.Linq;

namespace Admin.NET.Application
{
@@ -41,6 +42,52 @@
        }

        /// <summary>
        /// é€šè¿‡æžšä¸¾ç±»åž‹èŽ·å–枚举值字符串集合
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("sysEnumData/getEnumDataListStrAsync")]
        public async Task<string> GetEnumDataListStrAsync([FromQuery] EnumDataInput input)
        {
            // æŸ¥æ‰¾æžšä¸¾
            var enumType = App.EffectiveTypes.FirstOrDefault(t => t.IsEnum && t.Name == input.EnumName);
            if (enumType == null)
                throw Oops.Oh(ErrorCode.D1502).StatusCode(405);

            // èŽ·å–枚举的Key和描述
            List<EnumDataOutput> retList = await Task.Run(() => EnumUtil.GetEnumDescDictionary(enumType)
                   .Select(x => new EnumDataOutput
                   {
                       Code = x.Key,
                       Value = x.Value
                   }).ToList());
            return string.Join(",", retList.Select(x => x.Value).ToList());
        }

        /// <summary>
        /// é€šè¿‡æžšä¸¾ç±»åž‹èŽ·å–枚举值字符串集合
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("sysEnumData/getEnumDataListStr")]
        public string GetEnumDataListStr([FromQuery] EnumDataInput input)
        {
            // æŸ¥æ‰¾æžšä¸¾
            var enumType = App.EffectiveTypes.FirstOrDefault(t => t.IsEnum && t.Name == input.EnumName);
            if (enumType == null)
                throw Oops.Oh(ErrorCode.D1502).StatusCode(405);

            // èŽ·å–枚举的Key和描述
            List<EnumDataOutput> retList = EnumUtil.GetEnumDescDictionary(enumType)
                   .Select(x => new EnumDataOutput
                   {
                       Code = x.Key,
                       Value = x.Value
                   }).ToList();
            return string.Join(",", retList.Select(x => x.Value).ToList());
        }

        /// <summary>
        /// é€šè¿‡å®žä½“字段类型获取相关集合（目前仅支持枚举类型）
        /// </summary>
        /// <param name="input"></param>

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Dto/WmsFactoryInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,165 @@
using Admin.NET.Core;
using Admin.NET.Core.Service;
using System.ComponentModel.DataAnnotations;

namespace Admin.NET.Application
{    
    
    /// <summary>
    /// å·¥åŽ‚信息表查询参数
    /// </summary>
    public class WmsFactorySearch : PageInputBase
    {
        /// <summary>
        /// ç¼–号
        /// </summary>
        public virtual string FactoryCode { get; set; }
        
        /// <summary>
        /// åç§°
        /// </summary>
        public virtual string FactoryName { get; set; }
        
        /// <summary>
        /// åœ°å€
        /// </summary>
        public virtual string FactoryAddress { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public virtual List<string> CreatedTime { get; set; }
        
        /// <summary>
        /// æ›´æ–°æ—¶é—´
        /// </summary>
        public virtual List<string> UpdatedTime { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…名称
        /// </summary>
        public virtual string CreatedUserName { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹è€…名称
        /// </summary>
        public virtual string UpdatedUserName { get; set; }
        
    }

        /// <summary>
    /// å·¥åŽ‚信息表不分页查询参数
    /// </summary>
    public class WmsFactorySearchNonPage : PageInputNonPageBase
    {
        /// <summary>
        /// ç¼–号
        /// </summary>
        public virtual string FactoryCode { get; set; }
        
        /// <summary>
        /// åç§°
        /// </summary>
        public virtual string FactoryName { get; set; }
        
        /// <summary>
        /// åœ°å€
        /// </summary>
        public virtual string FactoryAddress { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
         public virtual List<DateTimeOffset>? CreatedTime { get; set; }
        
        /// <summary>
        /// æ›´æ–°æ—¶é—´
        /// </summary>
         public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…名称
        /// </summary>
        public virtual string CreatedUserName { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹è€…名称
        /// </summary>
        public virtual string UpdatedUserName { get; set; }
        
    }

    /// <summary>
    /// å·¥åŽ‚信息表输入参数
    /// </summary>
    public class WmsFactoryInput
    {
        /// <summary>
        /// ç¼–号
        /// </summary>
        [Required(ErrorMessage = "编号不能为空")]
        public virtual string FactoryCode { get; set; }
        
        /// <summary>
        /// åç§°
        /// </summary>
        [Required(ErrorMessage = "名称不能为空")]
        public virtual string FactoryName { get; set; }
        
        /// <summary>
        /// åœ°å€
        /// </summary>
        public virtual string FactoryAddress { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }
        
    }

    /// <summary>
    /// å·¥åŽ‚信息表新增参数
    /// </summary>
    public class AddWmsFactoryInput : WmsFactoryInput
    {
    }

    /// <summary>
    /// å·¥åŽ‚信息表删除参数
    /// </summary>
    public class DeleteWmsFactoryInput : BaseId
    {
    }

    /// <summary>
    /// å·¥åŽ‚信息表更新参数
    /// </summary>
    public class UpdateWmsFactoryInput : WmsFactoryInput
    {
        /// <summary>
        /// Id主键
        /// </summary>
        [Required(ErrorMessage = "Id主键不能为空")]
        public long? Id { get; set; }
        
    }

    /// <summary>
    /// å·¥åŽ‚信息表获取单个参数
    /// </summary>
    public class QueryeWmsFactoryInput : BaseId
    {

    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Dto/WmsFactoryOutput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
using Admin.NET.Core.Util.LowCode.Dto;
using System;

namespace Admin.NET.Application
{
    /// <summary>
    /// å·¥åŽ‚信息表输出参数
    /// </summary>
    public class WmsFactoryOutput
    {
        /// <summary>
        /// ç¼–号
        /// </summary>
        public string FactoryCode { get; set; }
        
        /// <summary>
        /// åç§°
        /// </summary>
        public string FactoryName { get; set; }
        
        /// <summary>
        /// åœ°å€
        /// </summary>
        public string FactoryAddress { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool? IsDisabled { get; set; }
        
        /// <summary>
        /// Id主键
        /// </summary>
        public long? Id { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public DateTimeOffset? CreatedTime { get; set; }
        
        /// <summary>
        /// æ›´æ–°æ—¶é—´
        /// </summary>
        public DateTimeOffset? UpdatedTime { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…名称
        /// </summary>
        public string CreatedUserName { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹è€…名称
        /// </summary>
        public string UpdatedUserName { get; set; }
        
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/IWmsFactoryService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
using Admin.NET.Core;
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;

namespace Admin.NET.Application
{
    public interface IWmsFactoryService
    {
        Task<WmsFactoryOutput> Get([FromQuery] QueryeWmsFactoryInput input);
        Task<List<WmsFactoryOutput>> List([FromQuery] WmsFactoryInput input);
        Task<PageResult<WmsFactoryOutput>> Page([FromQuery] WmsFactorySearch input);
        Task<List<WmsFactoryOutput>> ListNonPageAsync([FromQuery] WmsFactorySearchNonPage input);
        
        Task Add(AddWmsFactoryInput input);
        Task Update(UpdateWmsFactoryInput input);
        Task Delete(DeleteWmsFactoryInput input);
        Task<int> ImportExcelAsync(IFormFile file);
        IActionResult DownloadExcelTemplate(string version);
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/Map/WmsFactoryMapper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
using Mapster;
using Admin.NET.Core;

namespace Admin.NET.Application
{
    public class WmsFactoryMapper : IRegister
    {
        public void Register(TypeAdapterConfig config)
        {
            config.ForType<AddWmsFactoryInput, WmsFactory>()
            ;
            config.ForType<UpdateWmsFactoryInput, WmsFactory>()
            ;
            config.ForType<WmsFactory, WmsFactoryOutput>()
            ;
        }
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsFactory/WmsFactoryService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,412 @@
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection;
using Furion.DynamicApiController;
using Furion.FriendlyException;
using Admin.NET.Core;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System.Linq.Dynamic.Core;
using Microsoft.AspNetCore.Http;
using System.Text;
using System.Web;
using System.ComponentModel;
using System.Data;
namespace Admin.NET.Application
{
    /// <summary>
    /// å·¥åŽ‚信息表服务
    /// </summary>
    [ApiDescriptionSettings("WmsBase", Name = "WmsFactory", Order = 100)]
    [Route("api")]
    public class WmsFactoryService : IWmsFactoryService, IDynamicApiController, ITransient
    {
        private readonly IRepository<WmsFactory,MasterDbContextLocator> _wmsFactoryRep;
        private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
        private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
        private readonly ISysExcelTemplateService _sysExcelTemplateService;
        private readonly static object _lock = new();

        public WmsFactoryService(
            IRepository<WmsFactory,MasterDbContextLocator> wmsFactoryRep
            ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
            ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
            ,ISysExcelTemplateService sysExcelTemplateService
        )
        {
            _wmsFactoryRep = wmsFactoryRep;
         _sysDictTypeRep = sysDictTypeRep;
         _sysDictDataRep = sysDictDataRep;
         _sysExcelTemplateService = sysExcelTemplateService;
        }

        /// <summary>
        /// åˆ†é¡µæŸ¥è¯¢å·¥åŽ‚信息表
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("WmsFactory/page")]
        public async Task<PageResult<WmsFactoryOutput>> Page([FromQuery] WmsFactorySearch input)
        {
            var wmsFactorys = await _wmsFactoryRep.DetachedEntities
                                     .Where(!string.IsNullOrEmpty(input.FactoryCode), u => u.FactoryCode == input.FactoryCode)
                                     .Where(!string.IsNullOrEmpty(input.FactoryName), u => EF.Functions.Like(u.FactoryName, $"%{input.FactoryName.Trim()}%"))
                                     .Where(!string.IsNullOrEmpty(input.FactoryAddress), u => u.FactoryAddress == input.FactoryAddress)
                                     .Where(input.IsDisabled != null, u => u.IsDisabled == input.IsDisabled)
                                     .Where(input.CreatedTime!=null, u => u.CreatedTime>=  Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
                                     .Where(input.UpdatedTime!=null, u => u.UpdatedTime>=  Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
                                     .Where(!string.IsNullOrEmpty(input.CreatedUserName), u => u.CreatedUserName == input.CreatedUserName)
                                     .Where(!string.IsNullOrEmpty(input.UpdatedUserName), u => u.UpdatedUserName == input.UpdatedUserName)
                                     .OrderBy(PageInputOrder.OrderBuilder<WmsFactorySearch>(input))
                                     .ProjectToType<WmsFactoryOutput>()
                                     .ToADPagedListAsync(input.PageNo, input.PageSize);
            return wmsFactorys;
        }

        /// <summary>
        /// ä¸åˆ†é¡µæŸ¥è¯¢å·¥åŽ‚信息表列表
        /// </summary>
        /// <param name="input">工厂信息表查询参数</param>
        /// <returns>(工厂信息表)实例列表</returns>
        [HttpGet("WmsFactory/listNonPage")]
        public async Task<List<WmsFactoryOutput>> ListNonPageAsync([FromQuery] WmsFactorySearchNonPage input)
        {
            var pFactoryCode = input.FactoryCode?.Trim() ?? "";
            var pFactoryName = input.FactoryName?.Trim() ?? "";
            var pFactoryAddress = input.FactoryAddress?.Trim() ?? "";
            var pIsDisabled = input.IsDisabled;
            var pCreatedTime = input.CreatedTime;
            var pUpdatedTime = input.UpdatedTime;
            var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
            var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
            var wmsFactorys = await _wmsFactoryRep.DetachedEntities
                .Where(!string.IsNullOrEmpty(pFactoryCode), u => u.FactoryCode == pFactoryCode)
                .Where(!string.IsNullOrEmpty(pFactoryName), u => EF.Functions.Like(u.FactoryName, $"%{pFactoryName}%")) 
                .Where(!string.IsNullOrEmpty(pFactoryAddress), u => u.FactoryAddress == pFactoryAddress)
                .Where(pIsDisabled != null, u => u.IsDisabled == pIsDisabled)
           .Where(input.CreatedTime!=null, u => u.CreatedTime>=  Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
           .Where(input.UpdatedTime!=null, u => u.UpdatedTime>=  Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
                .Where(!string.IsNullOrEmpty(pCreatedUserName), u => u.CreatedUserName == pCreatedUserName)
                .Where(!string.IsNullOrEmpty(pUpdatedUserName), u => u.UpdatedUserName == pUpdatedUserName)
            .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
            .ProjectToType<WmsFactoryOutput>()
            .ToListAsync();
            return wmsFactorys;
        }

         /// <summary>
        /// èŽ·å–工厂信息表
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("WmsFactory/detail")]
        public async Task<WmsFactoryOutput> Get([FromQuery] QueryeWmsFactoryInput input)
        {
            return (await _wmsFactoryRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsFactoryOutput>();
        }

        /// <summary>
        /// èŽ·å–工厂信息表列表
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("WmsFactory/list")]
        public async Task<List<WmsFactoryOutput>> List([FromQuery] WmsFactoryInput input)
        {
            return await _wmsFactoryRep.DetachedEntities.ProjectToType<WmsFactoryOutput>().ToListAsync();
        }    

        #region å¢žã€åˆ ã€æ”¹

        /// <summary>
        /// å¢žåŠ å·¥åŽ‚信息表
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("WmsFactory/add")]
        public async Task Add(AddWmsFactoryInput input)
        {
            var wmsFactory = input.Adapt<WmsFactory>();
                        //验证
            await CheckExisit(wmsFactory);

            wmsFactory.CreatedUserId = wmsFactory.UpdatedUserId = SysHelper.GetUserId();
            wmsFactory.CreatedUserName = wmsFactory.UpdatedUserName = SysHelper.GetUserName();
            wmsFactory.CreatedTime = wmsFactory.UpdatedTime = SysHelper.GetNowTime();
            await _wmsFactoryRep.InsertAsync(wmsFactory);
        }

        /// <summary>
        /// åˆ é™¤å·¥åŽ‚信息表
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("WmsFactory/delete")]
        public async Task Delete(DeleteWmsFactoryInput input)
        {
            var wmsFactory = await _wmsFactoryRep.FirstOrDefaultAsync(u => u.Id == input.Id);
            await _wmsFactoryRep.DeleteAsync(wmsFactory);
            
        }

        /// <summary>
        /// æ›´æ–°å·¥åŽ‚信息表
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("WmsFactory/edit")]
        public async Task Update(UpdateWmsFactoryInput input)
        {
            var isExist = await _wmsFactoryRep.AnyAsync(u => u.Id == input.Id, false);
            if (!isExist) throw Oops.Oh(ErrorCode.D1002);

            var wmsFactory = input.Adapt<WmsFactory>();
            //验证
            await CheckExisit(wmsFactory,true);

            wmsFactory.UpdatedUserId = SysHelper.GetUserId();
            wmsFactory.UpdatedUserName = SysHelper.GetUserName();
            wmsFactory.UpdatedTime = SysHelper.GetNowTime();
            await _wmsFactoryRep.UpdateAsync(wmsFactory,ignoreNullValues:true);
        }

        #endregion

        #region å¯¼å…¥

        /// <summary>
        /// Excel模板导入工厂信息表功能
        /// </summary>
        /// <param name="file">Excel模板文件</param>
        /// <returns>导入的记录数</returns>
        [HttpPost("WmsFactory/importExcel")]
        public async Task<int> ImportExcelAsync(IFormFile file)
        { 
            int _HeadStartLine = 2;//第1行是说明,第2行是列名
            int _DataStartLine = 3;//第3行开始是数据

            DataTable importDataTable = ExcelUtil.ImportExcelToDataTable(file, _HeadStartLine, _DataStartLine);
            var addList =await CommonImport(importDataTable, _DataStartLine);

            lock (_lock)
            {
                _wmsFactoryRep.InsertAsync(addList);
               
            }
            await Task.CompletedTask;
            return addList.Count;
        }

        /// <summary>
        ///  DataTable转换实体对象列表
        /// </summary>
        /// <param name="dataTable"></param>
        /// <param name="dataStartLine">模版列名开始行</param>
        /// <returns></returns>
        private async Task<List<WmsFactory>> CommonImport(DataTable dataTable, int dataStartLine)
        {

            var details = new List<WmsFactory>();
            int index = dataStartLine;//模版列名开始行
            foreach (System.Data.DataRow row in dataTable.Rows)
            {
                index++;

               //导入模版定制化代码（替换模版使用）
                                          
                           var addItem = new WmsFactory()
                            {
                               CreatedTime = SysHelper.GetNowTime(),
                               CreatedUserId = SysHelper.GetUserId(),
                               CreatedUserName = SysHelper.GetUserName(),
                               UpdatedTime = SysHelper.GetNowTime(),
                               UpdatedUserId = SysHelper.GetUserId(),
                               UpdatedUserName = SysHelper.GetUserName()
                             };
                          #region å®šä¹‰å˜é‡
                           var _FactoryCode = "";//编号
                           var _FactoryName = "";//名称
                           var _FactoryAddress = "";//地址
                           var _IsDisabled = "";//是否禁用
                           var _Id = "";//Id主键
                          #endregion
                          
                          
                          #region å–值
                           _FactoryCode = row["编号"]?.ToString() ;
                           _FactoryName = row["名称"]?.ToString() ;
                           _FactoryAddress = row["地址"]?.ToString() ;
                           _IsDisabled = row["是否禁用"]?.ToString() ;
                           _Id = row["Id主键"]?.ToString() ;
                          #endregion
                          
                          
                          #region éªŒè¯
                          
                          if (string.IsNullOrEmpty(_FactoryCode))
                          {
                            throw Oops.Oh($"第{index}行[编号]{_FactoryCode}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_FactoryCode))
                          {
                                addItem.FactoryCode = (string)_FactoryCode;
                           }
                          
                          if (string.IsNullOrEmpty(_FactoryName))
                          {
                            throw Oops.Oh($"第{index}行[名称]{_FactoryName}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_FactoryName))
                          {
                                addItem.FactoryName = (string)_FactoryName;
                           }
                          if(!string.IsNullOrEmpty(_FactoryAddress))
                          {
                                addItem.FactoryAddress = (string)_FactoryAddress;
                           }
                          if(!string.IsNullOrEmpty(_IsDisabled))
                          {
                            if(!_IsDisabled.Equals("是") && !_IsDisabled.Equals("否"))
                             {
                               throw Oops.Oh($"第{index}行[是否禁用]{_IsDisabled}值不正确！");
                             }
                             else
                             {
                               bool outIsDisabled = _IsDisabled.Equals("是") ? true : false;
                               addItem.IsDisabled = outIsDisabled;
                             }
                             }
                          
                          if(!string.IsNullOrEmpty(_Id))
                          {
                              if (!long.TryParse(_Id, out long outId)&&!string.IsNullOrEmpty(_Id))
                              {
                                 throw Oops.Oh($"第{index}行[Id主键]{_Id}值不正确！");
                              }
                              if (outId <= 0&&!string.IsNullOrEmpty(_Id))
                              {
                                 throw Oops.Oh($"第{index}行[Id主键]{_Id}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.Id = outId;
                              }
                          
                          }
                          #endregion
                          

              
                details.Add(addItem);
            }
              //验重
              await CheckExisitForImport(details);
            
            return details;
        }

        /// <summary>
        /// æ ¹æ®ç‰ˆæœ¬ä¸‹è½½å·¥åŽ‚信息表的Excel导入模板
        /// </summary>
        /// <param name="version">模板版本</param>
        /// <returns>下载的模板文件</returns>
        [HttpGet("WmsFactory/downloadExcelTemplate")]
        public IActionResult DownloadExcelTemplate([FromQuery] string version)
        {
            string _path = TemplateConst.EXCEL_TEMPLATEFILE_导入模版路径 + $"\\WmsFactory{TemplateConst.EXCEL_TEMPLATEFILE_导入模版名称后缀}.xlsx";
            var fileName = HttpUtility.UrlEncode($"导入模板(工厂信息表).xlsx", Encoding.GetEncoding("UTF-8"));
            return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
        }

        #endregion

        #region ç§æœ‰æ–¹æ³•

        /// <summary>
        /// æ ¹æ®è”合主键验证数据是否已存在-数据库
        /// </summary>
        /// <param name="input"></param>
        /// <param name="isEdit"></param>
        /// <returns></returns>
        private async Task CheckExisit( WmsFactory input,bool isEdit=false)
        {
           

           
           bool isExist = false;
           if (!isEdit)//新增
           {
                   //数据是否存在重复
                   isExist = await _wmsFactoryRep.AnyAsync(u =>
                                   u.FactoryCode.Equals(input.FactoryCode)
                   ,false);
          }
           else//编辑 
          {

          
                
                 //当前编辑数据以外是否存在重复
                  isExist = await _wmsFactoryRep.AnyAsync(u => 
                                    u.Id != input.Id
                                    &&u.FactoryCode.Equals(input.FactoryCode)
                    ,false);
               }
               
        

            if (isExist) throw Oops.Oh(ErrorCode.E0001);
       }
        
        /// <summary>
        /// æ ¹æ®è”合主键验证数据是否已存在-导入时验证
        /// </summary>
        /// <param name="inputs"></param>
        /// <returns></returns>
        private async Task CheckExisitForImport(List<WmsFactory> inputs)
        { 
            //根据联合主键验证表格中中是否已存在相同数据  
                 if (inputs?.Count <= 0)
                 {
                     throw Oops.Oh($"导入数据不能为空");
                 }
                 //数据是否重复
                 var existExcelItem = inputs.GroupBy(g => new {
                                               g.FactoryCode
                                               })
                                               .Where(g => g.Count() > 1)
                                               .Select(s => new {
                                               s.Key.FactoryCode
                                               }).FirstOrDefault();
                 if (existExcelItem != null)
                 {
                   var wmsFactory = existExcelItem.Adapt<WmsFactory>();
                   var item= existExcelItem.Adapt<WmsFactory>();
                   throw Oops.Oh($"导入的表格中,编号[{item.FactoryCode}]已存在");
                 }
                      



    //根据联合主键验证数据库中是否已存在相同数据
                 var existDBItem = await _wmsFactoryRep.DetachedEntities.FirstOrDefaultAsync(w=> 
                                                                         inputs.Select(s=>""
                                                                           +s.FactoryCode
                                                                        )
                                                                        .Contains(""
                                                                         +w.FactoryCode
                  ));
                  if (existDBItem != null)
                 {
                   var wmsFactory = existExcelItem.Adapt<WmsFactory>();
                   var item= existExcelItem.Adapt<WmsFactory>();
                   throw Oops.Oh($"系统中,编号[{item.FactoryCode}]已存在");
                 }
        }

        #endregion
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsFactoryImport.xlsx

Binary files differ