Skip to content

I
iBiz企业中心
提交 a498185d 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

xignzi006 发布系统代码

上级 71078391
隐藏空白字符变更
内嵌 并排
正在显示 包含 70 行增加 和 3 行删除
app_CRM/src/interface/entity/product-price-level.ts
浏览文件 @ a498185d
......@@ -277,4 +277,12 @@ export interface ProductPriceLevel {
* @memberof ProductPriceLevel
*/
uomname?: any;
/**
* 折扣类型名称
*
* @returns {*}
* @memberof ProductPriceLevel
*/
discounttypename?: any;
}
\ No newline at end of file
app_CRM/src/locale/lanres/entities/product-price-level/product-price-level_en_US.ts
浏览文件 @ a498185d
......@@ -35,5 +35,6 @@ export default {
pricelevelname: "价格水平名称",
productname: "产品名称",
uomname: "计量单位",
discounttypename: "折扣类型名称",
},
};
\ No newline at end of file
app_CRM/src/locale/lanres/entities/product-price-level/product-price-level_zh_CN.ts
浏览文件 @ a498185d
......@@ -34,5 +34,6 @@ export default {
pricelevelname: "价格水平名称",
productname: "产品名称",
uomname: "计量单位",
discounttypename: "折扣类型名称",
},
};
\ No newline at end of file
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/domain/ProductPriceLevel.java
浏览文件 @ a498185d
......@@ -287,6 +287,13 @@ public class ProductPriceLevel extends EntityMP implements Serializable {
@JSONField(name = "uomname")
@JsonProperty("uomname")
private String uomname;
/**
* 折扣类型名称
*/
@TableField(value = "discounttypename")
@JSONField(name = "discounttypename")
@JsonProperty("discounttypename")
private String discounttypename;
/**
*
......@@ -580,6 +587,14 @@ public class ProductPriceLevel extends EntityMP implements Serializable {
this.modify("uomname",uomname);
}
/**
* 设置 [折扣类型名称]
*/
public void setDiscounttypename(String discounttypename){
this.discounttypename = discounttypename ;
this.modify("discounttypename",discounttypename);
}
}
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/filter/ProductPriceLevelSearchContext.java
浏览文件 @ a498185d
......@@ -139,6 +139,20 @@ public class ProductPriceLevelSearchContext extends QueryWrapperContext<ProductP
this.getSearchCond().like("uomname", n_uomname_like);
}
}
private String n_discounttypename_eq;//[折扣类型名称]
public void setN_discounttypename_eq(String n_discounttypename_eq) {
this.n_discounttypename_eq = n_discounttypename_eq;
if(!ObjectUtils.isEmpty(this.n_discounttypename_eq)){
this.getSearchCond().eq("discounttypename", n_discounttypename_eq);
}
}
private String n_discounttypename_like;//[折扣类型名称]
public void setN_discounttypename_like(String n_discounttypename_like) {
this.n_discounttypename_like = n_discounttypename_like;
if(!ObjectUtils.isEmpty(this.n_discounttypename_like)){
this.getSearchCond().like("discounttypename", n_discounttypename_like);
}
}
/**
* 启用快速搜索
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/service/impl/ProductPriceLevelServiceImpl.java
浏览文件 @ a498185d
......@@ -243,6 +243,16 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
* @param et
*/
private void fillParentData(ProductPriceLevel et){
//实体关系[DER1N_PRODUCTPRICELEVEL__DISCOUNTTYPE__DISCOUNTTYPEID]
if(!ObjectUtils.isEmpty(et.getDiscounttypeid())){
cn.ibizlab.businesscentral.core.sales.domain.DiscountType discounttype=et.getDiscounttype();
if(ObjectUtils.isEmpty(discounttype)){
cn.ibizlab.businesscentral.core.sales.domain.DiscountType majorEntity=discounttypeService.get(et.getDiscounttypeid());
et.setDiscounttype(majorEntity);
discounttype=majorEntity;
}
et.setDiscounttypename(discounttype.getDiscounttypename());
}
//实体关系[DER1N_PRODUCTPRICELEVEL__PRICELEVEL__PRICELEVELID]
if(!ObjectUtils.isEmpty(et.getPricelevelid())){
cn.ibizlab.businesscentral.core.product.domain.PriceLevel pricelevel=et.getPricelevel();
......
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ a498185d
......@@ -1419,6 +1419,8 @@
</column>
<column name="UOMNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="DISCOUNTTYPENAME" remarks="" type="VARCHAR(100)">
</column>
</createTable>
</changeSet>
......
businesscentral-core/src/main/resources/mapper/product/productpricelevel/ProductPriceLevelMapper.xml
浏览文件 @ a498185d
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<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.`PRICELEVELNAME`, 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}]]>
<![CDATA[select t1.* from (SELECT t1.`AMOUNT`, t1.`AMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DISCOUNTTYPEID`, t1.`DISCOUNTTYPENAME`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`ORGANIZATIONID`, t1.`OVERRIDDENCREATEDON`, t1.`PERCENTAGE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, 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>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -89,12 +89,12 @@
<!--数据查询[Default]-->
<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.`PRICELEVELNAME`, 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
<![CDATA[ SELECT t1.`AMOUNT`, t1.`AMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DISCOUNTTYPEID`, t1.`DISCOUNTTYPENAME`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`ORGANIZATIONID`, t1.`OVERRIDDENCREATEDON`, t1.`PERCENTAGE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, 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>
<!--数据查询[View]-->
<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.`PRICELEVELNAME`, 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
<![CDATA[ SELECT t1.`AMOUNT`, t1.`AMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DISCOUNTTYPEID`, t1.`DISCOUNTTYPENAME`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`ORGANIZATIONID`, t1.`OVERRIDDENCREATEDON`, t1.`PERCENTAGE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, 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>
</mapper>
......
businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/ProductPriceLevelDTO.java
浏览文件 @ a498185d
......@@ -298,6 +298,14 @@ public class ProductPriceLevelDTO extends DTOBase implements Serializable {
@JsonProperty("uomname")
private String uomname;
/**
* 属性 [DISCOUNTTYPENAME]
*
*/
@JSONField(name = "discounttypename")
@JsonProperty("discounttypename")
private String discounttypename;
/**
* 设置 [IMPORTSEQUENCENUMBER]
......@@ -531,6 +539,14 @@ public class ProductPriceLevelDTO extends DTOBase implements Serializable {
this.modify("uomname",uomname);
}
/**
* 设置 [DISCOUNTTYPENAME]
*/
public void setDiscounttypename(String discounttypename){
this.discounttypename = discounttypename ;
this.modify("discounttypename",discounttypename);
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或