From 4d14b84903bf0277c5e8b9b3138c5e1d981e95db Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 11:01:31 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs | 139 +++----
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue | 15
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs | 10
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue | 17
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml | 514 +++--------------------------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs | 2
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm | 4
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue | 4
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs | 211 +++++-------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 11
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs | 4
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue | 9
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs | 2
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue | 38 -
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs | 4
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/BaseCustomerImport.xlsx | 0
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs | 8
17 files changed, 270 insertions(+), 722 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
index 98ee481..95ff7be 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
@@ -8,9 +8,6 @@
@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="['custCode', {rules: [{required: true, message: '璇疯緭鍏ュ鎴风紪鍙凤紒'}]}]" />
- </a-form-item>
<a-form-item label="瀹㈡埛涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ鎴蜂腑鏂囧悕绉�" v-decorator="['custChinaName', {rules: [{required: true, message: '璇疯緭鍏ュ鎴蜂腑鏂囧悕绉帮紒'}]}]" />
</a-form-item>
@@ -20,11 +17,10 @@
<a-form-item label="鍔╄鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode']" />
</a-form-item>
- <a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ョ被鍨�" style="width: 100%" v-decorator="['custType', {rules: [{required: true, message: '璇疯緭鍏ョ被鍨嬶紒'}]}]" />
- </a-form-item>
- <a-form-item label="绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ被鍨嬪悕绉�" v-decorator="['custTypeName']" />
+ <a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨绫诲瀷" v-decorator="['custType', {rules: [{ required: true, message: '璇烽�夋嫨绫诲瀷锛�' }]}]">
+ <a-select-option v-for="(item,index) in custTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
<a-form-item label="鑱旂郴浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ヨ仈绯讳汉" v-decorator="['linkMan']" />
@@ -71,6 +67,7 @@
xs: { span: 24 },
sm: { span: 15 }
},
+ custTypeData: [],
visible: false,
confirmLoading: false,
form: this.$form.createForm(this)
@@ -84,6 +81,8 @@
this.$nextTick(() => {
});
+ const custTypeOption = this.$options
+ this.custTypeData = custTypeOption.filters['dictData']('base_customer_type')
},
/**
* 鎻愪氦琛ㄥ崟
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue
index 56a3beb..080d07e 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue
@@ -8,9 +8,6 @@
@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="['custCode', {rules: [{required: true, message: '璇疯緭鍏ュ鎴风紪鍙凤紒'}]}]" />
- </a-form-item>
<a-form-item label="瀹㈡埛涓枃鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ鎴蜂腑鏂囧悕绉�" v-decorator="['custChinaName', {rules: [{required: true, message: '璇疯緭鍏ュ鎴蜂腑鏂囧悕绉帮紒'}]}]" />
</a-form-item>
@@ -20,11 +17,10 @@
<a-form-item label="鍔╄鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ姪璁扮爜" v-decorator="['mnemonicCode']" />
</a-form-item>
- <a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ョ被鍨�" style="width: 100%" v-decorator="['custType', {rules: [{required: true, message: '璇疯緭鍏ョ被鍨嬶紒'}]}]" />
- </a-form-item>
- <a-form-item label="绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ被鍨嬪悕绉�" v-decorator="['custTypeName']" />
+ <a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨绫诲瀷" v-decorator="['custType', {rules: [{ required: true, message: '璇烽�夋嫨绫诲瀷锛�' }]}]">
+ <a-select-option v-for="(item,index) in custTypeData" :key="index" :value="Number(item.code)">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
<a-form-item label="鑱旂郴浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ヨ仈绯讳汉" v-decorator="['linkMan']" />
@@ -74,6 +70,7 @@
sm: { span: 15 }
},
record: {},
+ custTypeData: [],
visible: false,
confirmLoading: false,
form: this.$form.createForm(this)
@@ -89,16 +86,16 @@
});
//娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
this.record = JSON.parse(JSON.stringify(record))
+ const custTypeOption = this.$options
+ this.custTypeData = custTypeOption.filters['dictData']('base_customer_type')
this.$nextTick(() => {
this.form.setFieldsValue(
{
id: record.id,
- custCode: record.custCode,
custChinaName: record.custChinaName,
custEnglishName: record.custEnglishName,
mnemonicCode: record.mnemonicCode,
custType: record.custType,
- custTypeName: record.custTypeName,
linkMan: record.linkMan,
phone: record.phone,
email: record.email,
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
index 8bb4943..8a552a5 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
@@ -27,12 +27,9 @@
</a-form-item>
</a-col><a-col :md="8" :sm="24">
<a-form-item label="绫诲瀷">
- <a-input-number v-model="queryParam.custType" style="width: 100%" allow-clear placeholder="璇疯緭鍏ョ被鍨�"/>
- </a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="绫诲瀷鍚嶇О">
- <a-input v-model="queryParam.custTypeName" allow-clear placeholder="璇疯緭鍏ョ被鍨嬪悕绉�"/>
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.custType" placeholder="璇烽�夋嫨绫诲瀷">
+ <a-select-option v-for="(item,index) in custTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -145,6 +142,9 @@
<a-button type="primary" v-if="hasPerm('BaseCustomer:add')" icon="plus" @click="$refs.addForm.add()">鏂板瀹㈡埛妗ｆ</a-button>
</div>
</template>
+ <span slot="custTypescopedSlots" slot-scope="text">
+ {{ 'base_customer_type' | dictType(text) }}
+ </span>
<span slot="isDisabledscopedSlots" slot-scope="text">
<div v-if="text===true ">
<a-tag color="green">鏄�</a-tag>
@@ -289,26 +289,6 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'custType'
- },
- {
- title: '绫诲瀷鍚嶇О',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
@@ -321,7 +301,8 @@
}
},
sorter: true,
- dataIndex: 'custTypeName'
+ dataIndex: 'custType',
+ scopedSlots: { customRender: 'custTypescopedSlots' }
},
{
title: '鑱旂郴浜�',
@@ -572,6 +553,7 @@
return res.data
})
},
+ custTypeData: [],
selectedRowKeys: [],
selectedRows: []
}
@@ -598,6 +580,8 @@
}
});
}
+ const custTypeOption = this.$options
+ this.custTypeData = custTypeOption.filters['dictData']('base_customer_type')
const isDisabledOption = this.$options
this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
index 496e596..57bf855 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/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()">缂栬緫</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>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
index 22e6397..2749b69 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/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="鏂板鍩虹鐗╂枡淇℃伅" :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="璇疯緭鍏ョ墿鏂欏悕绉�"
@@ -327,3 +327,10 @@
}
}
</script>
+
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
index cffb421..78066dd 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
+++ b/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>
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
index 625a7ac..0950e3c 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
+++ b/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>
- 鏍规嵁鐗堟湰涓嬭浇瀹㈡埛妗ｆ鐨凟xcel瀵煎叆妯℃澘
+ 鏍规嵁鐗堟湰涓嬭浇寰�鏉ュ叧绯荤殑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>
- 鎺у埗灞炴�ц鍒橧D
+ 鎺у埗灞炴�ц鍒欑紪鍙�
</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>
- 鎺у埗灞炴�ц鍒橧D
+ 鎺у埗灞炴�ц鍒欑紪鍙�
</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>
- 鎺у埗灞炴�ц鍒橧D
+ 鎺у埗灞炴�ц鍒欑紪鍙�
</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>
- 鎺у埗灞炴�ц鍒橧D
+ 鎺у埗灞炴�ц鍒欑紪鍙�
</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瀵煎叆妯℃澘
+ 鏍规嵁鐗堟湰涓嬭浇鐗╂枡淇℃伅鐨凟xcel瀵煎叆妯℃澘
</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">
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
index b8be889..0f9c112 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
@@ -16,7 +16,7 @@
namespace Admin.NET.Application
{
/// <summary>
- /// 瀹㈡埛妗ｆ鏈嶅姟
+ /// 寰�鏉ュ叧绯绘湇鍔�
/// </summary>
[ApiDescriptionSettings("WmsBase", Name = "BaseCustomer", Order = 100)]
[Route("api")]
@@ -42,7 +42,7 @@
}
/// <summary>
- /// 鍒嗛〉鏌ヨ瀹㈡埛妗ｆ
+ /// 鍒嗛〉鏌ヨ寰�鏉ュ叧绯�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -51,11 +51,10 @@
{
var baseCustomers = await _baseCustomerRep.DetachedEntities
.Where(!string.IsNullOrEmpty(input.CustCode), u => u.CustCode == input.CustCode)
- .Where(!string.IsNullOrEmpty(input.CustChinaName), u => EF.Functions.Like(u.CustChinaName, $"%{input.CustChinaName.Trim()}%"))
+ .Where(!string.IsNullOrEmpty(input.CustChinaName), u => u.CustChinaName == input.CustChinaName)
.Where(!string.IsNullOrEmpty(input.CustEnglishName), u => u.CustEnglishName == input.CustEnglishName)
.Where(!string.IsNullOrEmpty(input.MnemonicCode), u => u.MnemonicCode == input.MnemonicCode)
.Where(input.CustType != null, u => u.CustType == input.CustType)
- .Where(!string.IsNullOrEmpty(input.CustTypeName), u => u.CustTypeName == input.CustTypeName)
.Where(!string.IsNullOrEmpty(input.LinkMan), u => u.LinkMan == input.LinkMan)
.Where(!string.IsNullOrEmpty(input.Phone), u => u.Phone == input.Phone)
.Where(!string.IsNullOrEmpty(input.Email), u => u.Email == input.Email)
@@ -75,10 +74,10 @@
}
/// <summary>
- /// 涓嶅垎椤垫煡璇㈠鎴锋。妗堝垪琛�
+ /// 涓嶅垎椤垫煡璇㈠線鏉ュ叧绯诲垪琛�
/// </summary>
- /// <param name="input">瀹㈡埛妗ｆ鏌ヨ鍙傛暟</param>
- /// <returns>(瀹㈡埛妗ｆ)瀹炰緥鍒楄〃</returns>
+ /// <param name="input">寰�鏉ュ叧绯绘煡璇㈠弬鏁�</param>
+ /// <returns>(寰�鏉ュ叧绯�)瀹炰緥鍒楄〃</returns>
[HttpGet("BaseCustomer/listNonPage")]
public async Task<List<BaseCustomerOutput>> ListNonPageAsync([FromQuery] BaseCustomerSearchNonPage input)
{
@@ -87,7 +86,6 @@
var pCustEnglishName = input.CustEnglishName?.Trim() ?? "";
var pMnemonicCode = input.MnemonicCode?.Trim() ?? "";
var pCustType = input.CustType;
- var pCustTypeName = input.CustTypeName?.Trim() ?? "";
var pLinkMan = input.LinkMan?.Trim() ?? "";
var pPhone = input.Phone?.Trim() ?? "";
var pEmail = input.Email?.Trim() ?? "";
@@ -102,11 +100,10 @@
var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
var baseCustomers = await _baseCustomerRep.DetachedEntities
.Where(!string.IsNullOrEmpty(pCustCode), u => u.CustCode == pCustCode)
- .Where(!string.IsNullOrEmpty(pCustChinaName), u => EF.Functions.Like(u.CustChinaName, $"%{pCustChinaName}%"))
+ .Where(!string.IsNullOrEmpty(pCustChinaName), u => u.CustChinaName == pCustChinaName)
.Where(!string.IsNullOrEmpty(pCustEnglishName), u => u.CustEnglishName == pCustEnglishName)
.Where(!string.IsNullOrEmpty(pMnemonicCode), u => u.MnemonicCode == pMnemonicCode)
.Where(pCustType != null, u => u.CustType == pCustType)
- .Where(!string.IsNullOrEmpty(pCustTypeName), u => u.CustTypeName == pCustTypeName)
.Where(!string.IsNullOrEmpty(pLinkMan), u => u.LinkMan == pLinkMan)
.Where(!string.IsNullOrEmpty(pPhone), u => u.Phone == pPhone)
.Where(!string.IsNullOrEmpty(pEmail), u => u.Email == pEmail)
@@ -126,7 +123,7 @@
}
/// <summary>
- /// 鑾峰彇瀹㈡埛妗ｆ
+ /// 鑾峰彇寰�鏉ュ叧绯�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -137,7 +134,7 @@
}
/// <summary>
- /// 鑾峰彇瀹㈡埛妗ｆ鍒楄〃
+ /// 鑾峰彇寰�鏉ュ叧绯诲垪琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -150,7 +147,7 @@
#region 澧炪�佸垹銆佹敼
/// <summary>
- /// 澧炲姞瀹㈡埛妗ｆ
+ /// 澧炲姞寰�鏉ュ叧绯�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -158,9 +155,11 @@
public async Task Add(AddBaseCustomerInput input)
{
var baseCustomer = input.Adapt<BaseCustomer>();
- //楠岃瘉
- await CheckExisit(baseCustomer);
+ baseCustomer.CustCode = Yitter.IdGenerator.YitIdHelper.NextId().ToString();//TODO 瑕佽皟鐢ㄧ敓鎴� 缂栧彿鐨勬柟娉� 鍏堢敤闆姳ID
+ baseCustomer.CustTypeName = baseCustomer.CustType.ToString();
+ //楠岃瘉
+ await CheckExisit(baseCustomer);
baseCustomer.CreatedUserId = baseCustomer.UpdatedUserId = SysHelper.GetUserId();
baseCustomer.CreatedUserName = baseCustomer.UpdatedUserName = SysHelper.GetUserName();
baseCustomer.CreatedTime = baseCustomer.UpdatedTime = SysHelper.GetNowTime();
@@ -168,7 +167,7 @@
}
/// <summary>
- /// 鍒犻櫎瀹㈡埛妗ｆ
+ /// 鍒犻櫎寰�鏉ュ叧绯�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -181,7 +180,7 @@
}
/// <summary>
- /// 鏇存柊瀹㈡埛妗ｆ
+ /// 鏇存柊寰�鏉ュ叧绯�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -206,7 +205,7 @@
#region 瀵煎叆
/// <summary>
- /// Excel妯℃澘瀵煎叆瀹㈡埛妗ｆ鍔熻兘
+ /// Excel妯℃澘瀵煎叆寰�鏉ュ叧绯诲姛鑳�
/// </summary>
/// <param name="file">Excel妯℃澘鏂囦欢</param>
/// <returns>瀵煎叆鐨勮褰曟暟</returns>
@@ -247,20 +246,20 @@
var addItem = new BaseCustomer()
{
+ CustCode = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),//TODO 瑕佽皟鐢ㄧ敓鎴� 缂栧彿鐨勬柟娉� 鍏堢敤闆姳ID
CreatedTime = SysHelper.GetNowTime(),
CreatedUserId = SysHelper.GetUserId(),
CreatedUserName = SysHelper.GetUserName(),
UpdatedTime = SysHelper.GetNowTime(),
UpdatedUserId = SysHelper.GetUserId(),
UpdatedUserName = SysHelper.GetUserName()
+
};
#region 瀹氫箟鍙橀噺
- var _CustCode = "";//瀹㈡埛缂栧彿
var _CustChinaName = "";//瀹㈡埛涓枃鍚嶇О
var _CustEnglishName = "";//瀹㈡埛鑻辨枃鍚嶇О
var _MnemonicCode = "";//鍔╄鐮�
var _CustType = "";//绫诲瀷
- var _CustTypeName = "";//绫诲瀷鍚嶇О
var _LinkMan = "";//鑱旂郴浜�
var _Phone = "";//鐢佃瘽
var _Email = "";//鐢靛瓙閭欢
@@ -269,17 +268,14 @@
var _City = "";//鍩庡競
var _Address = "";//鍦板潃
var _IsDisabled = "";//鏄惁绂佺敤
- var _Id = "";//Id涓婚敭
#endregion
#region 鍙栧��
- _CustCode = row["瀹㈡埛缂栧彿"]?.ToString() ;
_CustChinaName = row["瀹㈡埛涓枃鍚嶇О"]?.ToString() ;
_CustEnglishName = row["瀹㈡埛鑻辨枃鍚嶇О"]?.ToString() ;
_MnemonicCode = row["鍔╄鐮�"]?.ToString() ;
_CustType = row["绫诲瀷"]?.ToString() ;
- _CustTypeName = row["绫诲瀷鍚嶇О"]?.ToString() ;
_LinkMan = row["鑱旂郴浜�"]?.ToString() ;
_Phone = row["鐢佃瘽"]?.ToString() ;
_Email = row["鐢靛瓙閭欢"]?.ToString() ;
@@ -287,22 +283,11 @@
_Province = row["鐪佷唤"]?.ToString() ;
_City = row["鍩庡競"]?.ToString() ;
_Address = row["鍦板潃"]?.ToString() ;
- _IsDisabled = row["鏄惁绂佺敤"]?.ToString() ;
- _Id = row["Id涓婚敭"]?.ToString() ;
+
#endregion
#region 楠岃瘉
-
- if (string.IsNullOrEmpty(_CustCode))
- {
- throw Oops.Oh($"绗瑊index}琛孾瀹㈡埛缂栧彿]{_CustCode}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_CustCode))
- {
- addItem.CustCode = (string)_CustCode;
- }
if (string.IsNullOrEmpty(_CustChinaName))
{
@@ -329,23 +314,18 @@
if(!string.IsNullOrEmpty(_CustType))
{
- if (!int.TryParse(_CustType, out int outCustType)&&!string.IsNullOrEmpty(_CustType))
+ Admin.NET.Core.BaseCustomerTypeEnum enumCustType = default(Admin.NET.Core.BaseCustomerTypeEnum);
+
+ if(!Enum.TryParse<Admin.NET.Core.BaseCustomerTypeEnum>(_CustType, out enumCustType)&&!string.IsNullOrEmpty(_CustType))
{
- throw Oops.Oh($"绗瑊index}琛孾绫诲瀷]{_CustType}鍊间笉姝ｇ‘锛�");
- }
- if (outCustType <= 0&&!string.IsNullOrEmpty(_CustType))
- {
- throw Oops.Oh($"绗瑊index}琛孾绫诲瀷]{_CustType}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ throw Oops.Oh($"绗瑊index}琛孾绫诲瀷]{_CustType}鍊间笉姝ｇ‘锛�");
}
else
{
- addItem.CustType = outCustType;
+ addItem.CustType = enumCustType;
+ addItem.CustTypeName = addItem.CustType.ToString();
}
- }
- if(!string.IsNullOrEmpty(_CustTypeName))
- {
- addItem.CustTypeName = (string)_CustTypeName;
}
if(!string.IsNullOrEmpty(_LinkMan))
{
@@ -386,24 +366,9 @@
bool outIsDisabled = _IsDisabled.Equals("鏄�") ? true : false;
addItem.IsDisabled = outIsDisabled;
}
- }
+ }
- if(!string.IsNullOrEmpty(_Id))
- {
- if (!long.TryParse(_Id, out long outId)&&!string.IsNullOrEmpty(_Id))
- {
- throw Oops.Oh($"绗瑊index}琛孾Id涓婚敭]{_Id}鍊间笉姝ｇ‘锛�");
- }
- if (outId <= 0&&!string.IsNullOrEmpty(_Id))
- {
- throw Oops.Oh($"绗瑊index}琛孾Id涓婚敭]{_Id}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.Id = outId;
- }
-
- }
+
#endregion
@@ -417,7 +382,7 @@
}
/// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇瀹㈡埛妗ｆ鐨凟xcel瀵煎叆妯℃澘
+ /// 鏍规嵁鐗堟湰涓嬭浇寰�鏉ュ叧绯荤殑Excel瀵煎叆妯℃澘
/// </summary>
/// <param name="version">妯℃澘鐗堟湰</param>
/// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
@@ -425,7 +390,7 @@
public IActionResult DownloadExcelTemplate([FromQuery] string version)
{
string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\BaseCustomer{TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増鍚嶇О鍚庣紑}.xlsx";
- var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(瀹㈡埛妗ｆ).xlsx", Encoding.GetEncoding("UTF-8"));
+ var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(寰�鏉ュ叧绯�).xlsx", Encoding.GetEncoding("UTF-8"));
return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
}
@@ -439,80 +404,78 @@
/// <param name="input"></param>
/// <param name="isEdit"></param>
/// <returns></returns>
- private async Task CheckExisit( BaseCustomer input,bool isEdit=false)
+ private async Task CheckExisit(BaseCustomer input, bool isEdit = false)
{
-
-
- bool isExist = false;
- if (!isEdit)//鏂板
- {
- //鏁版嵁鏄惁瀛樺湪閲嶅
- isExist = await _baseCustomerRep.AnyAsync(u =>
- u.CustCode.Equals(input.CustCode)
- ,false);
- }
- else//缂栬緫
- {
-
-
- //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
- isExist = await _baseCustomerRep.AnyAsync(u =>
- u.Id != input.Id
- &&u.CustCode.Equals(input.CustCode)
- ,false);
- }
-
-
+
+ bool isExist = false;
+ if (!isEdit)//鏂板
+ {
+ //鏁版嵁鏄惁瀛樺湪閲嶅
+ isExist = await _baseCustomerRep.AnyAsync(u =>
+ u.CustChinaName.Equals(input.CustChinaName)
+ , false);
+ }
+ else//缂栬緫
+ {
+
+
+
+ //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
+ isExist = await _baseCustomerRep.AnyAsync(u =>
+ u.Id != input.Id
+ && u.CustChinaName.Equals(input.CustChinaName)
+ , false);
+ }
+
+
if (isExist) throw Oops.Oh(ErrorCode.E0001);
- }
-
+ }
+
/// <summary>
/// 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-瀵煎叆鏃堕獙璇�
/// </summary>
/// <param name="inputs"></param>
/// <returns></returns>
private async Task CheckExisitForImport(List<BaseCustomer> inputs)
- {
+ {
//鏍规嵁鑱斿悎涓婚敭楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- if (inputs?.Count <= 0)
- {
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
- }
- //鏁版嵁鏄惁閲嶅
- var existExcelItem = inputs.GroupBy(g => new {
- g.CustCode
- })
- .Where(g => g.Count() > 1)
- .Select(s => new {
- s.Key.CustCode
- }).FirstOrDefault();
- if (existExcelItem != null)
- {
- var baseCustomer = existExcelItem.Adapt<BaseCustomer>();
- var item= existExcelItem.Adapt<BaseCustomer>();
- throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,瀹㈡埛缂栧彿[{item.CustCode}]宸插瓨鍦�");
- }
-
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏁版嵁鏄惁閲嶅
+ var existExcelItem = inputs.GroupBy(g => new {
+ g.CustChinaName
+ })
+ .Where(g => g.Count() > 1)
+ .Select(s => new {
+ s.Key.CustChinaName
+ }).FirstOrDefault();
+ if (existExcelItem != null)
+ {
+ var item = existExcelItem.Adapt<BaseCustomer>();
+ throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,瀹㈡埛涓枃鍚嶇О[{item.CustChinaName}]宸插瓨鍦�");
+ }
- //鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- var existDBItem = await _baseCustomerRep.DetachedEntities.FirstOrDefaultAsync(w=>
- inputs.Select(s=>""
- +s.CustCode
- )
- .Contains(""
- +w.CustCode
- ));
- if (existDBItem != null)
- {
- var baseCustomer = existExcelItem.Adapt<BaseCustomer>();
- var item= existExcelItem.Adapt<BaseCustomer>();
- throw Oops.Oh($"绯荤粺涓�,瀹㈡埛缂栧彿[{item.CustCode}]宸插瓨鍦�");
- }
+
+ //鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+ var existDBItem = await _baseCustomerRep.DetachedEntities.FirstOrDefaultAsync(w =>
+ inputs.Select(s => ""
+ + s.CustChinaName
+ )
+ .Contains(""
+ + w.CustChinaName
+ ));
+ if (existDBItem != null)
+ {
+ var item = existDBItem.Adapt<BaseCustomer>();
+ throw Oops.Oh($"绯荤粺涓�,瀹㈡埛涓枃鍚嶇О[{item.CustChinaName}]宸插瓨鍦�");
+ }
}
#endregion
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
index 41e21be..f4f854e 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
@@ -3,10 +3,10 @@
using System.ComponentModel.DataAnnotations;
namespace Admin.NET.Application
-{
-
+{
+
/// <summary>
- /// 瀹㈡埛妗ｆ鏌ヨ鍙傛暟
+ /// 寰�鏉ュ叧绯绘煡璇㈠弬鏁�
/// </summary>
public class BaseCustomerSearch : PageInputBase
{
@@ -14,96 +14,96 @@
/// 瀹㈡埛缂栧彿
/// </summary>
public virtual string CustCode { get; set; }
-
+
/// <summary>
/// 瀹㈡埛涓枃鍚嶇О
/// </summary>
public virtual string CustChinaName { get; set; }
-
+
/// <summary>
/// 瀹㈡埛鑻辨枃鍚嶇О
/// </summary>
public virtual string CustEnglishName { get; set; }
-
+
/// <summary>
/// 鍔╄鐮�
/// </summary>
public virtual string MnemonicCode { get; set; }
-
+
/// <summary>
/// 绫诲瀷
/// </summary>
- public virtual int? CustType { get; set; }
-
+ public virtual Admin.NET.Core.BaseCustomerTypeEnum? CustType { get; set; }
+
/// <summary>
/// 绫诲瀷鍚嶇О
/// </summary>
public virtual string CustTypeName { get; set; }
-
+
/// <summary>
/// 鑱旂郴浜�
/// </summary>
public virtual string LinkMan { get; set; }
-
+
/// <summary>
/// 鐢佃瘽
/// </summary>
public virtual string Phone { get; set; }
-
+
/// <summary>
/// 鐢靛瓙閭欢
/// </summary>
public virtual string Email { get; set; }
-
+
/// <summary>
/// 閭紪
/// </summary>
public virtual string ZipCode { get; set; }
-
+
/// <summary>
/// 鐪佷唤
/// </summary>
public virtual string Province { get; set; }
-
+
/// <summary>
/// 鍩庡競
/// </summary>
public virtual string City { get; set; }
-
+
/// <summary>
/// 鍦板潃
/// </summary>
public virtual string Address { get; set; }
-
+
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
public virtual bool? IsDisabled { get; set; }
-
+
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public virtual List<string> CreatedTime { get; set; }
-
+
/// <summary>
/// 鏇存柊鏃堕棿
/// </summary>
public virtual List<string> UpdatedTime { get; set; }
-
+
/// <summary>
/// 鍒涘缓鑰呭悕绉�
/// </summary>
public virtual string CreatedUserName { get; set; }
-
+
/// <summary>
/// 淇敼鑰呭悕绉�
/// </summary>
public virtual string UpdatedUserName { get; set; }
-
+
}
- /// <summary>
- /// 瀹㈡埛妗ｆ涓嶅垎椤垫煡璇㈠弬鏁�
+ /// <summary>
+ /// 寰�鏉ュ叧绯讳笉鍒嗛〉鏌ヨ鍙傛暟
/// </summary>
public class BaseCustomerSearchNonPage : PageInputNonPageBase
{
@@ -111,190 +111,179 @@
/// 瀹㈡埛缂栧彿
/// </summary>
public virtual string CustCode { get; set; }
-
+
/// <summary>
/// 瀹㈡埛涓枃鍚嶇О
/// </summary>
public virtual string CustChinaName { get; set; }
-
+
/// <summary>
/// 瀹㈡埛鑻辨枃鍚嶇О
/// </summary>
public virtual string CustEnglishName { get; set; }
-
+
/// <summary>
/// 鍔╄鐮�
/// </summary>
public virtual string MnemonicCode { get; set; }
-
+
/// <summary>
/// 绫诲瀷
/// </summary>
- public virtual int? CustType { get; set; }
-
+ public virtual Admin.NET.Core.BaseCustomerTypeEnum? CustType { get; set; }
+
/// <summary>
/// 绫诲瀷鍚嶇О
/// </summary>
public virtual string CustTypeName { get; set; }
-
+
/// <summary>
/// 鑱旂郴浜�
/// </summary>
public virtual string LinkMan { get; set; }
-
+
/// <summary>
/// 鐢佃瘽
/// </summary>
public virtual string Phone { get; set; }
-
+
/// <summary>
/// 鐢靛瓙閭欢
/// </summary>
public virtual string Email { get; set; }
-
+
/// <summary>
/// 閭紪
/// </summary>
public virtual string ZipCode { get; set; }
-
+
/// <summary>
/// 鐪佷唤
/// </summary>
public virtual string Province { get; set; }
-
+
/// <summary>
/// 鍩庡競
/// </summary>
public virtual string City { get; set; }
-
+
/// <summary>
/// 鍦板潃
/// </summary>
public virtual string Address { get; set; }
-
+
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
public virtual bool? IsDisabled { get; set; }
-
+
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
- public virtual List<DateTimeOffset>? CreatedTime { get; set; }
-
+ public virtual List<DateTimeOffset>? CreatedTime { get; set; }
+
/// <summary>
/// 鏇存柊鏃堕棿
/// </summary>
- public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
-
+ 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 BaseCustomerInput
{
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [Required(ErrorMessage = "瀹㈡埛缂栧彿涓嶈兘涓虹┖")]
- public virtual string CustCode { get; set; }
-
/// <summary>
/// 瀹㈡埛涓枃鍚嶇О
/// </summary>
[Required(ErrorMessage = "瀹㈡埛涓枃鍚嶇О涓嶈兘涓虹┖")]
public virtual string CustChinaName { get; set; }
-
+
/// <summary>
/// 瀹㈡埛鑻辨枃鍚嶇О
/// </summary>
public virtual string CustEnglishName { get; set; }
-
+
/// <summary>
/// 鍔╄鐮�
/// </summary>
public virtual string MnemonicCode { get; set; }
-
+
/// <summary>
/// 绫诲瀷
/// </summary>
[Required(ErrorMessage = "绫诲瀷涓嶈兘涓虹┖")]
- public virtual BaseCustomerTypeEnum CustType { get; set; }
-
- /// <summary>
- /// 绫诲瀷鍚嶇О
- /// </summary>
- public virtual string CustTypeName { get; set; }
-
+ public virtual Admin.NET.Core.BaseCustomerTypeEnum CustType { get; set; }
+
/// <summary>
/// 鑱旂郴浜�
/// </summary>
public virtual string LinkMan { get; set; }
-
+
/// <summary>
/// 鐢佃瘽
/// </summary>
public virtual string Phone { get; set; }
-
+
/// <summary>
/// 鐢靛瓙閭欢
/// </summary>
public virtual string Email { get; set; }
-
+
/// <summary>
/// 閭紪
/// </summary>
public virtual string ZipCode { get; set; }
-
+
/// <summary>
/// 鐪佷唤
/// </summary>
public virtual string Province { get; set; }
-
+
/// <summary>
/// 鍩庡競
/// </summary>
public virtual string City { get; set; }
-
+
/// <summary>
/// 鍦板潃
/// </summary>
public virtual string Address { get; set; }
-
+
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
public virtual bool? IsDisabled { get; set; }
-
+
}
/// <summary>
- /// 瀹㈡埛妗ｆ鏂板鍙傛暟
+ /// 寰�鏉ュ叧绯绘柊澧炲弬鏁�
/// </summary>
public class AddBaseCustomerInput : BaseCustomerInput
{
}
/// <summary>
- /// 瀹㈡埛妗ｆ鍒犻櫎鍙傛暟
+ /// 寰�鏉ュ叧绯诲垹闄ゅ弬鏁�
/// </summary>
public class DeleteBaseCustomerInput : BaseId
{
}
/// <summary>
- /// 瀹㈡埛妗ｆ鏇存柊鍙傛暟
+ /// 寰�鏉ュ叧绯绘洿鏂板弬鏁�
/// </summary>
public class UpdateBaseCustomerInput : BaseCustomerInput
{
@@ -303,11 +292,11 @@
/// </summary>
[Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
public long? Id { get; set; }
-
+
}
/// <summary>
- /// 瀹㈡埛妗ｆ鑾峰彇鍗曚釜鍙傛暟
+ /// 寰�鏉ュ叧绯昏幏鍙栧崟涓弬鏁�
/// </summary>
public class QueryeBaseCustomerInput : BaseId
{
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs
index 7c22cfa..7605247 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs
@@ -4,7 +4,7 @@
namespace Admin.NET.Application
{
/// <summary>
- /// 瀹㈡埛妗ｆ杈撳嚭鍙傛暟
+ /// 寰�鏉ュ叧绯昏緭鍑哄弬鏁�
/// </summary>
public class BaseCustomerOutput
{
@@ -31,7 +31,7 @@
/// <summary>
/// 绫诲瀷
/// </summary>
- public int CustType { get; set; }
+ public Admin.NET.Core.BaseCustomerTypeEnum CustType { get; set; }
/// <summary>
/// 绫诲瀷鍚嶇О
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
index 3ef7770..95ef2c7 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
@@ -453,7 +453,7 @@
public List<AddWmsSubstituteGoodInput> SubstituteGoodList { get; set; }
/// <summary>
- /// 瀹㈡埛妗ｆ
+ /// 寰�鏉ュ叧绯�
/// </summary>
public List<BaseCustomerInput> BaseCustomerList { get; set; }
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
index 83c63b7..7e2b3d6 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
@@ -191,7 +191,7 @@
var controlRuleld = input.ControlRuleld;
wmsMaterial.ControlRuleId = controlRuleld;
- //瀹㈡埛妗ｆ淇℃伅
+ //寰�鏉ュ叧绯讳俊鎭�
var baseCustomerList = input.BaseCustomerList.Adapt<List<BaseCustomer>>();
//鐗╂枡瀹㈡埛鍏宠仈鍏崇郴
var materialCustomerList=new List<WmsMaterialCustomer>();
@@ -279,7 +279,7 @@
}
- //瀹㈡埛妗ｆ淇℃伅
+ //寰�鏉ュ叧绯讳俊鎭�
var baseCustomerList = input.BaseCustomerList.Adapt<List<BaseCustomer>>();
//鐗╂枡瀹㈡埛鍏宠仈鍏崇郴
var materialCustomerList = new List<WmsMaterialCustomer>();
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs
index 4a4efb1..2a7c378 100755
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs
@@ -5,15 +5,15 @@
/*
* @author : 鍒樻枃濂�
* @date : 2024/4/23涓嬪崍4:07:57
- * @desc : 瀹㈡埛妗ｆ
+ * @desc : 寰�鏉ュ叧绯�
*/
namespace Admin.NET.Core
{
/// <summary>
- /// 瀹㈡埛妗ｆ
+ /// 寰�鏉ュ叧绯�
/// </summary>
[Table("base_customer")]
- [Comment("瀹㈡埛妗ｆ")]
+ [Comment("寰�鏉ュ叧绯�")]
public class BaseCustomer : DEntityBase
{
@@ -58,7 +58,7 @@
[Comment("绫诲瀷")]
[Required]
- public int CustType { get; set; }
+ public BaseCustomerTypeEnum CustType { get; set; }
/// <summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
index d82c481..279659c 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
@@ -264,11 +264,11 @@
new SysDictData{Id=539751869472837, TypeId=539751788187717, Value="B", Code="2", Sort=100, Remark="", Status=0 },
new SysDictData{Id=539751888134213, TypeId=539751788187717, Value="C", Code="3", Sort=100, Remark="", Status=0 },
- new SysDictData{Id=539751888134214, TypeId=539751788187718, Value="璐т富", Code="1", Sort=100, Remark="", Status=0 },
- new SysDictData{Id=539751888134215, TypeId=539751788187718, Value="鏀惰揣浜�", Code="2", Sort=100, Remark="", Status=0 },
- new SysDictData{Id=539751888134216, TypeId=539751788187718, Value="渚涘簲鍟�", Code="3", Sort=100, Remark="", Status=0 },
- new SysDictData{Id=539751888134217, TypeId=539751788187718, Value="鎵胯繍浜�", Code="3", Sort=100, Remark="", Status=0 },
- new SysDictData{Id=539751888134218, TypeId=539751788187718, Value="鍏朵粬", Code="3", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=540028409995333, TypeId=540028296155205, Value="璐т富", Code="1", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=540028593905733, TypeId=540028296155205, Value="鏀惰揣浜�", Code="2", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=540028612407365, TypeId=540028296155205, Value="渚涘簲鍟�", Code="3", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=540028658511941, TypeId=540028296155205, Value="鎵胯繍浜�", Code="4", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=540028759924805, TypeId=540028296155205, Value="鍏朵粬", Code="5", Sort=100, Remark="", Status=0 },
};
}
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
index 9151d84..bb817d7 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
@@ -82,7 +82,7 @@
new SysDictType{Id=539751788187717, Name="鐗╂枡ABC鍒嗙被", Code="abc_class_type", Sort=100, Remark="", Status=0 },
- new SysDictType{Id=539751788187718, Name="寰�鏉ュ叧绯荤被鍨�", Code="base_customer_type", Sort=100, Remark="", Status=0 },
+ new SysDictType{Id=540028296155205, Name="寰�鏉ュ叧绯荤被鍨�", Code="base_customer_type", Sort=100, Remark="", Status=0 },
};
}
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/BaseCustomerImport.xlsx b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/BaseCustomerImport.xlsx
index 0b5541f..19c0bb7 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/BaseCustomerImport.xlsx
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/BaseCustomerImport.xlsx
Binary files differ
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
index f5f2385..568a580 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
@@ -519,7 +519,6 @@
@:}).FirstOrDefault();
@:if (existExcelItem != null)
@:{
- @:var @(@Model.CamelizeClassName) = existExcelItem.Adapt<@(@Model.ClassName)>();
@:var item= existExcelItem.Adapt<@(@Model.ClassName)>();
@:throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑@(@message)宸插瓨鍦�");
@:}
@@ -560,8 +559,7 @@
@: ));
@: if (existDBItem != null)
@:{
- @:var @(@Model.CamelizeClassName) = existExcelItem.Adapt<@(@Model.ClassName)>();
- @:var item= existExcelItem.Adapt<@(@Model.ClassName)>();
+ @:var item= existDBItem.Adapt<@(@Model.ClassName)>();
@:throw Oops.Oh($"绯荤粺涓瑻(@message)宸插瓨鍦�");
@:}
}
--
Gitblit v1.9.3