From bf915c71f7ab3fcd9a7f81ed18f3a10c68d50dc0 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 10:35:45 +0800
Subject: [PATCH] 客户档案调整
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm | 4
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs | 125 +++++++++-----------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue | 15 +-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs | 89 ++++----------
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.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 | 2
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/BaseCustomerImport.xlsx | 0
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs | 2
11 files changed, 117 insertions(+), 187 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_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
index b8be889..c4da487 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
@@ -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)
@@ -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)
@@ -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();
@@ -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
@@ -449,7 +414,7 @@
{
//鏁版嵁鏄惁瀛樺湪閲嶅
isExist = await _baseCustomerRep.AnyAsync(u =>
- u.CustCode.Equals(input.CustCode)
+ u.CustChinaName.Equals(input.CustChinaName)
,false);
}
else//缂栬緫
@@ -460,7 +425,7 @@
//褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
isExist = await _baseCustomerRep.AnyAsync(u =>
u.Id != input.Id
- &&u.CustCode.Equals(input.CustCode)
+ &&u.CustChinaName.Equals(input.CustChinaName)
,false);
}
@@ -483,17 +448,16 @@
}
//鏁版嵁鏄惁閲嶅
var existExcelItem = inputs.GroupBy(g => new {
- g.CustCode
+ g.CustChinaName
})
.Where(g => g.Count() > 1)
.Select(s => new {
- s.Key.CustCode
+ s.Key.CustChinaName
}).FirstOrDefault();
if (existExcelItem != null)
{
- var baseCustomer = existExcelItem.Adapt<BaseCustomer>();
var item= existExcelItem.Adapt<BaseCustomer>();
- throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,瀹㈡埛缂栧彿[{item.CustCode}]宸插瓨鍦�");
+ throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,瀹㈡埛涓枃鍚嶇О[{item.CustChinaName}]宸插瓨鍦�");
}
@@ -502,16 +466,15 @@
//鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
var existDBItem = await _baseCustomerRep.DetachedEntities.FirstOrDefaultAsync(w=>
inputs.Select(s=>""
- +s.CustCode
+ +s.CustChinaName
)
.Contains(""
- +w.CustCode
+ +w.CustChinaName
));
if (existDBItem != null)
{
- var baseCustomer = existExcelItem.Adapt<BaseCustomer>();
- var item= existExcelItem.Adapt<BaseCustomer>();
- throw Oops.Oh($"绯荤粺涓�,瀹㈡埛缂栧彿[{item.CustCode}]宸插瓨鍦�");
+ var item= existDBItem.Adapt<BaseCustomer>();
+ throw Oops.Oh($"绯荤粺涓�,瀹㈡埛涓枃鍚嶇О[{item.CustChinaName}]宸插瓨鍦�");
}
}
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..c23ce82 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,8 +3,8 @@
using System.ComponentModel.DataAnnotations;
namespace Admin.NET.Application
-{
-
+{
+
/// <summary>
/// 瀹㈡埛妗ｆ鏌ヨ鍙傛暟
/// </summary>
@@ -14,95 +14,95 @@
/// 瀹㈡埛缂栧彿
/// </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,92 +111,92 @@
/// 瀹㈡埛缂栧彿
/// </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>
@@ -205,78 +205,67 @@
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>
@@ -303,7 +292,7 @@
/// </summary>
[Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
public long? Id { get; set; }
-
+
}
/// <summary>
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..3f0aea5 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
@@ -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.Core/Entity/WmsBase/BaseCustomer.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs
index 4a4efb1..35e9442 100755
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs
@@ -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..6f4da97 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