Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz企业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz企业中心
提交
1b6276e4
提交
1b6276e4
编写于
6月 30, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 发布系统代码
上级
3033b85a
变更
15
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
346 行增加
和
155 行删除
+346
-155
product-price-level.ts
app_CRM/src/interface/entity/product-price-level.ts
+24
-0
lead_en_US.ts
app_CRM/src/locale/lanres/entities/lead/lead_en_US.ts
+0
-4
lead_zh_CN.ts
app_CRM/src/locale/lanres/entities/lead/lead_zh_CN.ts
+0
-4
opportunity_en_US.ts
...c/locale/lanres/entities/opportunity/opportunity_en_US.ts
+25
-21
opportunity_zh_CN.ts
...c/locale/lanres/entities/opportunity/opportunity_zh_CN.ts
+25
-21
product-price-level_en_US.ts
...entities/product-price-level/product-price-level_en_US.ts
+3
-0
product-price-level_zh_CN.ts
...entities/product-price-level/product-price-level_zh_CN.ts
+3
-0
lead-info-base.tsx
app_CRM/src/pages/sales/lead-info/lead-info-base.tsx
+0
-1
opportunity-info-base.tsx
...rc/pages/sales/opportunity-info/opportunity-info-base.tsx
+79
-101
ProductPriceLevel.java
...usinesscentral/core/product/domain/ProductPriceLevel.java
+45
-0
ProductPriceLevelSearchContext.java
...l/core/product/filter/ProductPriceLevelSearchContext.java
+42
-0
ProductPriceLevelServiceImpl.java
...re/product/service/impl/ProductPriceLevelServiceImpl.java
+43
-0
h2_table.xml
...esscentral-core/src/main/resources/liquibase/h2_table.xml
+6
-0
ProductPriceLevelMapper.xml
...per/product/productpricelevel/ProductPriceLevelMapper.xml
+3
-3
ProductPriceLevelDTO.java
.../businesscentral/centralapi/dto/ProductPriceLevelDTO.java
+48
-0
未找到文件。
app_CRM/src/interface/entity/product-price-level.ts
浏览文件 @
1b6276e4
...
@@ -253,4 +253,28 @@ export interface ProductPriceLevel {
...
@@ -253,4 +253,28 @@ export interface ProductPriceLevel {
* @memberof ProductPriceLevel
* @memberof ProductPriceLevel
*/
*/
pricelevelid
?:
any
;
pricelevelid
?:
any
;
/**
* 价格水平名称
*
* @returns {*}
* @memberof ProductPriceLevel
*/
pricelevelname
?:
any
;
/**
* 产品名称
*
* @returns {*}
* @memberof ProductPriceLevel
*/
productname
?:
any
;
/**
* 计量单位
*
* @returns {*}
* @memberof ProductPriceLevel
*/
uomname
?:
any
;
}
}
\ No newline at end of file
app_CRM/src/locale/lanres/entities/lead/lead_en_US.ts
浏览文件 @
1b6276e4
...
@@ -426,10 +426,6 @@ export default {
...
@@ -426,10 +426,6 @@ export default {
caption
:
"授予资格"
,
caption
:
"授予资格"
,
tip
:
"授予资格"
,
tip
:
"授予资格"
,
},
},
tbitem17_disqualification_sep
:
{
caption
:
""
,
tip
:
""
,
},
tbitem17_disqualification
:
{
tbitem17_disqualification
:
{
caption
:
"取消资格"
,
caption
:
"取消资格"
,
tip
:
"取消资格"
,
tip
:
"取消资格"
,
...
...
app_CRM/src/locale/lanres/entities/lead/lead_zh_CN.ts
浏览文件 @
1b6276e4
...
@@ -425,10 +425,6 @@ export default {
...
@@ -425,10 +425,6 @@ export default {
caption
:
"授予资格"
,
caption
:
"授予资格"
,
tip
:
"授予资格"
,
tip
:
"授予资格"
,
},
},
tbitem17_disqualification_sep
:
{
caption
:
""
,
tip
:
""
,
},
tbitem17_disqualification
:
{
tbitem17_disqualification
:
{
caption
:
"取消资格"
,
caption
:
"取消资格"
,
tip
:
"取消资格"
,
tip
:
"取消资格"
,
...
...
app_CRM/src/locale/lanres/entities/opportunity/opportunity_en_US.ts
浏览文件 @
1b6276e4
...
@@ -345,19 +345,31 @@ export default {
...
@@ -345,19 +345,31 @@ export default {
caption
:
"编辑"
,
caption
:
"编辑"
,
tip
:
"编辑"
,
tip
:
"编辑"
,
},
},
tbitem2
:
{
seperator3
:
{
caption
:
"
-
"
,
caption
:
""
,
tip
:
""
,
tip
:
""
,
},
},
tbitem3
:
{
deuiaction4
:
{
caption
:
"
Save
"
,
caption
:
"
编辑
"
,
tip
:
"
Save
"
,
tip
:
"
编辑
"
,
},
},
tbitem5
:
{
seperator4
:
{
caption
:
"
Save And Close
"
,
caption
:
""
,
tip
:
"
Save And Close Window
"
,
tip
:
""
,
},
},
tbitem6
:
{
tbitem17_win_sep
:
{
caption
:
""
,
tip
:
""
,
},
tbitem17_win
:
{
caption
:
"作为赢单结束"
,
tip
:
"作为赢单结束"
,
},
tbitem17_lose
:
{
caption
:
"作为丢单结束"
,
tip
:
"作为丢单结束"
,
},
tbitem2
:
{
caption
:
"-"
,
caption
:
"-"
,
tip
:
""
,
tip
:
""
,
},
},
...
@@ -365,6 +377,10 @@ export default {
...
@@ -365,6 +377,10 @@ export default {
caption
:
"Remove And Close"
,
caption
:
"Remove And Close"
,
tip
:
"Remove And Close Window"
,
tip
:
"Remove And Close Window"
,
},
},
seperator2
:
{
caption
:
""
,
tip
:
""
,
},
deuiaction2
:
{
deuiaction2
:
{
caption
:
"刷新"
,
caption
:
"刷新"
,
tip
:
"刷新"
,
tip
:
"刷新"
,
...
@@ -373,18 +389,6 @@ export default {
...
@@ -373,18 +389,6 @@ export default {
caption
:
""
,
caption
:
""
,
tip
:
""
,
tip
:
""
,
},
},
deuiaction4
:
{
caption
:
"作为赢单结束"
,
tip
:
"作为赢单结束"
,
},
deuiaction5
:
{
caption
:
"作为丢单结束"
,
tip
:
"作为丢单结束"
,
},
tbitem13
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem12
:
{
tbitem12
:
{
caption
:
"关闭"
,
caption
:
"关闭"
,
tip
:
"关闭"
,
tip
:
"关闭"
,
...
...
app_CRM/src/locale/lanres/entities/opportunity/opportunity_zh_CN.ts
浏览文件 @
1b6276e4
...
@@ -344,19 +344,31 @@ export default {
...
@@ -344,19 +344,31 @@ export default {
caption
:
"编辑"
,
caption
:
"编辑"
,
tip
:
"编辑"
,
tip
:
"编辑"
,
},
},
tbitem2
:
{
seperator3
:
{
caption
:
"
-
"
,
caption
:
""
,
tip
:
""
,
tip
:
""
,
},
},
tbitem3
:
{
deuiaction4
:
{
caption
:
"
保存
"
,
caption
:
"
编辑
"
,
tip
:
"
保存
"
,
tip
:
"
编辑
"
,
},
},
tbitem5
:
{
seperator4
:
{
caption
:
"
保存并关闭
"
,
caption
:
""
,
tip
:
"
保存并关闭
"
,
tip
:
""
,
},
},
tbitem6
:
{
tbitem17_win_sep
:
{
caption
:
""
,
tip
:
""
,
},
tbitem17_win
:
{
caption
:
"作为赢单结束"
,
tip
:
"作为赢单结束"
,
},
tbitem17_lose
:
{
caption
:
"作为丢单结束"
,
tip
:
"作为丢单结束"
,
},
tbitem2
:
{
caption
:
"-"
,
caption
:
"-"
,
tip
:
""
,
tip
:
""
,
},
},
...
@@ -364,6 +376,10 @@ export default {
...
@@ -364,6 +376,10 @@ export default {
caption
:
"删除并关闭"
,
caption
:
"删除并关闭"
,
tip
:
"删除并关闭"
,
tip
:
"删除并关闭"
,
},
},
seperator2
:
{
caption
:
""
,
tip
:
""
,
},
deuiaction2
:
{
deuiaction2
:
{
caption
:
"刷新"
,
caption
:
"刷新"
,
tip
:
"刷新"
,
tip
:
"刷新"
,
...
@@ -372,18 +388,6 @@ export default {
...
@@ -372,18 +388,6 @@ export default {
caption
:
""
,
caption
:
""
,
tip
:
""
,
tip
:
""
,
},
},
deuiaction4
:
{
caption
:
"作为赢单结束"
,
tip
:
"作为赢单结束"
,
},
deuiaction5
:
{
caption
:
"作为丢单结束"
,
tip
:
"作为丢单结束"
,
},
tbitem13
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem12
:
{
tbitem12
:
{
caption
:
"关闭"
,
caption
:
"关闭"
,
tip
:
"关闭"
,
tip
:
"关闭"
,
...
...
app_CRM/src/locale/lanres/entities/product-price-level/product-price-level_en_US.ts
浏览文件 @
1b6276e4
...
@@ -32,5 +32,8 @@ export default {
...
@@ -32,5 +32,8 @@ export default {
uomid
:
"计价单位"
,
uomid
:
"计价单位"
,
discounttypeid
:
"折扣表"
,
discounttypeid
:
"折扣表"
,
pricelevelid
:
"价目表"
,
pricelevelid
:
"价目表"
,
pricelevelname
:
"价格水平名称"
,
productname
:
"产品名称"
,
uomname
:
"计量单位"
,
},
},
};
};
\ No newline at end of file
app_CRM/src/locale/lanres/entities/product-price-level/product-price-level_zh_CN.ts
浏览文件 @
1b6276e4
...
@@ -31,5 +31,8 @@ export default {
...
@@ -31,5 +31,8 @@ export default {
uomid
:
"计价单位"
,
uomid
:
"计价单位"
,
discounttypeid
:
"折扣表"
,
discounttypeid
:
"折扣表"
,
pricelevelid
:
"价目表"
,
pricelevelid
:
"价目表"
,
pricelevelname
:
"价格水平名称"
,
productname
:
"产品名称"
,
uomname
:
"计量单位"
,
},
},
};
};
\ No newline at end of file
app_CRM/src/pages/sales/lead-info/lead-info-base.tsx
浏览文件 @
1b6276e4
...
@@ -70,7 +70,6 @@ export class LeadInfoBase extends TabExpViewBase {
...
@@ -70,7 +70,6 @@ export class LeadInfoBase extends TabExpViewBase {
tbitem17_qualification_sep
:
{
name
:
'tbitem17_qualification_sep'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
tbitem17_qualification_sep
:
{
name
:
'tbitem17_qualification_sep'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
tbitem17_qualification
:
{
name
:
'tbitem17_qualification'
,
caption
:
'授予资格'
,
'isShowCaption'
:
true
,
'isShowIcon'
:
true
,
tooltip
:
'授予资格'
,
iconcls
:
'fa fa-check'
,
icon
:
''
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'Qualification'
,
target
:
'SINGLEKEY'
},
class
:
''
},
tbitem17_qualification
:
{
name
:
'tbitem17_qualification'
,
caption
:
'授予资格'
,
'isShowCaption'
:
true
,
'isShowIcon'
:
true
,
tooltip
:
'授予资格'
,
iconcls
:
'fa fa-check'
,
icon
:
''
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'Qualification'
,
target
:
'SINGLEKEY'
},
class
:
''
},
tbitem17_disqualification_sep
:
{
name
:
'tbitem17_disqualification_sep'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
tbitem17_disqualification
:
{
name
:
'tbitem17_disqualification'
,
caption
:
'取消资格'
,
'isShowCaption'
:
true
,
'isShowIcon'
:
true
,
tooltip
:
'取消资格'
,
iconcls
:
'fa fa-close'
,
icon
:
''
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'DisQualification'
,
target
:
'SINGLEKEY'
},
class
:
''
},
tbitem17_disqualification
:
{
name
:
'tbitem17_disqualification'
,
caption
:
'取消资格'
,
'isShowCaption'
:
true
,
'isShowIcon'
:
true
,
tooltip
:
'取消资格'
,
iconcls
:
'fa fa-close'
,
icon
:
''
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'DisQualification'
,
target
:
'SINGLEKEY'
},
class
:
''
},
tbitem2
:
{
name
:
'tbitem2'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
tbitem2
:
{
name
:
'tbitem2'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
...
...
app_CRM/src/pages/sales/opportunity-info/opportunity-info-base.tsx
浏览文件 @
1b6276e4
此差异已折叠。
点击以展开。
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/domain/ProductPriceLevel.java
浏览文件 @
1b6276e4
...
@@ -266,6 +266,27 @@ public class ProductPriceLevel extends EntityMP implements Serializable {
...
@@ -266,6 +266,27 @@ public class ProductPriceLevel extends EntityMP implements Serializable {
@JSONField
(
name
=
"pricelevelid"
)
@JSONField
(
name
=
"pricelevelid"
)
@JsonProperty
(
"pricelevelid"
)
@JsonProperty
(
"pricelevelid"
)
private
String
pricelevelid
;
private
String
pricelevelid
;
/**
* 价格水平名称
*/
@TableField
(
value
=
"pricelevelname"
)
@JSONField
(
name
=
"pricelevelname"
)
@JsonProperty
(
"pricelevelname"
)
private
String
pricelevelname
;
/**
* 产品名称
*/
@TableField
(
value
=
"productname"
)
@JSONField
(
name
=
"productname"
)
@JsonProperty
(
"productname"
)
private
String
productname
;
/**
* 计量单位
*/
@TableField
(
value
=
"uomname"
)
@JSONField
(
name
=
"uomname"
)
@JsonProperty
(
"uomname"
)
private
String
uomname
;
/**
/**
*
*
...
@@ -535,6 +556,30 @@ public class ProductPriceLevel extends EntityMP implements Serializable {
...
@@ -535,6 +556,30 @@ public class ProductPriceLevel extends EntityMP implements Serializable {
this
.
modify
(
"pricelevelid"
,
pricelevelid
);
this
.
modify
(
"pricelevelid"
,
pricelevelid
);
}
}
/**
* 设置 [价格水平名称]
*/
public
void
setPricelevelname
(
String
pricelevelname
){
this
.
pricelevelname
=
pricelevelname
;
this
.
modify
(
"pricelevelname"
,
pricelevelname
);
}
/**
* 设置 [产品名称]
*/
public
void
setProductname
(
String
productname
){
this
.
productname
=
productname
;
this
.
modify
(
"productname"
,
productname
);
}
/**
* 设置 [计量单位]
*/
public
void
setUomname
(
String
uomname
){
this
.
uomname
=
uomname
;
this
.
modify
(
"uomname"
,
uomname
);
}
}
}
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/filter/ProductPriceLevelSearchContext.java
浏览文件 @
1b6276e4
...
@@ -97,6 +97,48 @@ public class ProductPriceLevelSearchContext extends QueryWrapperContext<ProductP
...
@@ -97,6 +97,48 @@ public class ProductPriceLevelSearchContext extends QueryWrapperContext<ProductP
this
.
getSearchCond
().
eq
(
"pricelevelid"
,
n_pricelevelid_eq
);
this
.
getSearchCond
().
eq
(
"pricelevelid"
,
n_pricelevelid_eq
);
}
}
}
}
private
String
n_pricelevelname_eq
;
//[价格水平名称]
public
void
setN_pricelevelname_eq
(
String
n_pricelevelname_eq
)
{
this
.
n_pricelevelname_eq
=
n_pricelevelname_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_pricelevelname_eq
)){
this
.
getSearchCond
().
eq
(
"pricelevelname"
,
n_pricelevelname_eq
);
}
}
private
String
n_pricelevelname_like
;
//[价格水平名称]
public
void
setN_pricelevelname_like
(
String
n_pricelevelname_like
)
{
this
.
n_pricelevelname_like
=
n_pricelevelname_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_pricelevelname_like
)){
this
.
getSearchCond
().
like
(
"pricelevelname"
,
n_pricelevelname_like
);
}
}
private
String
n_productname_eq
;
//[产品名称]
public
void
setN_productname_eq
(
String
n_productname_eq
)
{
this
.
n_productname_eq
=
n_productname_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_productname_eq
)){
this
.
getSearchCond
().
eq
(
"productname"
,
n_productname_eq
);
}
}
private
String
n_productname_like
;
//[产品名称]
public
void
setN_productname_like
(
String
n_productname_like
)
{
this
.
n_productname_like
=
n_productname_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_productname_like
)){
this
.
getSearchCond
().
like
(
"productname"
,
n_productname_like
);
}
}
private
String
n_uomname_eq
;
//[计量单位]
public
void
setN_uomname_eq
(
String
n_uomname_eq
)
{
this
.
n_uomname_eq
=
n_uomname_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_uomname_eq
)){
this
.
getSearchCond
().
eq
(
"uomname"
,
n_uomname_eq
);
}
}
private
String
n_uomname_like
;
//[计量单位]
public
void
setN_uomname_like
(
String
n_uomname_like
)
{
this
.
n_uomname_like
=
n_uomname_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_uomname_like
)){
this
.
getSearchCond
().
like
(
"uomname"
,
n_uomname_like
);
}
}
/**
/**
* 启用快速搜索
* 启用快速搜索
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/service/impl/ProductPriceLevelServiceImpl.java
浏览文件 @
1b6276e4
...
@@ -68,6 +68,7 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
...
@@ -68,6 +68,7 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
@Override
@Override
@Transactional
@Transactional
public
boolean
create
(
ProductPriceLevel
et
)
{
public
boolean
create
(
ProductPriceLevel
et
)
{
fillParentData
(
et
);
if
(!
this
.
retBool
(
this
.
baseMapper
.
insert
(
et
)))
if
(!
this
.
retBool
(
this
.
baseMapper
.
insert
(
et
)))
return
false
;
return
false
;
CachedBeanCopier
.
copy
(
get
(
et
.
getProductpricelevelid
()),
et
);
CachedBeanCopier
.
copy
(
get
(
et
.
getProductpricelevelid
()),
et
);
...
@@ -76,12 +77,14 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
...
@@ -76,12 +77,14 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
@Override
@Override
public
void
createBatch
(
List
<
ProductPriceLevel
>
list
)
{
public
void
createBatch
(
List
<
ProductPriceLevel
>
list
)
{
list
.
forEach
(
item
->
fillParentData
(
item
));
this
.
saveBatch
(
list
,
batchSize
);
this
.
saveBatch
(
list
,
batchSize
);
}
}
@Override
@Override
@Transactional
@Transactional
public
boolean
update
(
ProductPriceLevel
et
)
{
public
boolean
update
(
ProductPriceLevel
et
)
{
fillParentData
(
et
);
if
(!
update
(
et
,(
Wrapper
)
et
.
getUpdateWrapper
(
true
).
eq
(
"productpricelevelid"
,
et
.
getProductpricelevelid
())))
if
(!
update
(
et
,(
Wrapper
)
et
.
getUpdateWrapper
(
true
).
eq
(
"productpricelevelid"
,
et
.
getProductpricelevelid
())))
return
false
;
return
false
;
CachedBeanCopier
.
copy
(
get
(
et
.
getProductpricelevelid
()),
et
);
CachedBeanCopier
.
copy
(
get
(
et
.
getProductpricelevelid
()),
et
);
...
@@ -90,6 +93,7 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
...
@@ -90,6 +93,7 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
@Override
@Override
public
void
updateBatch
(
List
<
ProductPriceLevel
>
list
)
{
public
void
updateBatch
(
List
<
ProductPriceLevel
>
list
)
{
list
.
forEach
(
item
->
fillParentData
(
item
));
updateBatchById
(
list
,
batchSize
);
updateBatchById
(
list
,
batchSize
);
}
}
...
@@ -120,6 +124,7 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
...
@@ -120,6 +124,7 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
@Override
@Override
public
ProductPriceLevel
getDraft
(
ProductPriceLevel
et
)
{
public
ProductPriceLevel
getDraft
(
ProductPriceLevel
et
)
{
fillParentData
(
et
);
return
et
;
return
et
;
}
}
...
@@ -149,12 +154,14 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
...
@@ -149,12 +154,14 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
@Override
@Override
public
boolean
saveBatch
(
Collection
<
ProductPriceLevel
>
list
)
{
public
boolean
saveBatch
(
Collection
<
ProductPriceLevel
>
list
)
{
list
.
forEach
(
item
->
fillParentData
(
item
));
saveOrUpdateBatch
(
list
,
batchSize
);
saveOrUpdateBatch
(
list
,
batchSize
);
return
true
;
return
true
;
}
}
@Override
@Override
public
void
saveBatch
(
List
<
ProductPriceLevel
>
list
)
{
public
void
saveBatch
(
List
<
ProductPriceLevel
>
list
)
{
list
.
forEach
(
item
->
fillParentData
(
item
));
saveOrUpdateBatch
(
list
,
batchSize
);
saveOrUpdateBatch
(
list
,
batchSize
);
}
}
...
@@ -231,6 +238,42 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
...
@@ -231,6 +238,42 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
/**
* 为当前实体填充父数据(外键值文本、外键值附加数据)
* @param et
*/
private
void
fillParentData
(
ProductPriceLevel
et
){
//实体关系[DER1N_PRODUCTPRICELEVEL__PRICELEVEL__PRICELEVELID]
if
(!
ObjectUtils
.
isEmpty
(
et
.
getPricelevelid
())){
cn
.
ibizlab
.
businesscentral
.
core
.
product
.
domain
.
PriceLevel
pricelevel
=
et
.
getPricelevel
();
if
(
ObjectUtils
.
isEmpty
(
pricelevel
)){
cn
.
ibizlab
.
businesscentral
.
core
.
product
.
domain
.
PriceLevel
majorEntity
=
pricelevelService
.
get
(
et
.
getPricelevelid
());
et
.
setPricelevel
(
majorEntity
);
pricelevel
=
majorEntity
;
}
et
.
setPricelevelname
(
pricelevel
.
getPricelevelname
());
}
//实体关系[DER1N_PRODUCTPRICELEVEL__PRODUCT__PRODUCTID]
if
(!
ObjectUtils
.
isEmpty
(
et
.
getProductid
())){
cn
.
ibizlab
.
businesscentral
.
core
.
product
.
domain
.
Product
product
=
et
.
getProduct
();
if
(
ObjectUtils
.
isEmpty
(
product
)){
cn
.
ibizlab
.
businesscentral
.
core
.
product
.
domain
.
Product
majorEntity
=
productService
.
get
(
et
.
getProductid
());
et
.
setProduct
(
majorEntity
);
product
=
majorEntity
;
}
et
.
setProductname
(
product
.
getProductname
());
}
//实体关系[DER1N_PRODUCTPRICELEVEL__UOM__UOMID]
if
(!
ObjectUtils
.
isEmpty
(
et
.
getUomid
())){
cn
.
ibizlab
.
businesscentral
.
core
.
base
.
domain
.
Uom
uom
=
et
.
getUom
();
if
(
ObjectUtils
.
isEmpty
(
uom
)){
cn
.
ibizlab
.
businesscentral
.
core
.
base
.
domain
.
Uom
majorEntity
=
uomService
.
get
(
et
.
getUomid
());
et
.
setUom
(
majorEntity
);
uom
=
majorEntity
;
}
et
.
setUomname
(
uom
.
getUomname
());
}
}
...
...
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
1b6276e4
...
@@ -1413,6 +1413,12 @@
...
@@ -1413,6 +1413,12 @@
</column>
</column>
<column
name=
"PRICELEVELID"
remarks=
""
type=
"VARCHAR(60)"
>
<column
name=
"PRICELEVELID"
remarks=
""
type=
"VARCHAR(60)"
>
</column>
</column>
<column
name=
"PRICELEVELNAME"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
<column
name=
"PRODUCTNAME"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
<column
name=
"UOMNAME"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
</createTable>
</createTable>
</changeSet>
</changeSet>
...
...
businesscentral-core/src/main/resources/mapper/product/productpricelevel/ProductPriceLevelMapper.xml
浏览文件 @
1b6276e4
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"ProductPriceLevelResultMap"
databaseId=
"mysql"
>
<select
id=
"selectById"
resultMap=
"ProductPriceLevelResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (SELECT t1.`AMOUNT`, t1.`AMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DISCOUNTTYPEID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`ORGANIZATIONID`, t1.`OVERRIDDENCREATEDON`, t1.`PERCENTAGE`, t1.`PRICELEVELID`, t1.`PRIC
INGMETHODCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNUMBER`, t1.`PRODUCTPRICELEVELID`, t1.`QUANTITYSELLINGCODE`, t1.`ROUNDINGOPTIONAMOUNT`, t1.`ROUNDINGOPTIONAMOUNT_BASE`, t1.`ROUNDINGOPTIONCODE`, t1.`ROUNDINGPOLICYCODE`, t1.`STAGEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UOMID
`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `PRODUCTPRICELEVEL` t1 ) t1 where productpricelevelid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`AMOUNT`, t1.`AMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DISCOUNTTYPEID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`ORGANIZATIONID`, t1.`OVERRIDDENCREATEDON`, t1.`PERCENTAGE`, t1.`PRICELEVELID`, t1.`PRIC
ELEVELNAME`, t1.`PRICINGMETHODCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTPRICELEVELID`, t1.`QUANTITYSELLINGCODE`, t1.`ROUNDINGOPTIONAMOUNT`, t1.`ROUNDINGOPTIONAMOUNT_BASE`, t1.`ROUNDINGOPTIONCODE`, t1.`ROUNDINGPOLICYCODE`, t1.`STAGEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UOMID`, t1.`UOMNAME
`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `PRODUCTPRICELEVEL` t1 ) t1 where productpricelevelid=#{id}]]>
</select>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...
@@ -89,12 +89,12 @@
...
@@ -89,12 +89,12 @@
<!--数据查询[Default]-->
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`AMOUNT`, t1.`AMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DISCOUNTTYPEID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`ORGANIZATIONID`, t1.`OVERRIDDENCREATEDON`, t1.`PERCENTAGE`, t1.`PRICELEVELID`, t1.`PRIC
INGMETHODCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNUMBER`, t1.`PRODUCTPRICELEVELID`, t1.`QUANTITYSELLINGCODE`, t1.`ROUNDINGOPTIONAMOUNT`, t1.`ROUNDINGOPTIONAMOUNT_BASE`, t1.`ROUNDINGOPTIONCODE`, t1.`ROUNDINGPOLICYCODE`, t1.`STAGEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UOMID
`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `PRODUCTPRICELEVEL` t1
<![CDATA[ SELECT t1.`AMOUNT`, t1.`AMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DISCOUNTTYPEID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`ORGANIZATIONID`, t1.`OVERRIDDENCREATEDON`, t1.`PERCENTAGE`, t1.`PRICELEVELID`, t1.`PRIC
ELEVELNAME`, t1.`PRICINGMETHODCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTPRICELEVELID`, t1.`QUANTITYSELLINGCODE`, t1.`ROUNDINGOPTIONAMOUNT`, t1.`ROUNDINGOPTIONAMOUNT_BASE`, t1.`ROUNDINGOPTIONCODE`, t1.`ROUNDINGPOLICYCODE`, t1.`STAGEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UOMID`, t1.`UOMNAME
`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `PRODUCTPRICELEVEL` t1
]]>
]]>
</sql>
</sql>
<!--数据查询[View]-->
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`AMOUNT`, t1.`AMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DISCOUNTTYPEID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`ORGANIZATIONID`, t1.`OVERRIDDENCREATEDON`, t1.`PERCENTAGE`, t1.`PRICELEVELID`, t1.`PRIC
INGMETHODCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNUMBER`, t1.`PRODUCTPRICELEVELID`, t1.`QUANTITYSELLINGCODE`, t1.`ROUNDINGOPTIONAMOUNT`, t1.`ROUNDINGOPTIONAMOUNT_BASE`, t1.`ROUNDINGOPTIONCODE`, t1.`ROUNDINGPOLICYCODE`, t1.`STAGEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UOMID
`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `PRODUCTPRICELEVEL` t1
<![CDATA[ SELECT t1.`AMOUNT`, t1.`AMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DISCOUNTTYPEID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`ORGANIZATIONID`, t1.`OVERRIDDENCREATEDON`, t1.`PERCENTAGE`, t1.`PRICELEVELID`, t1.`PRIC
ELEVELNAME`, t1.`PRICINGMETHODCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTPRICELEVELID`, t1.`QUANTITYSELLINGCODE`, t1.`ROUNDINGOPTIONAMOUNT`, t1.`ROUNDINGOPTIONAMOUNT_BASE`, t1.`ROUNDINGOPTIONCODE`, t1.`ROUNDINGPOLICYCODE`, t1.`STAGEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UOMID`, t1.`UOMNAME
`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `PRODUCTPRICELEVEL` t1
]]>
]]>
</sql>
</sql>
</mapper>
</mapper>
...
...
businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/ProductPriceLevelDTO.java
浏览文件 @
1b6276e4
...
@@ -274,6 +274,30 @@ public class ProductPriceLevelDTO extends DTOBase implements Serializable {
...
@@ -274,6 +274,30 @@ public class ProductPriceLevelDTO extends DTOBase implements Serializable {
@JsonProperty
(
"pricelevelid"
)
@JsonProperty
(
"pricelevelid"
)
private
String
pricelevelid
;
private
String
pricelevelid
;
/**
* 属性 [PRICELEVELNAME]
*
*/
@JSONField
(
name
=
"pricelevelname"
)
@JsonProperty
(
"pricelevelname"
)
private
String
pricelevelname
;
/**
* 属性 [PRODUCTNAME]
*
*/
@JSONField
(
name
=
"productname"
)
@JsonProperty
(
"productname"
)
private
String
productname
;
/**
* 属性 [UOMNAME]
*
*/
@JSONField
(
name
=
"uomname"
)
@JsonProperty
(
"uomname"
)
private
String
uomname
;
/**
/**
* 设置 [IMPORTSEQUENCENUMBER]
* 设置 [IMPORTSEQUENCENUMBER]
...
@@ -483,6 +507,30 @@ public class ProductPriceLevelDTO extends DTOBase implements Serializable {
...
@@ -483,6 +507,30 @@ public class ProductPriceLevelDTO extends DTOBase implements Serializable {
this
.
modify
(
"pricelevelid"
,
pricelevelid
);
this
.
modify
(
"pricelevelid"
,
pricelevelid
);
}
}
/**
* 设置 [PRICELEVELNAME]
*/
public
void
setPricelevelname
(
String
pricelevelname
){
this
.
pricelevelname
=
pricelevelname
;
this
.
modify
(
"pricelevelname"
,
pricelevelname
);
}
/**
* 设置 [PRODUCTNAME]
*/
public
void
setProductname
(
String
productname
){
this
.
productname
=
productname
;
this
.
modify
(
"productname"
,
productname
);
}
/**
* 设置 [UOMNAME]
*/
public
void
setUomname
(
String
uomname
){
this
.
uomname
=
uomname
;
this
.
modify
(
"uomname"
,
uomname
);
}
}
}
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录