Skip to content

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

xignzi006 发布系统代码

上级 3033b85a
显示空白字符变更
内嵌 并排
正在显示 包含 346 行增加 和 155 行删除
app_CRM/src/interface/entity/product-price-level.ts
浏览文件 @ 1b6276e4
......@@ -253,4 +253,28 @@ export interface ProductPriceLevel {
* @memberof ProductPriceLevel
*/
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 {
caption: "授予资格",
tip: "授予资格",
},
tbitem17_disqualification_sep: {
caption: "",
tip: "",
},
tbitem17_disqualification: {
caption: "取消资格",
tip: "取消资格",
......
app_CRM/src/locale/lanres/entities/lead/lead_zh_CN.ts
浏览文件 @ 1b6276e4
......@@ -425,10 +425,6 @@ export default {
caption: "授予资格",
tip: "授予资格",
},
tbitem17_disqualification_sep: {
caption: "",
tip: "",
},
tbitem17_disqualification: {
caption: "取消资格",
tip: "取消资格",
......
app_CRM/src/locale/lanres/entities/opportunity/opportunity_en_US.ts
浏览文件 @ 1b6276e4
......@@ -345,19 +345,31 @@ export default {
caption: "编辑",
tip: "编辑",
},
tbitem2: {
caption: "-",
seperator3: {
caption: "",
tip: "",
},
tbitem3: {
caption: "Save",
tip: "Save",
deuiaction4: {
caption: "编辑",
tip: "编辑",
},
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
seperator4: {
caption: "",
tip: "",
},
tbitem6: {
tbitem17_win_sep: {
caption: "",
tip: "",
},
tbitem17_win: {
caption: "作为赢单结束",
tip: "作为赢单结束",
},
tbitem17_lose: {
caption: "作为丢单结束",
tip: "作为丢单结束",
},
tbitem2: {
caption: "-",
tip: "",
},
......@@ -365,6 +377,10 @@ export default {
caption: "Remove And Close",
tip: "Remove And Close Window",
},
seperator2: {
caption: "",
tip: "",
},
deuiaction2: {
caption: "刷新",
tip: "刷新",
......@@ -373,18 +389,6 @@ export default {
caption: "",
tip: "",
},
deuiaction4: {
caption: "作为赢单结束",
tip: "作为赢单结束",
},
deuiaction5: {
caption: "作为丢单结束",
tip: "作为丢单结束",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "关闭",
tip: "关闭",
......
app_CRM/src/locale/lanres/entities/opportunity/opportunity_zh_CN.ts
浏览文件 @ 1b6276e4
......@@ -344,19 +344,31 @@ export default {
caption: "编辑",
tip: "编辑",
},
tbitem2: {
caption: "-",
seperator3: {
caption: "",
tip: "",
},
tbitem3: {
caption: "保存",
tip: "保存",
deuiaction4: {
caption: "编辑",
tip: "编辑",
},
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
seperator4: {
caption: "",
tip: "",
},
tbitem6: {
tbitem17_win_sep: {
caption: "",
tip: "",
},
tbitem17_win: {
caption: "作为赢单结束",
tip: "作为赢单结束",
},
tbitem17_lose: {
caption: "作为丢单结束",
tip: "作为丢单结束",
},
tbitem2: {
caption: "-",
tip: "",
},
......@@ -364,6 +376,10 @@ export default {
caption: "删除并关闭",
tip: "删除并关闭",
},
seperator2: {
caption: "",
tip: "",
},
deuiaction2: {
caption: "刷新",
tip: "刷新",
......@@ -372,18 +388,6 @@ export default {
caption: "",
tip: "",
},
deuiaction4: {
caption: "作为赢单结束",
tip: "作为赢单结束",
},
deuiaction5: {
caption: "作为丢单结束",
tip: "作为丢单结束",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "关闭",
tip: "关闭",
......
app_CRM/src/locale/lanres/entities/product-price-level/product-price-level_en_US.ts
浏览文件 @ 1b6276e4
......@@ -32,5 +32,8 @@ export default {
uomid: "计价单位",
discounttypeid: "折扣表",
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 {
uomid: "计价单位",
discounttypeid: "折扣表",
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 {
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_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: '' },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
......
app_CRM/src/pages/sales/opportunity-info/opportunity-info-base.tsx
浏览文件 @ 1b6276e4
......@@ -66,22 +66,22 @@ export class OpportunityInfoBase extends TabExpViewBase {
public toolBarModels: any = {
tbitem1_openmaineditview: { name: 'tbitem1_openmaineditview', caption: '编辑','isShowCaption':true,'isShowIcon':true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'OpenMainEditView', target: 'SINGLEKEY' }, class: '' },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem3: { name: 'tbitem3', caption: '保存','isShowCaption':true,'isShowIcon':true, tooltip: '保存', iconcls: 'fa fa-save', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' }, class: '' },
seperator3: { name: 'seperator3', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
deuiaction4: { name: 'deuiaction4', caption: '编辑','isShowCaption':true,'isShowIcon':true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'OpenEditMode', target: 'SINGLEKEY' }, class: '' },
seperator4: { name: 'seperator4', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem17_win_sep: { name: 'tbitem17_win_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem17_win: { name: 'tbitem17_win', caption: '作为赢单结束','isShowCaption':true,'isShowIcon':true, tooltip: '作为赢单结束', iconcls: 'fa fa-coffee', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Win', target: 'SINGLEKEY' }, class: '' },
tbitem5: { name: 'tbitem5', caption: '保存并关闭','isShowCaption':true,'isShowIcon':true, tooltip: '保存并关闭', iconcls: 'fa fa-power-off', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' }, class: '' },
tbitem17_lose: { name: 'tbitem17_lose', caption: '作为丢单结束','isShowCaption':true,'isShowIcon':true, tooltip: '作为丢单结束', iconcls: 'fa fa-close', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Lose', target: 'SINGLEKEY' }, class: '' },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
deuiaction1: { name: 'deuiaction1', caption: '删除并关闭','isShowCaption':true,'isShowIcon':true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' }, class: '' },
seperator2: { name: 'seperator2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
deuiaction2: { name: 'deuiaction2', caption: '刷新','isShowCaption':true,'isShowIcon':true, tooltip: '刷新', iconcls: 'fa fa-refresh', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Refresh', target: 'SINGLEKEY' }, class: '' },
seperator1: { name: 'seperator1', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
deuiaction4: { name: 'deuiaction4', caption: '作为赢单结束','isShowCaption':true,'isShowIcon':true, tooltip: '作为赢单结束', iconcls: 'fa fa-coffee', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Win', target: 'SINGLEKEY' }, class: '' },
deuiaction5: { name: 'deuiaction5', caption: '作为丢单结束','isShowCaption':true,'isShowIcon':true, tooltip: '作为丢单结束', iconcls: 'fa fa-close', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Lose', target: 'SINGLEKEY' }, class: '' },
tbitem13: { name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem12: { name: 'tbitem12', caption: '关闭','isShowCaption':true,'isShowIcon':true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Exit', target: '' }, class: '' },
};
......@@ -133,11 +133,14 @@ export class OpportunityInfoBase extends TabExpViewBase {
if (Object.is($event.tag, 'tbitem1_openmaineditview')) {
this.toolbar_tbitem1_openmaineditview_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2);
if (Object.is($event.tag, 'deuiaction4')) {
this.toolbar_deuiaction4_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem17_win')) {
this.toolbar_tbitem17_win_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
if (Object.is($event.tag, 'tbitem17_lose')) {
this.toolbar_tbitem17_lose_click(null, '', $event2);
}
if (Object.is($event.tag, 'deuiaction1')) {
this.toolbar_deuiaction1_click(null, '', $event2);
......@@ -145,12 +148,6 @@ export class OpportunityInfoBase extends TabExpViewBase {
if (Object.is($event.tag, 'deuiaction2')) {
this.toolbar_deuiaction2_click(null, '', $event2);
}
if (Object.is($event.tag, 'deuiaction4')) {
this.toolbar_deuiaction4_click(null, '', $event2);
}
if (Object.is($event.tag, 'deuiaction5')) {
this.toolbar_deuiaction5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem12')) {
this.toolbar_tbitem12_click(null, '', $event2);
}
......@@ -192,34 +189,7 @@ export class OpportunityInfoBase extends TabExpViewBase {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem3_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
if (_this.getDatas && _this.getDatas instanceof Function) {
datas = [..._this.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"Opportunity");
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_deuiaction4_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -235,7 +205,7 @@ export class OpportunityInfoBase extends TabExpViewBase {
datas = [params];
}
// 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"Opportunity");
this.OpenEditMode(datas, contextJO,paramJO, $event, xData,this,"Opportunity");
}
/**
......@@ -246,7 +216,7 @@ export class OpportunityInfoBase extends TabExpViewBase {
* @param {*} [$event]
* @memberof
*/
public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem17_win_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -262,7 +232,8 @@ export class OpportunityInfoBase extends TabExpViewBase {
datas = [params];
}
// 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"Opportunity");
const curUIService:OpportunityUIService = new OpportunityUIService();
curUIService.Opportunity_Win(datas,contextJO, paramJO, $event, xData,this,"Opportunity");
}
/**
......@@ -273,7 +244,7 @@ export class OpportunityInfoBase extends TabExpViewBase {
* @param {*} [$event]
* @memberof
*/
public toolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem17_lose_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -289,7 +260,8 @@ export class OpportunityInfoBase extends TabExpViewBase {
datas = [params];
}
// 界面行为
this.Refresh(datas, contextJO,paramJO, $event, xData,this,"Opportunity");
const curUIService:OpportunityUIService = new OpportunityUIService();
curUIService.Opportunity_Lose(datas,contextJO, paramJO, $event, xData,this,"Opportunity");
}
/**
......@@ -300,7 +272,7 @@ export class OpportunityInfoBase extends TabExpViewBase {
* @param {*} [$event]
* @memberof
*/
public toolbar_deuiaction4_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -316,8 +288,7 @@ export class OpportunityInfoBase extends TabExpViewBase {
datas = [params];
}
// 界面行为
const curUIService:OpportunityUIService = new OpportunityUIService();
curUIService.Opportunity_Win(datas,contextJO, paramJO, $event, xData,this,"Opportunity");
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"Opportunity");
}
/**
......@@ -328,7 +299,7 @@ export class OpportunityInfoBase extends TabExpViewBase {
* @param {*} [$event]
* @memberof
*/
public toolbar_deuiaction5_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -344,8 +315,7 @@ export class OpportunityInfoBase extends TabExpViewBase {
datas = [params];
}
// 界面行为
const curUIService:OpportunityUIService = new OpportunityUIService();
curUIService.Opportunity_Lose(datas,contextJO, paramJO, $event, xData,this,"Opportunity");
this.Refresh(datas, contextJO,paramJO, $event, xData,this,"Opportunity");
}
/**
......@@ -376,64 +346,72 @@ export class OpportunityInfoBase extends TabExpViewBase {
}
/**
* 保存
* 编辑
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {any} context 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof OpportunityInfoBase
* @param {*} [srfParentDeName] 父实体名称
* @returns {Promise<any>}
*/
public Save(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
// 界面行为容器对象 _this
public async OpenEditMode(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
xData = $event;
$event = params;
params = context;
let context2: any = {};
let data: any = {};
let parentContext:any = {};
let parentViewParam:any = {};
const _args: any[] = this.$util.deepCopy(args);
const _this: any = this;
if (xData && xData.save instanceof Function) {
xData.save().then((response: any) => {
if (!response || response.status !== 200) {
const actionTarget: string | null = 'SINGLEKEY';
Object.assign(context2, { res_partner: '%id%' });
Object.assign(params, { id: '%id%' });
Object.assign(params, { name: '%name%' })
if(actionContext.context){
parentContext = actionContext.context;
}
if(actionContext.viewparams){
parentViewParam = actionContext.viewparams;
}
context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
Object.assign(context,this.context,context);
if(context && context.srfsessionid){
context.srfsessionkey = context.srfsessionid;
delete context.srfsessionid;
}
const parameters: any[] = [
{ pathName: 'res_partners', parameterName: 'res_partner' },
];
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, context,data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
_this.$emit('viewdataschange', [{ ...response.data }]);
});
} else if (_this.save && _this.save instanceof Function) {
_this.save();
}
}
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof OpportunityInfoBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
if (xData && xData.refresh && xData.refresh instanceof Function) {
xData.refresh(args);
}
return result.datas;
});
}
const view: any = {
viewname: 'opportunity-info-edit-mode',
height: 0,
width: 0,
title: '商机信息',
placement: 'DRAWER_TOP',
};
openDrawer(view, data);
}
/**
* 删除并关闭
*
......
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 {
@JSONField(name = "pricelevelid")
@JsonProperty("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 {
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
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
@Override
@Transactional
public boolean create(ProductPriceLevel et) {
fillParentData(et);
if(!this.retBool(this.baseMapper.insert(et)))
return false;
CachedBeanCopier.copy(get(et.getProductpricelevelid()),et);
......@@ -76,12 +77,14 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
@Override
public void createBatch(List<ProductPriceLevel> list) {
list.forEach(item->fillParentData(item));
this.saveBatch(list,batchSize);
}
@Override
@Transactional
public boolean update(ProductPriceLevel et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("productpricelevelid",et.getProductpricelevelid())))
return false;
CachedBeanCopier.copy(get(et.getProductpricelevelid()),et);
......@@ -90,6 +93,7 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
@Override
public void updateBatch(List<ProductPriceLevel> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize);
}
......@@ -120,6 +124,7 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
@Override
public ProductPriceLevel getDraft(ProductPriceLevel et) {
fillParentData(et);
return et;
}
......@@ -149,12 +154,14 @@ public class ProductPriceLevelServiceImpl extends ServiceImpl<ProductPriceLevelM
@Override
public boolean saveBatch(Collection<ProductPriceLevel> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
return true;
}
@Override
public void saveBatch(List<ProductPriceLevel> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
}
......@@ -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 @@
</column>
<column name="PRICELEVELID" remarks="" type="VARCHAR(60)">
</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>
</changeSet>
......
businesscentral-core/src/main/resources/mapper/product/productpricelevel/ProductPriceLevelMapper.xml
浏览文件 @ 1b6276e4
......@@ -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.`PRICINGMETHODCODE`, 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.`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.`PRICINGMETHODCODE`, 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.`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.`PRICINGMETHODCODE`, 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.`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
浏览文件 @ 1b6276e4
......@@ -274,6 +274,30 @@ public class ProductPriceLevelDTO extends DTOBase implements Serializable {
@JsonProperty("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]
......@@ -483,6 +507,30 @@ public class ProductPriceLevelDTO extends DTOBase implements Serializable {
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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或