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

payne

2024-04-25 2306e1ff0c47d95864986f7e27c9d53a2d65ab59

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

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

@@ -1,7 +1,7 @@
<template>
  <a-modal
    title="新增客户档案"
    :width="900"
    :width="1100"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
@@ -121,3 +121,9 @@
    }
  }
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -1,7 +1,7 @@
<template>
  <a-modal
    title="编辑客户档案"
    :width="900"
    :width="1100"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
@@ -146,3 +146,9 @@
    }
  }
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -1,5 +1,5 @@
<template>
  <a-modal title="新增库区信息" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
  <a-modal title="新增库区信息" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
@@ -148,3 +148,9 @@
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -1,5 +1,5 @@
<template>
  <a-modal title="编辑库区信息" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
  <a-modal title="编辑库区信息" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
@@ -157,3 +157,9 @@
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -832,4 +832,5 @@
  button {
    margin-right: 8px;
  }

</style>

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

@@ -192,7 +192,9 @@
            </span>
          <span slot="action" slot-scope="text, record">
            
            <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">编辑</a>
            <!-- <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">编辑</a> -->
            <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(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>

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

@@ -1,12 +1,12 @@
<template>
  <a-modal title="新增基础物料信息" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
  <a-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <!-- tab -->
      <a-tabs default-active-key="1" @change="callbacktab">
        <a-tab-pane key="1" tab="基本信息">
          <!-- <add-form ref="addFormRef" @ok="handleOk" /> -->
          <!-- åŸºæœ¬ä¿¡æ¯ -->
          <!-- åŸºæœ¬ä¿¡æ¯  layout="inline"  layout="vertical" -->
          <a-form :form="form">
            <a-form-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入物料名称"
@@ -145,6 +145,7 @@
  },
  data() {
    return {
      title: '',
      labelCol: {
        // xs: { span: 24 },
        // sm: { span: 5 }
@@ -207,14 +208,21 @@
    handleOk() { },
    // åˆå§‹åŒ–方法
    add(record) {
      this.visible = true
      // this.$nextTick(() => {
      //   // this.getSelects()
      // })
      const materialTypeOption = this.$options
      this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class')
      // const inspectionMethodOption = this.$options
      // this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
        this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class')

      this.visible = true
      if (record) {//编辑
        this.title = '编辑基础物料信息';
        this.$nextTick(() => {
          this.form.setFieldsValue({
            ...record
          })
        })
     
      } else { // æ–°å¢ž
        this.title = '新增基础物料信息';
      }
    },
    getSelects() {
      if (this.areaNameParameterData.length <= 0 || this.stationNameParameterData.length <= 0) {
@@ -327,3 +335,10 @@
  }
}
</script>

<style lang="less" scoped>
.ant-row.ant-form-item {
  width: 50% !important;
  display: inline-block;
}
</style>

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

@@ -1,7 +1,8 @@
<template>
  <div>
    <!--tab æŽ§åˆ¶å±žæ€§è§„则明细 -->
    <a-form :form="form">
        <a-form-item label="控制属性规则明细" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
        <a-form-item label="控制属性规则" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input disabled  placeholder="请输入控制属性规则编号" v-decorator="['ruleCode', {rules: [{required: true, message: '请输入控制属性规则编号！'}]}]" />
        </a-form-item>
        <a-form-item label="最高库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -110,3 +111,9 @@
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -1,5 +1,5 @@
<template>
  <a-modal title="新增库位信息" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
  <a-modal title="新增库位信息" :width="1100" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
@@ -209,3 +209,9 @@
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -1,7 +1,7 @@
<template>
  <a-modal
    title="编辑库位信息"
    :width="900"
    :width="1100"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
@@ -243,3 +243,9 @@
    }
  }
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -127,3 +127,9 @@
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

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

@@ -149,3 +149,9 @@
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/addForm.vue

ÎļþÒÑɾ³ý

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/editForm.vue

ÎļþÒÑɾ³ý

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsPlace/index.vue

ÎļþÒÑɾ³ý

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

@@ -13597,61 +13597,61 @@
        </member>
        <member name="T:Admin.NET.Application.BaseCustomerService">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆæœåŠ¡
            å¾€æ¥å…³ç³»æœåŠ¡
            </summary>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.Page(Admin.NET.Application.BaseCustomerSearch)">
            <summary>
            åˆ†é¡µæŸ¥è¯¢å®¢æˆ·æ¡£æ¡ˆ
            åˆ†é¡µæŸ¥è¯¢å¾€æ¥å…³ç³»
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.ListNonPageAsync(Admin.NET.Application.BaseCustomerSearchNonPage)">
            <summary>
            ä¸åˆ†é¡µæŸ¥è¯¢å®¢æˆ·æ¡£æ¡ˆåˆ—表
            ä¸åˆ†é¡µæŸ¥è¯¢å¾€æ¥å…³ç³»åˆ—表
            </summary>
            <param name="input">客户档案查询参数</param>
            <returns>(客户档案)实例列表</returns>
            <param name="input">往来关系查询参数</param>
            <returns>(往来关系)实例列表</returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.Get(Admin.NET.Application.QueryeBaseCustomerInput)">
            <summary>
            èŽ·å–客户档案
            èŽ·å–往来关系
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.List(Admin.NET.Application.BaseCustomerInput)">
            <summary>
            èŽ·å–客户档案列表
            èŽ·å–往来关系列表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.Add(Admin.NET.Application.AddBaseCustomerInput)">
            <summary>
            å¢žåŠ å®¢æˆ·æ¡£æ¡ˆ
            å¢žåŠ å¾€æ¥å…³ç³»
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.Delete(Admin.NET.Application.DeleteBaseCustomerInput)">
            <summary>
            åˆ é™¤å®¢æˆ·æ¡£æ¡ˆ
            åˆ é™¤å¾€æ¥å…³ç³»
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.Update(Admin.NET.Application.UpdateBaseCustomerInput)">
            <summary>
            æ›´æ–°å®¢æˆ·æ¡£æ¡ˆ
            æ›´æ–°å¾€æ¥å…³ç³»
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.ImportExcelAsync(Microsoft.AspNetCore.Http.IFormFile)">
            <summary>
            Excel模板导入客户档案功能
            Excel模板导入往来关系功能
            </summary>
            <param name="file">Excel模板文件</param>
            <returns>导入的记录数</returns>
@@ -13666,7 +13666,7 @@
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.DownloadExcelTemplate(System.String)">
            <summary>
            æ ¹æ®ç‰ˆæœ¬ä¸‹è½½å®¢æˆ·æ¡£æ¡ˆçš„Excel导入模板
            æ ¹æ®ç‰ˆæœ¬ä¸‹è½½å¾€æ¥å…³ç³»çš„Excel导入模板
            </summary>
            <param name="version">模板版本</param>
            <returns>下载的模板文件</returns>
@@ -13688,7 +13688,7 @@
        </member>
        <member name="T:Admin.NET.Application.BaseCustomerSearch">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆæŸ¥è¯¢å‚æ•°
            å¾€æ¥å…³ç³»æŸ¥è¯¢å‚æ•°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.CustCode">
@@ -13783,7 +13783,7 @@
        </member>
        <member name="T:Admin.NET.Application.BaseCustomerSearchNonPage">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆä¸åˆ†é¡µæŸ¥è¯¢å‚æ•°
            å¾€æ¥å…³ç³»ä¸åˆ†é¡µæŸ¥è¯¢å‚æ•°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.CustCode">
@@ -13878,12 +13878,7 @@
        </member>
        <member name="T:Admin.NET.Application.BaseCustomerInput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆè¾“入参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.CustCode">
            <summary>
            å®¢æˆ·ç¼–号
            å¾€æ¥å…³ç³»è¾“入参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.CustChinaName">
@@ -13904,11 +13899,6 @@
        <member name="P:Admin.NET.Application.BaseCustomerInput.CustType">
            <summary>
            ç±»åž‹
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.CustTypeName">
            <summary>
            ç±»åž‹åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.LinkMan">
@@ -13953,17 +13943,17 @@
        </member>
        <member name="T:Admin.NET.Application.AddBaseCustomerInput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆæ–°å¢žå‚æ•°
            å¾€æ¥å…³ç³»æ–°å¢žå‚æ•°
            </summary>
        </member>
        <member name="T:Admin.NET.Application.DeleteBaseCustomerInput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆåˆ é™¤å‚æ•°
            å¾€æ¥å…³ç³»åˆ é™¤å‚æ•°
            </summary>
        </member>
        <member name="T:Admin.NET.Application.UpdateBaseCustomerInput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆæ›´æ–°å‚æ•°
            å¾€æ¥å…³ç³»æ›´æ–°å‚æ•°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.UpdateBaseCustomerInput.Id">
@@ -13973,12 +13963,12 @@
        </member>
        <member name="T:Admin.NET.Application.QueryeBaseCustomerInput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆèŽ·å–单个参数
            å¾€æ¥å…³ç³»èŽ·å–单个参数
            </summary>
        </member>
        <member name="T:Admin.NET.Application.BaseCustomerOutput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆè¾“出参数
            å¾€æ¥å…³ç³»è¾“出参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.CustCode">
@@ -15745,9 +15735,9 @@
            æŽ§åˆ¶å±žæ€§è§„则明细查询参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleDetailSearch.ControlRuleId">
        <member name="P:Admin.NET.Application.WmsControlRuleDetailSearch.RuleCode">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则ID
            æŽ§åˆ¶å±žæ€§è§„则编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleDetailSearch.MaxImumqty">
@@ -15815,9 +15805,9 @@
            æŽ§åˆ¶å±žæ€§è§„则明细不分页查询参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleDetailSearchNonPage.ControlRuleId">
        <member name="P:Admin.NET.Application.WmsControlRuleDetailSearchNonPage.RuleCode">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则ID
            æŽ§åˆ¶å±žæ€§è§„则编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleDetailSearchNonPage.MaxImumqty">
@@ -15885,9 +15875,9 @@
            æŽ§åˆ¶å±žæ€§è§„则明细输入参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleDetailInput.ControlRuleId">
        <member name="P:Admin.NET.Application.WmsControlRuleDetailInput.RuleCode">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则ID
            æŽ§åˆ¶å±žæ€§è§„则编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleDetailInput.MaxImumqty">
@@ -15960,9 +15950,9 @@
            æŽ§åˆ¶å±žæ€§è§„则明细输出参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleDetailOutput.ControlRuleId">
        <member name="P:Admin.NET.Application.WmsControlRuleDetailOutput.RuleCode">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则ID
            æŽ§åˆ¶å±žæ€§è§„则编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleDetailOutput.MaxImumqty">
@@ -16115,287 +16105,6 @@
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleDetailService.CheckExisitForImport(System.Collections.Generic.List{Admin.NET.Core.WmsControlRuleDetail})">
            <summary>
            æ ¹æ®è”合主键验证数据是否已存在-导入时验证
            </summary>
            <param name="inputs"></param>
            <returns></returns>
        </member>
        <member name="T:Admin.NET.Application.WmsControlRuleSearch">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则查询参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearch.RuleCode">
            <summary>
            è§„则编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearch.RuleName">
            <summary>
            è§„则名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearch.RuleDesc">
            <summary>
            è§„则描述
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearch.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearch.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearch.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearch.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearch.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsControlRuleSearchNonPage">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则不分页查询参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.RuleCode">
            <summary>
            è§„则编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.RuleName">
            <summary>
            è§„则名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.RuleDesc">
            <summary>
            è§„则描述
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleSearchNonPage.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsControlRuleInput">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则输入参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleInput.RuleCode">
            <summary>
            è§„则编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleInput.RuleName">
            <summary>
            è§„则名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleInput.RuleDesc">
            <summary>
            è§„则描述
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleInput.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="T:Admin.NET.Application.AddWmsControlRuleInput">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则新增参数
            </summary>
        </member>
        <member name="T:Admin.NET.Application.DeleteWmsControlRuleInput">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则删除参数
            </summary>
        </member>
        <member name="T:Admin.NET.Application.UpdateWmsControlRuleInput">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则更新参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.UpdateWmsControlRuleInput.Id">
            <summary>
            Id主键
            </summary>
        </member>
        <member name="T:Admin.NET.Application.QueryeWmsControlRuleInput">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则获取单个参数
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsControlRuleOutput">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则输出参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleOutput.RuleCode">
            <summary>
            è§„则编号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleOutput.RuleName">
            <summary>
            è§„则名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleOutput.RuleDesc">
            <summary>
            è§„则描述
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleOutput.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleOutput.Id">
            <summary>
            Id主键
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleOutput.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleOutput.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleOutput.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsControlRuleOutput.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsControlRuleService">
            <summary>
            æŽ§åˆ¶å±žæ€§è§„则服务
            </summary>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleService.Page(Admin.NET.Application.WmsControlRuleSearch)">
            <summary>
            åˆ†é¡µæŸ¥è¯¢æŽ§åˆ¶å±žæ€§è§„则
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleService.ListNonPageAsync(Admin.NET.Application.WmsControlRuleSearchNonPage)">
            <summary>
            ä¸åˆ†é¡µæŸ¥è¯¢æŽ§åˆ¶å±žæ€§è§„则列表
            </summary>
            <param name="input">控制属性规则查询参数</param>
            <returns>(控制属性规则)实例列表</returns>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleService.Get(Admin.NET.Application.QueryeWmsControlRuleInput)">
            <summary>
            èŽ·å–控制属性规则
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleService.List(Admin.NET.Application.WmsControlRuleInput)">
            <summary>
            èŽ·å–控制属性规则列表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleService.Add(Admin.NET.Application.AddWmsControlRuleInput)">
            <summary>
            å¢žåŠ æŽ§åˆ¶å±žæ€§è§„则
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleService.Delete(Admin.NET.Application.DeleteWmsControlRuleInput)">
            <summary>
            åˆ é™¤æŽ§åˆ¶å±žæ€§è§„则
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleService.Update(Admin.NET.Application.UpdateWmsControlRuleInput)">
            <summary>
            æ›´æ–°æŽ§åˆ¶å±žæ€§è§„则
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleService.ImportExcelAsync(Microsoft.AspNetCore.Http.IFormFile)">
            <summary>
            Excel模板导入控制属性规则功能
            </summary>
            <param name="file">Excel模板文件</param>
            <returns>导入的记录数</returns>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleService.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.WmsControlRuleService.DownloadExcelTemplate(System.String)">
            <summary>
            æ ¹æ®ç‰ˆæœ¬ä¸‹è½½æŽ§åˆ¶å±žæ€§è§„则的Excel导入模板
            </summary>
            <param name="version">模板版本</param>
            <returns>下载的模板文件</returns>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleService.CheckExisit(Admin.NET.Core.WmsControlRule,System.Boolean)">
            <summary>
            æ ¹æ®è”合主键验证数据是否已存在-数据库
            </summary>
            <param name="input"></param>
            <param name="isEdit"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsControlRuleService.CheckExisitForImport(System.Collections.Generic.List{Admin.NET.Core.WmsControlRule})">
            <summary>
            æ ¹æ®è”合主键验证数据是否已存在-导入时验证
            </summary>
@@ -16972,6 +16681,14 @@
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialCustomerService.AddRange(System.Collections.Generic.List{Admin.NET.Application.AddWmsMaterialCustomerInput})">
            <summary>
            æ‰¹é‡å¢žåŠ ç‰©æ–™å®¢æˆ·å…³è”信息
            </summary>
            <param name="input"></param>
            <returns></returns>
            <exception cref="T:System.NotImplementedException"></exception>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialCustomerService.Delete(Admin.NET.Application.DeleteWmsMaterialCustomerInput)">
            <summary>
@@ -17695,6 +17412,16 @@
            Id主键
            </summary>
        </member>
        <member name="T:Admin.NET.Application.UpdateWmsMaterialInfoInput">
            <summary>
            ç¼–辑物料业务信息实体入参--包含物料、物料客户关系、控制属性、替代品
            </summary>
        </member>
        <member name="P:Admin.NET.Application.UpdateWmsMaterialInfoInput.Id">
            <summary>
            Id主键
            </summary>
        </member>
        <member name="T:Admin.NET.Application.QueryeWmsMaterialInput">
            <summary>
            ç‰©æ–™ä¿¡æ¯è¡¨èŽ·å–单个参数
@@ -17722,7 +17449,7 @@
        </member>
        <member name="P:Admin.NET.Application.AddWmsMaterialInfoInput.BaseCustomerList">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆ
            å¾€æ¥å…³ç³»
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsMaterialOutput">
@@ -17867,28 +17594,28 @@
        </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>
            <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>
@@ -17902,21 +17629,21 @@
        </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)">
        <member name="M:Admin.NET.Application.WmsMaterialService.Update(Admin.NET.Application.UpdateWmsMaterialInfoInput)">
            <summary>
            æ›´æ–°ç‰©æ–™ä¿¡æ¯è¡¨
            æ›´æ–°ç‰©æ–™ä¿¡æ¯
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.ImportExcelAsync(Microsoft.AspNetCore.Http.IFormFile)">
            <summary>
            Excel模板导入物料信息表功能
            Excel模板导入物料信息功能
            </summary>
            <param name="file">Excel模板文件</param>
            <returns>导入的记录数</returns>
@@ -17931,7 +17658,7 @@
        </member>
        <member name="M:Admin.NET.Application.WmsMaterialService.DownloadExcelTemplate(System.String)">
            <summary>
            æ ¹æ®ç‰ˆæœ¬ä¸‹è½½ç‰©æ–™ä¿¡æ¯è¡¨çš„Excel导入模板
            æ ¹æ®ç‰ˆæœ¬ä¸‹è½½ç‰©æ–™ä¿¡æ¯çš„Excel导入模板
            </summary>
            <param name="version">模板版本</param>
            <returns>下载的模板文件</returns>
@@ -17989,46 +17716,6 @@
        <member name="P:Admin.NET.Application.WmsPlaceSearch.PlaceStatus">
            <summary>
            åº“位属性
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearch.IsSrmPlace">
            <summary>
            æ˜¯å¦å †åž›æœºåº“位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearch.SrmPlaceNo">
            <summary>
            å †åž›æœºåº“位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearch.IsRgvPlace">
            <summary>
            æ˜¯å¦RGV库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearch.RgvPlaceNo">
            <summary>
            RGV库位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearch.IsAgvPlace">
            <summary>
            æ˜¯å¦AGV库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearch.AgvPlaceNo">
            <summary>
            AGV库位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearch.IsTransPlace">
            <summary>
            æ˜¯å¦è¾“送线库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearch.TransPlaceNo">
            <summary>
            è¾“送线库位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearch.IsActivateWCS">
@@ -18196,46 +17883,6 @@
            åº“位属性
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.IsSrmPlace">
            <summary>
            æ˜¯å¦å †åž›æœºåº“位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.SrmPlaceNo">
            <summary>
            å †åž›æœºåº“位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.IsRgvPlace">
            <summary>
            æ˜¯å¦RGV库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.RgvPlaceNo">
            <summary>
            RGV库位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.IsAgvPlace">
            <summary>
            æ˜¯å¦AGV库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.AgvPlaceNo">
            <summary>
            AGV库位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.IsTransPlace">
            <summary>
            æ˜¯å¦è¾“送线库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.TransPlaceNo">
            <summary>
            è¾“送线库位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceSearchNonPage.IsActivateWCS">
            <summary>
            æ˜¯å¦æ¿€æ´»ä¸Žä»»åŠ¡è°ƒåº¦
@@ -18391,54 +18038,9 @@
            åº“位类型名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceInput.StockUnit">
            <summary>
            å­˜æ”¾å•ä½
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceInput.PlaceStatus">
            <summary>
            åº“位属性
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceInput.IsSrmPlace">
            <summary>
            æ˜¯å¦å †åž›æœºåº“位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceInput.SrmPlaceNo">
            <summary>
            å †åž›æœºåº“位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceInput.IsRgvPlace">
            <summary>
            æ˜¯å¦RGV库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceInput.RgvPlaceNo">
            <summary>
            RGV库位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceInput.IsAgvPlace">
            <summary>
            æ˜¯å¦AGV库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceInput.AgvPlaceNo">
            <summary>
            AGV库位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceInput.IsTransPlace">
            <summary>
            æ˜¯å¦è¾“送线库位
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceInput.TransPlaceNo">
            <summary>
            è¾“送线库位号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.WmsPlaceInput.IsActivateWCS">

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

@@ -146,6 +146,10 @@
                if (codeGenConfig.WhetherRequired == YesOrNot.Y.ToString())
                {//必填字段必须配置增改。
                    codeGenConfig.WhetherAddUpdate = YesOrNot.Y.ToString();
                    if (codeGenConfig.ColumnName.ToLower() == "id")
                    {
                        codeGenConfig.WhetherAddUpdate = YesOrNot.N.ToString();
                    }
                }

                codeGenConfig.WhetherTable = YesOrNo;