客户物料关系信息

liuying

2024-04-24 ef2eff66971bdaa912cb7373446cc3b092785913

客户物料关系信息

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

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

/**
 * æŸ¥è¯¢ç‰©æ–™å®¢æˆ·å…³è”信息
 *
 * @author ly
 */
export function WmsMaterialCustomerPage (parameter) {
  return axios({
    url: '/WmsMaterialCustomer/page',
    method: 'get',
    params: parameter
  })
}

/**
 * ç‰©æ–™å®¢æˆ·å…³è”信息列表
 *
 * @author ly
 */
export function WmsMaterialCustomerList (parameter) {
  return axios({
    url: '/WmsMaterialCustomer/list',
    method: 'get',
    params: parameter
  })
}

/**
 * æ·»åŠ ç‰©æ–™å®¢æˆ·å…³è”信息
 *
 * @author ly
 */
export function WmsMaterialCustomerAdd (parameter) {
  return axios({
    url: '/WmsMaterialCustomer/add',
    method: 'post',
    data: parameter
  })
}

/**
 * ç¼–辑物料客户关联信息
 *
 * @author ly
 */
export function WmsMaterialCustomerEdit (parameter) {
  return axios({
    url: '/WmsMaterialCustomer/edit',
    method: 'post',
    data: parameter
  })
}

/**
 * åˆ é™¤ç‰©æ–™å®¢æˆ·å…³è”信息
 *
 * @author ly
 */
export function WmsMaterialCustomerDelete (parameter) {
  return axios({
    url: '/WmsMaterialCustomer/delete',
    method: 'post',
    data: parameter
  })
}


/**
 * å¯¼å‡ºç‰©æ–™å®¢æˆ·å…³è”信息的Excel文件
 *
 * @author ly
 */
export function WmsMaterialCustomerToExcel (parameter) {
  return axios({
    url: '/WmsMaterialCustomer/toExcel',
    method: 'get',
    params: parameter,
    responseType: 'blob'
  })
}

/**
 * å¯¼å…¥ç‰©æ–™å®¢æˆ·å…³è”信息的Excel文件
 *
 * @author ly
 */
export function WmsMaterialCustomerImportExcel (data, parameter) {
  return axios({
    url: '/WmsMaterialCustomer/importExcel',
    method: 'post',
    data: data,
    params: parameter

  })
}


/**
 * ä¸‹è½½ç‰©æ–™å®¢æˆ·å…³è”信息的Excel导入模板
 *
 * @author ly
 */
export function WmsMaterialCustomerDownloadExcelTemplate(parameter) {
  return axios({
    url: '/WmsMaterialCustomer/downloadExcelTemplate',
    method: 'get',
    params: parameter,
    responseType: 'blob'
  })
}




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

@@ -1,17 +1,11 @@
<template>
  <a-modal
    title="新增物料信息"
    :width="900"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
    @cancel="handleCancel"
  >
  <a-modal title="新增物料信息" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <!-- tab @change="callback"-->
      <a-tabs default-active-key="1" >
      <a-tabs default-active-key="1">
        <a-tab-pane key="1" tab="基本信息">
         <add-form ref="addForm" @ok="handleOk" />
          <add-form ref="addForm" @ok="handleOk" />
        </a-tab-pane>
        <a-tab-pane key="2" tab="控制属性" force-render>
          <add-control-rule ref="WmsControlRule" @ok="handleOk" />
@@ -73,7 +67,7 @@
    }
  },
  methods: {
    handleOk(){
    handleOk() {

    },
    // åˆå§‹åŒ–方法
@@ -125,7 +119,27 @@
            })
            values.stationNameParameter = values.stationNameParameterArr.join(',')
          }
          WmsMaterialAdd(values)
          console.log(6666666666666)
          console.log()
          console.log(6666666666666 + '控制属性')
          console.log(this.$refs.WmsControlRule.selectedRows)
          var ControlRuleld = this.$refs.WmsControlRule.selectedRows[0].id;

          console.log(6666666666666 + '替代品')
          console.log(this.$refs.addFormWmsSubstituteGood.list)

          console.log(6666666666666 + '客户档案集合')
          console.log(this.$refs.addFormBaseCustomer.list)

          var param = {
            value1: values,
            ControlRuleld: ControlRuleld, //控制属性
            BaseCustomerList: this.$refs.addFormBaseCustomer.list, //客户档案集合
            SubstituteGoodLis: this.$refs.addFormWmsSubstituteGood.list, //替代品
            value5: {},
            value6: {},
          }
          WmsMaterialAdd(param)
            .then(res => {
              if (res.success) {
                this.$message.success('新增成功')

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsContainerPackaging/addFormContainerPackaging.vue

@@ -16,17 +16,17 @@
              }}</a-tag>
            </span>

            <span slot="action" slot-scope="text, record">
            <!-- <span slot="action" slot-scope="text, record">
              <a-popconfirm v-if="hasPerm('BaseCustomer:delete')" placement="topRight" title="确认删除？"
                @confirm="() => itemDelete(record, index)">
                <a>删除</a>
              </a-popconfirm>
            </span>
            </span> -->
          </a-table>
        </div>
      </div>

      <p @click="visible = true">新增行</p>
      <!-- <p @click="visible = true">新增行</p> -->

      <a-modal title="包装关系" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
        @cancel="handleCancel">

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

@@ -1,5 +1,5 @@
<template>
  <a-modal
 <a-modal
    title="新增替代品管理"
    :width="900"
    :visible="visible"
@@ -7,97 +7,106 @@
    @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="['substituteCode', {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="物料名称" :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="['substituteMaterialCode', {rules: [{required: true, message: '请输入替代品物料编号！'}]}]" />
        </a-form-item>
        <a-form-item label="替代品物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入替代品物料名称" v-decorator="['substituteMaterialName', {rules: [{required: true, message: '请输入替代品物料名称！'}]}]" />
        </a-form-item>
        <a-form-item label="替代次序" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入替代次序" style="width: 100%" v-decorator="['substituteIndex', {rules: [{required: true, message: '请输入替代次序！'}]}]" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>

    </a-spin>    <a-form :form="form">
      <a-form-item label="替代编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
        <a-input placeholder="请输入替代编号"
          v-decorator="['substituteCode', { 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="物料名称" :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="['substituteMaterialCode', { rules: [{ required: true, message: '请输入替代品物料编号！' }] }]" />
      </a-form-item>
      <a-form-item label="替代品物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
        <a-input placeholder="请输入替代品物料名称"
          v-decorator="['substituteMaterialName', { rules: [{ required: true, message: '请输入替代品物料名称！' }] }]" />
      </a-form-item>
      <a-form-item label="替代次序" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
        <a-input-number placeholder="请输入替代次序" style="width: 100%"
          v-decorator="['substituteIndex', { rules: [{ required: true, message: '请输入替代次序！' }] }]" />
      </a-form-item>
      <!-- <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled',{rules: [{ required: true, message: '请选择是否禁用！' }], valuePropName: 'checked'}]" />
        </a-form-item>
      </a-form>
    </a-spin>
  </a-modal>
        </a-form-item> -->
    </a-form>
  </a-modal> 
</template>

<script>
  import moment from 'moment'
  import {
import moment from 'moment'
import {
  WmsSubstituteGoodAdd
  } from '@/api/modular/main/WmsBase/WmsSubstituteGoodManage'
  export default {
  data () {
  return {
  labelCol: {
  xs: { span: 24 },
  sm: { span: 5 }
} from '@/api/modular/main/WmsBase/WmsSubstituteGoodManage'
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)
    }
  },
  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(() => {
  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])
              }
      });
    },
    /**
     * æäº¤è¡¨å•
     */
    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])
            }
            WmsSubstituteGoodAdd(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
      }
              this.confirmLoading = false
              this.$emit('ok', values)
              this.handleCancel()


          // WmsSubstituteGoodAdd(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/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue

@@ -25,20 +25,17 @@
        </div>
      </div>

      <p @click="visible = true">新增行</p>
      <p @click="$refs.showList.add()">新增行</p>

      <a-modal title="替代品列表" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
        @cancel="handleCancel">
        <show-list ref="showList" @ok="handleOk" />
        <!-- <a-spin :spinning="confirmLoading"></a-spin> -->
      </a-modal>
      <show-list ref="showList" @ok="handleSubmit" />
     
    </div>
  </div>
</template>

<script>
import { WmsOrderRukuDetail } from '@/api/modular/main/WmsOrderManage'
import showList from './index.vue'
import showList from './addForm.vue'

export default {
  name: 'wmsOrderRukuManagementDetailDrawer',
@@ -258,9 +255,11 @@
      this.list = []
    },
    handleOk(param) {
      this.list = param

    },
    handleSubmit() {
    handleSubmit(item) {
      alert(1)
      this.list.push(item) 
      this.visible = false
    },
    handleCancel() {
@@ -268,6 +267,11 @@
    },
    itemDelete(record, index) {
      this.list.splice(index, 1)
    },
    addLine(){
      this.list.push({
        
      })
    }
  }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,103 @@
<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="物料ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料ID" v-decorator="['materialId', {rules: [{required: true, message: '请输入物料ID！'}]}]" />
        </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="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料名称" v-decorator="['materialName', {rules: [{required: true, message: '请输入物料名称！'}]}]" />
        </a-form-item>
        <a-form-item label="客户ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户ID" v-decorator="['custId']" />
        </a-form-item>
        <a-form-item label="客户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户编号" v-decorator="['custCode']" />
        </a-form-item>
        <a-form-item label="客户英文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户英文名称" v-decorator="['custEnglishName']" />
        </a-form-item>
        <a-form-item label="客户中文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户中文名称" v-decorator="['custChinaName']" />
        </a-form-item>
      </a-form>
    </a-spin>
  </a-modal>
</template>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,123 @@
<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="物料ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料ID" v-decorator="['materialId', {rules: [{required: true, message: '请输入物料ID！'}]}]" />
        </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="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料名称" v-decorator="['materialName', {rules: [{required: true, message: '请输入物料名称！'}]}]" />
        </a-form-item>
        <a-form-item label="客户ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户ID" v-decorator="['custId']" />
        </a-form-item>
        <a-form-item label="客户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户编号" v-decorator="['custCode']" />
        </a-form-item>
        <a-form-item label="客户英文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户英文名称" v-decorator="['custEnglishName']" />
        </a-form-item>
        <a-form-item label="客户中文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户中文名称" v-decorator="['custChinaName']" />
        </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 {
  WmsMaterialCustomerEdit
  } from '@/api/modular/main/WmsBase/WmsMaterialCustomerManage'
  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,
              materialId: record.materialId,
              materialCode: record.materialCode,
              materialName: record.materialName,
              custId: record.custId,
              custCode: record.custCode,
              custEnglishName: record.custEnglishName,
              custChinaName: record.custChinaName
            }
          )
        })
      },
      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]
              }
            }
            WmsMaterialCustomerEdit(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/WmsMaterialCustomer/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="wmsMaterialCustomerDownloadExcelTemplate" 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 { WmsMaterialCustomerImportExcel, WmsMaterialCustomerDownloadExcelTemplate} from '@/api/modular/main/WmsBase/WmsMaterialCustomerManage'
  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("wmsMaterialCustomerDownloadExcelTemplate")
  window.downloadFile = this.wmsMaterialCustomerDownloadExcelTemplate;
  this.getTable();
  },
  showDemand() {
  this.detailed = !this.detailed;
  },
  customRequest(document) {
  this.uploadFile = document
  },
  getTable() {
  sysExcelTemplateGetColumnList({className: "WmsMaterialCustomer"}).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)
  WmsMaterialCustomerImportExcel(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
  },
  wmsMaterialCustomerDownloadExcelTemplate() {
  WmsMaterialCustomerDownloadExcelTemplate({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/WmsMaterialCustomer/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,523 @@
<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('WmsMaterialCustomer:page')">
        <a-form layout="inline">
          <a-row :gutter="48">
            <a-col :md="8" :sm="24">
              <a-form-item label="物料ID">
                <a-input v-model="queryParam.materialId" allow-clear placeholder="请输入物料ID"/>
              </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="物料名称">
                  <a-input v-model="queryParam.materialName" allow-clear placeholder="请输入物料名称"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="客户ID">
                  <a-input v-model="queryParam.custId" allow-clear placeholder="请输入客户ID"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="客户编号">
                  <a-input v-model="queryParam.custCode" allow-clear placeholder="请输入客户编号"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="客户英文名称">
                  <a-input v-model="queryParam.custEnglishName" allow-clear placeholder="请输入客户英文名称"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="客户中文名称">
                  <a-input v-model="queryParam.custChinaName" 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('WmsMaterialCustomer: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('WmsMaterialCustomer:exportExcel')" icon="download" @click="WmsMaterialCustomerToExcel()">
            å¯¼å‡º
          </a-button>
            <a-button type="primary" v-if="hasPerm('WmsMaterialCustomer:add')" icon="plus" @click="$refs.addForm.add()">新增物料客户关联信息</a-button>
        </div>
        </template>
          <span slot="action" slot-scope="text, record">
			
            <a v-if="hasPerm('WmsMaterialCustomer:edit')" @click="$refs.editForm.edit(record)">编辑</a>
          <a-divider type="vertical" v-if="hasPerm('WmsMaterialCustomer:edit') & hasPerm('WmsMaterialCustomer:delete')"/>
          <a-popconfirm v-if="hasPerm('WmsMaterialCustomer:delete')" placement="topRight" title="确认删除？" @confirm="() => WmsMaterialCustomerDelete(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 { WmsMaterialCustomerPage, WmsMaterialCustomerDelete, WmsMaterialCustomerToExcel } from '@/api/modular/main/WmsBase/WmsMaterialCustomerManage'
    //自定义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: '物料ID',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialId'
    },
    {
    title: '物料编号',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialCode'
    },
    {
    title: '物料名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialName'
    },
    {
    title: '客户ID',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'custId'
    },
    {
    title: '客户编号',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'custCode'
    },
    {
    title: '客户英文名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'custEnglishName'
    },
    {
    title: '客户中文名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'custChinaName'
    },
    {
    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 WmsMaterialCustomerPage(Object.assign(parameter, this.switchingDate())).then((res) => {
    return res.data
    })
    },
    selectedRowKeys: [],
    selectedRows: []
    }
    },
    created () {
    if (this.hasPerm('WmsMaterialCustomer:edit') || this.hasPerm('WmsMaterialCustomer: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;
    }
    });
    }

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


    WmsMaterialCustomerToExcel() {
    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
    }
    })
    }
    WmsMaterialCustomerPage(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/Service/WmsBase/WmsMaterialCustomer/Dto/WmsMaterialCustomerInput.cs

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

namespace Admin.NET.Application
{    
    
    /// <summary>
    /// ç‰©æ–™å®¢æˆ·å…³è”信息查询参数
    /// </summary>
    public class WmsMaterialCustomerSearch : PageInputBase
    {
        /// <summary>
        /// ç‰©æ–™ID
        /// </summary>
        public virtual long? MaterialId { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç¼–号
        /// </summary>
        public virtual string MaterialCode { get; set; }
        
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public virtual string MaterialName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ID
        /// </summary>
        public virtual long? CustId { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ç¼–号
        /// </summary>
        public virtual string CustCode { get; set; }
        
        /// <summary>
        /// å®¢æˆ·è‹±æ–‡åç§°
        /// </summary>
        public virtual string CustEnglishName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ä¸­æ–‡åç§°
        /// </summary>
        public virtual string CustChinaName { 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 WmsMaterialCustomerSearchNonPage : PageInputNonPageBase
    {
        /// <summary>
        /// ç‰©æ–™ID
        /// </summary>
        public virtual long? MaterialId { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç¼–号
        /// </summary>
        public virtual string MaterialCode { get; set; }
        
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public virtual string MaterialName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ID
        /// </summary>
        public virtual long? CustId { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ç¼–号
        /// </summary>
        public virtual string CustCode { get; set; }
        
        /// <summary>
        /// å®¢æˆ·è‹±æ–‡åç§°
        /// </summary>
        public virtual string CustEnglishName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ä¸­æ–‡åç§°
        /// </summary>
        public virtual string CustChinaName { 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 WmsMaterialCustomerInput
    {
        /// <summary>
        /// ç‰©æ–™ID
        /// </summary>
        [Required(ErrorMessage = "物料ID不能为空")]
        public virtual long MaterialId { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç¼–号
        /// </summary>
        [Required(ErrorMessage = "物料编号不能为空")]
        public virtual string MaterialCode { get; set; }
        
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        [Required(ErrorMessage = "物料名称不能为空")]
        public virtual string MaterialName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ID
        /// </summary>
        public virtual long? CustId { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ç¼–号
        /// </summary>
        public virtual string CustCode { get; set; }
        
        /// <summary>
        /// å®¢æˆ·è‹±æ–‡åç§°
        /// </summary>
        public virtual string CustEnglishName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ä¸­æ–‡åç§°
        /// </summary>
        public virtual string CustChinaName { get; set; }
        
    }

    /// <summary>
    /// ç‰©æ–™å®¢æˆ·å…³è”信息新增参数
    /// </summary>
    public class AddWmsMaterialCustomerInput : WmsMaterialCustomerInput
    {
    }

    /// <summary>
    /// ç‰©æ–™å®¢æˆ·å…³è”信息删除参数
    /// </summary>
    public class DeleteWmsMaterialCustomerInput : BaseId
    {
    }

    /// <summary>
    /// ç‰©æ–™å®¢æˆ·å…³è”信息更新参数
    /// </summary>
    public class UpdateWmsMaterialCustomerInput : WmsMaterialCustomerInput
    {
        /// <summary>
        /// Id主键
        /// </summary>
        [Required(ErrorMessage = "Id主键不能为空")]
        public long? Id { get; set; }
        
    }

    /// <summary>
    /// ç‰©æ–™å®¢æˆ·å…³è”信息获取单个参数
    /// </summary>
    public class QueryeWmsMaterialCustomerInput : BaseId
    {

    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/Dto/WmsMaterialCustomerOutput.cs

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

namespace Admin.NET.Application
{
    /// <summary>
    /// ç‰©æ–™å®¢æˆ·å…³è”信息输出参数
    /// </summary>
    public class WmsMaterialCustomerOutput
    {
        /// <summary>
        /// ç‰©æ–™ID
        /// </summary>
        public long MaterialId { get; set; }
        
        /// <summary>
        /// ç‰©æ–™ç¼–号
        /// </summary>
        public string MaterialCode { get; set; }
        
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ID
        /// </summary>
        public long? CustId { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ç¼–号
        /// </summary>
        public string CustCode { get; set; }
        
        /// <summary>
        /// å®¢æˆ·è‹±æ–‡åç§°
        /// </summary>
        public string CustEnglishName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ä¸­æ–‡åç§°
        /// </summary>
        public string CustChinaName { 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/WmsMaterialCustomer/IWmsMaterialCustomerService.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 IWmsMaterialCustomerService
    {
        Task<WmsMaterialCustomerOutput> Get([FromQuery] QueryeWmsMaterialCustomerInput input);
        Task<List<WmsMaterialCustomerOutput>> List([FromQuery] WmsMaterialCustomerInput input);
        Task<PageResult<WmsMaterialCustomerOutput>> Page([FromQuery] WmsMaterialCustomerSearch input);
        Task<List<WmsMaterialCustomerOutput>> ListNonPageAsync([FromQuery] WmsMaterialCustomerSearchNonPage input);
        
        Task Add(AddWmsMaterialCustomerInput input);
        Task Update(UpdateWmsMaterialCustomerInput input);
        Task Delete(DeleteWmsMaterialCustomerInput input);
        Task<int> ImportExcelAsync(IFormFile file);
        IActionResult DownloadExcelTemplate(string version);
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/Map/WmsMaterialCustomerMapper.cs

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

namespace Admin.NET.Application
{
    public class WmsMaterialCustomerMapper : IRegister
    {
        public void Register(TypeAdapterConfig config)
        {
            config.ForType<AddWmsMaterialCustomerInput, WmsMaterialCustomer>()
            ;
            config.ForType<UpdateWmsMaterialCustomerInput, WmsMaterialCustomer>()
            ;
            config.ForType<WmsMaterialCustomer, WmsMaterialCustomerOutput>()
            ;
        }
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/WmsMaterialCustomerService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,412 @@
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection;
using Furion.DynamicApiController;
using Furion.FriendlyException;
using Admin.NET.Core;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System.Linq.Dynamic.Core;
using Microsoft.AspNetCore.Http;
using System.Text;
using System.Web;
using System.ComponentModel;
using System.Data;
namespace Admin.NET.Application
{
    /// <summary>
    /// ç‰©æ–™å®¢æˆ·å…³è”信息服务
    /// </summary>
    [ApiDescriptionSettings("WmsBase", Name = "WmsMaterialCustomer", Order = 100)]
    [Route("api")]
    public class WmsMaterialCustomerService : IWmsMaterialCustomerService, IDynamicApiController, ITransient
    {
        private readonly IRepository<WmsMaterialCustomer,MasterDbContextLocator> _wmsMaterialCustomerRep;
        private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
        private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
        private readonly ISysExcelTemplateService _sysExcelTemplateService;
        private readonly static object _lock = new();

        public WmsMaterialCustomerService(
            IRepository<WmsMaterialCustomer,MasterDbContextLocator> wmsMaterialCustomerRep
            ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
            ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
            ,ISysExcelTemplateService sysExcelTemplateService
        )
        {
            _wmsMaterialCustomerRep = wmsMaterialCustomerRep;
         _sysDictTypeRep = sysDictTypeRep;
         _sysDictDataRep = sysDictDataRep;
         _sysExcelTemplateService = sysExcelTemplateService;
        }

        /// <summary>
        /// åˆ†é¡µæŸ¥è¯¢ç‰©æ–™å®¢æˆ·å…³è”信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("WmsMaterialCustomer/page")]
        public async Task<PageResult<WmsMaterialCustomerOutput>> Page([FromQuery] WmsMaterialCustomerSearch input)
        {
            var wmsMaterialCustomers = await _wmsMaterialCustomerRep.DetachedEntities
                                     .Where(input.MaterialId != null, u => u.MaterialId == input.MaterialId)
                                     .Where(!string.IsNullOrEmpty(input.MaterialCode), u => u.MaterialCode == input.MaterialCode)
                                     .Where(!string.IsNullOrEmpty(input.MaterialName), u => u.MaterialName == input.MaterialName)
                                     .Where(input.CustId != null, u => u.CustId == input.CustId)
                                     .Where(!string.IsNullOrEmpty(input.CustCode), u => u.CustCode == input.CustCode)
                                     .Where(!string.IsNullOrEmpty(input.CustEnglishName), u => u.CustEnglishName == input.CustEnglishName)
                                     .Where(!string.IsNullOrEmpty(input.CustChinaName), u => u.CustChinaName == input.CustChinaName)
                                     .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<WmsMaterialCustomerSearch>(input))
                                     .ProjectToType<WmsMaterialCustomerOutput>()
                                     .ToADPagedListAsync(input.PageNo, input.PageSize);
            return wmsMaterialCustomers;
        }

        /// <summary>
        /// ä¸åˆ†é¡µæŸ¥è¯¢ç‰©æ–™å®¢æˆ·å…³è”信息列表
        /// </summary>
        /// <param name="input">物料客户关联信息查询参数</param>
        /// <returns>(物料客户关联信息)实例列表</returns>
        [HttpGet("WmsMaterialCustomer/listNonPage")]
        public async Task<List<WmsMaterialCustomerOutput>> ListNonPageAsync([FromQuery] WmsMaterialCustomerSearchNonPage input)
        {
            var pMaterialId = input.MaterialId;
            var pMaterialCode = input.MaterialCode?.Trim() ?? "";
            var pMaterialName = input.MaterialName?.Trim() ?? "";
            var pCustId = input.CustId;
            var pCustCode = input.CustCode?.Trim() ?? "";
            var pCustEnglishName = input.CustEnglishName?.Trim() ?? "";
            var pCustChinaName = input.CustChinaName?.Trim() ?? "";
            var pCreatedTime = input.CreatedTime;
            var pUpdatedTime = input.UpdatedTime;
            var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
            var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
            var wmsMaterialCustomers = await _wmsMaterialCustomerRep.DetachedEntities
                .Where(pMaterialId != null, u => u.MaterialId == pMaterialId)
                .Where(!string.IsNullOrEmpty(pMaterialCode), u => u.MaterialCode == pMaterialCode)
                .Where(!string.IsNullOrEmpty(pMaterialName), u => u.MaterialName == pMaterialName)
                .Where(pCustId != null, u => u.CustId == pCustId)
                .Where(!string.IsNullOrEmpty(pCustCode), u => u.CustCode == pCustCode)
                .Where(!string.IsNullOrEmpty(pCustEnglishName), u => u.CustEnglishName == pCustEnglishName)
                .Where(!string.IsNullOrEmpty(pCustChinaName), u => u.CustChinaName == pCustChinaName)
           .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<WmsMaterialCustomerOutput>()
            .ToListAsync();
            return wmsMaterialCustomers;
        }

         /// <summary>
        /// èŽ·å–物料客户关联信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("WmsMaterialCustomer/detail")]
        public async Task<WmsMaterialCustomerOutput> Get([FromQuery] QueryeWmsMaterialCustomerInput input)
        {
            return (await _wmsMaterialCustomerRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsMaterialCustomerOutput>();
        }

        /// <summary>
        /// èŽ·å–物料客户关联信息列表
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("WmsMaterialCustomer/list")]
        public async Task<List<WmsMaterialCustomerOutput>> List([FromQuery] WmsMaterialCustomerInput input)
        {
            return await _wmsMaterialCustomerRep.DetachedEntities.ProjectToType<WmsMaterialCustomerOutput>().ToListAsync();
        }    

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

        /// <summary>
        /// å¢žåŠ ç‰©æ–™å®¢æˆ·å…³è”信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("WmsMaterialCustomer/add")]
        public async Task Add(AddWmsMaterialCustomerInput input)
        {
            var wmsMaterialCustomer = input.Adapt<WmsMaterialCustomer>();
                        //验证
            await CheckExisit(wmsMaterialCustomer);

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

        /// <summary>
        /// åˆ é™¤ç‰©æ–™å®¢æˆ·å…³è”信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("WmsMaterialCustomer/delete")]
        public async Task Delete(DeleteWmsMaterialCustomerInput input)
        {
            var wmsMaterialCustomer = await _wmsMaterialCustomerRep.FirstOrDefaultAsync(u => u.Id == input.Id);
            await _wmsMaterialCustomerRep.DeleteAsync(wmsMaterialCustomer);
            
        }

        /// <summary>
        /// æ›´æ–°ç‰©æ–™å®¢æˆ·å…³è”信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("WmsMaterialCustomer/edit")]
        public async Task Update(UpdateWmsMaterialCustomerInput input)
        {
            var isExist = await _wmsMaterialCustomerRep.AnyAsync(u => u.Id == input.Id, false);
            if (!isExist) throw Oops.Oh(ErrorCode.D1002);

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

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

        #endregion

        #region å¯¼å…¥

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

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

               //导入模版定制化代码（替换模版使用）
                                          
                           var addItem = new WmsMaterialCustomer()
                            {
                               CreatedTime = SysHelper.GetNowTime(),
                               CreatedUserId = SysHelper.GetUserId(),
                               CreatedUserName = SysHelper.GetUserName(),
                               UpdatedTime = SysHelper.GetNowTime(),
                               UpdatedUserId = SysHelper.GetUserId(),
                               UpdatedUserName = SysHelper.GetUserName()
                             };
                          #region å®šä¹‰å˜é‡
                           var _MaterialId = "";//物料ID
                           var _MaterialCode = "";//物料编号
                           var _MaterialName = "";//物料名称
                           var _CustId = "";//客户ID
                           var _CustCode = "";//客户编号
                           var _CustEnglishName = "";//客户英文名称
                           var _CustChinaName = "";//客户中文名称
                           var _Id = "";//Id主键
                          #endregion
                          
                          
                          #region å–值
                           _MaterialId = row["物料ID"]?.ToString() ;
                           _MaterialCode = row["物料编号"]?.ToString() ;
                           _MaterialName = row["物料名称"]?.ToString() ;
                           _CustId = row["客户ID"]?.ToString() ;
                           _CustCode = row["客户编号"]?.ToString() ;
                           _CustEnglishName = row["客户英文名称"]?.ToString() ;
                           _CustChinaName = row["客户中文名称"]?.ToString() ;
                           _Id = row["Id主键"]?.ToString() ;
                          #endregion
                          
                          
                          #region éªŒè¯
                          
                          if (string.IsNullOrEmpty(_MaterialId))
                          {
                            throw Oops.Oh($"第{index}行[物料ID]{_MaterialId}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_MaterialId))
                          {
                              if (!long.TryParse(_MaterialId, out long outMaterialId)&&!string.IsNullOrEmpty(_MaterialId))
                              {
                                 throw Oops.Oh($"第{index}行[物料ID]{_MaterialId}值不正确！");
                              }
                              if (outMaterialId <= 0&&!string.IsNullOrEmpty(_MaterialId))
                              {
                                 throw Oops.Oh($"第{index}行[物料ID]{_MaterialId}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.MaterialId = outMaterialId;
                              }
                          
                          }
                          
                          if (string.IsNullOrEmpty(_MaterialCode))
                          {
                            throw Oops.Oh($"第{index}行[物料编号]{_MaterialCode}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_MaterialCode))
                          {
                                addItem.MaterialCode = (string)_MaterialCode;
                           }
                          
                          if (string.IsNullOrEmpty(_MaterialName))
                          {
                            throw Oops.Oh($"第{index}行[物料名称]{_MaterialName}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_MaterialName))
                          {
                                addItem.MaterialName = (string)_MaterialName;
                           }
                          if(!string.IsNullOrEmpty(_CustId))
                          {
                              if (!long.TryParse(_CustId, out long outCustId)&&!string.IsNullOrEmpty(_CustId))
                              {
                                 throw Oops.Oh($"第{index}行[客户ID]{_CustId}值不正确！");
                              }
                              if (outCustId <= 0&&!string.IsNullOrEmpty(_CustId))
                              {
                                 throw Oops.Oh($"第{index}行[客户ID]{_CustId}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.CustId = outCustId;
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_CustCode))
                          {
                                addItem.CustCode = (string)_CustCode;
                           }
                          if(!string.IsNullOrEmpty(_CustEnglishName))
                          {
                                addItem.CustEnglishName = (string)_CustEnglishName;
                           }
                          if(!string.IsNullOrEmpty(_CustChinaName))
                          {
                                addItem.CustChinaName = (string)_CustChinaName;
                           }
                          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("WmsMaterialCustomer/downloadExcelTemplate")]
        public IActionResult DownloadExcelTemplate([FromQuery] string version)
        {
            string _path = TemplateConst.EXCEL_TEMPLATEFILE_导入模版路径 + $"\\WmsMaterialCustomer{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( WmsMaterialCustomer input,bool isEdit=false)
        {
           

           

          
                
               
        

            //没有配置联合主键，不需要验重
       }
        
        /// <summary>
        /// æ ¹æ®è”合主键验证数据是否已存在-导入时验证
        /// </summary>
        /// <param name="inputs"></param>
        /// <returns></returns>
        private async Task CheckExisitForImport(List<WmsMaterialCustomer> inputs)
        { 
            //根据联合主键验证表格中中是否已存在相同数据  
                      



        }

        #endregion
    }
}

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

Binary files differ