xignzi006 部署微服务接口

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/domain/Invoice.java

@@ -473,13 +473,6 @@ public class Invoice extends EntityMP implements Serializable {
     @JSONField(name = "importsequencenumber")
     @JsonProperty("importsequencenumber")
     private Integer importsequencenumber;
-    /**
-     * SLAName
-     */
-    @TableField(value = "slaname")
-    @JSONField(name = "slaname")
-    @JsonProperty("slaname")
-    private String slaname;
     /**
      * 客户类型
      */
@@ -666,6 +659,13 @@ public class Invoice extends EntityMP implements Serializable {
     @JSONField(name = "billto_fax")
     @JsonProperty("billto_fax")
     private String billtoFax;
+    /**
+     * SLA
+     */
+    @TableField(value = "slaname")
+    @JSONField(name = "slaname")
+    @JsonProperty("slaname")
+    private String slaname;
     /**
      * 货币
      */
@@ -701,6 +701,34 @@ public class Invoice extends EntityMP implements Serializable {
     @JSONField(name = "slaid")
     @JsonProperty("slaid")
     private String slaid;
+    /**
+     * 货币
+     */
+    @TableField(value = "transactioncurrencyname")
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+    /**
+     * 价目表
+     */
+    @TableField(value = "pricelevelname")
+    @JSONField(name = "pricelevelname")
+    @JsonProperty("pricelevelname")
+    private String pricelevelname;
+    /**
+     * 订单
+     */
+    @TableField(value = "salesordername")
+    @JSONField(name = "salesordername")
+    @JsonProperty("salesordername")
+    private String salesordername;
+    /**
+     * 商机
+     */
+    @TableField(value = "opportunityname")
+    @JSONField(name = "opportunityname")
+    @JsonProperty("opportunityname")
+    private String opportunityname;
 
     /**
      * 
@@ -1200,14 +1228,6 @@ public class Invoice extends EntityMP implements Serializable {
         this.modify("importsequencenumber",importsequencenumber);
     }
 
-    /**
-     * 设置 [SLAName]
-     */
-    public void setSlaname(String slaname){
-        this.slaname = slaname ;
-        this.modify("slaname",slaname);
-    }
-
     /**
      * 设置 [客户类型]
      */
@@ -1418,6 +1438,14 @@ public class Invoice extends EntityMP implements Serializable {
         this.modify("billto_fax",billtoFax);
     }
 
+    /**
+     * 设置 [SLA]
+     */
+    public void setSlaname(String slaname){
+        this.slaname = slaname ;
+        this.modify("slaname",slaname);
+    }
+
     /**
      * 设置 [货币]
      */
@@ -1458,6 +1486,38 @@ public class Invoice extends EntityMP implements Serializable {
         this.modify("slaid",slaid);
     }
 
+    /**
+     * 设置 [货币]
+     */
+    public void setTransactioncurrencyname(String transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
+    /**
+     * 设置 [价目表]
+     */
+    public void setPricelevelname(String pricelevelname){
+        this.pricelevelname = pricelevelname ;
+        this.modify("pricelevelname",pricelevelname);
+    }
+
+    /**
+     * 设置 [订单]
+     */
+    public void setSalesordername(String salesordername){
+        this.salesordername = salesordername ;
+        this.modify("salesordername",salesordername);
+    }
+
+    /**
+     * 设置 [商机]
+     */
+    public void setOpportunityname(String opportunityname){
+        this.opportunityname = opportunityname ;
+        this.modify("opportunityname",opportunityname);
+    }
+
 
 }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/filter/InvoiceSearchContext.java

@@ -118,6 +118,62 @@ public class InvoiceSearchContext extends QueryWrapperContext<Invoice> {
             this.getSearchCond().eq("slaid", n_slaid_eq);
         }
     }
+	private String n_transactioncurrencyname_eq;//[货币]
+	public void setN_transactioncurrencyname_eq(String n_transactioncurrencyname_eq) {
+        this.n_transactioncurrencyname_eq = n_transactioncurrencyname_eq;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_eq)){
+            this.getSearchCond().eq("transactioncurrencyname", n_transactioncurrencyname_eq);
+        }
+    }
+	private String n_transactioncurrencyname_like;//[货币]
+	public void setN_transactioncurrencyname_like(String n_transactioncurrencyname_like) {
+        this.n_transactioncurrencyname_like = n_transactioncurrencyname_like;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_like)){
+            this.getSearchCond().like("transactioncurrencyname", n_transactioncurrencyname_like);
+        }
+    }
+	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_salesordername_eq;//[订单]
+	public void setN_salesordername_eq(String n_salesordername_eq) {
+        this.n_salesordername_eq = n_salesordername_eq;
+        if(!ObjectUtils.isEmpty(this.n_salesordername_eq)){
+            this.getSearchCond().eq("salesordername", n_salesordername_eq);
+        }
+    }
+	private String n_salesordername_like;//[订单]
+	public void setN_salesordername_like(String n_salesordername_like) {
+        this.n_salesordername_like = n_salesordername_like;
+        if(!ObjectUtils.isEmpty(this.n_salesordername_like)){
+            this.getSearchCond().like("salesordername", n_salesordername_like);
+        }
+    }
+	private String n_opportunityname_eq;//[商机]
+	public void setN_opportunityname_eq(String n_opportunityname_eq) {
+        this.n_opportunityname_eq = n_opportunityname_eq;
+        if(!ObjectUtils.isEmpty(this.n_opportunityname_eq)){
+            this.getSearchCond().eq("opportunityname", n_opportunityname_eq);
+        }
+    }
+	private String n_opportunityname_like;//[商机]
+	public void setN_opportunityname_like(String n_opportunityname_like) {
+        this.n_opportunityname_like = n_opportunityname_like;
+        if(!ObjectUtils.isEmpty(this.n_opportunityname_like)){
+            this.getSearchCond().like("opportunityname", n_opportunityname_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/service/impl/InvoiceServiceImpl.java

@@ -68,6 +68,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     @Override
     @Transactional
     public boolean create(Invoice et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getInvoiceid()),et);
@@ -76,17 +77,20 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
 
     @Override
     public void createBatch(List<Invoice> list) {
+        list.forEach(item->fillParentData(item));
         this.saveBatch(list,batchSize);
     }
 
     @Override
     public Invoice getDraft(Invoice et) {
+        fillParentData(et);
         return et;
     }
 
     @Override
     @Transactional
     public boolean update(Invoice et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("invoiceid",et.getInvoiceid())))
             return false;
         CachedBeanCopier.copy(get(et.getInvoiceid()),et);
@@ -95,6 +99,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
 
     @Override
     public void updateBatch(List<Invoice> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
@@ -136,12 +141,14 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
 
     @Override
     public boolean saveBatch(Collection<Invoice> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<Invoice> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
@@ -221,6 +228,62 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(Invoice et){
+        //实体关系[DER1N_INVOICE__OPPORTUNITY__OPPORTUNITYID]
+        if(!ObjectUtils.isEmpty(et.getOpportunityid())){
+            cn.ibizlab.businesscentral.core.sales.domain.Opportunity opportunity=et.getOpportunity();
+            if(ObjectUtils.isEmpty(opportunity)){
+                cn.ibizlab.businesscentral.core.sales.domain.Opportunity majorEntity=opportunityService.get(et.getOpportunityid());
+                et.setOpportunity(majorEntity);
+                opportunity=majorEntity;
+            }
+            et.setOpportunityname(opportunity.getOpportunityname());
+        }
+        //实体关系[DER1N_INVOICE__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_INVOICE__SALESORDER__SALESORDERID]
+        if(!ObjectUtils.isEmpty(et.getSalesorderid())){
+            cn.ibizlab.businesscentral.core.sales.domain.SalesOrder salesorder=et.getSalesorder();
+            if(ObjectUtils.isEmpty(salesorder)){
+                cn.ibizlab.businesscentral.core.sales.domain.SalesOrder majorEntity=salesorderService.get(et.getSalesorderid());
+                et.setSalesorder(majorEntity);
+                salesorder=majorEntity;
+            }
+            et.setSalesordername(salesorder.getSalesordername());
+        }
+        //实体关系[DER1N_INVOICE__SLA__SLAID]
+        if(!ObjectUtils.isEmpty(et.getSlaid())){
+            cn.ibizlab.businesscentral.core.base.domain.Sla sla=et.getSla();
+            if(ObjectUtils.isEmpty(sla)){
+                cn.ibizlab.businesscentral.core.base.domain.Sla majorEntity=slaService.get(et.getSlaid());
+                et.setSla(majorEntity);
+                sla=majorEntity;
+            }
+            et.setSlaname(sla.getSlaname());
+        }
+        //实体关系[DER1N_INVOICE__TRANSACTIONCURRENCY__TRANSACTIONCURRENCYID]
+        if(!ObjectUtils.isEmpty(et.getTransactioncurrencyid())){
+            cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency transactioncurrency=et.getTransactioncurrency();
+            if(ObjectUtils.isEmpty(transactioncurrency)){
+                cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency majorEntity=transactioncurrencyService.get(et.getTransactioncurrencyid());
+                et.setTransactioncurrency(majorEntity);
+                transactioncurrency=majorEntity;
+            }
+            et.setTransactioncurrencyname(transactioncurrency.getCurrencyname());
+        }
+    }
 
 
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/domain/Product.java

@@ -435,6 +435,48 @@ public class Product extends EntityMP implements Serializable {
     @JSONField(name = "subjectid")
     @JsonProperty("subjectid")
     private String subjectid;
+    /**
+     * 父级
+     */
+    @TableField(value = "parentproductname")
+    @JSONField(name = "parentproductname")
+    @JsonProperty("parentproductname")
+    private String parentproductname;
+    /**
+     * 货币
+     */
+    @TableField(value = "transactioncurrencyname")
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+    /**
+     * 默认价目表
+     */
+    @TableField(value = "pricelevelname")
+    @JSONField(name = "pricelevelname")
+    @JsonProperty("pricelevelname")
+    private String pricelevelname;
+    /**
+     * 默认计价单位
+     */
+    @TableField(value = "defaultuomname")
+    @JSONField(name = "defaultuomname")
+    @JsonProperty("defaultuomname")
+    private String defaultuomname;
+    /**
+     * 计价单位组
+     */
+    @TableField(value = "defaultuomschedulename")
+    @JSONField(name = "defaultuomschedulename")
+    @JsonProperty("defaultuomschedulename")
+    private String defaultuomschedulename;
+    /**
+     * 主题
+     */
+    @TableField(value = "subject")
+    @JSONField(name = "subject")
+    @JsonProperty("subject")
+    private String subject;
 
     /**
      * 
@@ -908,6 +950,54 @@ public class Product extends EntityMP implements Serializable {
         this.modify("subjectid",subjectid);
     }
 
+    /**
+     * 设置 [父级]
+     */
+    public void setParentproductname(String parentproductname){
+        this.parentproductname = parentproductname ;
+        this.modify("parentproductname",parentproductname);
+    }
+
+    /**
+     * 设置 [货币]
+     */
+    public void setTransactioncurrencyname(String transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
+    /**
+     * 设置 [默认价目表]
+     */
+    public void setPricelevelname(String pricelevelname){
+        this.pricelevelname = pricelevelname ;
+        this.modify("pricelevelname",pricelevelname);
+    }
+
+    /**
+     * 设置 [默认计价单位]
+     */
+    public void setDefaultuomname(String defaultuomname){
+        this.defaultuomname = defaultuomname ;
+        this.modify("defaultuomname",defaultuomname);
+    }
+
+    /**
+     * 设置 [计价单位组]
+     */
+    public void setDefaultuomschedulename(String defaultuomschedulename){
+        this.defaultuomschedulename = defaultuomschedulename ;
+        this.modify("defaultuomschedulename",defaultuomschedulename);
+    }
+
+    /**
+     * 设置 [主题]
+     */
+    public void setSubject(String subject){
+        this.subject = subject ;
+        this.modify("subject",subject);
+    }
+
 
 }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/filter/ProductSearchContext.java

@@ -104,6 +104,90 @@ public class ProductSearchContext extends QueryWrapperContext<Product> {
             this.getSearchCond().eq("subjectid", n_subjectid_eq);
         }
     }
+	private String n_parentproductname_eq;//[父级]
+	public void setN_parentproductname_eq(String n_parentproductname_eq) {
+        this.n_parentproductname_eq = n_parentproductname_eq;
+        if(!ObjectUtils.isEmpty(this.n_parentproductname_eq)){
+            this.getSearchCond().eq("parentproductname", n_parentproductname_eq);
+        }
+    }
+	private String n_parentproductname_like;//[父级]
+	public void setN_parentproductname_like(String n_parentproductname_like) {
+        this.n_parentproductname_like = n_parentproductname_like;
+        if(!ObjectUtils.isEmpty(this.n_parentproductname_like)){
+            this.getSearchCond().like("parentproductname", n_parentproductname_like);
+        }
+    }
+	private String n_transactioncurrencyname_eq;//[货币]
+	public void setN_transactioncurrencyname_eq(String n_transactioncurrencyname_eq) {
+        this.n_transactioncurrencyname_eq = n_transactioncurrencyname_eq;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_eq)){
+            this.getSearchCond().eq("transactioncurrencyname", n_transactioncurrencyname_eq);
+        }
+    }
+	private String n_transactioncurrencyname_like;//[货币]
+	public void setN_transactioncurrencyname_like(String n_transactioncurrencyname_like) {
+        this.n_transactioncurrencyname_like = n_transactioncurrencyname_like;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_like)){
+            this.getSearchCond().like("transactioncurrencyname", n_transactioncurrencyname_like);
+        }
+    }
+	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_defaultuomname_eq;//[默认计价单位]
+	public void setN_defaultuomname_eq(String n_defaultuomname_eq) {
+        this.n_defaultuomname_eq = n_defaultuomname_eq;
+        if(!ObjectUtils.isEmpty(this.n_defaultuomname_eq)){
+            this.getSearchCond().eq("defaultuomname", n_defaultuomname_eq);
+        }
+    }
+	private String n_defaultuomname_like;//[默认计价单位]
+	public void setN_defaultuomname_like(String n_defaultuomname_like) {
+        this.n_defaultuomname_like = n_defaultuomname_like;
+        if(!ObjectUtils.isEmpty(this.n_defaultuomname_like)){
+            this.getSearchCond().like("defaultuomname", n_defaultuomname_like);
+        }
+    }
+	private String n_defaultuomschedulename_eq;//[计价单位组]
+	public void setN_defaultuomschedulename_eq(String n_defaultuomschedulename_eq) {
+        this.n_defaultuomschedulename_eq = n_defaultuomschedulename_eq;
+        if(!ObjectUtils.isEmpty(this.n_defaultuomschedulename_eq)){
+            this.getSearchCond().eq("defaultuomschedulename", n_defaultuomschedulename_eq);
+        }
+    }
+	private String n_defaultuomschedulename_like;//[计价单位组]
+	public void setN_defaultuomschedulename_like(String n_defaultuomschedulename_like) {
+        this.n_defaultuomschedulename_like = n_defaultuomschedulename_like;
+        if(!ObjectUtils.isEmpty(this.n_defaultuomschedulename_like)){
+            this.getSearchCond().like("defaultuomschedulename", n_defaultuomschedulename_like);
+        }
+    }
+	private String n_subject_eq;//[主题]
+	public void setN_subject_eq(String n_subject_eq) {
+        this.n_subject_eq = n_subject_eq;
+        if(!ObjectUtils.isEmpty(this.n_subject_eq)){
+            this.getSearchCond().eq("subject", n_subject_eq);
+        }
+    }
+	private String n_subject_like;//[主题]
+	public void setN_subject_like(String n_subject_like) {
+        this.n_subject_like = n_subject_like;
+        if(!ObjectUtils.isEmpty(this.n_subject_like)){
+            this.getSearchCond().like("subject", n_subject_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/service/impl/ProductServiceImpl.java

@@ -117,18 +117,21 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
 
     @Override
     public boolean saveBatch(Collection<Product> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<Product> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
     @Override
     @Transactional
     public boolean create(Product et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getProductid()),et);
@@ -137,12 +140,14 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
 
     @Override
     public void createBatch(List<Product> list) {
+        list.forEach(item->fillParentData(item));
         this.saveBatch(list,batchSize);
     }
 
     @Override
     @Transactional
     public boolean update(Product et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("productid",et.getProductid())))
             return false;
         CachedBeanCopier.copy(get(et.getProductid()),et);
@@ -151,6 +156,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
 
     @Override
     public void updateBatch(List<Product> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
@@ -168,6 +174,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
 
     @Override
     public Product getDraft(Product et) {
+        fillParentData(et);
         return et;
     }
 
@@ -257,6 +264,72 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(Product et){
+        //实体关系[DER1N_PRODUCT__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_PRODUCT__PRODUCT__PARENTPRODUCTID]
+        if(!ObjectUtils.isEmpty(et.getParentproductid())){
+            cn.ibizlab.businesscentral.core.product.domain.Product parentproduct=et.getParentproduct();
+            if(ObjectUtils.isEmpty(parentproduct)){
+                cn.ibizlab.businesscentral.core.product.domain.Product majorEntity=productService.get(et.getParentproductid());
+                et.setParentproduct(majorEntity);
+                parentproduct=majorEntity;
+            }
+            et.setParentproductname(parentproduct.getProductname());
+        }
+        //实体关系[DER1N_PRODUCT__SUBJECT__SUBJECTID]
+        if(!ObjectUtils.isEmpty(et.getSubjectid())){
+            cn.ibizlab.businesscentral.core.base.domain.Subject subject=et.getSubject();
+            if(ObjectUtils.isEmpty(subject)){
+                cn.ibizlab.businesscentral.core.base.domain.Subject majorEntity=subjectService.get(et.getSubjectid());
+                et.setSubject(majorEntity);
+                subject=majorEntity;
+            }
+            et.setSubject(subject.getTitle());
+        }
+        //实体关系[DER1N_PRODUCT__TRANSACTIONCURRENCY__TRANSACTIONCURRENCYID]
+        if(!ObjectUtils.isEmpty(et.getTransactioncurrencyid())){
+            cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency transactioncurrency=et.getTransactioncurrency();
+            if(ObjectUtils.isEmpty(transactioncurrency)){
+                cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency majorEntity=transactioncurrencyService.get(et.getTransactioncurrencyid());
+                et.setTransactioncurrency(majorEntity);
+                transactioncurrency=majorEntity;
+            }
+            et.setTransactioncurrencyname(transactioncurrency.getCurrencyname());
+        }
+        //实体关系[DER1N_PRODUCT__UOMSCHEDULE__DEFAULTUOMSCHEDULEID]
+        if(!ObjectUtils.isEmpty(et.getDefaultuomscheduleid())){
+            cn.ibizlab.businesscentral.core.base.domain.UomSchedule defaultuomschedule=et.getDefaultuomschedule();
+            if(ObjectUtils.isEmpty(defaultuomschedule)){
+                cn.ibizlab.businesscentral.core.base.domain.UomSchedule majorEntity=uomscheduleService.get(et.getDefaultuomscheduleid());
+                et.setDefaultuomschedule(majorEntity);
+                defaultuomschedule=majorEntity;
+            }
+            et.setDefaultuomschedulename(defaultuomschedule.getUomschedulename());
+        }
+        //实体关系[DER1N_PRODUCT__UOM__DEFAULTUOMID]
+        if(!ObjectUtils.isEmpty(et.getDefaultuomid())){
+            cn.ibizlab.businesscentral.core.base.domain.Uom defaultuom=et.getDefaultuom();
+            if(ObjectUtils.isEmpty(defaultuom)){
+                cn.ibizlab.businesscentral.core.base.domain.Uom majorEntity=uomService.get(et.getDefaultuomid());
+                et.setDefaultuom(majorEntity);
+                defaultuom=majorEntity;
+            }
+            et.setDefaultuomname(defaultuom.getUomname());
+        }
+    }
 
 
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/domain/Competitor.java

@@ -654,6 +654,13 @@ public class Competitor extends EntityMP implements Serializable {
     @JSONField(name = "transactioncurrencyid")
     @JsonProperty("transactioncurrencyid")
     private String transactioncurrencyid;
+    /**
+     * 货币
+     */
+    @TableField(value = "transactioncurrencyname")
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
 
     /**
      * 
@@ -1275,6 +1282,14 @@ public class Competitor extends EntityMP implements Serializable {
         this.modify("transactioncurrencyid",transactioncurrencyid);
     }
 
+    /**
+     * 设置 [货币]
+     */
+    public void setTransactioncurrencyname(String transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
 
 }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/domain/Lead.java

@@ -55,13 +55,6 @@ public class Lead extends EntityMP implements Serializable {
     @JSONField(name = "address2_utcoffset")
     @JsonProperty("address2_utcoffset")
     private Integer address2Utcoffset;
-    /**
-     * SLAName
-     */
-    @TableField(value = "slaname")
-    @JSONField(name = "slaname")
-    @JsonProperty("slaname")
-    private String slaname;
     /**
      * 职务
      */
@@ -198,13 +191,6 @@ public class Lead extends EntityMP implements Serializable {
     @JSONField(name = "createman")
     @JsonProperty("createman")
     private String createman;
-    /**
-     * ParentContactIdYomiName
-     */
-    @TableField(value = "parentcontactidyominame")
-    @JSONField(name = "parentcontactidyominame")
-    @JsonProperty("parentcontactidyominame")
-    private String parentcontactidyominame;
     /**
      * 地址 2: 省/市/自治区
      */
@@ -537,13 +523,6 @@ public class Lead extends EntityMP implements Serializable {
     @JSONField(name = "stageid")
     @JsonProperty("stageid")
     private String stageid;
-    /**
-     * ParentAccountIdYomiName
-     */
-    @TableField(value = "parentaccountidyominame")
-    @JSONField(name = "parentaccountidyominame")
-    @JsonProperty("parentaccountidyominame")
-    private String parentaccountidyominame;
     /**
      * 地址 1: 送货方式
      */
@@ -666,13 +645,6 @@ public class Lead extends EntityMP implements Serializable {
     @JSONField(name = "customeridyominame")
     @JsonProperty("customeridyominame")
     private String customeridyominame;
-    /**
-     * AccountIdYomiName
-     */
-    @TableField(value = "accountidyominame")
-    @JSONField(name = "accountidyominame")
-    @JsonProperty("accountidyominame")
-    private String accountidyominame;
     /**
      * 年收入 (Base)
      */
@@ -1118,6 +1090,13 @@ public class Lead extends EntityMP implements Serializable {
     @JSONField(name = "address1_upszone")
     @JsonProperty("address1_upszone")
     private String address1Upszone;
+    /**
+     * SLA
+     */
+    @TableField(value = "slaname")
+    @JSONField(name = "slaname")
+    @JsonProperty("slaname")
+    private String slaname;
     /**
      * 授予商机资格
      */
@@ -1174,6 +1153,55 @@ public class Lead extends EntityMP implements Serializable {
     @JSONField(name = "parentcontactid")
     @JsonProperty("parentcontactid")
     private String parentcontactid;
+    /**
+     * 原始案例
+     */
+    @TableField(value = "originatingcasename")
+    @JSONField(name = "originatingcasename")
+    @JsonProperty("originatingcasename")
+    private String originatingcasename;
+    /**
+     * 授予商机资格
+     */
+    @TableField(value = "qualifyingopportunityname")
+    @JSONField(name = "qualifyingopportunityname")
+    @JsonProperty("qualifyingopportunityname")
+    private String qualifyingopportunityname;
+    /**
+     * 源市场活动
+     */
+    @TableField(value = "campaignname")
+    @JSONField(name = "campaignname")
+    @JsonProperty("campaignname")
+    private String campaignname;
+    /**
+     * 潜在顾客的上司
+     */
+    @TableField(value = "parentcontactname")
+    @JSONField(name = "parentcontactname")
+    @JsonProperty("parentcontactname")
+    private String parentcontactname;
+    /**
+     * 潜在顾客的上级单位
+     */
+    @TableField(value = "parentaccountname")
+    @JSONField(name = "parentaccountname")
+    @JsonProperty("parentaccountname")
+    private String parentaccountname;
+    /**
+     * 相关市场活动响应
+     */
+    @TableField(value = "relatedobjectname")
+    @JSONField(name = "relatedobjectname")
+    @JsonProperty("relatedobjectname")
+    private String relatedobjectname;
+    /**
+     * 货币
+     */
+    @TableField(value = "transactioncurrencyname")
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
 
     /**
      * 
@@ -1257,14 +1285,6 @@ public class Lead extends EntityMP implements Serializable {
         this.modify("address2_utcoffset",address2Utcoffset);
     }
 
-    /**
-     * 设置 [SLAName]
-     */
-    public void setSlaname(String slaname){
-        this.slaname = slaname ;
-        this.modify("slaname",slaname);
-    }
-
     /**
      * 设置 [职务]
      */
@@ -1393,14 +1413,6 @@ public class Lead extends EntityMP implements Serializable {
         this.modify("entityimage_url",entityimageUrl);
     }
 
-    /**
-     * 设置 [ParentContactIdYomiName]
-     */
-    public void setParentcontactidyominame(String parentcontactidyominame){
-        this.parentcontactidyominame = parentcontactidyominame ;
-        this.modify("parentcontactidyominame",parentcontactidyominame);
-    }
-
     /**
      * 设置 [地址 2: 省/市/自治区]
      */
@@ -1745,14 +1757,6 @@ public class Lead extends EntityMP implements Serializable {
         this.modify("stageid",stageid);
     }
 
-    /**
-     * 设置 [ParentAccountIdYomiName]
-     */
-    public void setParentaccountidyominame(String parentaccountidyominame){
-        this.parentaccountidyominame = parentaccountidyominame ;
-        this.modify("parentaccountidyominame",parentaccountidyominame);
-    }
-
     /**
      * 设置 [地址 1: 送货方式]
      */
@@ -1883,14 +1887,6 @@ public class Lead extends EntityMP implements Serializable {
         this.modify("customeridyominame",customeridyominame);
     }
 
-    /**
-     * 设置 [AccountIdYomiName]
-     */
-    public void setAccountidyominame(String accountidyominame){
-        this.accountidyominame = accountidyominame ;
-        this.modify("accountidyominame",accountidyominame);
-    }
-
     /**
      * 设置 [年收入 (Base)]
      */
@@ -2405,6 +2401,14 @@ public class Lead extends EntityMP implements Serializable {
         this.modify("address1_upszone",address1Upszone);
     }
 
+    /**
+     * 设置 [SLA]
+     */
+    public void setSlaname(String slaname){
+        this.slaname = slaname ;
+        this.modify("slaname",slaname);
+    }
+
     /**
      * 设置 [授予商机资格]
      */
@@ -2469,6 +2473,62 @@ public class Lead extends EntityMP implements Serializable {
         this.modify("parentcontactid",parentcontactid);
     }
 
+    /**
+     * 设置 [原始案例]
+     */
+    public void setOriginatingcasename(String originatingcasename){
+        this.originatingcasename = originatingcasename ;
+        this.modify("originatingcasename",originatingcasename);
+    }
+
+    /**
+     * 设置 [授予商机资格]
+     */
+    public void setQualifyingopportunityname(String qualifyingopportunityname){
+        this.qualifyingopportunityname = qualifyingopportunityname ;
+        this.modify("qualifyingopportunityname",qualifyingopportunityname);
+    }
+
+    /**
+     * 设置 [源市场活动]
+     */
+    public void setCampaignname(String campaignname){
+        this.campaignname = campaignname ;
+        this.modify("campaignname",campaignname);
+    }
+
+    /**
+     * 设置 [潜在顾客的上司]
+     */
+    public void setParentcontactname(String parentcontactname){
+        this.parentcontactname = parentcontactname ;
+        this.modify("parentcontactname",parentcontactname);
+    }
+
+    /**
+     * 设置 [潜在顾客的上级单位]
+     */
+    public void setParentaccountname(String parentaccountname){
+        this.parentaccountname = parentaccountname ;
+        this.modify("parentaccountname",parentaccountname);
+    }
+
+    /**
+     * 设置 [相关市场活动响应]
+     */
+    public void setRelatedobjectname(String relatedobjectname){
+        this.relatedobjectname = relatedobjectname ;
+        this.modify("relatedobjectname",relatedobjectname);
+    }
+
+    /**
+     * 设置 [货币]
+     */
+    public void setTransactioncurrencyname(String transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
 
 }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/domain/Opportunity.java

@@ -113,13 +113,6 @@ public class Opportunity extends EntityMP implements Serializable {
     @JSONField(name = "estimatedvalue_base")
     @JsonProperty("estimatedvalue_base")
     private BigDecimal estimatedvalueBase;
-    /**
-     * ParentContactIdYomiName
-     */
-    @TableField(value = "parentcontactidyominame")
-    @JSONField(name = "parentcontactidyominame")
-    @JsonProperty("parentcontactidyominame")
-    private String parentcontactidyominame;
     /**
      * 提供最终建议
      */
@@ -543,13 +536,6 @@ public class Opportunity extends EntityMP implements Serializable {
     @JSONField(name = "completefinalproposal")
     @JsonProperty("completefinalproposal")
     private Integer completefinalproposal;
-    /**
-     * OriginatingLeadIdYomiName
-     */
-    @TableField(value = "originatingleadidyominame")
-    @JSONField(name = "originatingleadidyominame")
-    @JsonProperty("originatingleadidyominame")
-    private String originatingleadidyominame;
     /**
      * 商机折扣额
      */
@@ -756,13 +742,6 @@ public class Opportunity extends EntityMP implements Serializable {
     @JSONField(name = "quotecomments")
     @JsonProperty("quotecomments")
     private String quotecomments;
-    /**
-     * ParentAccountIdYomiName
-     */
-    @TableField(value = "parentaccountidyominame")
-    @JSONField(name = "parentaccountidyominame")
-    @JsonProperty("parentaccountidyominame")
-    private String parentaccountidyominame;
     /**
      * 潜在客户类型
      */
@@ -770,13 +749,6 @@ public class Opportunity extends EntityMP implements Serializable {
     @JSONField(name = "customeridtype")
     @JsonProperty("customeridtype")
     private String customeridtype;
-    /**
-     * SLAName
-     */
-    @TableField(value = "slaname")
-    @JSONField(name = "slaname")
-    @JsonProperty("slaname")
-    private String slaname;
     /**
      * Record Created On
      */
@@ -792,6 +764,13 @@ public class Opportunity extends EntityMP implements Serializable {
     @JSONField(name = "ownerid")
     @JsonProperty("ownerid")
     private String ownerid;
+    /**
+     * SLA
+     */
+    @TableField(value = "slaname")
+    @JSONField(name = "slaname")
+    @JsonProperty("slaname")
+    private String slaname;
     /**
      * 联系人
      */
@@ -841,6 +820,48 @@ public class Opportunity extends EntityMP implements Serializable {
     @JSONField(name = "slaid")
     @JsonProperty("slaid")
     private String slaid;
+    /**
+     * 价目表
+     */
+    @TableField(value = "pricelevel")
+    @JSONField(name = "pricelevel")
+    @JsonProperty("pricelevel")
+    private String pricelevel;
+    /**
+     * 原始潜在顾客
+     */
+    @TableField(value = "originatingleadname")
+    @JSONField(name = "originatingleadname")
+    @JsonProperty("originatingleadname")
+    private String originatingleadname;
+    /**
+     * 帐户
+     */
+    @TableField(value = "parentaccountname")
+    @JSONField(name = "parentaccountname")
+    @JsonProperty("parentaccountname")
+    private String parentaccountname;
+    /**
+     * 源市场活动
+     */
+    @TableField(value = "campaignname")
+    @JSONField(name = "campaignname")
+    @JsonProperty("campaignname")
+    private String campaignname;
+    /**
+     * 联系人
+     */
+    @TableField(value = "parentcontactname")
+    @JSONField(name = "parentcontactname")
+    @JsonProperty("parentcontactname")
+    private String parentcontactname;
+    /**
+     * 货币
+     */
+    @TableField(value = "transactioncurrencyname")
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
 
     /**
      * 
@@ -972,14 +993,6 @@ public class Opportunity extends EntityMP implements Serializable {
         this.modify("estimatedvalue_base",estimatedvalueBase);
     }
 
-    /**
-     * 设置 [ParentContactIdYomiName]
-     */
-    public void setParentcontactidyominame(String parentcontactidyominame){
-        this.parentcontactidyominame = parentcontactidyominame ;
-        this.modify("parentcontactidyominame",parentcontactidyominame);
-    }
-
     /**
      * 设置 [提供最终建议]
      */
@@ -1462,14 +1475,6 @@ public class Opportunity extends EntityMP implements Serializable {
         this.modify("completefinalproposal",completefinalproposal);
     }
 
-    /**
-     * 设置 [OriginatingLeadIdYomiName]
-     */
-    public void setOriginatingleadidyominame(String originatingleadidyominame){
-        this.originatingleadidyominame = originatingleadidyominame ;
-        this.modify("originatingleadidyominame",originatingleadidyominame);
-    }
-
     /**
      * 设置 [商机折扣额]
      */
@@ -1698,14 +1703,6 @@ public class Opportunity extends EntityMP implements Serializable {
         this.modify("quotecomments",quotecomments);
     }
 
-    /**
-     * 设置 [ParentAccountIdYomiName]
-     */
-    public void setParentaccountidyominame(String parentaccountidyominame){
-        this.parentaccountidyominame = parentaccountidyominame ;
-        this.modify("parentaccountidyominame",parentaccountidyominame);
-    }
-
     /**
      * 设置 [潜在客户类型]
      */
@@ -1714,14 +1711,6 @@ public class Opportunity extends EntityMP implements Serializable {
         this.modify("customeridtype",customeridtype);
     }
 
-    /**
-     * 设置 [SLAName]
-     */
-    public void setSlaname(String slaname){
-        this.slaname = slaname ;
-        this.modify("slaname",slaname);
-    }
-
     /**
      * 设置 [Record Created On]
      */
@@ -1748,6 +1737,14 @@ public class Opportunity extends EntityMP implements Serializable {
         this.modify("ownerid",ownerid);
     }
 
+    /**
+     * 设置 [SLA]
+     */
+    public void setSlaname(String slaname){
+        this.slaname = slaname ;
+        this.modify("slaname",slaname);
+    }
+
     /**
      * 设置 [联系人]
      */
@@ -1804,6 +1801,54 @@ public class Opportunity extends EntityMP implements Serializable {
         this.modify("slaid",slaid);
     }
 
+    /**
+     * 设置 [价目表]
+     */
+    public void setPricelevel(String pricelevel){
+        this.pricelevel = pricelevel ;
+        this.modify("pricelevel",pricelevel);
+    }
+
+    /**
+     * 设置 [原始潜在顾客]
+     */
+    public void setOriginatingleadname(String originatingleadname){
+        this.originatingleadname = originatingleadname ;
+        this.modify("originatingleadname",originatingleadname);
+    }
+
+    /**
+     * 设置 [帐户]
+     */
+    public void setParentaccountname(String parentaccountname){
+        this.parentaccountname = parentaccountname ;
+        this.modify("parentaccountname",parentaccountname);
+    }
+
+    /**
+     * 设置 [源市场活动]
+     */
+    public void setCampaignname(String campaignname){
+        this.campaignname = campaignname ;
+        this.modify("campaignname",campaignname);
+    }
+
+    /**
+     * 设置 [联系人]
+     */
+    public void setParentcontactname(String parentcontactname){
+        this.parentcontactname = parentcontactname ;
+        this.modify("parentcontactname",parentcontactname);
+    }
+
+    /**
+     * 设置 [货币]
+     */
+    public void setTransactioncurrencyname(String transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
 
 }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/domain/Quote.java

@@ -524,13 +524,6 @@ public class Quote extends EntityMP implements Serializable {
     @JSONField(name = "billto_name")
     @JsonProperty("billto_name")
     private String billtoName;
-    /**
-     * SLAName
-     */
-    @TableField(value = "slaname")
-    @JSONField(name = "slaname")
-    @JsonProperty("slaname")
-    private String slaname;
     /**
      * 帐单寄往街道 1
      */
@@ -690,6 +683,13 @@ public class Quote extends EntityMP implements Serializable {
     @JSONField(name = "freightamount")
     @JsonProperty("freightamount")
     private BigDecimal freightamount;
+    /**
+     * SLA
+     */
+    @TableField(value = "slaname")
+    @JSONField(name = "slaname")
+    @JsonProperty("slaname")
+    private String slaname;
     /**
      * 价目表
      */
@@ -725,6 +725,34 @@ public class Quote extends EntityMP implements Serializable {
     @JSONField(name = "campaignid")
     @JsonProperty("campaignid")
     private String campaignid;
+    /**
+     * 价目表
+     */
+    @TableField(value = "pricelevelname")
+    @JSONField(name = "pricelevelname")
+    @JsonProperty("pricelevelname")
+    private String pricelevelname;
+    /**
+     * 商机
+     */
+    @TableField(value = "opportunityname")
+    @JSONField(name = "opportunityname")
+    @JsonProperty("opportunityname")
+    private String opportunityname;
+    /**
+     * 货币
+     */
+    @TableField(value = "transactioncurrencyname")
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+    /**
+     * 源市场活动
+     */
+    @TableField(value = "campaignname")
+    @JSONField(name = "campaignname")
+    @JsonProperty("campaignname")
+    private String campaignname;
 
     /**
      * 
@@ -1300,14 +1328,6 @@ public class Quote extends EntityMP implements Serializable {
         this.modify("billto_name",billtoName);
     }
 
-    /**
-     * 设置 [SLAName]
-     */
-    public void setSlaname(String slaname){
-        this.slaname = slaname ;
-        this.modify("slaname",slaname);
-    }
-
     /**
      * 设置 [帐单寄往街道 1]
      */
@@ -1486,6 +1506,14 @@ public class Quote extends EntityMP implements Serializable {
         this.modify("freightamount",freightamount);
     }
 
+    /**
+     * 设置 [SLA]
+     */
+    public void setSlaname(String slaname){
+        this.slaname = slaname ;
+        this.modify("slaname",slaname);
+    }
+
     /**
      * 设置 [价目表]
      */
@@ -1526,6 +1554,38 @@ public class Quote extends EntityMP implements Serializable {
         this.modify("campaignid",campaignid);
     }
 
+    /**
+     * 设置 [价目表]
+     */
+    public void setPricelevelname(String pricelevelname){
+        this.pricelevelname = pricelevelname ;
+        this.modify("pricelevelname",pricelevelname);
+    }
+
+    /**
+     * 设置 [商机]
+     */
+    public void setOpportunityname(String opportunityname){
+        this.opportunityname = opportunityname ;
+        this.modify("opportunityname",opportunityname);
+    }
+
+    /**
+     * 设置 [货币]
+     */
+    public void setTransactioncurrencyname(String transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
+    /**
+     * 设置 [源市场活动]
+     */
+    public void setCampaignname(String campaignname){
+        this.campaignname = campaignname ;
+        this.modify("campaignname",campaignname);
+    }
+
 
 }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/domain/SalesLiterature.java

@@ -255,6 +255,20 @@ public class SalesLiterature extends EntityMP implements Serializable {
     @JSONField(name = "subjectid")
     @JsonProperty("subjectid")
     private String subjectid;
+    /**
+     * 货币
+     */
+    @TableField(value = "transactioncurrencyname")
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+    /**
+     * 主题
+     */
+    @TableField(value = "subjectname")
+    @JSONField(name = "subjectname")
+    @JsonProperty("subjectname")
+    private String subjectname;
 
     /**
      * 
@@ -486,6 +500,22 @@ public class SalesLiterature extends EntityMP implements Serializable {
         this.modify("subjectid",subjectid);
     }
 
+    /**
+     * 设置 [货币]
+     */
+    public void setTransactioncurrencyname(String transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
+    /**
+     * 设置 [主题]
+     */
+    public void setSubjectname(String subjectname){
+        this.subjectname = subjectname ;
+        this.modify("subjectname",subjectname);
+    }
+
 
 }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/domain/SalesOrder.java

@@ -346,13 +346,6 @@ public class SalesOrder extends EntityMP implements Serializable {
     @JSONField(name = "shipto_addressid")
     @JsonProperty("shipto_addressid")
     private String shiptoAddressid;
-    /**
-     * SLAName
-     */
-    @TableField(value = "slaname")
-    @JSONField(name = "slaname")
-    @JsonProperty("slaname")
-    private String slaname;
     /**
      * 付款条件
      */
@@ -727,6 +720,13 @@ public class SalesOrder extends EntityMP implements Serializable {
     @JSONField(name = "description")
     @JsonProperty("description")
     private String description;
+    /**
+     * SLA
+     */
+    @TableField(value = "slaname")
+    @JSONField(name = "slaname")
+    @JsonProperty("slaname")
+    private String slaname;
     /**
      * 报价单
      */
@@ -769,6 +769,41 @@ public class SalesOrder extends EntityMP implements Serializable {
     @JSONField(name = "campaignid")
     @JsonProperty("campaignid")
     private String campaignid;
+    /**
+     * 报价单
+     */
+    @TableField(value = "quotename")
+    @JSONField(name = "quotename")
+    @JsonProperty("quotename")
+    private String quotename;
+    /**
+     * 货币
+     */
+    @TableField(value = "transactioncurrencyname")
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+    /**
+     * 商机
+     */
+    @TableField(value = "opportunityname")
+    @JSONField(name = "opportunityname")
+    @JsonProperty("opportunityname")
+    private String opportunityname;
+    /**
+     * 价目表
+     */
+    @TableField(value = "pricelevelname")
+    @JSONField(name = "pricelevelname")
+    @JsonProperty("pricelevelname")
+    private String pricelevelname;
+    /**
+     * 源市场活动
+     */
+    @TableField(value = "campaignname")
+    @JSONField(name = "campaignname")
+    @JsonProperty("campaignname")
+    private String campaignname;
 
     /**
      * 
@@ -1152,14 +1187,6 @@ public class SalesOrder extends EntityMP implements Serializable {
         this.modify("shipto_addressid",shiptoAddressid);
     }
 
-    /**
-     * 设置 [SLAName]
-     */
-    public void setSlaname(String slaname){
-        this.slaname = slaname ;
-        this.modify("slaname",slaname);
-    }
-
     /**
      * 设置 [付款条件]
      */
@@ -1568,6 +1595,14 @@ public class SalesOrder extends EntityMP implements Serializable {
         this.modify("description",description);
     }
 
+    /**
+     * 设置 [SLA]
+     */
+    public void setSlaname(String slaname){
+        this.slaname = slaname ;
+        this.modify("slaname",slaname);
+    }
+
     /**
      * 设置 [报价单]
      */
@@ -1616,6 +1651,46 @@ public class SalesOrder extends EntityMP implements Serializable {
         this.modify("campaignid",campaignid);
     }
 
+    /**
+     * 设置 [报价单]
+     */
+    public void setQuotename(String quotename){
+        this.quotename = quotename ;
+        this.modify("quotename",quotename);
+    }
+
+    /**
+     * 设置 [货币]
+     */
+    public void setTransactioncurrencyname(String transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
+    /**
+     * 设置 [商机]
+     */
+    public void setOpportunityname(String opportunityname){
+        this.opportunityname = opportunityname ;
+        this.modify("opportunityname",opportunityname);
+    }
+
+    /**
+     * 设置 [价目表]
+     */
+    public void setPricelevelname(String pricelevelname){
+        this.pricelevelname = pricelevelname ;
+        this.modify("pricelevelname",pricelevelname);
+    }
+
+    /**
+     * 设置 [源市场活动]
+     */
+    public void setCampaignname(String campaignname){
+        this.campaignname = campaignname ;
+        this.modify("campaignname",campaignname);
+    }
+
 
 }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/filter/CompetitorSearchContext.java

@@ -69,6 +69,20 @@ public class CompetitorSearchContext extends QueryWrapperContext<Competitor> {
             this.getSearchCond().eq("transactioncurrencyid", n_transactioncurrencyid_eq);
         }
     }
+	private String n_transactioncurrencyname_eq;//[货币]
+	public void setN_transactioncurrencyname_eq(String n_transactioncurrencyname_eq) {
+        this.n_transactioncurrencyname_eq = n_transactioncurrencyname_eq;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_eq)){
+            this.getSearchCond().eq("transactioncurrencyname", n_transactioncurrencyname_eq);
+        }
+    }
+	private String n_transactioncurrencyname_like;//[货币]
+	public void setN_transactioncurrencyname_like(String n_transactioncurrencyname_like) {
+        this.n_transactioncurrencyname_like = n_transactioncurrencyname_like;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_like)){
+            this.getSearchCond().like("transactioncurrencyname", n_transactioncurrencyname_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/filter/LeadSearchContext.java

@@ -216,6 +216,104 @@ public class LeadSearchContext extends QueryWrapperContext<Lead> {
             this.getSearchCond().eq("parentcontactid", n_parentcontactid_eq);
         }
     }
+	private String n_originatingcasename_eq;//[原始案例]
+	public void setN_originatingcasename_eq(String n_originatingcasename_eq) {
+        this.n_originatingcasename_eq = n_originatingcasename_eq;
+        if(!ObjectUtils.isEmpty(this.n_originatingcasename_eq)){
+            this.getSearchCond().eq("originatingcasename", n_originatingcasename_eq);
+        }
+    }
+	private String n_originatingcasename_like;//[原始案例]
+	public void setN_originatingcasename_like(String n_originatingcasename_like) {
+        this.n_originatingcasename_like = n_originatingcasename_like;
+        if(!ObjectUtils.isEmpty(this.n_originatingcasename_like)){
+            this.getSearchCond().like("originatingcasename", n_originatingcasename_like);
+        }
+    }
+	private String n_qualifyingopportunityname_eq;//[授予商机资格]
+	public void setN_qualifyingopportunityname_eq(String n_qualifyingopportunityname_eq) {
+        this.n_qualifyingopportunityname_eq = n_qualifyingopportunityname_eq;
+        if(!ObjectUtils.isEmpty(this.n_qualifyingopportunityname_eq)){
+            this.getSearchCond().eq("qualifyingopportunityname", n_qualifyingopportunityname_eq);
+        }
+    }
+	private String n_qualifyingopportunityname_like;//[授予商机资格]
+	public void setN_qualifyingopportunityname_like(String n_qualifyingopportunityname_like) {
+        this.n_qualifyingopportunityname_like = n_qualifyingopportunityname_like;
+        if(!ObjectUtils.isEmpty(this.n_qualifyingopportunityname_like)){
+            this.getSearchCond().like("qualifyingopportunityname", n_qualifyingopportunityname_like);
+        }
+    }
+	private String n_campaignname_eq;//[源市场活动]
+	public void setN_campaignname_eq(String n_campaignname_eq) {
+        this.n_campaignname_eq = n_campaignname_eq;
+        if(!ObjectUtils.isEmpty(this.n_campaignname_eq)){
+            this.getSearchCond().eq("campaignname", n_campaignname_eq);
+        }
+    }
+	private String n_campaignname_like;//[源市场活动]
+	public void setN_campaignname_like(String n_campaignname_like) {
+        this.n_campaignname_like = n_campaignname_like;
+        if(!ObjectUtils.isEmpty(this.n_campaignname_like)){
+            this.getSearchCond().like("campaignname", n_campaignname_like);
+        }
+    }
+	private String n_parentcontactname_eq;//[潜在顾客的上司]
+	public void setN_parentcontactname_eq(String n_parentcontactname_eq) {
+        this.n_parentcontactname_eq = n_parentcontactname_eq;
+        if(!ObjectUtils.isEmpty(this.n_parentcontactname_eq)){
+            this.getSearchCond().eq("parentcontactname", n_parentcontactname_eq);
+        }
+    }
+	private String n_parentcontactname_like;//[潜在顾客的上司]
+	public void setN_parentcontactname_like(String n_parentcontactname_like) {
+        this.n_parentcontactname_like = n_parentcontactname_like;
+        if(!ObjectUtils.isEmpty(this.n_parentcontactname_like)){
+            this.getSearchCond().like("parentcontactname", n_parentcontactname_like);
+        }
+    }
+	private String n_parentaccountname_eq;//[潜在顾客的上级单位]
+	public void setN_parentaccountname_eq(String n_parentaccountname_eq) {
+        this.n_parentaccountname_eq = n_parentaccountname_eq;
+        if(!ObjectUtils.isEmpty(this.n_parentaccountname_eq)){
+            this.getSearchCond().eq("parentaccountname", n_parentaccountname_eq);
+        }
+    }
+	private String n_parentaccountname_like;//[潜在顾客的上级单位]
+	public void setN_parentaccountname_like(String n_parentaccountname_like) {
+        this.n_parentaccountname_like = n_parentaccountname_like;
+        if(!ObjectUtils.isEmpty(this.n_parentaccountname_like)){
+            this.getSearchCond().like("parentaccountname", n_parentaccountname_like);
+        }
+    }
+	private String n_relatedobjectname_eq;//[相关市场活动响应]
+	public void setN_relatedobjectname_eq(String n_relatedobjectname_eq) {
+        this.n_relatedobjectname_eq = n_relatedobjectname_eq;
+        if(!ObjectUtils.isEmpty(this.n_relatedobjectname_eq)){
+            this.getSearchCond().eq("relatedobjectname", n_relatedobjectname_eq);
+        }
+    }
+	private String n_relatedobjectname_like;//[相关市场活动响应]
+	public void setN_relatedobjectname_like(String n_relatedobjectname_like) {
+        this.n_relatedobjectname_like = n_relatedobjectname_like;
+        if(!ObjectUtils.isEmpty(this.n_relatedobjectname_like)){
+            this.getSearchCond().like("relatedobjectname", n_relatedobjectname_like);
+        }
+    }
+	private String n_transactioncurrencyname_eq;//[货币]
+	public void setN_transactioncurrencyname_eq(String n_transactioncurrencyname_eq) {
+        this.n_transactioncurrencyname_eq = n_transactioncurrencyname_eq;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_eq)){
+            this.getSearchCond().eq("transactioncurrencyname", n_transactioncurrencyname_eq);
+        }
+    }
+	private String n_transactioncurrencyname_like;//[货币]
+	public void setN_transactioncurrencyname_like(String n_transactioncurrencyname_like) {
+        this.n_transactioncurrencyname_like = n_transactioncurrencyname_like;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_like)){
+            this.getSearchCond().like("transactioncurrencyname", n_transactioncurrencyname_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/filter/OpportunitySearchContext.java

@@ -174,6 +174,90 @@ public class OpportunitySearchContext extends QueryWrapperContext<Opportunity> {
             this.getSearchCond().eq("slaid", n_slaid_eq);
         }
     }
+	private String n_pricelevel_eq;//[价目表]
+	public void setN_pricelevel_eq(String n_pricelevel_eq) {
+        this.n_pricelevel_eq = n_pricelevel_eq;
+        if(!ObjectUtils.isEmpty(this.n_pricelevel_eq)){
+            this.getSearchCond().eq("pricelevel", n_pricelevel_eq);
+        }
+    }
+	private String n_pricelevel_like;//[价目表]
+	public void setN_pricelevel_like(String n_pricelevel_like) {
+        this.n_pricelevel_like = n_pricelevel_like;
+        if(!ObjectUtils.isEmpty(this.n_pricelevel_like)){
+            this.getSearchCond().like("pricelevel", n_pricelevel_like);
+        }
+    }
+	private String n_originatingleadname_eq;//[原始潜在顾客]
+	public void setN_originatingleadname_eq(String n_originatingleadname_eq) {
+        this.n_originatingleadname_eq = n_originatingleadname_eq;
+        if(!ObjectUtils.isEmpty(this.n_originatingleadname_eq)){
+            this.getSearchCond().eq("originatingleadname", n_originatingleadname_eq);
+        }
+    }
+	private String n_originatingleadname_like;//[原始潜在顾客]
+	public void setN_originatingleadname_like(String n_originatingleadname_like) {
+        this.n_originatingleadname_like = n_originatingleadname_like;
+        if(!ObjectUtils.isEmpty(this.n_originatingleadname_like)){
+            this.getSearchCond().like("originatingleadname", n_originatingleadname_like);
+        }
+    }
+	private String n_parentaccountname_eq;//[帐户]
+	public void setN_parentaccountname_eq(String n_parentaccountname_eq) {
+        this.n_parentaccountname_eq = n_parentaccountname_eq;
+        if(!ObjectUtils.isEmpty(this.n_parentaccountname_eq)){
+            this.getSearchCond().eq("parentaccountname", n_parentaccountname_eq);
+        }
+    }
+	private String n_parentaccountname_like;//[帐户]
+	public void setN_parentaccountname_like(String n_parentaccountname_like) {
+        this.n_parentaccountname_like = n_parentaccountname_like;
+        if(!ObjectUtils.isEmpty(this.n_parentaccountname_like)){
+            this.getSearchCond().like("parentaccountname", n_parentaccountname_like);
+        }
+    }
+	private String n_campaignname_eq;//[源市场活动]
+	public void setN_campaignname_eq(String n_campaignname_eq) {
+        this.n_campaignname_eq = n_campaignname_eq;
+        if(!ObjectUtils.isEmpty(this.n_campaignname_eq)){
+            this.getSearchCond().eq("campaignname", n_campaignname_eq);
+        }
+    }
+	private String n_campaignname_like;//[源市场活动]
+	public void setN_campaignname_like(String n_campaignname_like) {
+        this.n_campaignname_like = n_campaignname_like;
+        if(!ObjectUtils.isEmpty(this.n_campaignname_like)){
+            this.getSearchCond().like("campaignname", n_campaignname_like);
+        }
+    }
+	private String n_parentcontactname_eq;//[联系人]
+	public void setN_parentcontactname_eq(String n_parentcontactname_eq) {
+        this.n_parentcontactname_eq = n_parentcontactname_eq;
+        if(!ObjectUtils.isEmpty(this.n_parentcontactname_eq)){
+            this.getSearchCond().eq("parentcontactname", n_parentcontactname_eq);
+        }
+    }
+	private String n_parentcontactname_like;//[联系人]
+	public void setN_parentcontactname_like(String n_parentcontactname_like) {
+        this.n_parentcontactname_like = n_parentcontactname_like;
+        if(!ObjectUtils.isEmpty(this.n_parentcontactname_like)){
+            this.getSearchCond().like("parentcontactname", n_parentcontactname_like);
+        }
+    }
+	private String n_transactioncurrencyname_eq;//[货币]
+	public void setN_transactioncurrencyname_eq(String n_transactioncurrencyname_eq) {
+        this.n_transactioncurrencyname_eq = n_transactioncurrencyname_eq;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_eq)){
+            this.getSearchCond().eq("transactioncurrencyname", n_transactioncurrencyname_eq);
+        }
+    }
+	private String n_transactioncurrencyname_like;//[货币]
+	public void setN_transactioncurrencyname_like(String n_transactioncurrencyname_like) {
+        this.n_transactioncurrencyname_like = n_transactioncurrencyname_like;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_like)){
+            this.getSearchCond().like("transactioncurrencyname", n_transactioncurrencyname_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/filter/QuoteSearchContext.java

@@ -118,6 +118,62 @@ public class QuoteSearchContext extends QueryWrapperContext<Quote> {
             this.getSearchCond().eq("campaignid", n_campaignid_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_opportunityname_eq;//[商机]
+	public void setN_opportunityname_eq(String n_opportunityname_eq) {
+        this.n_opportunityname_eq = n_opportunityname_eq;
+        if(!ObjectUtils.isEmpty(this.n_opportunityname_eq)){
+            this.getSearchCond().eq("opportunityname", n_opportunityname_eq);
+        }
+    }
+	private String n_opportunityname_like;//[商机]
+	public void setN_opportunityname_like(String n_opportunityname_like) {
+        this.n_opportunityname_like = n_opportunityname_like;
+        if(!ObjectUtils.isEmpty(this.n_opportunityname_like)){
+            this.getSearchCond().like("opportunityname", n_opportunityname_like);
+        }
+    }
+	private String n_transactioncurrencyname_eq;//[货币]
+	public void setN_transactioncurrencyname_eq(String n_transactioncurrencyname_eq) {
+        this.n_transactioncurrencyname_eq = n_transactioncurrencyname_eq;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_eq)){
+            this.getSearchCond().eq("transactioncurrencyname", n_transactioncurrencyname_eq);
+        }
+    }
+	private String n_transactioncurrencyname_like;//[货币]
+	public void setN_transactioncurrencyname_like(String n_transactioncurrencyname_like) {
+        this.n_transactioncurrencyname_like = n_transactioncurrencyname_like;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_like)){
+            this.getSearchCond().like("transactioncurrencyname", n_transactioncurrencyname_like);
+        }
+    }
+	private String n_campaignname_eq;//[源市场活动]
+	public void setN_campaignname_eq(String n_campaignname_eq) {
+        this.n_campaignname_eq = n_campaignname_eq;
+        if(!ObjectUtils.isEmpty(this.n_campaignname_eq)){
+            this.getSearchCond().eq("campaignname", n_campaignname_eq);
+        }
+    }
+	private String n_campaignname_like;//[源市场活动]
+	public void setN_campaignname_like(String n_campaignname_like) {
+        this.n_campaignname_like = n_campaignname_like;
+        if(!ObjectUtils.isEmpty(this.n_campaignname_like)){
+            this.getSearchCond().like("campaignname", n_campaignname_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/filter/SalesLiteratureSearchContext.java

@@ -55,6 +55,34 @@ public class SalesLiteratureSearchContext extends QueryWrapperContext<SalesLiter
             this.getSearchCond().eq("subjectid", n_subjectid_eq);
         }
     }
+	private String n_transactioncurrencyname_eq;//[货币]
+	public void setN_transactioncurrencyname_eq(String n_transactioncurrencyname_eq) {
+        this.n_transactioncurrencyname_eq = n_transactioncurrencyname_eq;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_eq)){
+            this.getSearchCond().eq("transactioncurrencyname", n_transactioncurrencyname_eq);
+        }
+    }
+	private String n_transactioncurrencyname_like;//[货币]
+	public void setN_transactioncurrencyname_like(String n_transactioncurrencyname_like) {
+        this.n_transactioncurrencyname_like = n_transactioncurrencyname_like;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_like)){
+            this.getSearchCond().like("transactioncurrencyname", n_transactioncurrencyname_like);
+        }
+    }
+	private String n_subjectname_eq;//[主题]
+	public void setN_subjectname_eq(String n_subjectname_eq) {
+        this.n_subjectname_eq = n_subjectname_eq;
+        if(!ObjectUtils.isEmpty(this.n_subjectname_eq)){
+            this.getSearchCond().eq("subjectname", n_subjectname_eq);
+        }
+    }
+	private String n_subjectname_like;//[主题]
+	public void setN_subjectname_like(String n_subjectname_like) {
+        this.n_subjectname_like = n_subjectname_like;
+        if(!ObjectUtils.isEmpty(this.n_subjectname_like)){
+            this.getSearchCond().like("subjectname", n_subjectname_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/filter/SalesOrderSearchContext.java

@@ -132,6 +132,76 @@ public class SalesOrderSearchContext extends QueryWrapperContext<SalesOrder> {
             this.getSearchCond().eq("campaignid", n_campaignid_eq);
         }
     }
+	private String n_quotename_eq;//[报价单]
+	public void setN_quotename_eq(String n_quotename_eq) {
+        this.n_quotename_eq = n_quotename_eq;
+        if(!ObjectUtils.isEmpty(this.n_quotename_eq)){
+            this.getSearchCond().eq("quotename", n_quotename_eq);
+        }
+    }
+	private String n_quotename_like;//[报价单]
+	public void setN_quotename_like(String n_quotename_like) {
+        this.n_quotename_like = n_quotename_like;
+        if(!ObjectUtils.isEmpty(this.n_quotename_like)){
+            this.getSearchCond().like("quotename", n_quotename_like);
+        }
+    }
+	private String n_transactioncurrencyname_eq;//[货币]
+	public void setN_transactioncurrencyname_eq(String n_transactioncurrencyname_eq) {
+        this.n_transactioncurrencyname_eq = n_transactioncurrencyname_eq;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_eq)){
+            this.getSearchCond().eq("transactioncurrencyname", n_transactioncurrencyname_eq);
+        }
+    }
+	private String n_transactioncurrencyname_like;//[货币]
+	public void setN_transactioncurrencyname_like(String n_transactioncurrencyname_like) {
+        this.n_transactioncurrencyname_like = n_transactioncurrencyname_like;
+        if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_like)){
+            this.getSearchCond().like("transactioncurrencyname", n_transactioncurrencyname_like);
+        }
+    }
+	private String n_opportunityname_eq;//[商机]
+	public void setN_opportunityname_eq(String n_opportunityname_eq) {
+        this.n_opportunityname_eq = n_opportunityname_eq;
+        if(!ObjectUtils.isEmpty(this.n_opportunityname_eq)){
+            this.getSearchCond().eq("opportunityname", n_opportunityname_eq);
+        }
+    }
+	private String n_opportunityname_like;//[商机]
+	public void setN_opportunityname_like(String n_opportunityname_like) {
+        this.n_opportunityname_like = n_opportunityname_like;
+        if(!ObjectUtils.isEmpty(this.n_opportunityname_like)){
+            this.getSearchCond().like("opportunityname", n_opportunityname_like);
+        }
+    }
+	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_campaignname_eq;//[源市场活动]
+	public void setN_campaignname_eq(String n_campaignname_eq) {
+        this.n_campaignname_eq = n_campaignname_eq;
+        if(!ObjectUtils.isEmpty(this.n_campaignname_eq)){
+            this.getSearchCond().eq("campaignname", n_campaignname_eq);
+        }
+    }
+	private String n_campaignname_like;//[源市场活动]
+	public void setN_campaignname_like(String n_campaignname_like) {
+        this.n_campaignname_like = n_campaignname_like;
+        if(!ObjectUtils.isEmpty(this.n_campaignname_like)){
+            this.getSearchCond().like("campaignname", n_campaignname_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/CompetitorServiceImpl.java

@@ -68,6 +68,7 @@ public class CompetitorServiceImpl extends ServiceImpl<CompetitorMapper, Competi
     @Override
     @Transactional
     public boolean update(Competitor et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("competitorid",et.getCompetitorid())))
             return false;
         CachedBeanCopier.copy(get(et.getCompetitorid()),et);
@@ -76,6 +77,7 @@ public class CompetitorServiceImpl extends ServiceImpl<CompetitorMapper, Competi
 
     @Override
     public void updateBatch(List<Competitor> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
@@ -101,12 +103,14 @@ public class CompetitorServiceImpl extends ServiceImpl<CompetitorMapper, Competi
 
     @Override
     public boolean saveBatch(Collection<Competitor> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<Competitor> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
@@ -126,6 +130,7 @@ public class CompetitorServiceImpl extends ServiceImpl<CompetitorMapper, Competi
     @Override
     @Transactional
     public boolean create(Competitor et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getCompetitorid()),et);
@@ -134,6 +139,7 @@ public class CompetitorServiceImpl extends ServiceImpl<CompetitorMapper, Competi
 
     @Override
     public void createBatch(List<Competitor> list) {
+        list.forEach(item->fillParentData(item));
         this.saveBatch(list,batchSize);
     }
 
@@ -143,6 +149,7 @@ public class CompetitorServiceImpl extends ServiceImpl<CompetitorMapper, Competi
     }
     @Override
     public Competitor getDraft(Competitor et) {
+        fillParentData(et);
         return et;
     }
 
@@ -169,6 +176,22 @@ public class CompetitorServiceImpl extends ServiceImpl<CompetitorMapper, Competi
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(Competitor et){
+        //实体关系[DER1N_COMPETITOR__TRANSACTIONCURRENCY__TRANSACTIONCURRENCYID]
+        if(!ObjectUtils.isEmpty(et.getTransactioncurrencyid())){
+            cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency transactioncurrency=et.getTransactioncurrency();
+            if(ObjectUtils.isEmpty(transactioncurrency)){
+                cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency majorEntity=transactioncurrencyService.get(et.getTransactioncurrencyid());
+                et.setTransactioncurrency(majorEntity);
+                transactioncurrency=majorEntity;
+            }
+            et.setTransactioncurrencyname(transactioncurrency.getCurrencyname());
+        }
+    }
 
 
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/LeadServiceImpl.java

@@ -77,6 +77,7 @@ public class LeadServiceImpl extends ServiceImpl<LeadMapper, Lead> implements IL
     @Override
     @Transactional
     public boolean update(Lead et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("leadid",et.getLeadid())))
             return false;
         CachedBeanCopier.copy(get(et.getLeadid()),et);
@@ -85,11 +86,13 @@ public class LeadServiceImpl extends ServiceImpl<LeadMapper, Lead> implements IL
 
     @Override
     public void updateBatch(List<Lead> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
     @Override
     public Lead getDraft(Lead et) {
+        fillParentData(et);
         return et;
     }
 
@@ -132,18 +135,21 @@ public class LeadServiceImpl extends ServiceImpl<LeadMapper, Lead> implements IL
 
     @Override
     public boolean saveBatch(Collection<Lead> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<Lead> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
     @Override
     @Transactional
     public boolean create(Lead et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getLeadid()),et);
@@ -152,6 +158,7 @@ public class LeadServiceImpl extends ServiceImpl<LeadMapper, Lead> implements IL
 
     @Override
     public void createBatch(List<Lead> list) {
+        list.forEach(item->fillParentData(item));
         this.saveBatch(list,batchSize);
     }
 
@@ -260,6 +267,92 @@ public class LeadServiceImpl extends ServiceImpl<LeadMapper, Lead> implements IL
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(Lead et){
+        //实体关系[DER1N_LEAD__ACCOUNT__PARENTACCOUNTID]
+        if(!ObjectUtils.isEmpty(et.getParentaccountid())){
+            cn.ibizlab.businesscentral.core.base.domain.Account parentaccount=et.getParentaccount();
+            if(ObjectUtils.isEmpty(parentaccount)){
+                cn.ibizlab.businesscentral.core.base.domain.Account majorEntity=accountService.get(et.getParentaccountid());
+                et.setParentaccount(majorEntity);
+                parentaccount=majorEntity;
+            }
+            et.setParentaccountname(parentaccount.getAccountname());
+        }
+        //实体关系[DER1N_LEAD__CAMPAIGNRESPONSE__RELATEDOBJECTID]
+        if(!ObjectUtils.isEmpty(et.getRelatedobjectid())){
+            cn.ibizlab.businesscentral.core.marketing.domain.CampaignResponse relatedobject=et.getRelatedobject();
+            if(ObjectUtils.isEmpty(relatedobject)){
+                cn.ibizlab.businesscentral.core.marketing.domain.CampaignResponse majorEntity=campaignresponseService.get(et.getRelatedobjectid());
+                et.setRelatedobject(majorEntity);
+                relatedobject=majorEntity;
+            }
+            et.setRelatedobjectname(relatedobject.getSubject());
+        }
+        //实体关系[DER1N_LEAD__CAMPAIGN__CAMPAIGNID]
+        if(!ObjectUtils.isEmpty(et.getCampaignid())){
+            cn.ibizlab.businesscentral.core.marketing.domain.Campaign campaign=et.getCampaign();
+            if(ObjectUtils.isEmpty(campaign)){
+                cn.ibizlab.businesscentral.core.marketing.domain.Campaign majorEntity=campaignService.get(et.getCampaignid());
+                et.setCampaign(majorEntity);
+                campaign=majorEntity;
+            }
+            et.setCampaignname(campaign.getCampaignname());
+        }
+        //实体关系[DER1N_LEAD__CONTACT__PARENTCONTACTID]
+        if(!ObjectUtils.isEmpty(et.getParentcontactid())){
+            cn.ibizlab.businesscentral.core.base.domain.Contact parentcontact=et.getParentcontact();
+            if(ObjectUtils.isEmpty(parentcontact)){
+                cn.ibizlab.businesscentral.core.base.domain.Contact majorEntity=contactService.get(et.getParentcontactid());
+                et.setParentcontact(majorEntity);
+                parentcontact=majorEntity;
+            }
+            et.setParentcontactname(parentcontact.getFullname());
+        }
+        //实体关系[DER1N_LEAD__INCIDENT__ORIGINATINGCASEID]
+        if(!ObjectUtils.isEmpty(et.getOriginatingcaseid())){
+            cn.ibizlab.businesscentral.core.service.domain.Incident originatingcase=et.getOriginatingcase();
+            if(ObjectUtils.isEmpty(originatingcase)){
+                cn.ibizlab.businesscentral.core.service.domain.Incident majorEntity=incidentService.get(et.getOriginatingcaseid());
+                et.setOriginatingcase(majorEntity);
+                originatingcase=majorEntity;
+            }
+            et.setOriginatingcasename(originatingcase.getTitle());
+        }
+        //实体关系[DER1N_LEAD__OPPORTUNITY__QUALIFYINGOPPORTUNITYID]
+        if(!ObjectUtils.isEmpty(et.getQualifyingopportunityid())){
+            cn.ibizlab.businesscentral.core.sales.domain.Opportunity qualifyingopportunity=et.getQualifyingopportunity();
+            if(ObjectUtils.isEmpty(qualifyingopportunity)){
+                cn.ibizlab.businesscentral.core.sales.domain.Opportunity majorEntity=opportunityService.get(et.getQualifyingopportunityid());
+                et.setQualifyingopportunity(majorEntity);
+                qualifyingopportunity=majorEntity;
+            }
+            et.setQualifyingopportunityname(qualifyingopportunity.getOpportunityname());
+        }
+        //实体关系[DER1N_LEAD__SLA__SLAID]
+        if(!ObjectUtils.isEmpty(et.getSlaid())){
+            cn.ibizlab.businesscentral.core.base.domain.Sla sla=et.getSla();
+            if(ObjectUtils.isEmpty(sla)){
+                cn.ibizlab.businesscentral.core.base.domain.Sla majorEntity=slaService.get(et.getSlaid());
+                et.setSla(majorEntity);
+                sla=majorEntity;
+            }
+            et.setSlaname(sla.getSlaname());
+        }
+        //实体关系[DER1N_LEAD__TRANSACTIONCURRENCY__TRANSACTIONCURRENCYID]
+        if(!ObjectUtils.isEmpty(et.getTransactioncurrencyid())){
+            cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency transactioncurrency=et.getTransactioncurrency();
+            if(ObjectUtils.isEmpty(transactioncurrency)){
+                cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency majorEntity=transactioncurrencyService.get(et.getTransactioncurrencyid());
+                et.setTransactioncurrency(majorEntity);
+                transactioncurrency=majorEntity;
+            }
+            et.setTransactioncurrencyname(transactioncurrency.getCurrencyname());
+        }
+    }
 
 
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/OpportunityServiceImpl.java

@@ -98,12 +98,14 @@ public class OpportunityServiceImpl extends ServiceImpl<OpportunityMapper, Oppor
 
     @Override
     public Opportunity getDraft(Opportunity et) {
+        fillParentData(et);
         return et;
     }
 
     @Override
     @Transactional
     public boolean create(Opportunity et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getOpportunityid()),et);
@@ -112,6 +114,7 @@ public class OpportunityServiceImpl extends ServiceImpl<OpportunityMapper, Oppor
 
     @Override
     public void createBatch(List<Opportunity> list) {
+        list.forEach(item->fillParentData(item));
         this.saveBatch(list,batchSize);
     }
 
@@ -130,6 +133,7 @@ public class OpportunityServiceImpl extends ServiceImpl<OpportunityMapper, Oppor
     @Override
     @Transactional
     public boolean update(Opportunity et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("opportunityid",et.getOpportunityid())))
             return false;
         CachedBeanCopier.copy(get(et.getOpportunityid()),et);
@@ -138,6 +142,7 @@ public class OpportunityServiceImpl extends ServiceImpl<OpportunityMapper, Oppor
 
     @Override
     public void updateBatch(List<Opportunity> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
@@ -167,12 +172,14 @@ public class OpportunityServiceImpl extends ServiceImpl<OpportunityMapper, Oppor
 
     @Override
     public boolean saveBatch(Collection<Opportunity> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<Opportunity> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
@@ -259,6 +266,82 @@ public class OpportunityServiceImpl extends ServiceImpl<OpportunityMapper, Oppor
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(Opportunity et){
+        //实体关系[DER1N_OPPORTUNITY__ACCOUNT__PARENTACCOUNTID]
+        if(!ObjectUtils.isEmpty(et.getParentaccountid())){
+            cn.ibizlab.businesscentral.core.base.domain.Account parentaccount=et.getParentaccount();
+            if(ObjectUtils.isEmpty(parentaccount)){
+                cn.ibizlab.businesscentral.core.base.domain.Account majorEntity=accountService.get(et.getParentaccountid());
+                et.setParentaccount(majorEntity);
+                parentaccount=majorEntity;
+            }
+            et.setParentaccountname(parentaccount.getAccountname());
+        }
+        //实体关系[DER1N_OPPORTUNITY__CAMPAIGN__CAMPAIGNID]
+        if(!ObjectUtils.isEmpty(et.getCampaignid())){
+            cn.ibizlab.businesscentral.core.marketing.domain.Campaign campaign=et.getCampaign();
+            if(ObjectUtils.isEmpty(campaign)){
+                cn.ibizlab.businesscentral.core.marketing.domain.Campaign majorEntity=campaignService.get(et.getCampaignid());
+                et.setCampaign(majorEntity);
+                campaign=majorEntity;
+            }
+            et.setCampaignname(campaign.getCampaignname());
+        }
+        //实体关系[DER1N_OPPORTUNITY__CONTACT__PARENTCONTACTID]
+        if(!ObjectUtils.isEmpty(et.getParentcontactid())){
+            cn.ibizlab.businesscentral.core.base.domain.Contact parentcontact=et.getParentcontact();
+            if(ObjectUtils.isEmpty(parentcontact)){
+                cn.ibizlab.businesscentral.core.base.domain.Contact majorEntity=contactService.get(et.getParentcontactid());
+                et.setParentcontact(majorEntity);
+                parentcontact=majorEntity;
+            }
+            et.setParentcontactname(parentcontact.getFullname());
+        }
+        //实体关系[DER1N_OPPORTUNITY__LEAD__ORIGINATINGLEADID]
+        if(!ObjectUtils.isEmpty(et.getOriginatingleadid())){
+            cn.ibizlab.businesscentral.core.sales.domain.Lead originatinglead=et.getOriginatinglead();
+            if(ObjectUtils.isEmpty(originatinglead)){
+                cn.ibizlab.businesscentral.core.sales.domain.Lead majorEntity=leadService.get(et.getOriginatingleadid());
+                et.setOriginatinglead(majorEntity);
+                originatinglead=majorEntity;
+            }
+            et.setOriginatingleadname(originatinglead.getFullname());
+        }
+        //实体关系[DER1N_OPPORTUNITY__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.setPricelevel(pricelevel.getPricelevelname());
+        }
+        //实体关系[DER1N_OPPORTUNITY__SLA__SLAID]
+        if(!ObjectUtils.isEmpty(et.getSlaid())){
+            cn.ibizlab.businesscentral.core.base.domain.Sla sla=et.getSla();
+            if(ObjectUtils.isEmpty(sla)){
+                cn.ibizlab.businesscentral.core.base.domain.Sla majorEntity=slaService.get(et.getSlaid());
+                et.setSla(majorEntity);
+                sla=majorEntity;
+            }
+            et.setSlaname(sla.getSlaname());
+        }
+        //实体关系[DER1N_OPPORTUNITY__TRANSACTIONCURRENCY__TRANSACTIONCURRENCYID]
+        if(!ObjectUtils.isEmpty(et.getTransactioncurrencyid())){
+            cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency transactioncurrency=et.getTransactioncurrency();
+            if(ObjectUtils.isEmpty(transactioncurrency)){
+                cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency majorEntity=transactioncurrencyService.get(et.getTransactioncurrencyid());
+                et.setTransactioncurrency(majorEntity);
+                transactioncurrency=majorEntity;
+            }
+            et.setTransactioncurrencyname(transactioncurrency.getCurrencyname());
+        }
+    }
 
 
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/QuoteServiceImpl.java

@@ -74,6 +74,7 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
     @Override
     @Transactional
     public boolean create(Quote et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getQuoteid()),et);
@@ -82,6 +83,7 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
 
     @Override
     public void createBatch(List<Quote> list) {
+        list.forEach(item->fillParentData(item));
         this.saveBatch(list,batchSize);
     }
 
@@ -107,12 +109,14 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
 
     @Override
     public boolean saveBatch(Collection<Quote> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<Quote> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
@@ -131,6 +135,7 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
     @Override
     @Transactional
     public boolean update(Quote et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("quoteid",et.getQuoteid())))
             return false;
         CachedBeanCopier.copy(get(et.getQuoteid()),et);
@@ -139,6 +144,7 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
 
     @Override
     public void updateBatch(List<Quote> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
@@ -161,6 +167,7 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
     }
     @Override
     public Quote getDraft(Quote et) {
+        fillParentData(et);
         return et;
     }
 
@@ -227,6 +234,62 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(Quote et){
+        //实体关系[DER1N_QUOTE__CAMPAIGN__CAMPAIGNID]
+        if(!ObjectUtils.isEmpty(et.getCampaignid())){
+            cn.ibizlab.businesscentral.core.marketing.domain.Campaign campaign=et.getCampaign();
+            if(ObjectUtils.isEmpty(campaign)){
+                cn.ibizlab.businesscentral.core.marketing.domain.Campaign majorEntity=campaignService.get(et.getCampaignid());
+                et.setCampaign(majorEntity);
+                campaign=majorEntity;
+            }
+            et.setCampaignname(campaign.getCampaignname());
+        }
+        //实体关系[DER1N_QUOTE__OPPORTUNITY__OPPORTUNITYID]
+        if(!ObjectUtils.isEmpty(et.getOpportunityid())){
+            cn.ibizlab.businesscentral.core.sales.domain.Opportunity opportunity=et.getOpportunity();
+            if(ObjectUtils.isEmpty(opportunity)){
+                cn.ibizlab.businesscentral.core.sales.domain.Opportunity majorEntity=opportunityService.get(et.getOpportunityid());
+                et.setOpportunity(majorEntity);
+                opportunity=majorEntity;
+            }
+            et.setOpportunityname(opportunity.getOpportunityname());
+        }
+        //实体关系[DER1N_QUOTE__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_QUOTE__SLA__SLAID]
+        if(!ObjectUtils.isEmpty(et.getSlaid())){
+            cn.ibizlab.businesscentral.core.base.domain.Sla sla=et.getSla();
+            if(ObjectUtils.isEmpty(sla)){
+                cn.ibizlab.businesscentral.core.base.domain.Sla majorEntity=slaService.get(et.getSlaid());
+                et.setSla(majorEntity);
+                sla=majorEntity;
+            }
+            et.setSlaname(sla.getSlaname());
+        }
+        //实体关系[DER1N_QUOTE__TRANSACTIONCURRENCY__TRANSACTIONCURRENCYID]
+        if(!ObjectUtils.isEmpty(et.getTransactioncurrencyid())){
+            cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency transactioncurrency=et.getTransactioncurrency();
+            if(ObjectUtils.isEmpty(transactioncurrency)){
+                cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency majorEntity=transactioncurrencyService.get(et.getTransactioncurrencyid());
+                et.setTransactioncurrency(majorEntity);
+                transactioncurrency=majorEntity;
+            }
+            et.setTransactioncurrencyname(transactioncurrency.getCurrencyname());
+        }
+    }
 
 
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/SalesLiteratureServiceImpl.java

@@ -91,18 +91,21 @@ public class SalesLiteratureServiceImpl extends ServiceImpl<SalesLiteratureMappe
 
     @Override
     public boolean saveBatch(Collection<SalesLiterature> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<SalesLiterature> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
     @Override
     @Transactional
     public boolean create(SalesLiterature et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getSalesliteratureid()),et);
@@ -111,6 +114,7 @@ public class SalesLiteratureServiceImpl extends ServiceImpl<SalesLiteratureMappe
 
     @Override
     public void createBatch(List<SalesLiterature> list) {
+        list.forEach(item->fillParentData(item));
         this.saveBatch(list,batchSize);
     }
 
@@ -133,6 +137,7 @@ public class SalesLiteratureServiceImpl extends ServiceImpl<SalesLiteratureMappe
     @Override
     @Transactional
     public boolean update(SalesLiterature et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("salesliteratureid",et.getSalesliteratureid())))
             return false;
         CachedBeanCopier.copy(get(et.getSalesliteratureid()),et);
@@ -141,11 +146,13 @@ public class SalesLiteratureServiceImpl extends ServiceImpl<SalesLiteratureMappe
 
     @Override
     public void updateBatch(List<SalesLiterature> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
     @Override
     public SalesLiterature getDraft(SalesLiterature et) {
+        fillParentData(et);
         return et;
     }
 
@@ -182,6 +189,32 @@ public class SalesLiteratureServiceImpl extends ServiceImpl<SalesLiteratureMappe
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(SalesLiterature et){
+        //实体关系[DER1N_SALESLITERATURE__SUBJECT__SUBJECTID]
+        if(!ObjectUtils.isEmpty(et.getSubjectid())){
+            cn.ibizlab.businesscentral.core.base.domain.Subject subject=et.getSubject();
+            if(ObjectUtils.isEmpty(subject)){
+                cn.ibizlab.businesscentral.core.base.domain.Subject majorEntity=subjectService.get(et.getSubjectid());
+                et.setSubject(majorEntity);
+                subject=majorEntity;
+            }
+            et.setSubjectname(subject.getTitle());
+        }
+        //实体关系[DER1N_SALESLITERATURE__TRANSACTIONCURRENCY__TRANSACTIONCURRENCYID]
+        if(!ObjectUtils.isEmpty(et.getTransactioncurrencyid())){
+            cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency transactioncurrency=et.getTransactioncurrency();
+            if(ObjectUtils.isEmpty(transactioncurrency)){
+                cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency majorEntity=transactioncurrencyService.get(et.getTransactioncurrencyid());
+                et.setTransactioncurrency(majorEntity);
+                transactioncurrency=majorEntity;
+            }
+            et.setTransactioncurrencyname(transactioncurrency.getCurrencyname());
+        }
+    }
 
 
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/SalesOrderServiceImpl.java

@@ -80,6 +80,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
     }
     @Override
     public SalesOrder getDraft(SalesOrder et) {
+        fillParentData(et);
         return et;
     }
 
@@ -118,12 +119,14 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
 
     @Override
     public boolean saveBatch(Collection<SalesOrder> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<SalesOrder> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
@@ -142,6 +145,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
     @Override
     @Transactional
     public boolean update(SalesOrder et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("salesorderid",et.getSalesorderid())))
             return false;
         CachedBeanCopier.copy(get(et.getSalesorderid()),et);
@@ -150,12 +154,14 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
 
     @Override
     public void updateBatch(List<SalesOrder> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
     @Override
     @Transactional
     public boolean create(SalesOrder et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getSalesorderid()),et);
@@ -164,6 +170,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
 
     @Override
     public void createBatch(List<SalesOrder> list) {
+        list.forEach(item->fillParentData(item));
         this.saveBatch(list,batchSize);
     }
 
@@ -240,6 +247,72 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(SalesOrder et){
+        //实体关系[DER1N_SALESORDER__CAMPAIGN__CAMPAIGNID]
+        if(!ObjectUtils.isEmpty(et.getCampaignid())){
+            cn.ibizlab.businesscentral.core.marketing.domain.Campaign campaign=et.getCampaign();
+            if(ObjectUtils.isEmpty(campaign)){
+                cn.ibizlab.businesscentral.core.marketing.domain.Campaign majorEntity=campaignService.get(et.getCampaignid());
+                et.setCampaign(majorEntity);
+                campaign=majorEntity;
+            }
+            et.setCampaignname(campaign.getCampaignname());
+        }
+        //实体关系[DER1N_SALESORDER__OPPORTUNITY__OPPORTUNITYID]
+        if(!ObjectUtils.isEmpty(et.getOpportunityid())){
+            cn.ibizlab.businesscentral.core.sales.domain.Opportunity opportunity=et.getOpportunity();
+            if(ObjectUtils.isEmpty(opportunity)){
+                cn.ibizlab.businesscentral.core.sales.domain.Opportunity majorEntity=opportunityService.get(et.getOpportunityid());
+                et.setOpportunity(majorEntity);
+                opportunity=majorEntity;
+            }
+            et.setOpportunityname(opportunity.getOpportunityname());
+        }
+        //实体关系[DER1N_SALESORDER__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_SALESORDER__QUOTE__QUOTEID]
+        if(!ObjectUtils.isEmpty(et.getQuoteid())){
+            cn.ibizlab.businesscentral.core.sales.domain.Quote quote=et.getQuote();
+            if(ObjectUtils.isEmpty(quote)){
+                cn.ibizlab.businesscentral.core.sales.domain.Quote majorEntity=quoteService.get(et.getQuoteid());
+                et.setQuote(majorEntity);
+                quote=majorEntity;
+            }
+            et.setQuotename(quote.getQuotename());
+        }
+        //实体关系[DER1N_SALESORDER__SLA__SLAID]
+        if(!ObjectUtils.isEmpty(et.getSlaid())){
+            cn.ibizlab.businesscentral.core.base.domain.Sla sla=et.getSla();
+            if(ObjectUtils.isEmpty(sla)){
+                cn.ibizlab.businesscentral.core.base.domain.Sla majorEntity=slaService.get(et.getSlaid());
+                et.setSla(majorEntity);
+                sla=majorEntity;
+            }
+            et.setSlaname(sla.getSlaname());
+        }
+        //实体关系[DER1N_SALESORDER__TRANSACTIONCURRENCY__TRANSACTIONCURRENCYID]
+        if(!ObjectUtils.isEmpty(et.getTransactioncurrencyid())){
+            cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency transactioncurrency=et.getTransactioncurrency();
+            if(ObjectUtils.isEmpty(transactioncurrency)){
+                cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency majorEntity=transactioncurrencyService.get(et.getTransactioncurrencyid());
+                et.setTransactioncurrency(majorEntity);
+                transactioncurrency=majorEntity;
+            }
+            et.setTransactioncurrencyname(transactioncurrency.getCurrencyname());
+        }
+    }
 
 
     @Override

businesscentral-core/src/main/resources/mapper/product/product/ProductMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="ProductResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  ) t1 where productid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECT`, t1.`SUBJECTID`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  ) t1 where productid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -92,12 +92,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
+       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECT`, t1.`SUBJECTID`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
+       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECT`, t1.`SUBJECTID`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/sales/salesliterature/SalesLiteratureMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="SalesLiteratureResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTIDYOMINAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYWORDS`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  ) t1 where salesliteratureid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTIDYOMINAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYWORDS`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  ) t1 where salesliteratureid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -49,12 +49,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTIDYOMINAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  
+       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTIDYOMINAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTIDYOMINAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYWORDS`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  
+       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTIDYOMINAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYWORDS`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-provider-centralapi.jar
 
-EXPOSE 8081
+EXPOSE 10310
 
 ADD businesscentral-provider-centralapi.jar /businesscentral-provider-centralapi.jar

businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/businesscentral-provider-centralapi.yaml

@@ -3,9 +3,23 @@ services:
   businesscentral-provider-centralapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-provider-centralapi:latest
     ports:
-      - "8081:8081"
+      - "10310:10310"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10310
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
     deploy:
       resources:
            limits:

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/CompetitorDTO.java

@@ -666,6 +666,14 @@ public class CompetitorDTO extends DTOBase implements Serializable {
     @JsonProperty("transactioncurrencyid")
     private String transactioncurrencyid;
 
+    /**
+     * 属性 [TRANSACTIONCURRENCYNAME]
+     *
+     */
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+
 
     /**
      * 设置 [ENTITYIMAGE]
@@ -1267,6 +1275,14 @@ public class CompetitorDTO extends DTOBase implements Serializable {
         this.modify("transactioncurrencyid",transactioncurrencyid);
     }
 
+    /**
+     * 设置 [TRANSACTIONCURRENCYNAME]
+     */
+    public void setTransactioncurrencyname(String  transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
 
 }
 

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/InvoiceDTO.java

@@ -485,14 +485,6 @@ public class InvoiceDTO extends DTOBase implements Serializable {
     @JsonProperty("importsequencenumber")
     private Integer importsequencenumber;
 
-    /**
-     * 属性 [SLANAME]
-     *
-     */
-    @JSONField(name = "slaname")
-    @JsonProperty("slaname")
-    private String slaname;
-
     /**
      * 属性 [CUSTOMERIDTYPE]
      *
@@ -694,6 +686,14 @@ public class InvoiceDTO extends DTOBase implements Serializable {
     @JsonProperty("billto_fax")
     private String billtoFax;
 
+    /**
+     * 属性 [SLANAME]
+     *
+     */
+    @JSONField(name = "slaname")
+    @JsonProperty("slaname")
+    private String slaname;
+
     /**
      * 属性 [TRANSACTIONCURRENCYID]
      *
@@ -734,6 +734,38 @@ public class InvoiceDTO extends DTOBase implements Serializable {
     @JsonProperty("slaid")
     private String slaid;
 
+    /**
+     * 属性 [TRANSACTIONCURRENCYNAME]
+     *
+     */
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+
+    /**
+     * 属性 [PRICELEVELNAME]
+     *
+     */
+    @JSONField(name = "pricelevelname")
+    @JsonProperty("pricelevelname")
+    private String pricelevelname;
+
+    /**
+     * 属性 [SALESORDERNAME]
+     *
+     */
+    @JSONField(name = "salesordername")
+    @JsonProperty("salesordername")
+    private String salesordername;
+
+    /**
+     * 属性 [OPPORTUNITYNAME]
+     *
+     */
+    @JSONField(name = "opportunityname")
+    @JsonProperty("opportunityname")
+    private String opportunityname;
+
 
     /**
      * 设置 [BILLTO_LINE1]
@@ -1151,14 +1183,6 @@ public class InvoiceDTO extends DTOBase implements Serializable {
         this.modify("importsequencenumber",importsequencenumber);
     }
 
-    /**
-     * 设置 [SLANAME]
-     */
-    public void setSlaname(String  slaname){
-        this.slaname = slaname ;
-        this.modify("slaname",slaname);
-    }
-
     /**
      * 设置 [CUSTOMERIDTYPE]
      */
@@ -1359,6 +1383,14 @@ public class InvoiceDTO extends DTOBase implements Serializable {
         this.modify("billto_fax",billtoFax);
     }
 
+    /**
+     * 设置 [SLANAME]
+     */
+    public void setSlaname(String  slaname){
+        this.slaname = slaname ;
+        this.modify("slaname",slaname);
+    }
+
     /**
      * 设置 [TRANSACTIONCURRENCYID]
      */
@@ -1399,6 +1431,38 @@ public class InvoiceDTO extends DTOBase implements Serializable {
         this.modify("slaid",slaid);
     }
 
+    /**
+     * 设置 [TRANSACTIONCURRENCYNAME]
+     */
+    public void setTransactioncurrencyname(String  transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
+    /**
+     * 设置 [PRICELEVELNAME]
+     */
+    public void setPricelevelname(String  pricelevelname){
+        this.pricelevelname = pricelevelname ;
+        this.modify("pricelevelname",pricelevelname);
+    }
+
+    /**
+     * 设置 [SALESORDERNAME]
+     */
+    public void setSalesordername(String  salesordername){
+        this.salesordername = salesordername ;
+        this.modify("salesordername",salesordername);
+    }
+
+    /**
+     * 设置 [OPPORTUNITYNAME]
+     */
+    public void setOpportunityname(String  opportunityname){
+        this.opportunityname = opportunityname ;
+        this.modify("opportunityname",opportunityname);
+    }
+
 
 }
 

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/LeadDTO.java

@@ -39,14 +39,6 @@ public class LeadDTO extends DTOBase implements Serializable {
     @JsonProperty("address2_utcoffset")
     private Integer address2Utcoffset;
 
-    /**
-     * 属性 [SLANAME]
-     *
-     */
-    @JSONField(name = "slaname")
-    @JsonProperty("slaname")
-    private String slaname;
-
     /**
      * 属性 [JOBTITLE]
      *
@@ -191,14 +183,6 @@ public class LeadDTO extends DTOBase implements Serializable {
     @JsonProperty("createman")
     private String createman;
 
-    /**
-     * 属性 [PARENTCONTACTIDYOMINAME]
-     *
-     */
-    @JSONField(name = "parentcontactidyominame")
-    @JsonProperty("parentcontactidyominame")
-    private String parentcontactidyominame;
-
     /**
      * 属性 [ADDRESS2_STATEORPROVINCE]
      *
@@ -552,14 +536,6 @@ public class LeadDTO extends DTOBase implements Serializable {
     @JsonProperty("stageid")
     private String stageid;
 
-    /**
-     * 属性 [PARENTACCOUNTIDYOMINAME]
-     *
-     */
-    @JSONField(name = "parentaccountidyominame")
-    @JsonProperty("parentaccountidyominame")
-    private String parentaccountidyominame;
-
     /**
      * 属性 [ADDRESS1_SHIPPINGMETHODCODE]
      *
@@ -690,14 +666,6 @@ public class LeadDTO extends DTOBase implements Serializable {
     @JsonProperty("customeridyominame")
     private String customeridyominame;
 
-    /**
-     * 属性 [ACCOUNTIDYOMINAME]
-     *
-     */
-    @JSONField(name = "accountidyominame")
-    @JsonProperty("accountidyominame")
-    private String accountidyominame;
-
     /**
      * 属性 [REVENUE_BASE]
      *
@@ -1175,6 +1143,14 @@ public class LeadDTO extends DTOBase implements Serializable {
     @JsonProperty("address1_upszone")
     private String address1Upszone;
 
+    /**
+     * 属性 [SLANAME]
+     *
+     */
+    @JSONField(name = "slaname")
+    @JsonProperty("slaname")
+    private String slaname;
+
     /**
      * 属性 [QUALIFYINGOPPORTUNITYID]
      *
@@ -1239,6 +1215,62 @@ public class LeadDTO extends DTOBase implements Serializable {
     @JsonProperty("parentcontactid")
     private String parentcontactid;
 
+    /**
+     * 属性 [ORIGINATINGCASENAME]
+     *
+     */
+    @JSONField(name = "originatingcasename")
+    @JsonProperty("originatingcasename")
+    private String originatingcasename;
+
+    /**
+     * 属性 [QUALIFYINGOPPORTUNITYNAME]
+     *
+     */
+    @JSONField(name = "qualifyingopportunityname")
+    @JsonProperty("qualifyingopportunityname")
+    private String qualifyingopportunityname;
+
+    /**
+     * 属性 [CAMPAIGNNAME]
+     *
+     */
+    @JSONField(name = "campaignname")
+    @JsonProperty("campaignname")
+    private String campaignname;
+
+    /**
+     * 属性 [PARENTCONTACTNAME]
+     *
+     */
+    @JSONField(name = "parentcontactname")
+    @JsonProperty("parentcontactname")
+    private String parentcontactname;
+
+    /**
+     * 属性 [PARENTACCOUNTNAME]
+     *
+     */
+    @JSONField(name = "parentaccountname")
+    @JsonProperty("parentaccountname")
+    private String parentaccountname;
+
+    /**
+     * 属性 [RELATEDOBJECTNAME]
+     *
+     */
+    @JSONField(name = "relatedobjectname")
+    @JsonProperty("relatedobjectname")
+    private String relatedobjectname;
+
+    /**
+     * 属性 [TRANSACTIONCURRENCYNAME]
+     *
+     */
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+
 
     /**
      * 设置 [ADDRESS1_FAX]
@@ -1256,14 +1288,6 @@ public class LeadDTO extends DTOBase implements Serializable {
         this.modify("address2_utcoffset",address2Utcoffset);
     }
 
-    /**
-     * 设置 [SLANAME]
-     */
-    public void setSlaname(String  slaname){
-        this.slaname = slaname ;
-        this.modify("slaname",slaname);
-    }
-
     /**
      * 设置 [JOBTITLE]
      */
@@ -1392,14 +1416,6 @@ public class LeadDTO extends DTOBase implements Serializable {
         this.modify("entityimage_url",entityimageUrl);
     }
 
-    /**
-     * 设置 [PARENTCONTACTIDYOMINAME]
-     */
-    public void setParentcontactidyominame(String  parentcontactidyominame){
-        this.parentcontactidyominame = parentcontactidyominame ;
-        this.modify("parentcontactidyominame",parentcontactidyominame);
-    }
-
     /**
      * 设置 [ADDRESS2_STATEORPROVINCE]
      */
@@ -1744,14 +1760,6 @@ public class LeadDTO extends DTOBase implements Serializable {
         this.modify("stageid",stageid);
     }
 
-    /**
-     * 设置 [PARENTACCOUNTIDYOMINAME]
-     */
-    public void setParentaccountidyominame(String  parentaccountidyominame){
-        this.parentaccountidyominame = parentaccountidyominame ;
-        this.modify("parentaccountidyominame",parentaccountidyominame);
-    }
-
     /**
      * 设置 [ADDRESS1_SHIPPINGMETHODCODE]
      */
@@ -1872,14 +1880,6 @@ public class LeadDTO extends DTOBase implements Serializable {
         this.modify("customeridyominame",customeridyominame);
     }
 
-    /**
-     * 设置 [ACCOUNTIDYOMINAME]
-     */
-    public void setAccountidyominame(String  accountidyominame){
-        this.accountidyominame = accountidyominame ;
-        this.modify("accountidyominame",accountidyominame);
-    }
-
     /**
      * 设置 [REVENUE_BASE]
      */
@@ -2344,6 +2344,14 @@ public class LeadDTO extends DTOBase implements Serializable {
         this.modify("address1_upszone",address1Upszone);
     }
 
+    /**
+     * 设置 [SLANAME]
+     */
+    public void setSlaname(String  slaname){
+        this.slaname = slaname ;
+        this.modify("slaname",slaname);
+    }
+
     /**
      * 设置 [QUALIFYINGOPPORTUNITYID]
      */
@@ -2408,6 +2416,62 @@ public class LeadDTO extends DTOBase implements Serializable {
         this.modify("parentcontactid",parentcontactid);
     }
 
+    /**
+     * 设置 [ORIGINATINGCASENAME]
+     */
+    public void setOriginatingcasename(String  originatingcasename){
+        this.originatingcasename = originatingcasename ;
+        this.modify("originatingcasename",originatingcasename);
+    }
+
+    /**
+     * 设置 [QUALIFYINGOPPORTUNITYNAME]
+     */
+    public void setQualifyingopportunityname(String  qualifyingopportunityname){
+        this.qualifyingopportunityname = qualifyingopportunityname ;
+        this.modify("qualifyingopportunityname",qualifyingopportunityname);
+    }
+
+    /**
+     * 设置 [CAMPAIGNNAME]
+     */
+    public void setCampaignname(String  campaignname){
+        this.campaignname = campaignname ;
+        this.modify("campaignname",campaignname);
+    }
+
+    /**
+     * 设置 [PARENTCONTACTNAME]
+     */
+    public void setParentcontactname(String  parentcontactname){
+        this.parentcontactname = parentcontactname ;
+        this.modify("parentcontactname",parentcontactname);
+    }
+
+    /**
+     * 设置 [PARENTACCOUNTNAME]
+     */
+    public void setParentaccountname(String  parentaccountname){
+        this.parentaccountname = parentaccountname ;
+        this.modify("parentaccountname",parentaccountname);
+    }
+
+    /**
+     * 设置 [RELATEDOBJECTNAME]
+     */
+    public void setRelatedobjectname(String  relatedobjectname){
+        this.relatedobjectname = relatedobjectname ;
+        this.modify("relatedobjectname",relatedobjectname);
+    }
+
+    /**
+     * 设置 [TRANSACTIONCURRENCYNAME]
+     */
+    public void setTransactioncurrencyname(String  transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
 
 }
 

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/OpportunityDTO.java

@@ -103,14 +103,6 @@ public class OpportunityDTO extends DTOBase implements Serializable {
     @JsonProperty("estimatedvalue_base")
     private BigDecimal estimatedvalueBase;
 
-    /**
-     * 属性 [PARENTCONTACTIDYOMINAME]
-     *
-     */
-    @JSONField(name = "parentcontactidyominame")
-    @JsonProperty("parentcontactidyominame")
-    private String parentcontactidyominame;
-
     /**
      * 属性 [PRESENTFINALPROPOSAL]
      *
@@ -565,14 +557,6 @@ public class OpportunityDTO extends DTOBase implements Serializable {
     @JsonProperty("completefinalproposal")
     private Integer completefinalproposal;
 
-    /**
-     * 属性 [ORIGINATINGLEADIDYOMINAME]
-     *
-     */
-    @JSONField(name = "originatingleadidyominame")
-    @JsonProperty("originatingleadidyominame")
-    private String originatingleadidyominame;
-
     /**
      * 属性 [DISCOUNTAMOUNT]
      *
@@ -800,14 +784,6 @@ public class OpportunityDTO extends DTOBase implements Serializable {
     @JsonProperty("quotecomments")
     private String quotecomments;
 
-    /**
-     * 属性 [PARENTACCOUNTIDYOMINAME]
-     *
-     */
-    @JSONField(name = "parentaccountidyominame")
-    @JsonProperty("parentaccountidyominame")
-    private String parentaccountidyominame;
-
     /**
      * 属性 [CUSTOMERIDTYPE]
      *
@@ -816,14 +792,6 @@ public class OpportunityDTO extends DTOBase implements Serializable {
     @JsonProperty("customeridtype")
     private String customeridtype;
 
-    /**
-     * 属性 [SLANAME]
-     *
-     */
-    @JSONField(name = "slaname")
-    @JsonProperty("slaname")
-    private String slaname;
-
     /**
      * 属性 [OVERRIDDENCREATEDON]
      *
@@ -841,6 +809,14 @@ public class OpportunityDTO extends DTOBase implements Serializable {
     @JsonProperty("ownerid")
     private String ownerid;
 
+    /**
+     * 属性 [SLANAME]
+     *
+     */
+    @JSONField(name = "slaname")
+    @JsonProperty("slaname")
+    private String slaname;
+
     /**
      * 属性 [PARENTCONTACTID]
      *
@@ -897,6 +873,54 @@ public class OpportunityDTO extends DTOBase implements Serializable {
     @JsonProperty("slaid")
     private String slaid;
 
+    /**
+     * 属性 [PRICELEVEL]
+     *
+     */
+    @JSONField(name = "pricelevel")
+    @JsonProperty("pricelevel")
+    private String pricelevel;
+
+    /**
+     * 属性 [ORIGINATINGLEADNAME]
+     *
+     */
+    @JSONField(name = "originatingleadname")
+    @JsonProperty("originatingleadname")
+    private String originatingleadname;
+
+    /**
+     * 属性 [PARENTACCOUNTNAME]
+     *
+     */
+    @JSONField(name = "parentaccountname")
+    @JsonProperty("parentaccountname")
+    private String parentaccountname;
+
+    /**
+     * 属性 [CAMPAIGNNAME]
+     *
+     */
+    @JSONField(name = "campaignname")
+    @JsonProperty("campaignname")
+    private String campaignname;
+
+    /**
+     * 属性 [PARENTCONTACTNAME]
+     *
+     */
+    @JSONField(name = "parentcontactname")
+    @JsonProperty("parentcontactname")
+    private String parentcontactname;
+
+    /**
+     * 属性 [TRANSACTIONCURRENCYNAME]
+     *
+     */
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+
 
     /**
      * 设置 [DECISIONMAKER]
@@ -970,14 +994,6 @@ public class OpportunityDTO extends DTOBase implements Serializable {
         this.modify("estimatedvalue_base",estimatedvalueBase);
     }
 
-    /**
-     * 设置 [PARENTCONTACTIDYOMINAME]
-     */
-    public void setParentcontactidyominame(String  parentcontactidyominame){
-        this.parentcontactidyominame = parentcontactidyominame ;
-        this.modify("parentcontactidyominame",parentcontactidyominame);
-    }
-
     /**
      * 设置 [PRESENTFINALPROPOSAL]
      */
@@ -1410,14 +1426,6 @@ public class OpportunityDTO extends DTOBase implements Serializable {
         this.modify("completefinalproposal",completefinalproposal);
     }
 
-    /**
-     * 设置 [ORIGINATINGLEADIDYOMINAME]
-     */
-    public void setOriginatingleadidyominame(String  originatingleadidyominame){
-        this.originatingleadidyominame = originatingleadidyominame ;
-        this.modify("originatingleadidyominame",originatingleadidyominame);
-    }
-
     /**
      * 设置 [DISCOUNTAMOUNT]
      */
@@ -1626,14 +1634,6 @@ public class OpportunityDTO extends DTOBase implements Serializable {
         this.modify("quotecomments",quotecomments);
     }
 
-    /**
-     * 设置 [PARENTACCOUNTIDYOMINAME]
-     */
-    public void setParentaccountidyominame(String  parentaccountidyominame){
-        this.parentaccountidyominame = parentaccountidyominame ;
-        this.modify("parentaccountidyominame",parentaccountidyominame);
-    }
-
     /**
      * 设置 [CUSTOMERIDTYPE]
      */
@@ -1642,14 +1642,6 @@ public class OpportunityDTO extends DTOBase implements Serializable {
         this.modify("customeridtype",customeridtype);
     }
 
-    /**
-     * 设置 [SLANAME]
-     */
-    public void setSlaname(String  slaname){
-        this.slaname = slaname ;
-        this.modify("slaname",slaname);
-    }
-
     /**
      * 设置 [OVERRIDDENCREATEDON]
      */
@@ -1666,6 +1658,14 @@ public class OpportunityDTO extends DTOBase implements Serializable {
         this.modify("ownerid",ownerid);
     }
 
+    /**
+     * 设置 [SLANAME]
+     */
+    public void setSlaname(String  slaname){
+        this.slaname = slaname ;
+        this.modify("slaname",slaname);
+    }
+
     /**
      * 设置 [PARENTCONTACTID]
      */
@@ -1722,6 +1722,54 @@ public class OpportunityDTO extends DTOBase implements Serializable {
         this.modify("slaid",slaid);
     }
 
+    /**
+     * 设置 [PRICELEVEL]
+     */
+    public void setPricelevel(String  pricelevel){
+        this.pricelevel = pricelevel ;
+        this.modify("pricelevel",pricelevel);
+    }
+
+    /**
+     * 设置 [ORIGINATINGLEADNAME]
+     */
+    public void setOriginatingleadname(String  originatingleadname){
+        this.originatingleadname = originatingleadname ;
+        this.modify("originatingleadname",originatingleadname);
+    }
+
+    /**
+     * 设置 [PARENTACCOUNTNAME]
+     */
+    public void setParentaccountname(String  parentaccountname){
+        this.parentaccountname = parentaccountname ;
+        this.modify("parentaccountname",parentaccountname);
+    }
+
+    /**
+     * 设置 [CAMPAIGNNAME]
+     */
+    public void setCampaignname(String  campaignname){
+        this.campaignname = campaignname ;
+        this.modify("campaignname",campaignname);
+    }
+
+    /**
+     * 设置 [PARENTCONTACTNAME]
+     */
+    public void setParentcontactname(String  parentcontactname){
+        this.parentcontactname = parentcontactname ;
+        this.modify("parentcontactname",parentcontactname);
+    }
+
+    /**
+     * 设置 [TRANSACTIONCURRENCYNAME]
+     */
+    public void setTransactioncurrencyname(String  transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
 
 }
 

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/ProductDTO.java

@@ -460,6 +460,54 @@ public class ProductDTO extends DTOBase implements Serializable {
     @JsonProperty("subjectid")
     private String subjectid;
 
+    /**
+     * 属性 [PARENTPRODUCTNAME]
+     *
+     */
+    @JSONField(name = "parentproductname")
+    @JsonProperty("parentproductname")
+    private String parentproductname;
+
+    /**
+     * 属性 [TRANSACTIONCURRENCYNAME]
+     *
+     */
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+
+    /**
+     * 属性 [PRICELEVELNAME]
+     *
+     */
+    @JSONField(name = "pricelevelname")
+    @JsonProperty("pricelevelname")
+    private String pricelevelname;
+
+    /**
+     * 属性 [DEFAULTUOMNAME]
+     *
+     */
+    @JSONField(name = "defaultuomname")
+    @JsonProperty("defaultuomname")
+    private String defaultuomname;
+
+    /**
+     * 属性 [DEFAULTUOMSCHEDULENAME]
+     *
+     */
+    @JSONField(name = "defaultuomschedulename")
+    @JsonProperty("defaultuomschedulename")
+    private String defaultuomschedulename;
+
+    /**
+     * 属性 [SUBJECT]
+     *
+     */
+    @JSONField(name = "subject")
+    @JsonProperty("subject")
+    private String subject;
+
 
     /**
      * 设置 [VENDORID]
@@ -853,6 +901,54 @@ public class ProductDTO extends DTOBase implements Serializable {
         this.modify("subjectid",subjectid);
     }
 
+    /**
+     * 设置 [PARENTPRODUCTNAME]
+     */
+    public void setParentproductname(String  parentproductname){
+        this.parentproductname = parentproductname ;
+        this.modify("parentproductname",parentproductname);
+    }
+
+    /**
+     * 设置 [TRANSACTIONCURRENCYNAME]
+     */
+    public void setTransactioncurrencyname(String  transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
+    /**
+     * 设置 [PRICELEVELNAME]
+     */
+    public void setPricelevelname(String  pricelevelname){
+        this.pricelevelname = pricelevelname ;
+        this.modify("pricelevelname",pricelevelname);
+    }
+
+    /**
+     * 设置 [DEFAULTUOMNAME]
+     */
+    public void setDefaultuomname(String  defaultuomname){
+        this.defaultuomname = defaultuomname ;
+        this.modify("defaultuomname",defaultuomname);
+    }
+
+    /**
+     * 设置 [DEFAULTUOMSCHEDULENAME]
+     */
+    public void setDefaultuomschedulename(String  defaultuomschedulename){
+        this.defaultuomschedulename = defaultuomschedulename ;
+        this.modify("defaultuomschedulename",defaultuomschedulename);
+    }
+
+    /**
+     * 设置 [SUBJECT]
+     */
+    public void setSubject(String  subject){
+        this.subject = subject ;
+        this.modify("subject",subject);
+    }
+
 
 }
 

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/QuoteDTO.java

@@ -543,14 +543,6 @@ public class QuoteDTO extends DTOBase implements Serializable {
     @JsonProperty("billto_name")
     private String billtoName;
 
-    /**
-     * 属性 [SLANAME]
-     *
-     */
-    @JSONField(name = "slaname")
-    @JsonProperty("slaname")
-    private String slaname;
-
     /**
      * 属性 [BILLTO_LINE1]
      *
@@ -720,6 +712,14 @@ public class QuoteDTO extends DTOBase implements Serializable {
     @JsonProperty("freightamount")
     private BigDecimal freightamount;
 
+    /**
+     * 属性 [SLANAME]
+     *
+     */
+    @JSONField(name = "slaname")
+    @JsonProperty("slaname")
+    private String slaname;
+
     /**
      * 属性 [PRICELEVELID]
      *
@@ -760,6 +760,38 @@ public class QuoteDTO extends DTOBase implements Serializable {
     @JsonProperty("campaignid")
     private String campaignid;
 
+    /**
+     * 属性 [PRICELEVELNAME]
+     *
+     */
+    @JSONField(name = "pricelevelname")
+    @JsonProperty("pricelevelname")
+    private String pricelevelname;
+
+    /**
+     * 属性 [OPPORTUNITYNAME]
+     *
+     */
+    @JSONField(name = "opportunityname")
+    @JsonProperty("opportunityname")
+    private String opportunityname;
+
+    /**
+     * 属性 [TRANSACTIONCURRENCYNAME]
+     *
+     */
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+
+    /**
+     * 属性 [CAMPAIGNNAME]
+     *
+     */
+    @JSONField(name = "campaignname")
+    @JsonProperty("campaignname")
+    private String campaignname;
+
 
     /**
      * 设置 [BILLTO_COUNTRY]
@@ -1233,14 +1265,6 @@ public class QuoteDTO extends DTOBase implements Serializable {
         this.modify("billto_name",billtoName);
     }
 
-    /**
-     * 设置 [SLANAME]
-     */
-    public void setSlaname(String  slaname){
-        this.slaname = slaname ;
-        this.modify("slaname",slaname);
-    }
-
     /**
      * 设置 [BILLTO_LINE1]
      */
@@ -1409,6 +1433,14 @@ public class QuoteDTO extends DTOBase implements Serializable {
         this.modify("freightamount",freightamount);
     }
 
+    /**
+     * 设置 [SLANAME]
+     */
+    public void setSlaname(String  slaname){
+        this.slaname = slaname ;
+        this.modify("slaname",slaname);
+    }
+
     /**
      * 设置 [PRICELEVELID]
      */
@@ -1449,6 +1481,38 @@ public class QuoteDTO extends DTOBase implements Serializable {
         this.modify("campaignid",campaignid);
     }
 
+    /**
+     * 设置 [PRICELEVELNAME]
+     */
+    public void setPricelevelname(String  pricelevelname){
+        this.pricelevelname = pricelevelname ;
+        this.modify("pricelevelname",pricelevelname);
+    }
+
+    /**
+     * 设置 [OPPORTUNITYNAME]
+     */
+    public void setOpportunityname(String  opportunityname){
+        this.opportunityname = opportunityname ;
+        this.modify("opportunityname",opportunityname);
+    }
+
+    /**
+     * 设置 [TRANSACTIONCURRENCYNAME]
+     */
+    public void setTransactioncurrencyname(String  transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
+    /**
+     * 设置 [CAMPAIGNNAME]
+     */
+    public void setCampaignname(String  campaignname){
+        this.campaignname = campaignname ;
+        this.modify("campaignname",campaignname);
+    }
+
 
 }
 

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/SalesLiteratureDTO.java

@@ -259,6 +259,22 @@ public class SalesLiteratureDTO extends DTOBase implements Serializable {
     @JsonProperty("subjectid")
     private String subjectid;
 
+    /**
+     * 属性 [TRANSACTIONCURRENCYNAME]
+     *
+     */
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+
+    /**
+     * 属性 [SUBJECTNAME]
+     *
+     */
+    @JSONField(name = "subjectname")
+    @JsonProperty("subjectname")
+    private String subjectname;
+
 
     /**
      * 设置 [IMPORTSEQUENCENUMBER]
@@ -452,6 +468,22 @@ public class SalesLiteratureDTO extends DTOBase implements Serializable {
         this.modify("subjectid",subjectid);
     }
 
+    /**
+     * 设置 [TRANSACTIONCURRENCYNAME]
+     */
+    public void setTransactioncurrencyname(String  transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
+    /**
+     * 设置 [SUBJECTNAME]
+     */
+    public void setSubjectname(String  subjectname){
+        this.subjectname = subjectname ;
+        this.modify("subjectname",subjectname);
+    }
+
 
 }
 

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/SalesOrderDTO.java

@@ -353,14 +353,6 @@ public class SalesOrderDTO extends DTOBase implements Serializable {
     @JsonProperty("shipto_addressid")
     private String shiptoAddressid;
 
-    /**
-     * 属性 [SLANAME]
-     *
-     */
-    @JSONField(name = "slaname")
-    @JsonProperty("slaname")
-    private String slaname;
-
     /**
      * 属性 [PAYMENTTERMSCODE]
      *
@@ -759,6 +751,14 @@ public class SalesOrderDTO extends DTOBase implements Serializable {
     @JsonProperty("description")
     private String description;
 
+    /**
+     * 属性 [SLANAME]
+     *
+     */
+    @JSONField(name = "slaname")
+    @JsonProperty("slaname")
+    private String slaname;
+
     /**
      * 属性 [QUOTEID]
      *
@@ -807,6 +807,46 @@ public class SalesOrderDTO extends DTOBase implements Serializable {
     @JsonProperty("campaignid")
     private String campaignid;
 
+    /**
+     * 属性 [QUOTENAME]
+     *
+     */
+    @JSONField(name = "quotename")
+    @JsonProperty("quotename")
+    private String quotename;
+
+    /**
+     * 属性 [TRANSACTIONCURRENCYNAME]
+     *
+     */
+    @JSONField(name = "transactioncurrencyname")
+    @JsonProperty("transactioncurrencyname")
+    private String transactioncurrencyname;
+
+    /**
+     * 属性 [OPPORTUNITYNAME]
+     *
+     */
+    @JSONField(name = "opportunityname")
+    @JsonProperty("opportunityname")
+    private String opportunityname;
+
+    /**
+     * 属性 [PRICELEVELNAME]
+     *
+     */
+    @JSONField(name = "pricelevelname")
+    @JsonProperty("pricelevelname")
+    private String pricelevelname;
+
+    /**
+     * 属性 [CAMPAIGNNAME]
+     *
+     */
+    @JSONField(name = "campaignname")
+    @JsonProperty("campaignname")
+    private String campaignname;
+
 
     /**
      * 设置 [ENTITYIMAGE]
@@ -1120,14 +1160,6 @@ public class SalesOrderDTO extends DTOBase implements Serializable {
         this.modify("shipto_addressid",shiptoAddressid);
     }
 
-    /**
-     * 设置 [SLANAME]
-     */
-    public void setSlaname(String  slaname){
-        this.slaname = slaname ;
-        this.modify("slaname",slaname);
-    }
-
     /**
      * 设置 [PAYMENTTERMSCODE]
      */
@@ -1496,6 +1528,14 @@ public class SalesOrderDTO extends DTOBase implements Serializable {
         this.modify("description",description);
     }
 
+    /**
+     * 设置 [SLANAME]
+     */
+    public void setSlaname(String  slaname){
+        this.slaname = slaname ;
+        this.modify("slaname",slaname);
+    }
+
     /**
      * 设置 [QUOTEID]
      */
@@ -1544,6 +1584,46 @@ public class SalesOrderDTO extends DTOBase implements Serializable {
         this.modify("campaignid",campaignid);
     }
 
+    /**
+     * 设置 [QUOTENAME]
+     */
+    public void setQuotename(String  quotename){
+        this.quotename = quotename ;
+        this.modify("quotename",quotename);
+    }
+
+    /**
+     * 设置 [TRANSACTIONCURRENCYNAME]
+     */
+    public void setTransactioncurrencyname(String  transactioncurrencyname){
+        this.transactioncurrencyname = transactioncurrencyname ;
+        this.modify("transactioncurrencyname",transactioncurrencyname);
+    }
+
+    /**
+     * 设置 [OPPORTUNITYNAME]
+     */
+    public void setOpportunityname(String  opportunityname){
+        this.opportunityname = opportunityname ;
+        this.modify("opportunityname",opportunityname);
+    }
+
+    /**
+     * 设置 [PRICELEVELNAME]
+     */
+    public void setPricelevelname(String  pricelevelname){
+        this.pricelevelname = pricelevelname ;
+        this.modify("pricelevelname",pricelevelname);
+    }
+
+    /**
+     * 设置 [CAMPAIGNNAME]
+     */
+    public void setCampaignname(String  campaignname){
+        this.campaignname = campaignname ;
+        this.modify("campaignname",campaignname);
+    }
+
 
 }
 

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibizbusinesscentral/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizbusinesscentral/
+      mvn clean package -Pcentralapi
+      cd businesscentral-provider/businesscentral-provider-centralapi
+      mvn -Pcentralapi docker:build
+      mvn -Pcentralapi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-provider-centralapi.yaml iBizEE --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>