物料信息表

liuying

2024-04-23 a4a2c5ebed22b2201af6da20dc696b88b566c0f6

物料信息表

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

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

/**
 * æŸ¥è¯¢ç‰©æ–™ä¿¡æ¯è¡¨
 *
 * @author ly
 */
export function WmsMaterialPage (parameter) {
  return axios({
    url: '/WmsMaterial/page',
    method: 'get',
    params: parameter
  })
}

/**
 * ç‰©æ–™ä¿¡æ¯è¡¨åˆ—表
 *
 * @author ly
 */
export function WmsMaterialList (parameter) {
  return axios({
    url: '/WmsMaterial/list',
    method: 'get',
    params: parameter
  })
}

/**
 * æ·»åŠ ç‰©æ–™ä¿¡æ¯è¡¨
 *
 * @author ly
 */
export function WmsMaterialAdd (parameter) {
  return axios({
    url: '/WmsMaterial/add',
    method: 'post',
    data: parameter
  })
}

/**
 * ç¼–辑物料信息表
 *
 * @author ly
 */
export function WmsMaterialEdit (parameter) {
  return axios({
    url: '/WmsMaterial/edit',
    method: 'post',
    data: parameter
  })
}

/**
 * åˆ é™¤ç‰©æ–™ä¿¡æ¯è¡¨
 *
 * @author ly
 */
export function WmsMaterialDelete (parameter) {
  return axios({
    url: '/WmsMaterial/delete',
    method: 'post',
    data: parameter
  })
}


/**
 * å¯¼å‡ºç‰©æ–™ä¿¡æ¯è¡¨çš„Excel文件
 *
 * @author ly
 */
export function WmsMaterialToExcel (parameter) {
  return axios({
    url: '/WmsMaterial/toExcel',
    method: 'get',
    params: parameter,
    responseType: 'blob'
  })
}

/**
 * å¯¼å…¥ç‰©æ–™ä¿¡æ¯è¡¨çš„Excel文件
 *
 * @author ly
 */
export function WmsMaterialImportExcel (data, parameter) {
  return axios({
    url: '/WmsMaterial/importExcel',
    method: 'post',
    data: data,
    params: parameter

  })
}


/**
 * ä¸‹è½½ç‰©æ–™ä¿¡æ¯è¡¨çš„Excel导入模板
 *
 * @author ly
 */
export function WmsMaterialDownloadExcelTemplate(parameter) {
  return axios({
    url: '/WmsMaterial/downloadExcelTemplate',
    method: 'get',
    params: parameter,
    responseType: 'blob'
  })
}




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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,145 @@
<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="['materialName', {rules: [{required: true, message: '请输入物料名称！'}]}]" />
        </a-form-item>
        <a-form-item label="物料编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料编号" v-decorator="['materialCode', {rules: [{required: true, message: '请输入物料编号！'}]}]" />
        </a-form-item>
        <a-form-item label="ERP编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入ERP编号" v-decorator="['erpCode']" />
        </a-form-item>
        <a-form-item label="物料类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料类型名称" v-decorator="['materialTypeName']" />
        </a-form-item>
        <a-form-item label="物料类型描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料类型描述" v-decorator="['materialTypeDescr']" />
        </a-form-item>
        <a-form-item label="物料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入物料类型" style="width: 100%" v-decorator="['materialType']" />
        </a-form-item>
        <a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料组" v-decorator="['materialGroup']" />
        </a-form-item>
        <a-form-item label="ABC分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入ABC分类名称" v-decorator="['aBCClassName']" />
        </a-form-item>
        <a-form-item label="ABC分类" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入ABC分类" style="width: 100%" v-decorator="['aBCClass']" />
        </a-form-item>
        <a-form-item label="物料规格" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料规格" v-decorator="['materialSpec']" />
        </a-form-item>
        <a-form-item label="默认入库库位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入默认入库库位" v-decorator="['inPlaceCode']" />
        </a-form-item>
        <a-form-item label="库存单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库存单位" v-decorator="['materialUnit']" />
        </a-form-item>
        <a-form-item label="采购单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入采购单位" v-decorator="['pOUnit']" />
        </a-form-item>
        <a-form-item label="颜色" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入颜色" v-decorator="['color']" />
        </a-form-item>
        <a-form-item label="重量" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入重量" v-decorator="['weight']" />
        </a-form-item>
        <a-form-item label="标包数量" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入标包数量" v-decorator="['sNP']" />
        </a-form-item>
        <a-form-item label="换算率" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入换算率" v-decorator="['translateRate']" />
        </a-form-item>
        <a-form-item label="批次属性规则" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入批次属性规则" v-decorator="['batchRuleId']" />
        </a-form-item>
        <a-form-item label="控制属性规则" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入控制属性规则" v-decorator="['controlRuleId']" />
        </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 label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入描述" v-decorator="['materialDesc']" />
        </a-form-item>
      </a-form>
    </a-spin>
  </a-modal>
</template>

<script>
  import moment from 'moment'
  import {
  WmsMaterialAdd
  } from '@/api/modular/main/WmsBase/WmsMaterialManage'
  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])
              }
            }
            WmsMaterialAdd(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/WmsMaterial/editForm.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,179 @@
<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="['materialName', {rules: [{required: true, message: '请输入物料名称！'}]}]" />
        </a-form-item>
        <a-form-item label="物料编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料编号" v-decorator="['materialCode', {rules: [{required: true, message: '请输入物料编号！'}]}]" />
        </a-form-item>
        <a-form-item label="ERP编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入ERP编号" v-decorator="['erpCode']" />
        </a-form-item>
        <a-form-item label="物料类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料类型名称" v-decorator="['materialTypeName']" />
        </a-form-item>
        <a-form-item label="物料类型描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料类型描述" v-decorator="['materialTypeDescr']" />
        </a-form-item>
        <a-form-item label="物料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入物料类型" style="width: 100%" v-decorator="['materialType']" />
        </a-form-item>
        <a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料组" v-decorator="['materialGroup']" />
        </a-form-item>
        <a-form-item label="ABC分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入ABC分类名称" v-decorator="['aBCClassName']" />
        </a-form-item>
        <a-form-item label="ABC分类" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入ABC分类" style="width: 100%" v-decorator="['aBCClass']" />
        </a-form-item>
        <a-form-item label="物料规格" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料规格" v-decorator="['materialSpec']" />
        </a-form-item>
        <a-form-item label="默认入库库位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入默认入库库位" v-decorator="['inPlaceCode']" />
        </a-form-item>
        <a-form-item label="库存单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库存单位" v-decorator="['materialUnit']" />
        </a-form-item>
        <a-form-item label="采购单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入采购单位" v-decorator="['pOUnit']" />
        </a-form-item>
        <a-form-item label="颜色" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入颜色" v-decorator="['color']" />
        </a-form-item>
        <a-form-item label="重量" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入重量" v-decorator="['weight']" />
        </a-form-item>
        <a-form-item label="标包数量" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入标包数量" v-decorator="['sNP']" />
        </a-form-item>
        <a-form-item label="换算率" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入换算率" v-decorator="['translateRate']" />
        </a-form-item>
        <a-form-item label="批次属性规则" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入批次属性规则" v-decorator="['batchRuleId']" />
        </a-form-item>
        <a-form-item label="控制属性规则" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入控制属性规则" v-decorator="['controlRuleId']" />
        </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 label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入描述" v-decorator="['materialDesc']" />
        </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 {
  WmsMaterialEdit
  } from '@/api/modular/main/WmsBase/WmsMaterialManage'
  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,
              materialName: record.materialName,
              materialCode: record.materialCode,
              erpCode: record.erpCode,
              materialTypeName: record.materialTypeName,
              materialTypeDescr: record.materialTypeDescr,
              materialType: record.materialType,
              materialGroup: record.materialGroup,
              aBCClassName: record.aBCClassName,
              aBCClass: record.aBCClass,
              materialSpec: record.materialSpec,
              inPlaceCode: record.inPlaceCode,
              materialUnit: record.materialUnit,
              pOUnit: record.pOUnit,
              color: record.color,
              weight: record.weight,
              sNP: record.sNP,
              translateRate: record.translateRate,
              batchRuleId: record.batchRuleId,
              controlRuleId: record.controlRuleId,
              isDisabled: record.isDisabled,
              materialDesc: record.materialDesc
            }
          )
        })
      },
      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]
              }
            }
            WmsMaterialEdit(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/WmsMaterial/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="wmsMaterialDownloadExcelTemplate" 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 { WmsMaterialImportExcel, WmsMaterialDownloadExcelTemplate} from '@/api/modular/main/WmsBase/WmsMaterialManage'
  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("wmsMaterialDownloadExcelTemplate")
  window.downloadFile = this.wmsMaterialDownloadExcelTemplate;
  this.getTable();
  },
  showDemand() {
  this.detailed = !this.detailed;
  },
  customRequest(document) {
  this.uploadFile = document
  },
  getTable() {
  sysExcelTemplateGetColumnList({className: "WmsMaterial"}).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)
  WmsMaterialImportExcel(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
  },
  wmsMaterialDownloadExcelTemplate() {
  WmsMaterialDownloadExcelTemplate({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/WmsMaterial/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,886 @@
<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('WmsMaterial:page')">
        <a-form layout="inline">
          <a-row :gutter="48">
            <a-col :md="8" :sm="24">
              <a-form-item label="物料名称">
                <a-input v-model="queryParam.materialName" allow-clear placeholder="请输入物料名称"/>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="24">
              <a-form-item label="物料编号">
                <a-input v-model="queryParam.materialCode" allow-clear placeholder="请输入物料编号"/>
              </a-form-item>
            </a-col><template v-if="advanced">
              <a-col :md="8" :sm="24">
                <a-form-item label="ERP编号">
                  <a-input v-model="queryParam.erpCode" allow-clear placeholder="请输入ERP编号"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="物料类型名称">
                  <a-input v-model="queryParam.materialTypeName" allow-clear placeholder="请输入物料类型名称"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="物料类型描述">
                  <a-input v-model="queryParam.materialTypeDescr" allow-clear placeholder="请输入物料类型描述"/>
                </a-form-item>
              </a-col><a-col :md="8" :sm="24">
                <a-form-item label="物料类型">
                  <a-input-number v-model="queryParam.materialType" style="width: 100%" allow-clear placeholder="请输入物料类型"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="物料组">
                  <a-input v-model="queryParam.materialGroup" allow-clear placeholder="请输入物料组"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="ABC分类名称">
                  <a-input v-model="queryParam.aBCClassName" allow-clear placeholder="请输入ABC分类名称"/>
                </a-form-item>
              </a-col><a-col :md="8" :sm="24">
                <a-form-item label="ABC分类">
                  <a-input-number v-model="queryParam.aBCClass" style="width: 100%" allow-clear placeholder="请输入ABC分类"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="物料规格">
                  <a-input v-model="queryParam.materialSpec" allow-clear placeholder="请输入物料规格"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="默认入库库位">
                  <a-input v-model="queryParam.inPlaceCode" allow-clear placeholder="请输入默认入库库位"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="库存单位">
                  <a-input v-model="queryParam.materialUnit" allow-clear placeholder="请输入库存单位"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="采购单位">
                  <a-input v-model="queryParam.pOUnit" allow-clear placeholder="请输入采购单位"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="颜色">
                  <a-input v-model="queryParam.color" allow-clear placeholder="请输入颜色"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="重量">
                  <a-input v-model="queryParam.weight" allow-clear placeholder="请输入重量"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="标包数量">
                  <a-input v-model="queryParam.sNP" allow-clear placeholder="请输入标包数量"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="换算率">
                  <a-input v-model="queryParam.translateRate" allow-clear placeholder="请输入换算率"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="批次属性规则">
                  <a-input v-model="queryParam.batchRuleId" allow-clear placeholder="请输入批次属性规则"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="控制属性规则">
                  <a-input v-model="queryParam.controlRuleId" 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-input v-model="queryParam.materialDesc" allow-clear placeholder="请输入描述"/>
                </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('WmsMaterial: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('WmsMaterial:exportExcel')" icon="download" @click="WmsMaterialToExcel()">
            å¯¼å‡º
          </a-button>
            <a-button type="primary" v-if="hasPerm('WmsMaterial: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('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">编辑</a>
          <a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')"/>
          <a-popconfirm v-if="hasPerm('WmsMaterial:delete')" placement="topRight" title="确认删除？" @confirm="() => WmsMaterialDelete(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 { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
    //自定义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: 'materialName'
    },
    {
    title: '物料编号',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialCode'
    },
    {
    title: 'ERP编号',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'erpCode'
    },
    {
    title: '物料类型名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialTypeName'
    },
    {
    title: '物料类型描述',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialTypeDescr'
    },
    {
    title: '物料类型',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialType'
    },
    {
    title: '物料组',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialGroup'
    },
    {
    title: 'ABC分类名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'aBCClassName'
    },
    {
    title: 'ABC分类',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'aBCClass'
    },
    {
    title: '物料规格',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialSpec'
    },
    {
    title: '默认入库库位',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'inPlaceCode'
    },
    {
    title: '库存单位',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialUnit'
    },
    {
    title: '采购单位',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'pOUnit'
    },
    {
    title: '颜色',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'color'
    },
    {
    title: '重量',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'weight'
    },
    {
    title: '标包数量',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'sNP'
    },
    {
    title: '换算率',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'translateRate'
    },
    {
    title: '批次属性规则',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'batchRuleId'
    },
    {
    title: '控制属性规则',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'controlRuleId'
    },
    {
    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: 'materialDesc'
    },
    {
    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 WmsMaterialPage(Object.assign(parameter, this.switchingDate())).then((res) => {
    return res.data
    })
    },
    selectedRowKeys: [],
    selectedRows: []
    }
    },
    created () {
    if (this.hasPerm('WmsMaterial:edit') || this.hasPerm('WmsMaterial: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
    },
    WmsMaterialDelete (record) {
    WmsMaterialDelete(record).then((res) => {
    if (res.success) {
    this.$message.success('删除成功')
    this.$refs.table.refresh()
    } else {
    this.$message.error('删除失败') // + res.message
    }
    })
    },


    WmsMaterialToExcel() {
    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
    }
    })
    }
    WmsMaterialPage(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

@@ -15339,6 +15339,627 @@
            <param name="Aisle"></param>
            <returns></returns>
        </member>
        <member name="T:Admin.NET.Application.WmsMaterialSearch">
            <summary>
            ç‰©æ–™ä¿¡æ¯è¡¨æŸ¥è¯¢å‚æ•°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialName">
            <summary>
            ç‰©æ–™åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialCode">
            <summary>
            ç‰©æ–™ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.ErpCode">
            <summary>
            ERP编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialTypeName">
            <summary>
            ç‰©æ–™ç±»åž‹åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialTypeDescr">
            <summary>
            ç‰©æ–™ç±»åž‹æè¿°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialType">
            <summary>
            ç‰©æ–™ç±»åž‹
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialGroup">
            <summary>
            ç‰©æ–™ç»„
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.ABCClassName">
            <summary>
            ABC分类名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.ABCClass">
            <summary>
            ABC分类
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialSpec">
            <summary>
            ç‰©æ–™è§„æ ¼
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.InPlaceCode">
            <summary>
            é»˜è®¤å…¥åº“库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialUnit">
            <summary>
            åº“存单位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.POUnit">
            <summary>
            é‡‡è´­å•ä½
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.Color">
            <summary>
            é¢œè‰²
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.Weight">
            <summary>
            é‡é‡
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.SNP">
            <summary>
            æ ‡åŒ…数量
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.TranslateRate">
            <summary>
            æ¢ç®—率
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.BatchRuleId">
            <summary>
            æ‰¹æ¬¡å±žæ€§è§„则
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.ControlRuleId">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialDesc">
            <summary>
            æè¿°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearch.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsMaterialSearchNonPage">
            <summary>
            ç‰©æ–™ä¿¡æ¯è¡¨ä¸åˆ†é¡µæŸ¥è¯¢å‚æ•°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialName">
            <summary>
            ç‰©æ–™åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialCode">
            <summary>
            ç‰©æ–™ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.ErpCode">
            <summary>
            ERP编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialTypeName">
            <summary>
            ç‰©æ–™ç±»åž‹åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialTypeDescr">
            <summary>
            ç‰©æ–™ç±»åž‹æè¿°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialType">
            <summary>
            ç‰©æ–™ç±»åž‹
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialGroup">
            <summary>
            ç‰©æ–™ç»„
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.ABCClassName">
            <summary>
            ABC分类名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.ABCClass">
            <summary>
            ABC分类
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialSpec">
            <summary>
            ç‰©æ–™è§„æ ¼
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.InPlaceCode">
            <summary>
            é»˜è®¤å…¥åº“库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialUnit">
            <summary>
            åº“存单位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.POUnit">
            <summary>
            é‡‡è´­å•ä½
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.Color">
            <summary>
            é¢œè‰²
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.Weight">
            <summary>
            é‡é‡
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.SNP">
            <summary>
            æ ‡åŒ…数量
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.TranslateRate">
            <summary>
            æ¢ç®—率
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.BatchRuleId">
            <summary>
            æ‰¹æ¬¡å±žæ€§è§„则
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.ControlRuleId">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.MaterialDesc">
            <summary>
            æè¿°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialSearchNonPage.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsMaterialInput">
            <summary>
            ç‰©æ–™ä¿¡æ¯è¡¨è¾“入参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialName">
            <summary>
            ç‰©æ–™åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialCode">
            <summary>
            ç‰©æ–™ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.ErpCode">
            <summary>
            ERP编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialTypeName">
            <summary>
            ç‰©æ–™ç±»åž‹åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialTypeDescr">
            <summary>
            ç‰©æ–™ç±»åž‹æè¿°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialType">
            <summary>
            ç‰©æ–™ç±»åž‹
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialGroup">
            <summary>
            ç‰©æ–™ç»„
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.ABCClassName">
            <summary>
            ABC分类名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.ABCClass">
            <summary>
            ABC分类
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialSpec">
            <summary>
            ç‰©æ–™è§„æ ¼
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.InPlaceCode">
            <summary>
            é»˜è®¤å…¥åº“库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialUnit">
            <summary>
            åº“存单位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.POUnit">
            <summary>
            é‡‡è´­å•ä½
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.Color">
            <summary>
            é¢œè‰²
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.Weight">
            <summary>
            é‡é‡
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.SNP">
            <summary>
            æ ‡åŒ…数量
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.TranslateRate">
            <summary>
            æ¢ç®—率
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.BatchRuleId">
            <summary>
            æ‰¹æ¬¡å±žæ€§è§„则
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.ControlRuleId">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialDesc">
            <summary>
            æè¿°
            </summary>
        </member>
        <member name="T:Admin.NET.Application.AddWmsMaterialInput">
            <summary>
            ç‰©æ–™ä¿¡æ¯è¡¨æ–°å¢žå‚æ•°
            </summary>
        </member>
        <member name="T:Admin.NET.Application.DeleteWmsMaterialInput">
            <summary>
            ç‰©æ–™ä¿¡æ¯è¡¨åˆ é™¤å‚æ•°
            </summary>
        </member>
        <member name="T:Admin.NET.Application.UpdateWmsMaterialInput">
            <summary>
            ç‰©æ–™ä¿¡æ¯è¡¨æ›´æ–°å‚æ•°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.UpdateWmsMaterialInput.Id">
            <summary>
            Id主键
            </summary>
        </member>
        <member name="T:Admin.NET.Application.QueryeWmsMaterialInput">
            <summary>
            ç‰©æ–™ä¿¡æ¯è¡¨èŽ·å–单个参数
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsMaterialOutput">
            <summary>
            ç‰©æ–™ä¿¡æ¯è¡¨è¾“出参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialName">
            <summary>
            ç‰©æ–™åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialCode">
            <summary>
            ç‰©æ–™ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.ErpCode">
            <summary>
            ERP编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialTypeName">
            <summary>
            ç‰©æ–™ç±»åž‹åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialTypeDescr">
            <summary>
            ç‰©æ–™ç±»åž‹æè¿°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialType">
            <summary>
            ç‰©æ–™ç±»åž‹
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialGroup">
            <summary>
            ç‰©æ–™ç»„
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.ABCClassName">
            <summary>
            ABC分类名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.ABCClass">
            <summary>
            ABC分类
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialSpec">
            <summary>
            ç‰©æ–™è§„æ ¼
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.InPlaceCode">
            <summary>
            é»˜è®¤å…¥åº“库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialUnit">
            <summary>
            åº“存单位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.POUnit">
            <summary>
            é‡‡è´­å•ä½
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.Color">
            <summary>
            é¢œè‰²
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.Weight">
            <summary>
            é‡é‡
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.SNP">
            <summary>
            æ ‡åŒ…数量
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.TranslateRate">
            <summary>
            æ¢ç®—率
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.BatchRuleId">
            <summary>
            æ‰¹æ¬¡å±žæ€§è§„则
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.ControlRuleId">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialDesc">
            <summary>
            æè¿°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.Id">
            <summary>
            Id主键
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsMaterialOutput.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsMaterialService">
            <summary>
            ç‰©æ–™ä¿¡æ¯è¡¨æœåŠ¡
            </summary>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.Page(Admin.NET.Application.WmsMaterialSearch)">
            <summary>
            åˆ†é¡µæŸ¥è¯¢ç‰©æ–™ä¿¡æ¯è¡¨
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.ListNonPageAsync(Admin.NET.Application.WmsMaterialSearchNonPage)">
            <summary>
            ä¸åˆ†é¡µæŸ¥è¯¢ç‰©æ–™ä¿¡æ¯è¡¨åˆ—表
            </summary>
            <param name="input">物料信息表查询参数</param>
            <returns>(物料信息表)实例列表</returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.Get(Admin.NET.Application.QueryeWmsMaterialInput)">
            <summary>
            èŽ·å–物料信息表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.List(Admin.NET.Application.WmsMaterialInput)">
            <summary>
            èŽ·å–物料信息表列表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.Add(Admin.NET.Application.AddWmsMaterialInput)">
            <summary>
            å¢žåŠ ç‰©æ–™ä¿¡æ¯è¡¨
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.Delete(Admin.NET.Application.DeleteWmsMaterialInput)">
            <summary>
            åˆ é™¤ç‰©æ–™ä¿¡æ¯è¡¨
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.Update(Admin.NET.Application.UpdateWmsMaterialInput)">
            <summary>
            æ›´æ–°ç‰©æ–™ä¿¡æ¯è¡¨
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.ImportExcelAsync(Microsoft.AspNetCore.Http.IFormFile)">
            <summary>
            Excel模板导入物料信息表功能
            </summary>
            <param name="file">Excel模板文件</param>
            <returns>导入的记录数</returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.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.WmsMaterialService.DownloadExcelTemplate(System.String)">
            <summary>
            æ ¹æ®ç‰ˆæœ¬ä¸‹è½½ç‰©æ–™ä¿¡æ¯è¡¨çš„Excel导入模板
            </summary>
            <param name="version">模板版本</param>
            <returns>下载的模板文件</returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.CheckExisit(Admin.NET.Core.WmsMaterial,System.Boolean)">
            <summary>
            æ ¹æ®è”合主键验证数据是否已存在-数据库
            </summary>
            <param name="input"></param>
            <param name="isEdit"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.CheckExisitForImport(System.Collections.Generic.List{Admin.NET.Core.WmsMaterial})">
            <summary>
            æ ¹æ®è”合主键验证数据是否已存在-导入时验证
            </summary>
            <param name="inputs"></param>
            <returns></returns>
        </member>
        <member name="T:Admin.NET.Application.AccessDetailsDto">
            <summary>
            å‡ºå…¥åº“记录输出参数

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs

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

namespace Admin.NET.Application
{    
    
    /// <summary>
    /// ç‰©æ–™ä¿¡æ¯è¡¨æŸ¥è¯¢å‚æ•°
    /// </summary>
    public class WmsMaterialSearch : PageInputBase
    {
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public virtual string MaterialName { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç¼–号
        /// </summary>
        public virtual string MaterialCode { get; set; }
        
        /// <summary>
        /// ERP编号
        /// </summary>
        public virtual string ErpCode { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹åç§°
        /// </summary>
        public virtual string MaterialTypeName { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹æè¿°
        /// </summary>
        public virtual string MaterialTypeDescr { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹
        /// </summary>
        public virtual int? MaterialType { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç»„
        /// </summary>
        public virtual string MaterialGroup { get; set; }
        
        /// <summary>
        /// ABC分类名称
        /// </summary>
        public virtual string ABCClassName { get; set; }
        
        /// <summary>
        /// ABC分类
        /// </summary>
        public virtual int? ABCClass { get; set; }
        
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        public virtual string MaterialSpec { get; set; }
        
        /// <summary>
        /// é»˜è®¤å…¥åº“库位
        /// </summary>
        public virtual string InPlaceCode { get; set; }
        
        /// <summary>
        /// åº“存单位
        /// </summary>
        public virtual string MaterialUnit { get; set; }
        
        /// <summary>
        /// é‡‡è´­å•ä½
        /// </summary>
        public virtual string POUnit { get; set; }
        
        /// <summary>
        /// é¢œè‰²
        /// </summary>
        public virtual string Color { get; set; }
        
        /// <summary>
        /// é‡é‡
        /// </summary>
        public virtual string Weight { get; set; }
        
        /// <summary>
        /// æ ‡åŒ…数量
        /// </summary>
        public virtual decimal? SNP { get; set; }
        
        /// <summary>
        /// æ¢ç®—率
        /// </summary>
        public virtual decimal? TranslateRate { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å±žæ€§è§„则
        /// </summary>
        public virtual long? BatchRuleId { get; set; }
        
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则
        /// </summary>
        public virtual long? ControlRuleId { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }
        
        /// <summary>
        /// æè¿°
        /// </summary>
        public virtual string MaterialDesc { 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 WmsMaterialSearchNonPage : PageInputNonPageBase
    {
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public virtual string MaterialName { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç¼–号
        /// </summary>
        public virtual string MaterialCode { get; set; }
        
        /// <summary>
        /// ERP编号
        /// </summary>
        public virtual string ErpCode { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹åç§°
        /// </summary>
        public virtual string MaterialTypeName { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹æè¿°
        /// </summary>
        public virtual string MaterialTypeDescr { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹
        /// </summary>
        public virtual int? MaterialType { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç»„
        /// </summary>
        public virtual string MaterialGroup { get; set; }
        
        /// <summary>
        /// ABC分类名称
        /// </summary>
        public virtual string ABCClassName { get; set; }
        
        /// <summary>
        /// ABC分类
        /// </summary>
        public virtual int? ABCClass { get; set; }
        
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        public virtual string MaterialSpec { get; set; }
        
        /// <summary>
        /// é»˜è®¤å…¥åº“库位
        /// </summary>
        public virtual string InPlaceCode { get; set; }
        
        /// <summary>
        /// åº“存单位
        /// </summary>
        public virtual string MaterialUnit { get; set; }
        
        /// <summary>
        /// é‡‡è´­å•ä½
        /// </summary>
        public virtual string POUnit { get; set; }
        
        /// <summary>
        /// é¢œè‰²
        /// </summary>
        public virtual string Color { get; set; }
        
        /// <summary>
        /// é‡é‡
        /// </summary>
        public virtual string Weight { get; set; }
        
        /// <summary>
        /// æ ‡åŒ…数量
        /// </summary>
        public virtual decimal? SNP { get; set; }
        
        /// <summary>
        /// æ¢ç®—率
        /// </summary>
        public virtual decimal? TranslateRate { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å±žæ€§è§„则
        /// </summary>
        public virtual long? BatchRuleId { get; set; }
        
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则
        /// </summary>
        public virtual long? ControlRuleId { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }
        
        /// <summary>
        /// æè¿°
        /// </summary>
        public virtual string MaterialDesc { 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 WmsMaterialInput
    {
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        [Required(ErrorMessage = "物料名称不能为空")]
        public virtual string MaterialName { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç¼–号
        /// </summary>
        [Required(ErrorMessage = "物料编号不能为空")]
        public virtual string MaterialCode { get; set; }
        
        /// <summary>
        /// ERP编号
        /// </summary>
        public virtual string ErpCode { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹åç§°
        /// </summary>
        public virtual string MaterialTypeName { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹æè¿°
        /// </summary>
        public virtual string MaterialTypeDescr { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹
        /// </summary>
        public virtual int? MaterialType { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç»„
        /// </summary>
        public virtual string MaterialGroup { get; set; }
        
        /// <summary>
        /// ABC分类名称
        /// </summary>
        public virtual string ABCClassName { get; set; }
        
        /// <summary>
        /// ABC分类
        /// </summary>
        public virtual int? ABCClass { get; set; }
        
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        public virtual string MaterialSpec { get; set; }
        
        /// <summary>
        /// é»˜è®¤å…¥åº“库位
        /// </summary>
        public virtual string InPlaceCode { get; set; }
        
        /// <summary>
        /// åº“存单位
        /// </summary>
        public virtual string MaterialUnit { get; set; }
        
        /// <summary>
        /// é‡‡è´­å•ä½
        /// </summary>
        public virtual string POUnit { get; set; }
        
        /// <summary>
        /// é¢œè‰²
        /// </summary>
        public virtual string Color { get; set; }
        
        /// <summary>
        /// é‡é‡
        /// </summary>
        public virtual string Weight { get; set; }
        
        /// <summary>
        /// æ ‡åŒ…数量
        /// </summary>
        public virtual decimal? SNP { get; set; }
        
        /// <summary>
        /// æ¢ç®—率
        /// </summary>
        public virtual decimal? TranslateRate { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å±žæ€§è§„则
        /// </summary>
        public virtual long? BatchRuleId { get; set; }
        
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则
        /// </summary>
        public virtual long? ControlRuleId { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }
        
        /// <summary>
        /// æè¿°
        /// </summary>
        public virtual string MaterialDesc { get; set; }
        
    }

    /// <summary>
    /// ç‰©æ–™ä¿¡æ¯è¡¨æ–°å¢žå‚æ•°
    /// </summary>
    public class AddWmsMaterialInput : WmsMaterialInput
    {
    }

    /// <summary>
    /// ç‰©æ–™ä¿¡æ¯è¡¨åˆ é™¤å‚æ•°
    /// </summary>
    public class DeleteWmsMaterialInput : BaseId
    {
    }

    /// <summary>
    /// ç‰©æ–™ä¿¡æ¯è¡¨æ›´æ–°å‚æ•°
    /// </summary>
    public class UpdateWmsMaterialInput : WmsMaterialInput
    {
        /// <summary>
        /// Id主键
        /// </summary>
        [Required(ErrorMessage = "Id主键不能为空")]
        public long? Id { get; set; }
        
    }

    /// <summary>
    /// ç‰©æ–™ä¿¡æ¯è¡¨èŽ·å–单个参数
    /// </summary>
    public class QueryeWmsMaterialInput : BaseId
    {

    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs

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

namespace Admin.NET.Application
{
    /// <summary>
    /// ç‰©æ–™ä¿¡æ¯è¡¨è¾“出参数
    /// </summary>
    public class WmsMaterialOutput
    {
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç¼–号
        /// </summary>
        public string MaterialCode { get; set; }
        
        /// <summary>
        /// ERP编号
        /// </summary>
        public string ErpCode { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹åç§°
        /// </summary>
        public string MaterialTypeName { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹æè¿°
        /// </summary>
        public string MaterialTypeDescr { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç±»åž‹
        /// </summary>
        public int? MaterialType { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç»„
        /// </summary>
        public string MaterialGroup { get; set; }
        
        /// <summary>
        /// ABC分类名称
        /// </summary>
        public string ABCClassName { get; set; }
        
        /// <summary>
        /// ABC分类
        /// </summary>
        public int? ABCClass { get; set; }
        
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        public string MaterialSpec { get; set; }
        
        /// <summary>
        /// é»˜è®¤å…¥åº“库位
        /// </summary>
        public string InPlaceCode { get; set; }
        
        /// <summary>
        /// åº“存单位
        /// </summary>
        public string MaterialUnit { get; set; }
        
        /// <summary>
        /// é‡‡è´­å•ä½
        /// </summary>
        public string POUnit { get; set; }
        
        /// <summary>
        /// é¢œè‰²
        /// </summary>
        public string Color { get; set; }
        
        /// <summary>
        /// é‡é‡
        /// </summary>
        public string Weight { get; set; }
        
        /// <summary>
        /// æ ‡åŒ…数量
        /// </summary>
        public decimal? SNP { get; set; }
        
        /// <summary>
        /// æ¢ç®—率
        /// </summary>
        public decimal? TranslateRate { get; set; }
        
        /// <summary>
        /// æ‰¹æ¬¡å±žæ€§è§„则
        /// </summary>
        public long? BatchRuleId { get; set; }
        
        /// <summary>
        /// æŽ§åˆ¶å±žæ€§è§„则
        /// </summary>
        public long? ControlRuleId { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool? IsDisabled { get; set; }
        
        /// <summary>
        /// æè¿°
        /// </summary>
        public string MaterialDesc { 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/WmsMaterial/IWmsMaterialService.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 IWmsMaterialService
    {
        Task<WmsMaterialOutput> Get([FromQuery] QueryeWmsMaterialInput input);
        Task<List<WmsMaterialOutput>> List([FromQuery] WmsMaterialInput input);
        Task<PageResult<WmsMaterialOutput>> Page([FromQuery] WmsMaterialSearch input);
        Task<List<WmsMaterialOutput>> ListNonPageAsync([FromQuery] WmsMaterialSearchNonPage input);
        
        Task Add(AddWmsMaterialInput input);
        Task Update(UpdateWmsMaterialInput input);
        Task Delete(DeleteWmsMaterialInput input);
        Task<int> ImportExcelAsync(IFormFile file);
        IActionResult DownloadExcelTemplate(string version);
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Map/WmsMaterialMapper.cs

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

namespace Admin.NET.Application
{
    public class WmsMaterialMapper : IRegister
    {
        public void Register(TypeAdapterConfig config)
        {
            config.ForType<AddWmsMaterialInput, WmsMaterial>()
            ;
            config.ForType<UpdateWmsMaterialInput, WmsMaterial>()
            ;
            config.ForType<WmsMaterial, WmsMaterialOutput>()
            ;
        }
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,637 @@
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 = "WmsMaterial", Order = 100)]
    [Route("api")]
    public class WmsMaterialService : IWmsMaterialService, IDynamicApiController, ITransient
    {
        private readonly IRepository<WmsMaterial,MasterDbContextLocator> _wmsMaterialRep;
        private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
        private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
        private readonly ISysExcelTemplateService _sysExcelTemplateService;
        private readonly static object _lock = new();

        public WmsMaterialService(
            IRepository<WmsMaterial,MasterDbContextLocator> wmsMaterialRep
            ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
            ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
            ,ISysExcelTemplateService sysExcelTemplateService
        )
        {
            _wmsMaterialRep = wmsMaterialRep;
         _sysDictTypeRep = sysDictTypeRep;
         _sysDictDataRep = sysDictDataRep;
         _sysExcelTemplateService = sysExcelTemplateService;
        }

        /// <summary>
        /// åˆ†é¡µæŸ¥è¯¢ç‰©æ–™ä¿¡æ¯è¡¨
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("WmsMaterial/page")]
        public async Task<PageResult<WmsMaterialOutput>> Page([FromQuery] WmsMaterialSearch input)
        {
            var wmsMaterials = await _wmsMaterialRep.DetachedEntities
                                     .Where(!string.IsNullOrEmpty(input.MaterialName), u => EF.Functions.Like(u.MaterialName, $"%{input.MaterialName.Trim()}%"))
                                     .Where(!string.IsNullOrEmpty(input.MaterialCode), u => u.MaterialCode == input.MaterialCode)
                                     .Where(!string.IsNullOrEmpty(input.ErpCode), u => u.ErpCode == input.ErpCode)
                                     .Where(!string.IsNullOrEmpty(input.MaterialTypeName), u => u.MaterialTypeName == input.MaterialTypeName)
                                     .Where(!string.IsNullOrEmpty(input.MaterialTypeDescr), u => u.MaterialTypeDescr == input.MaterialTypeDescr)
                                     .Where(input.MaterialType != null, u => u.MaterialType == input.MaterialType)
                                     .Where(!string.IsNullOrEmpty(input.MaterialGroup), u => u.MaterialGroup == input.MaterialGroup)
                                     .Where(!string.IsNullOrEmpty(input.ABCClassName), u => u.ABCClassName == input.ABCClassName)
                                     .Where(input.ABCClass != null, u => u.ABCClass == input.ABCClass)
                                     .Where(!string.IsNullOrEmpty(input.MaterialSpec), u => u.MaterialSpec == input.MaterialSpec)
                                     .Where(!string.IsNullOrEmpty(input.InPlaceCode), u => u.InPlaceCode == input.InPlaceCode)
                                     .Where(!string.IsNullOrEmpty(input.MaterialUnit), u => u.MaterialUnit == input.MaterialUnit)
                                     .Where(!string.IsNullOrEmpty(input.POUnit), u => u.POUnit == input.POUnit)
                                     .Where(!string.IsNullOrEmpty(input.Color), u => u.Color == input.Color)
                                     .Where(!string.IsNullOrEmpty(input.Weight), u => u.Weight == input.Weight)
                                     .Where(input.SNP != null, u => u.SNP == input.SNP)
                                     .Where(input.TranslateRate != null, u => u.TranslateRate == input.TranslateRate)
                                     .Where(input.BatchRuleId != null, u => u.BatchRuleId == input.BatchRuleId)
                                     .Where(input.ControlRuleId != null, u => u.ControlRuleId == input.ControlRuleId)
                                     .Where(input.IsDisabled != null, u => u.IsDisabled == input.IsDisabled)
                                     .Where(!string.IsNullOrEmpty(input.MaterialDesc), u => u.MaterialDesc == input.MaterialDesc)
                                     .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<WmsMaterialSearch>(input))
                                     .ProjectToType<WmsMaterialOutput>()
                                     .ToADPagedListAsync(input.PageNo, input.PageSize);
            return wmsMaterials;
        }

        /// <summary>
        /// ä¸åˆ†é¡µæŸ¥è¯¢ç‰©æ–™ä¿¡æ¯è¡¨åˆ—表
        /// </summary>
        /// <param name="input">物料信息表查询参数</param>
        /// <returns>(物料信息表)实例列表</returns>
        [HttpGet("WmsMaterial/listNonPage")]
        public async Task<List<WmsMaterialOutput>> ListNonPageAsync([FromQuery] WmsMaterialSearchNonPage input)
        {
            var pMaterialName = input.MaterialName?.Trim() ?? "";
            var pMaterialCode = input.MaterialCode?.Trim() ?? "";
            var pErpCode = input.ErpCode?.Trim() ?? "";
            var pMaterialTypeName = input.MaterialTypeName?.Trim() ?? "";
            var pMaterialTypeDescr = input.MaterialTypeDescr?.Trim() ?? "";
            var pMaterialType = input.MaterialType;
            var pMaterialGroup = input.MaterialGroup?.Trim() ?? "";
            var pABCClassName = input.ABCClassName?.Trim() ?? "";
            var pABCClass = input.ABCClass;
            var pMaterialSpec = input.MaterialSpec?.Trim() ?? "";
            var pInPlaceCode = input.InPlaceCode?.Trim() ?? "";
            var pMaterialUnit = input.MaterialUnit?.Trim() ?? "";
            var pPOUnit = input.POUnit?.Trim() ?? "";
            var pColor = input.Color?.Trim() ?? "";
            var pWeight = input.Weight?.Trim() ?? "";
            var pSNP = input.SNP;
            var pTranslateRate = input.TranslateRate;
            var pBatchRuleId = input.BatchRuleId;
            var pControlRuleId = input.ControlRuleId;
            var pIsDisabled = input.IsDisabled;
            var pMaterialDesc = input.MaterialDesc?.Trim() ?? "";
            var pCreatedTime = input.CreatedTime;
            var pUpdatedTime = input.UpdatedTime;
            var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
            var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
            var wmsMaterials = await _wmsMaterialRep.DetachedEntities
                .Where(!string.IsNullOrEmpty(pMaterialName), u => EF.Functions.Like(u.MaterialName, $"%{pMaterialName}%")) 
                .Where(!string.IsNullOrEmpty(pMaterialCode), u => u.MaterialCode == pMaterialCode)
                .Where(!string.IsNullOrEmpty(pErpCode), u => u.ErpCode == pErpCode)
                .Where(!string.IsNullOrEmpty(pMaterialTypeName), u => u.MaterialTypeName == pMaterialTypeName)
                .Where(!string.IsNullOrEmpty(pMaterialTypeDescr), u => u.MaterialTypeDescr == pMaterialTypeDescr)
                .Where(pMaterialType != null, u => u.MaterialType == pMaterialType)
                .Where(!string.IsNullOrEmpty(pMaterialGroup), u => u.MaterialGroup == pMaterialGroup)
                .Where(!string.IsNullOrEmpty(pABCClassName), u => u.ABCClassName == pABCClassName)
                .Where(pABCClass != null, u => u.ABCClass == pABCClass)
                .Where(!string.IsNullOrEmpty(pMaterialSpec), u => u.MaterialSpec == pMaterialSpec)
                .Where(!string.IsNullOrEmpty(pInPlaceCode), u => u.InPlaceCode == pInPlaceCode)
                .Where(!string.IsNullOrEmpty(pMaterialUnit), u => u.MaterialUnit == pMaterialUnit)
                .Where(!string.IsNullOrEmpty(pPOUnit), u => u.POUnit == pPOUnit)
                .Where(!string.IsNullOrEmpty(pColor), u => u.Color == pColor)
                .Where(!string.IsNullOrEmpty(pWeight), u => u.Weight == pWeight)
                .Where(pSNP != null, u => u.SNP == pSNP)
                .Where(pTranslateRate != null, u => u.TranslateRate == pTranslateRate)
                .Where(pBatchRuleId != null, u => u.BatchRuleId == pBatchRuleId)
                .Where(pControlRuleId != null, u => u.ControlRuleId == pControlRuleId)
                .Where(pIsDisabled != null, u => u.IsDisabled == pIsDisabled)
                .Where(!string.IsNullOrEmpty(pMaterialDesc), u => u.MaterialDesc == pMaterialDesc)
           .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<WmsMaterialOutput>()
            .ToListAsync();
            return wmsMaterials;
        }

         /// <summary>
        /// èŽ·å–物料信息表
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("WmsMaterial/detail")]
        public async Task<WmsMaterialOutput> Get([FromQuery] QueryeWmsMaterialInput input)
        {
            return (await _wmsMaterialRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsMaterialOutput>();
        }

        /// <summary>
        /// èŽ·å–物料信息表列表
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("WmsMaterial/list")]
        public async Task<List<WmsMaterialOutput>> List([FromQuery] WmsMaterialInput input)
        {
            return await _wmsMaterialRep.DetachedEntities.ProjectToType<WmsMaterialOutput>().ToListAsync();
        }    

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

        /// <summary>
        /// å¢žåŠ ç‰©æ–™ä¿¡æ¯è¡¨
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("WmsMaterial/add")]
        public async Task Add(AddWmsMaterialInput input)
        {
            var wmsMaterial = input.Adapt<WmsMaterial>();
                        //验证
            await CheckExisit(wmsMaterial);

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

        /// <summary>
        /// åˆ é™¤ç‰©æ–™ä¿¡æ¯è¡¨
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("WmsMaterial/delete")]
        public async Task Delete(DeleteWmsMaterialInput input)
        {
            var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.Id == input.Id);
            await _wmsMaterialRep.DeleteAsync(wmsMaterial);
            
        }

        /// <summary>
        /// æ›´æ–°ç‰©æ–™ä¿¡æ¯è¡¨
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("WmsMaterial/edit")]
        public async Task Update(UpdateWmsMaterialInput input)
        {
            var isExist = await _wmsMaterialRep.AnyAsync(u => u.Id == input.Id, false);
            if (!isExist) throw Oops.Oh(ErrorCode.D1002);

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

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

        #endregion

        #region å¯¼å…¥

        /// <summary>
        /// Excel模板导入物料信息表功能
        /// </summary>
        /// <param name="file">Excel模板文件</param>
        /// <returns>导入的记录数</returns>
        [HttpPost("WmsMaterial/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)
            {
                _wmsMaterialRep.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<WmsMaterial>> CommonImport(DataTable dataTable, int dataStartLine)
        {

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

               //导入模版定制化代码（替换模版使用）
                                          
                           var addItem = new WmsMaterial()
                            {
                               CreatedTime = SysHelper.GetNowTime(),
                               CreatedUserId = SysHelper.GetUserId(),
                               CreatedUserName = SysHelper.GetUserName(),
                               UpdatedTime = SysHelper.GetNowTime(),
                               UpdatedUserId = SysHelper.GetUserId(),
                               UpdatedUserName = SysHelper.GetUserName()
                             };
                          #region å®šä¹‰å˜é‡
                           var _MaterialName = "";//物料名称
                           var _MaterialCode = "";//物料编号
                           var _ErpCode = "";//ERP编号
                           var _MaterialTypeName = "";//物料类型名称
                           var _MaterialTypeDescr = "";//物料类型描述
                           var _MaterialType = "";//物料类型
                           var _MaterialGroup = "";//物料组
                           var _ABCClassName = "";//ABC分类名称
                           var _ABCClass = "";//ABC分类
                           var _MaterialSpec = "";//物料规格
                           var _InPlaceCode = "";//默认入库库位
                           var _MaterialUnit = "";//库存单位
                           var _POUnit = "";//采购单位
                           var _Color = "";//颜色
                           var _Weight = "";//重量
                           var _SNP = "";//标包数量
                           var _TranslateRate = "";//换算率
                           var _BatchRuleId = "";//批次属性规则
                           var _ControlRuleId = "";//控制属性规则
                           var _IsDisabled = "";//是否禁用
                           var _MaterialDesc = "";//描述
                           var _Id = "";//Id主键
                          #endregion
                          
                          
                          #region å–值
                           _MaterialName = row["物料名称"]?.ToString() ;
                           _MaterialCode = row["物料编号"]?.ToString() ;
                           _ErpCode = row["ERP编号"]?.ToString() ;
                           _MaterialTypeName = row["物料类型名称"]?.ToString() ;
                           _MaterialTypeDescr = row["物料类型描述"]?.ToString() ;
                           _MaterialType = row["物料类型"]?.ToString() ;
                           _MaterialGroup = row["物料组"]?.ToString() ;
                           _ABCClassName = row["ABC分类名称"]?.ToString() ;
                           _ABCClass = row["ABC分类"]?.ToString() ;
                           _MaterialSpec = row["物料规格"]?.ToString() ;
                           _InPlaceCode = row["默认入库库位"]?.ToString() ;
                           _MaterialUnit = row["库存单位"]?.ToString() ;
                           _POUnit = row["采购单位"]?.ToString() ;
                           _Color = row["颜色"]?.ToString() ;
                           _Weight = row["重量"]?.ToString() ;
                           _SNP = row["标包数量"]?.ToString() ;
                           _TranslateRate = row["换算率"]?.ToString() ;
                           _BatchRuleId = row["批次属性规则"]?.ToString() ;
                           _ControlRuleId = row["控制属性规则"]?.ToString() ;
                           _IsDisabled = row["是否禁用"]?.ToString() ;
                           _MaterialDesc = row["描述"]?.ToString() ;
                           _Id = row["Id主键"]?.ToString() ;
                          #endregion
                          
                          
                          #region éªŒè¯
                          
                          if (string.IsNullOrEmpty(_MaterialName))
                          {
                            throw Oops.Oh($"第{index}行[物料名称]{_MaterialName}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_MaterialName))
                          {
                                addItem.MaterialName = (string)_MaterialName;
                           }
                          
                          if (string.IsNullOrEmpty(_MaterialCode))
                          {
                            throw Oops.Oh($"第{index}行[物料编号]{_MaterialCode}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_MaterialCode))
                          {
                                addItem.MaterialCode = (string)_MaterialCode;
                           }
                          if(!string.IsNullOrEmpty(_ErpCode))
                          {
                                addItem.ErpCode = (string)_ErpCode;
                           }
                          if(!string.IsNullOrEmpty(_MaterialTypeName))
                          {
                                addItem.MaterialTypeName = (string)_MaterialTypeName;
                           }
                          if(!string.IsNullOrEmpty(_MaterialTypeDescr))
                          {
                                addItem.MaterialTypeDescr = (string)_MaterialTypeDescr;
                           }
                          if(!string.IsNullOrEmpty(_MaterialType))
                          {
                              if (!int.TryParse(_MaterialType, out int outMaterialType)&&!string.IsNullOrEmpty(_MaterialType))
                              {
                                 throw Oops.Oh($"第{index}行[物料类型]{_MaterialType}值不正确！");
                              }
                              if (outMaterialType <= 0&&!string.IsNullOrEmpty(_MaterialType))
                              {
                                 throw Oops.Oh($"第{index}行[物料类型]{_MaterialType}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.MaterialType = outMaterialType;
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_MaterialGroup))
                          {
                                addItem.MaterialGroup = (string)_MaterialGroup;
                           }
                          if(!string.IsNullOrEmpty(_ABCClassName))
                          {
                                addItem.ABCClassName = (string)_ABCClassName;
                           }
                          if(!string.IsNullOrEmpty(_ABCClass))
                          {
                              if (!int.TryParse(_ABCClass, out int outABCClass)&&!string.IsNullOrEmpty(_ABCClass))
                              {
                                 throw Oops.Oh($"第{index}行[ABC分类]{_ABCClass}值不正确！");
                              }
                              if (outABCClass <= 0&&!string.IsNullOrEmpty(_ABCClass))
                              {
                                 throw Oops.Oh($"第{index}行[ABC分类]{_ABCClass}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.ABCClass = outABCClass;
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_MaterialSpec))
                          {
                                addItem.MaterialSpec = (string)_MaterialSpec;
                           }
                          if(!string.IsNullOrEmpty(_InPlaceCode))
                          {
                                addItem.InPlaceCode = (string)_InPlaceCode;
                           }
                          if(!string.IsNullOrEmpty(_MaterialUnit))
                          {
                                addItem.MaterialUnit = (string)_MaterialUnit;
                           }
                          if(!string.IsNullOrEmpty(_POUnit))
                          {
                                addItem.POUnit = (string)_POUnit;
                           }
                          if(!string.IsNullOrEmpty(_Color))
                          {
                                addItem.Color = (string)_Color;
                           }
                          if(!string.IsNullOrEmpty(_Weight))
                          {
                                addItem.Weight = (string)_Weight;
                           }
                          if(!string.IsNullOrEmpty(_SNP))
                          {
                              if (!decimal.TryParse(_SNP, out decimal outSNP)&&!string.IsNullOrEmpty(_SNP))
                              {
                                 throw Oops.Oh($"第{index}行[标包数量]{_SNP}值不正确！");
                              }
                              if (outSNP <= 0&&!string.IsNullOrEmpty(_SNP))
                              {
                                 throw Oops.Oh($"第{index}行[标包数量]{_SNP}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.SNP = outSNP;
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_TranslateRate))
                          {
                              if (!decimal.TryParse(_TranslateRate, out decimal outTranslateRate)&&!string.IsNullOrEmpty(_TranslateRate))
                              {
                                 throw Oops.Oh($"第{index}行[换算率]{_TranslateRate}值不正确！");
                              }
                              if (outTranslateRate <= 0&&!string.IsNullOrEmpty(_TranslateRate))
                              {
                                 throw Oops.Oh($"第{index}行[换算率]{_TranslateRate}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.TranslateRate = outTranslateRate;
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_BatchRuleId))
                          {
                              if (!long.TryParse(_BatchRuleId, out long outBatchRuleId)&&!string.IsNullOrEmpty(_BatchRuleId))
                              {
                                 throw Oops.Oh($"第{index}行[批次属性规则]{_BatchRuleId}值不正确！");
                              }
                              if (outBatchRuleId <= 0&&!string.IsNullOrEmpty(_BatchRuleId))
                              {
                                 throw Oops.Oh($"第{index}行[批次属性规则]{_BatchRuleId}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.BatchRuleId = outBatchRuleId;
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_ControlRuleId))
                          {
                              if (!long.TryParse(_ControlRuleId, out long outControlRuleId)&&!string.IsNullOrEmpty(_ControlRuleId))
                              {
                                 throw Oops.Oh($"第{index}行[控制属性规则]{_ControlRuleId}值不正确！");
                              }
                              if (outControlRuleId <= 0&&!string.IsNullOrEmpty(_ControlRuleId))
                              {
                                 throw Oops.Oh($"第{index}行[控制属性规则]{_ControlRuleId}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.ControlRuleId = outControlRuleId;
                              }
                          
                          }
                          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(_MaterialDesc))
                          {
                                addItem.MaterialDesc = (string)_MaterialDesc;
                           }
                          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("WmsMaterial/downloadExcelTemplate")]
        public IActionResult DownloadExcelTemplate([FromQuery] string version)
        {
            string _path = TemplateConst.EXCEL_TEMPLATEFILE_导入模版路径 + $"\\WmsMaterial{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( WmsMaterial input,bool isEdit=false)
        {
           

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

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

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



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

        #endregion
    }
}

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

Binary files differ