xignzi006 发布系统代码 [Spring Boot]

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/extensions/service/Res_config_settingsExService.java

+package cn.ibizlab.businesscentral.core.extensions.service;
+
+import cn.ibizlab.businesscentral.core.odoo_base.service.impl.Res_config_settingsServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import cn.ibizlab.businesscentral.core.odoo_base.domain.Res_config_settings;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Primary;
+import java.util.*;
+
+/**
+ * 实体[配置设定] 自定义服务对象
+ */
+@Slf4j
+@Primary
+@Service("Res_config_settingsExService")
+public class Res_config_settingsExService extends Res_config_settingsServiceImpl {
+
+    @Override
+    protected Class currentModelClass() {
+        return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
+    }
+
+    /**
+     * 自定义行为[Get_default]用户扩展
+     * @param et
+     * @return
+     */
+    @Override
+    @Transactional
+    public Res_config_settings get_default(Res_config_settings et) {
+        return super.get_default(et);
+    }
+}
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/service/impl/Account_fiscal_positionServiceImpl.java

@@ -71,6 +71,9 @@ public class Account_fiscal_positionServiceImpl extends EBSServiceImpl<Account_f
     protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_reportService purchaseReportService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_sale.service.ISale_orderService saleOrderService;
     @Autowired
     @Lazy

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/client/res_config_settingsFallback.java

@@ -69,6 +69,10 @@ public class res_config_settingsFallback implements res_config_settingsFeignClie
      }
 
 
+    public Res_config_settings get_default( Long id, Res_config_settings res_config_settings){
+            return null;
+     }
+
     public Boolean save(Res_config_settings res_config_settings){
             return false;
      }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/client/res_config_settingsFeignClient.java

@@ -64,6 +64,10 @@ public interface res_config_settingsFeignClient {
     Boolean checkKey(@RequestBody Res_config_settings res_config_settings);
 
 
+    @RequestMapping(method = RequestMethod.GET, value = "/res_config_settings/{id}/get_default")
+    Res_config_settings get_default(@PathVariable("id") Long id,@RequestBody Res_config_settings res_config_settings);
+
+
     @RequestMapping(method = RequestMethod.POST, value = "/res_config_settings/save")
     Boolean save(@RequestBody Res_config_settings res_config_settings);
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/domain/Res_supplier.java

@@ -196,6 +196,186 @@ public class Res_supplier extends EntityMP implements Serializable {
     @JSONField(name = "state_id")
     @JsonProperty("state_id")
     private Long stateId;
+    /**
+     * 交货方法
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_delivery_carrier_id")
+    @JsonProperty("property_delivery_carrier_id")
+    @DynaProperty(res_model="res.partner",reference=cn.ibizlab.businesscentral.core.odoo_stock.service.IDelivery_carrierService.class,pickup_text = "property_delivery_carrier_name",reference_field = "name")
+    private Long propertyDeliveryCarrierId;
+    /**
+     * 交货方法
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_delivery_carrier_name")
+    @JsonProperty("property_delivery_carrier_name")
+    private String propertyDeliveryCarrierName;
+    /**
+     * 销售付款条款
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_payment_term_id")
+    @JsonProperty("property_payment_term_id")
+    @DynaProperty(res_model="res.partner",reference=cn.ibizlab.businesscentral.core.odoo_account.service.IAccount_payment_termService.class,pickup_text = "property_payment_term_name",reference_field = "name")
+    private Long propertyPaymentTermId;
+    /**
+     * 付款条款
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_payment_term_name")
+    @JsonProperty("property_payment_term_name")
+    private String propertyPaymentTermName;
+    /**
+     * 供应商货币
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_purchase_currency_id")
+    @JsonProperty("property_purchase_currency_id")
+    @DynaProperty(res_model="res.partner",reference=cn.ibizlab.businesscentral.core.odoo_base.service.IRes_currencyService.class,pickup_text = "property_purchase_currency_name",reference_field = "name")
+    private Long propertyPurchaseCurrencyId;
+    /**
+     * 供应商货币
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_purchase_currency_name")
+    @JsonProperty("property_purchase_currency_name")
+    private String propertyPurchaseCurrencyName;
+    /**
+     * 税科目调整
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_account_position_id")
+    @JsonProperty("property_account_position_id")
+    @DynaProperty(res_model="res.partner",reference=cn.ibizlab.businesscentral.core.odoo_account.service.IAccount_fiscal_positionService.class,pickup_text = "property_account_position_name",reference_field = "name")
+    private Long propertyAccountPositionId;
+    /**
+     * 税科目调整
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_account_position_name")
+    @JsonProperty("property_account_position_name")
+    private String propertyAccountPositionName;
+    /**
+     * 客户位置
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_stock_customer")
+    @JsonProperty("property_stock_customer")
+    @DynaProperty(res_model="res.partner",reference=cn.ibizlab.businesscentral.core.odoo_stock.service.IStock_locationService.class,pickup_text = "property_stock_customer_name",reference_field = "name")
+    private Long propertyStockCustomer;
+    /**
+     * 客户位置
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_stock_customer_name")
+    @JsonProperty("property_stock_customer_name")
+    private String propertyStockCustomerName;
+    /**
+     * 供应商位置
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_stock_supplier")
+    @JsonProperty("property_stock_supplier")
+    @DynaProperty(res_model="res.partner",reference=cn.ibizlab.businesscentral.core.odoo_stock.service.IStock_locationService.class,pickup_text = "property_stock_supplier_name",reference_field = "name")
+    private Long propertyStockSupplier;
+    /**
+     * 供应商位置
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_stock_supplier_name")
+    @JsonProperty("property_stock_supplier_name")
+    private String propertyStockSupplierName;
+    /**
+     * 分包商位置
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_stock_subcontractor")
+    @JsonProperty("property_stock_subcontractor")
+    @DynaProperty(res_model="res.partner",reference=cn.ibizlab.businesscentral.core.odoo_stock.service.IStock_locationService.class,pickup_text = "property_stock_subcontractor_name",reference_field = "name")
+    private Long propertyStockSubcontractor;
+    /**
+     * 分包商位置
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_stock_subcontractor_name")
+    @JsonProperty("property_stock_subcontractor_name")
+    private String propertyStockSubcontractorName;
+    /**
+     * 销售员
+     */
+    @DEField(name = "user_id")
+    @TableField(value = "user_id")
+    @JSONField(name = "user_id")
+    @JsonProperty("user_id")
+    private Long userId;
+    /**
+     * 销售员
+     */
+    @TableField(exist = false)
+    @JSONField(name = "user_name")
+    @JsonProperty("user_name")
+    private String userName;
+    /**
+     * 价格表
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_product_pricelist")
+    @JsonProperty("property_product_pricelist")
+    @DynaProperty(res_model="res.partner",reference=cn.ibizlab.businesscentral.core.odoo_product.service.IProduct_pricelistService.class,pickup_text = "property_product_pricelist_name",reference_field = "name")
+    private Long propertyProductPricelist;
+    /**
+     * 价格表
+     */
+    @TableField(exist = false)
+    @JSONField(name = "property_product_pricelist_name")
+    @JsonProperty("property_product_pricelist_name")
+    private String propertyProductPricelistName;
+    /**
+     * ID
+     */
+    @DEField(name = "parent_id")
+    @TableField(value = "parent_id")
+    @JSONField(name = "parent_id")
+    @JsonProperty("parent_id")
+    private Long parentId;
+    /**
+     * 公司
+     */
+    @TableField(exist = false)
+    @JSONField(name = "parent_name")
+    @JsonProperty("parent_name")
+    private String parentName;
+    /**
+     * 条码
+     */
+    @TableField(value = "barcode")
+    @JSONField(name = "barcode")
+    @JsonProperty("barcode")
+    private String barcode;
+    /**
+     * 内部参考
+     */
+    @TableField(value = "ref")
+    @JSONField(name = "ref")
+    @JsonProperty("ref")
+    private String ref;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_fiscal_position odooAccountPosition;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_payment_term odooAccountPaymentTerm;
 
     /**
      * 
@@ -205,6 +385,22 @@ public class Res_supplier extends EntityMP implements Serializable {
     @TableField(exist = false)
     private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_payment_term odooPurchasePaymentTerm;
 
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_stock.domain.Delivery_carrier odooDeliveryCarrier;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_product.domain.Product_pricelist odooPricelist;
+
     /**
      * 
      */
@@ -229,6 +425,22 @@ public class Res_supplier extends EntityMP implements Serializable {
     @TableField(exist = false)
     private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_country_state odooState;
 
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_currency odooCurrency;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner odooParent;
+
     /**
      * 
      */
@@ -237,6 +449,38 @@ public class Res_supplier extends EntityMP implements Serializable {
     @TableField(exist = false)
     private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner_title odooTitle;
 
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooUser;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_stock.domain.Stock_location odooCustomerLocation;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_stock.domain.Stock_location odooSubcontractorLocation;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_stock.domain.Stock_location odooVendorLocation;
+
 
 
     /**
@@ -335,6 +579,38 @@ public class Res_supplier extends EntityMP implements Serializable {
         this.modify("state_id",stateId);
     }
 
+    /**
+     * 设置 [销售员]
+     */
+    public void setUserId(Long userId){
+        this.userId = userId ;
+        this.modify("user_id",userId);
+    }
+
+    /**
+     * 设置 [ID]
+     */
+    public void setParentId(Long parentId){
+        this.parentId = parentId ;
+        this.modify("parent_id",parentId);
+    }
+
+    /**
+     * 设置 [条码]
+     */
+    public void setBarcode(String barcode){
+        this.barcode = barcode ;
+        this.modify("barcode",barcode);
+    }
+
+    /**
+     * 设置 [内部参考]
+     */
+    public void setRef(String ref){
+        this.ref = ref ;
+        this.modify("ref",ref);
+    }
+
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/mapper/Res_supplierMapper.java

@@ -62,16 +62,36 @@ public interface Res_supplierMapper extends BaseMapper<Res_supplier>{
     @Delete("${sql}")
     boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
 
+    List<Res_supplier> selectByPropertyAccountPositionId(@Param("id") Serializable id) ;
+
+    List<Res_supplier> selectByPropertyPaymentTermId(@Param("id") Serializable id) ;
+
     List<Res_supplier> selectByPropertySupplierPaymentTermId(@Param("id") Serializable id) ;
 
+    List<Res_supplier> selectByPropertyDeliveryCarrierId(@Param("id") Serializable id) ;
+
+    List<Res_supplier> selectByPropertyProductPricelist(@Param("id") Serializable id) ;
+
     List<Res_supplier> selectByCompanyId(@Param("id") Serializable id) ;
 
     List<Res_supplier> selectByCountryId(@Param("id") Serializable id) ;
 
     List<Res_supplier> selectByStateId(@Param("id") Serializable id) ;
 
+    List<Res_supplier> selectByPropertyPurchaseCurrencyId(@Param("id") Serializable id) ;
+
+    List<Res_supplier> selectByParentId(@Param("id") Serializable id) ;
+
     List<Res_supplier> selectByTitle(@Param("id") Serializable id) ;
 
+    List<Res_supplier> selectByUserId(@Param("id") Serializable id) ;
+
+    List<Res_supplier> selectByPropertyStockCustomer(@Param("id") Serializable id) ;
+
+    List<Res_supplier> selectByPropertyStockSubcontractor(@Param("id") Serializable id) ;
+
+    List<Res_supplier> selectByPropertyStockSupplier(@Param("id") Serializable id) ;
+
 
         
     boolean saveRelByCategoryId(@Param("partner_id") Long partner_id, List<cn.ibizlab.businesscentral.util.domain.MultiSelectItem> res_partner_categories);

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/IRes_config_settingsService.java

@@ -34,6 +34,7 @@ public interface IRes_config_settingsService extends IService<Res_config_setting
     Res_config_settings get(Long key) ;
     Res_config_settings getDraft(Res_config_settings et) ;
     boolean checkKey(Res_config_settings et) ;
+    Res_config_settings get_default(Res_config_settings et) ;
     boolean save(Res_config_settings et) ;
     void saveBatch(List<Res_config_settings> list) ;
     Page<Res_config_settings> searchDefault(Res_config_settingsSearchContext context) ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/IRes_supplierService.java

@@ -38,16 +38,36 @@ public interface IRes_supplierService extends IService<Res_supplier>{
     boolean save(Res_supplier et) ;
     void saveBatch(List<Res_supplier> list) ;
     Page<Res_supplier> searchDefault(Res_supplierSearchContext context) ;
+    List<Res_supplier> selectByPropertyAccountPositionId(Long id);
+    void removeByPropertyAccountPositionId(Long id);
+    List<Res_supplier> selectByPropertyPaymentTermId(Long id);
+    void removeByPropertyPaymentTermId(Long id);
     List<Res_supplier> selectByPropertySupplierPaymentTermId(Long id);
     void removeByPropertySupplierPaymentTermId(Long id);
+    List<Res_supplier> selectByPropertyDeliveryCarrierId(Long id);
+    void removeByPropertyDeliveryCarrierId(Long id);
+    List<Res_supplier> selectByPropertyProductPricelist(Long id);
+    void removeByPropertyProductPricelist(Long id);
     List<Res_supplier> selectByCompanyId(Long id);
     void removeByCompanyId(Long id);
     List<Res_supplier> selectByCountryId(Long id);
     void removeByCountryId(Long id);
     List<Res_supplier> selectByStateId(Long id);
     void removeByStateId(Long id);
+    List<Res_supplier> selectByPropertyPurchaseCurrencyId(Long id);
+    void removeByPropertyPurchaseCurrencyId(Long id);
+    List<Res_supplier> selectByParentId(Long id);
+    void removeByParentId(Long id);
     List<Res_supplier> selectByTitle(Long id);
     void removeByTitle(Long id);
+    List<Res_supplier> selectByUserId(Long id);
+    void removeByUserId(Long id);
+    List<Res_supplier> selectByPropertyStockCustomer(Long id);
+    void removeByPropertyStockCustomer(Long id);
+    List<Res_supplier> selectByPropertyStockSubcontractor(Long id);
+    void removeByPropertyStockSubcontractor(Long id);
+    List<Res_supplier> selectByPropertyStockSupplier(Long id);
+    void removeByPropertyStockSupplier(Long id);
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_companyServiceImpl.java

@@ -134,6 +134,9 @@ public class Res_companyServiceImpl extends EBSServiceImpl<Res_companyMapper, Re
     protected cn.ibizlab.businesscentral.core.odoo_crm.service.ICrm_teamService crmTeamService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_stock.service.IDelivery_carrierService deliveryCarrierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_digest.service.IDigest_digestService digestDigestService;
     @Autowired
     @Lazy

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_config_settingsServiceImpl.java

@@ -176,6 +176,13 @@ public class Res_config_settingsServiceImpl extends EBSServiceImpl<Res_config_se
     public boolean checkKey(Res_config_settings et) {
         return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
     }
+    @Override
+    @Transactional
+    public Res_config_settings get_default(Res_config_settings et) {
+        //自定义代码
+        return et;
+    }
+
     @Override
     @Transactional
     public boolean save(Res_config_settings et) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_currencyServiceImpl.java

@@ -158,6 +158,9 @@ public class Res_currencyServiceImpl extends EBSServiceImpl<Res_currencyMapper,
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partner_bankService resPartnerBankService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_sale.service.ISale_order_lineService saleOrderLineService;
     @Autowired
     @Lazy

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_partnerServiceImpl.java

@@ -235,6 +235,9 @@ public class Res_partnerServiceImpl extends EBSServiceImpl<Res_partnerMapper, Re
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partnerService resPartnerService = this;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
     @Autowired
     @Lazy

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_usersServiceImpl.java

@@ -374,6 +374,9 @@ public class Res_usersServiceImpl extends EBSServiceImpl<Res_usersMapper, Res_us
     protected cn.ibizlab.businesscentral.core.odoo_crm.service.ICrm_teamService crmTeamService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_stock.service.IDelivery_carrierService deliveryCarrierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_digest.service.IDigest_digestService digestDigestService;
     @Autowired
     @Lazy
@@ -983,6 +986,9 @@ public class Res_usersServiceImpl extends EBSServiceImpl<Res_usersMapper, Res_us
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partnerService resPartnerService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_users_logService resUsersLogService;
 
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService = this;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/domain/Hr_contract.java

@@ -139,7 +139,7 @@ public class Hr_contract extends EntityMP implements Serializable {
     @TableField(value = "wage")
     @JSONField(name = "wage")
     @JsonProperty("wage")
-    private BigDecimal wage;
+    private Double wage;
     /**
      * 开始日期
      */
@@ -533,7 +533,7 @@ public class Hr_contract extends EntityMP implements Serializable {
     /**
      * 设置 [工资]
      */
-    public void setWage(BigDecimal wage){
+    public void setWage(Double wage){
         this.wage = wage ;
         this.modify("wage",wage);
     }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/service/impl/Product_pricelistServiceImpl.java

@@ -62,6 +62,9 @@ public class Product_pricelistServiceImpl extends EBSServiceImpl<Product_priceli
     protected cn.ibizlab.businesscentral.core.odoo_repair.service.IRepair_orderService repairOrderService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_sale.service.ISale_orderService saleOrderService;
     @Autowired
     @Lazy

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/service/impl/Product_productServiceImpl.java

@@ -65,6 +65,9 @@ public class Product_productServiceImpl extends EBSServiceImpl<Product_productMa
     protected cn.ibizlab.businesscentral.core.odoo_account.service.IAccount_move_lineService accountMoveLineService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_stock.service.IDelivery_carrierService deliveryCarrierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_event.service.IEvent_event_ticketService eventEventTicketService;
     @Autowired
     @Lazy

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/filter/Delivery_carrierSearchContext.java

+package cn.ibizlab.businesscentral.core.odoo_stock.filter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import lombok.*;
+import lombok.extern.slf4j.Slf4j;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+
+import cn.ibizlab.businesscentral.util.filter.QueryWrapperContext;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.ibizlab.businesscentral.core.odoo_stock.domain.Delivery_carrier;
+/**
+ * 关系型数据实体[Delivery_carrier] 查询条件对象
+ */
+@Slf4j
+@Data
+public class Delivery_carrierSearchContext extends QueryWrapperContext<Delivery_carrier> {
+
+	private String n_name_like;//[名称]
+	public void setN_name_like(String n_name_like) {
+        this.n_name_like = n_name_like;
+        if(!ObjectUtils.isEmpty(this.n_name_like)){
+            this.getSearchCond().like("name", n_name_like);
+        }
+    }
+	private String n_integration_level_eq;//[集成级别]
+	public void setN_integration_level_eq(String n_integration_level_eq) {
+        this.n_integration_level_eq = n_integration_level_eq;
+        if(!ObjectUtils.isEmpty(this.n_integration_level_eq)){
+            this.getSearchCond().eq("integration_level", n_integration_level_eq);
+        }
+    }
+	private Long n_company_id_eq;//[ID]
+	public void setN_company_id_eq(Long n_company_id_eq) {
+        this.n_company_id_eq = n_company_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_company_id_eq)){
+            this.getSearchCond().eq("company_id", n_company_id_eq);
+        }
+    }
+	private Long n_product_id_eq;//[ID]
+	public void setN_product_id_eq(Long n_product_id_eq) {
+        this.n_product_id_eq = n_product_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_product_id_eq)){
+            this.getSearchCond().eq("product_id", n_product_id_eq);
+        }
+    }
+	private String n_company_name_eq;//[公司名称]
+	public void setN_company_name_eq(String n_company_name_eq) {
+        this.n_company_name_eq = n_company_name_eq;
+        if(!ObjectUtils.isEmpty(this.n_company_name_eq)){
+            this.getSearchCond().eq("company_name", n_company_name_eq);
+        }
+    }
+	private String n_company_name_like;//[公司名称]
+	public void setN_company_name_like(String n_company_name_like) {
+        this.n_company_name_like = n_company_name_like;
+        if(!ObjectUtils.isEmpty(this.n_company_name_like)){
+            this.getSearchCond().like("company_name", n_company_name_like);
+        }
+    }
+	private String n_product_name_eq;//[名称]
+	public void setN_product_name_eq(String n_product_name_eq) {
+        this.n_product_name_eq = n_product_name_eq;
+        if(!ObjectUtils.isEmpty(this.n_product_name_eq)){
+            this.getSearchCond().eq("product_name", n_product_name_eq);
+        }
+    }
+	private String n_product_name_like;//[名称]
+	public void setN_product_name_like(String n_product_name_like) {
+        this.n_product_name_like = n_product_name_like;
+        if(!ObjectUtils.isEmpty(this.n_product_name_like)){
+            this.getSearchCond().like("product_name", n_product_name_like);
+        }
+    }
+	private String n_invoice_policy_eq;//[发票原则]
+	public void setN_invoice_policy_eq(String n_invoice_policy_eq) {
+        this.n_invoice_policy_eq = n_invoice_policy_eq;
+        if(!ObjectUtils.isEmpty(this.n_invoice_policy_eq)){
+            this.getSearchCond().eq("invoice_policy", n_invoice_policy_eq);
+        }
+    }
+	private String n_delivery_type_eq;//[供应商]
+	public void setN_delivery_type_eq(String n_delivery_type_eq) {
+        this.n_delivery_type_eq = n_delivery_type_eq;
+        if(!ObjectUtils.isEmpty(this.n_delivery_type_eq)){
+            this.getSearchCond().eq("delivery_type", n_delivery_type_eq);
+        }
+    }
+	private Long n_write_uid_eq;//[ID]
+	public void setN_write_uid_eq(Long n_write_uid_eq) {
+        this.n_write_uid_eq = n_write_uid_eq;
+        if(!ObjectUtils.isEmpty(this.n_write_uid_eq)){
+            this.getSearchCond().eq("write_uid", n_write_uid_eq);
+        }
+    }
+	private Long n_create_uid_eq;//[ID]
+	public void setN_create_uid_eq(Long n_create_uid_eq) {
+        this.n_create_uid_eq = n_create_uid_eq;
+        if(!ObjectUtils.isEmpty(this.n_create_uid_eq)){
+            this.getSearchCond().eq("create_uid", n_create_uid_eq);
+        }
+    }
+	private String n_write_uname_eq;//[名称]
+	public void setN_write_uname_eq(String n_write_uname_eq) {
+        this.n_write_uname_eq = n_write_uname_eq;
+        if(!ObjectUtils.isEmpty(this.n_write_uname_eq)){
+            this.getSearchCond().eq("write_uname", n_write_uname_eq);
+        }
+    }
+	private String n_write_uname_like;//[名称]
+	public void setN_write_uname_like(String n_write_uname_like) {
+        this.n_write_uname_like = n_write_uname_like;
+        if(!ObjectUtils.isEmpty(this.n_write_uname_like)){
+            this.getSearchCond().like("write_uname", n_write_uname_like);
+        }
+    }
+	private String n_create_uname_eq;//[名称]
+	public void setN_create_uname_eq(String n_create_uname_eq) {
+        this.n_create_uname_eq = n_create_uname_eq;
+        if(!ObjectUtils.isEmpty(this.n_create_uname_eq)){
+            this.getSearchCond().eq("create_uname", n_create_uname_eq);
+        }
+    }
+	private String n_create_uname_like;//[名称]
+	public void setN_create_uname_like(String n_create_uname_like) {
+        this.n_create_uname_like = n_create_uname_like;
+        if(!ObjectUtils.isEmpty(this.n_create_uname_like)){
+            this.getSearchCond().like("create_uname", n_create_uname_like);
+        }
+    }
+
+    /**
+	 * 启用快速搜索
+	 */
+	public void setQuery(String query)
+	{
+		 this.query=query;
+		 if(!StringUtils.isEmpty(query)){
+            this.getSearchCond().and( wrapper ->
+                     wrapper.like("name", query)   
+            );
+		 }
+	}
+}
+
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/mapper/Delivery_carrierMapper.java

+package cn.ibizlab.businesscentral.core.odoo_stock.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.*;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.HashMap;
+import org.apache.ibatis.annotations.Select;
+import cn.ibizlab.businesscentral.core.odoo_stock.domain.Delivery_carrier;
+import cn.ibizlab.businesscentral.core.odoo_stock.filter.Delivery_carrierSearchContext;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.alibaba.fastjson.JSONObject;
+
+public interface Delivery_carrierMapper extends BaseMapper<Delivery_carrier>{
+
+    Page<Delivery_carrier> searchDefault(IPage page, @Param("srf") Delivery_carrierSearchContext context, @Param("ew") Wrapper<Delivery_carrier> wrapper) ;
+    @Override
+    Delivery_carrier selectById(Serializable id);
+    @Override
+    int insert(Delivery_carrier entity);
+    @Override
+    int updateById(@Param(Constants.ENTITY) Delivery_carrier entity);
+    @Override
+    int update(@Param(Constants.ENTITY) Delivery_carrier entity, @Param("ew") Wrapper<Delivery_carrier> updateWrapper);
+    @Override
+    int deleteById(Serializable id);
+     /**
+      * 自定义查询SQL
+      * @param sql
+      * @return
+      */
+     @Select("${sql}")
+     List<JSONObject> selectBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义更新SQL
+    * @param sql
+    * @return
+    */
+    @Update("${sql}")
+    boolean updateBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义插入SQL
+    * @param sql
+    * @return
+    */
+    @Insert("${sql}")
+    boolean insertBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义删除SQL
+    * @param sql
+    * @return
+    */
+    @Delete("${sql}")
+    boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    List<Delivery_carrier> selectByProductId(@Param("id") Serializable id) ;
+
+    List<Delivery_carrier> selectByCompanyId(@Param("id") Serializable id) ;
+
+    List<Delivery_carrier> selectByCreateUid(@Param("id") Serializable id) ;
+
+    List<Delivery_carrier> selectByWriteUid(@Param("id") Serializable id) ;
+
+
+}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/service/IDelivery_carrierService.java

+package cn.ibizlab.businesscentral.core.odoo_stock.service;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.math.BigInteger;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
+
+import cn.ibizlab.businesscentral.core.odoo_stock.domain.Delivery_carrier;
+import cn.ibizlab.businesscentral.core.odoo_stock.filter.Delivery_carrierSearchContext;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 实体[Delivery_carrier] 服务对象接口
+ */
+public interface IDelivery_carrierService extends IService<Delivery_carrier>{
+
+    boolean create(Delivery_carrier et) ;
+    void createBatch(List<Delivery_carrier> list) ;
+    boolean update(Delivery_carrier et) ;
+    void updateBatch(List<Delivery_carrier> list) ;
+    boolean remove(Long key) ;
+    void removeBatch(Collection<Long> idList) ;
+    Delivery_carrier get(Long key) ;
+    Delivery_carrier getDraft(Delivery_carrier et) ;
+    boolean checkKey(Delivery_carrier et) ;
+    boolean save(Delivery_carrier et) ;
+    void saveBatch(List<Delivery_carrier> list) ;
+    Page<Delivery_carrier> searchDefault(Delivery_carrierSearchContext context) ;
+    List<Delivery_carrier> selectByProductId(Long id);
+    void removeByProductId(Long id);
+    List<Delivery_carrier> selectByCompanyId(Long id);
+    void removeByCompanyId(Long id);
+    List<Delivery_carrier> selectByCreateUid(Long id);
+    void removeByCreateUid(Long id);
+    List<Delivery_carrier> selectByWriteUid(Long id);
+    void removeByWriteUid(Long id);
+    /**
+     *自定义查询SQL
+     * @param sql  select * from table where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return select * from table where id = '1'
+     */
+    List<JSONObject> select(String sql, Map param);
+    /**
+     *自定义SQL
+     * @param sql  update table  set name ='test' where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return     update table  set name ='test' where id = '1'
+     */
+    boolean execute(String sql, Map param);
+
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/service/impl/Stock_locationServiceImpl.java

@@ -71,6 +71,9 @@ public class Stock_locationServiceImpl extends EBSServiceImpl<Stock_locationMapp
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_companyService resCompanyService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_stock.service.IStock_change_product_qtyService stockChangeProductQtyService;
     @Autowired
     @Lazy

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -345,6 +345,9 @@
     <!--输出实体[CRM_TEAM]数据结构 -->
 
 
+    <!--输出实体[DELIVERY_CARRIER]数据结构 -->
+
+
     <!--输出实体[DIGEST_DIGEST]数据结构 -->
 
 
@@ -1382,6 +1385,7 @@
         <!--输出实体[CRM_PARTNER_BINDING]外键关系 -->
         <!--输出实体[CRM_STAGE]外键关系 -->
         <!--输出实体[CRM_TEAM]外键关系 -->
+        <!--输出实体[DELIVERY_CARRIER]外键关系 -->
         <!--输出实体[DIGEST_DIGEST]外键关系 -->
         <!--输出实体[DIGEST_TIP]外键关系 -->
         <!--输出实体[EVENT_CONFIRM]外键关系 -->

businesscentral-core/src/main/resources/mapper/odoo_stock/delivery_carrier/Delivery_carrierMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper	namespace="cn.ibizlab.businesscentral.core.odoo_stock.mapper.Delivery_carrierMapper">
+
+    <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
+	<select id="selectById"  resultMap="Delivery_carrierResultMap" databaseId="postgresql">
+        <![CDATA[select t1.* from (SELECT t1.ACTIVE, t1.AMOUNT, t1.COMPANY_ID, t21.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t81.NAME AS CREATE_UNAME, t1.DEBUG_LOGGING, t1.DELIVERY_TYPE, t1.FIXED_PRICE, t1.FREE_OVER, t1.GET_RETURN_LABEL_FROM_PORTAL, t1.ID, t1.INTEGRATION_LEVEL, t1.INVOICE_POLICY, t1.IS_PUBLISHED, t1.MARGIN, t1.NAME, t1.PRODUCT_ID, t41.NAME AS PRODUCT_NAME, t1.PROD_ENVIRONMENT, t1.RETURN_LABEL_ON_DELIVERY, t1.SEQUENCE, t1.WRITE_DATE, t1.WRITE_UID, t61.NAME AS WRITE_UNAME, t1.ZIP_FROM, t1.ZIP_TO FROM DELIVERY_CARRIER t1  LEFT JOIN RES_COMPANY t11 ON t1.COMPANY_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN PRODUCT_PRODUCT t31 ON t1.PRODUCT_ID = t31.ID  LEFT JOIN PRODUCT_TEMPLATE t41 ON t31.PRODUCT_TMPL_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.WRITE_UID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN RES_USERS t71 ON t1.CREATE_UID = t71.ID  LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID  ) t1 where id=#{id}]]>
+    </select>
+
+    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
+    <resultMap id="Delivery_carrierResultMap" type="cn.ibizlab.businesscentral.core.odoo_stock.domain.Delivery_carrier" autoMapping="true">
+		<id property="id" column="id" /><!--主键字段映射-->
+		<result property="integrationLevel" column="integration_level" />
+		<result property="prodEnvironment" column="prod_environment" />
+		<result property="debugLogging" column="debug_logging" />
+		<result property="companyId" column="company_id" />
+		<result property="productId" column="product_id" />
+		<result property="companyName" column="company_name" />
+		<result property="productName" column="product_name" />
+		<result property="invoicePolicy" column="invoice_policy" />
+		<result property="zipFrom" column="zip_from" />
+		<result property="zipTo" column="zip_to" />
+		<result property="freeOver" column="free_over" />
+		<result property="returnLabelOnDelivery" column="return_label_on_delivery" />
+		<result property="getReturnLabelFromPortal" column="get_return_label_from_portal" />
+		<result property="fixedPrice" column="fixed_price" />
+		<result property="deliveryType" column="delivery_type" />
+		<result property="createDate" column="create_date" />
+		<result property="writeDate" column="write_date" />
+		<result property="isPublished" column="is_published" />
+		<result property="writeUid" column="write_uid" />
+		<result property="createUid" column="create_uid" />
+		<result property="writeUname" column="write_uname" />
+		<result property="createUname" column="create_uname" />
+            
+		
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooProduct" javaType="cn.ibizlab.businesscentral.core.odoo_product.domain.Product_product" column="product_id" select="cn.ibizlab.businesscentral.core.odoo_product.mapper.Product_productMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooCompany" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_company" column="company_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_companyMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooCreate" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="create_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooWrite" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="write_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
+    </resultMap>
+
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_DELIVERY_CARRIER_PRODUCT_PRODUCT_PRODUCT_ID] -->
+	 <select id="selectByProductId" resultMap="Delivery_carrierResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  product_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_DELIVERY_CARRIER_RES_COMPANY_COMPANY_ID] -->
+	 <select id="selectByCompanyId" resultMap="Delivery_carrierResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  company_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_DELIVERY_CARRIER_RES_USERS_CREATE_UID] -->
+	 <select id="selectByCreateUid" resultMap="Delivery_carrierResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  create_uid=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_DELIVERY_CARRIER_RES_USERS_WRITE_UID] -->
+	 <select id="selectByWriteUid" resultMap="Delivery_carrierResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  write_uid=#{id}
+     </select>
+
+    <!--数据集合[Default]-->
+	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.odoo_stock.filter.Delivery_carrierSearchContext"  resultMap="Delivery_carrierResultMap">
+         select t1.* from (
+                <include refid="Default" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="postgresql">
+		<![CDATA[ SELECT t1.ACTIVE, t1.AMOUNT, t1.COMPANY_ID, t21.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t81.NAME AS CREATE_UNAME, t1.DEBUG_LOGGING, t1.DELIVERY_TYPE, t1.FIXED_PRICE, t1.FREE_OVER, t1.GET_RETURN_LABEL_FROM_PORTAL, t1.ID, t1.INTEGRATION_LEVEL, t1.INVOICE_POLICY, t1.IS_PUBLISHED, t1.MARGIN, t1.NAME, t1.PRODUCT_ID, t41.NAME AS PRODUCT_NAME, t1.PROD_ENVIRONMENT, t1.RETURN_LABEL_ON_DELIVERY, t1.SEQUENCE, t1.WRITE_DATE, t1.WRITE_UID, t61.NAME AS WRITE_UNAME, t1.ZIP_FROM, t1.ZIP_TO FROM DELIVERY_CARRIER t1  LEFT JOIN RES_COMPANY t11 ON t1.COMPANY_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN PRODUCT_PRODUCT t31 ON t1.PRODUCT_ID = t31.ID  LEFT JOIN PRODUCT_TEMPLATE t41 ON t31.PRODUCT_TMPL_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.WRITE_UID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN RES_USERS t71 ON t1.CREATE_UID = t71.ID  LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID  
+			]]>
+    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="postgresql">
+		<![CDATA[ SELECT t1.ACTIVE, t1.AMOUNT, t1.COMPANY_ID, t21.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t81.NAME AS CREATE_UNAME, t1.DEBUG_LOGGING, t1.DELIVERY_TYPE, t1.FIXED_PRICE, t1.FREE_OVER, t1.GET_RETURN_LABEL_FROM_PORTAL, t1.ID, t1.INTEGRATION_LEVEL, t1.INVOICE_POLICY, t1.IS_PUBLISHED, t1.MARGIN, t1.NAME, t1.PRODUCT_ID, t41.NAME AS PRODUCT_NAME, t1.PROD_ENVIRONMENT, t1.RETURN_LABEL_ON_DELIVERY, t1.SEQUENCE, t1.WRITE_DATE, t1.WRITE_UID, t61.NAME AS WRITE_UNAME, t1.ZIP_FROM, t1.ZIP_TO FROM DELIVERY_CARRIER t1  LEFT JOIN RES_COMPANY t11 ON t1.COMPANY_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN PRODUCT_PRODUCT t31 ON t1.PRODUCT_ID = t31.ID  LEFT JOIN PRODUCT_TEMPLATE t41 ON t31.PRODUCT_TMPL_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.WRITE_UID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN RES_USERS t71 ON t1.CREATE_UID = t71.ID  LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID  
+			]]>
+    </sql>
+    
+</mapper>
+

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Hr_contractDTO.java

@@ -143,7 +143,7 @@ public class Hr_contractDTO extends DTOBase implements Serializable {
     @JSONField(name = "wage")
     @JsonProperty("wage")
     @NotNull(message = "[工资]不允许为空!")
-    private BigDecimal wage;
+    private Double wage;
 
     /**
      * 属性 [DATE_START]
@@ -523,7 +523,7 @@ public class Hr_contractDTO extends DTOBase implements Serializable {
     /**
      * 设置 [WAGE]
      */
-    public void setWage(BigDecimal  wage){
+    public void setWage(Double  wage){
         this.wage = wage ;
         this.modify("wage",wage);
     }

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Res_supplierDTO.java

@@ -216,6 +216,204 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long stateId;
 
+    /**
+     * 属性 [PROPERTY_DELIVERY_CARRIER_ID]
+     *
+     */
+    @JSONField(name = "property_delivery_carrier_id")
+    @JsonProperty("property_delivery_carrier_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long propertyDeliveryCarrierId;
+
+    /**
+     * 属性 [PROPERTY_DELIVERY_CARRIER_NAME]
+     *
+     */
+    @JSONField(name = "property_delivery_carrier_name")
+    @JsonProperty("property_delivery_carrier_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String propertyDeliveryCarrierName;
+
+    /**
+     * 属性 [PROPERTY_PAYMENT_TERM_ID]
+     *
+     */
+    @JSONField(name = "property_payment_term_id")
+    @JsonProperty("property_payment_term_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long propertyPaymentTermId;
+
+    /**
+     * 属性 [PROPERTY_PAYMENT_TERM_NAME]
+     *
+     */
+    @JSONField(name = "property_payment_term_name")
+    @JsonProperty("property_payment_term_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String propertyPaymentTermName;
+
+    /**
+     * 属性 [PROPERTY_PURCHASE_CURRENCY_ID]
+     *
+     */
+    @JSONField(name = "property_purchase_currency_id")
+    @JsonProperty("property_purchase_currency_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long propertyPurchaseCurrencyId;
+
+    /**
+     * 属性 [PROPERTY_PURCHASE_CURRENCY_NAME]
+     *
+     */
+    @JSONField(name = "property_purchase_currency_name")
+    @JsonProperty("property_purchase_currency_name")
+    @Size(min = 0, max = 3, message = "内容长度必须小于等于[3]")
+    private String propertyPurchaseCurrencyName;
+
+    /**
+     * 属性 [PROPERTY_ACCOUNT_POSITION_ID]
+     *
+     */
+    @JSONField(name = "property_account_position_id")
+    @JsonProperty("property_account_position_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long propertyAccountPositionId;
+
+    /**
+     * 属性 [PROPERTY_ACCOUNT_POSITION_NAME]
+     *
+     */
+    @JSONField(name = "property_account_position_name")
+    @JsonProperty("property_account_position_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String propertyAccountPositionName;
+
+    /**
+     * 属性 [PROPERTY_STOCK_CUSTOMER]
+     *
+     */
+    @JSONField(name = "property_stock_customer")
+    @JsonProperty("property_stock_customer")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long propertyStockCustomer;
+
+    /**
+     * 属性 [PROPERTY_STOCK_CUSTOMER_NAME]
+     *
+     */
+    @JSONField(name = "property_stock_customer_name")
+    @JsonProperty("property_stock_customer_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String propertyStockCustomerName;
+
+    /**
+     * 属性 [PROPERTY_STOCK_SUPPLIER]
+     *
+     */
+    @JSONField(name = "property_stock_supplier")
+    @JsonProperty("property_stock_supplier")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long propertyStockSupplier;
+
+    /**
+     * 属性 [PROPERTY_STOCK_SUPPLIER_NAME]
+     *
+     */
+    @JSONField(name = "property_stock_supplier_name")
+    @JsonProperty("property_stock_supplier_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String propertyStockSupplierName;
+
+    /**
+     * 属性 [PROPERTY_STOCK_SUBCONTRACTOR]
+     *
+     */
+    @JSONField(name = "property_stock_subcontractor")
+    @JsonProperty("property_stock_subcontractor")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long propertyStockSubcontractor;
+
+    /**
+     * 属性 [PROPERTY_STOCK_SUBCONTRACTOR_NAME]
+     *
+     */
+    @JSONField(name = "property_stock_subcontractor_name")
+    @JsonProperty("property_stock_subcontractor_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String propertyStockSubcontractorName;
+
+    /**
+     * 属性 [USER_ID]
+     *
+     */
+    @JSONField(name = "user_id")
+    @JsonProperty("user_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    /**
+     * 属性 [USER_NAME]
+     *
+     */
+    @JSONField(name = "user_name")
+    @JsonProperty("user_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String userName;
+
+    /**
+     * 属性 [PROPERTY_PRODUCT_PRICELIST]
+     *
+     */
+    @JSONField(name = "property_product_pricelist")
+    @JsonProperty("property_product_pricelist")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long propertyProductPricelist;
+
+    /**
+     * 属性 [PROPERTY_PRODUCT_PRICELIST_NAME]
+     *
+     */
+    @JSONField(name = "property_product_pricelist_name")
+    @JsonProperty("property_product_pricelist_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String propertyProductPricelistName;
+
+    /**
+     * 属性 [PARENT_ID]
+     *
+     */
+    @JSONField(name = "parent_id")
+    @JsonProperty("parent_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
+
+    /**
+     * 属性 [PARENT_NAME]
+     *
+     */
+    @JSONField(name = "parent_name")
+    @JsonProperty("parent_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String parentName;
+
+    /**
+     * 属性 [BARCODE]
+     *
+     */
+    @JSONField(name = "barcode")
+    @JsonProperty("barcode")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String barcode;
+
+    /**
+     * 属性 [REF]
+     *
+     */
+    @JSONField(name = "ref")
+    @JsonProperty("ref")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String ref;
+
 
     /**
      * 设置 [NAME]
@@ -321,6 +519,102 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
         this.modify("state_id",stateId);
     }
 
+    /**
+     * 设置 [PROPERTY_DELIVERY_CARRIER_ID]
+     */
+    public void setPropertyDeliveryCarrierId(Long  propertyDeliveryCarrierId){
+        this.propertyDeliveryCarrierId = propertyDeliveryCarrierId ;
+        this.modify("property_delivery_carrier_id",propertyDeliveryCarrierId);
+    }
+
+    /**
+     * 设置 [PROPERTY_PAYMENT_TERM_ID]
+     */
+    public void setPropertyPaymentTermId(Long  propertyPaymentTermId){
+        this.propertyPaymentTermId = propertyPaymentTermId ;
+        this.modify("property_payment_term_id",propertyPaymentTermId);
+    }
+
+    /**
+     * 设置 [PROPERTY_PURCHASE_CURRENCY_ID]
+     */
+    public void setPropertyPurchaseCurrencyId(Long  propertyPurchaseCurrencyId){
+        this.propertyPurchaseCurrencyId = propertyPurchaseCurrencyId ;
+        this.modify("property_purchase_currency_id",propertyPurchaseCurrencyId);
+    }
+
+    /**
+     * 设置 [PROPERTY_ACCOUNT_POSITION_ID]
+     */
+    public void setPropertyAccountPositionId(Long  propertyAccountPositionId){
+        this.propertyAccountPositionId = propertyAccountPositionId ;
+        this.modify("property_account_position_id",propertyAccountPositionId);
+    }
+
+    /**
+     * 设置 [PROPERTY_STOCK_CUSTOMER]
+     */
+    public void setPropertyStockCustomer(Long  propertyStockCustomer){
+        this.propertyStockCustomer = propertyStockCustomer ;
+        this.modify("property_stock_customer",propertyStockCustomer);
+    }
+
+    /**
+     * 设置 [PROPERTY_STOCK_SUPPLIER]
+     */
+    public void setPropertyStockSupplier(Long  propertyStockSupplier){
+        this.propertyStockSupplier = propertyStockSupplier ;
+        this.modify("property_stock_supplier",propertyStockSupplier);
+    }
+
+    /**
+     * 设置 [PROPERTY_STOCK_SUBCONTRACTOR]
+     */
+    public void setPropertyStockSubcontractor(Long  propertyStockSubcontractor){
+        this.propertyStockSubcontractor = propertyStockSubcontractor ;
+        this.modify("property_stock_subcontractor",propertyStockSubcontractor);
+    }
+
+    /**
+     * 设置 [USER_ID]
+     */
+    public void setUserId(Long  userId){
+        this.userId = userId ;
+        this.modify("user_id",userId);
+    }
+
+    /**
+     * 设置 [PROPERTY_PRODUCT_PRICELIST]
+     */
+    public void setPropertyProductPricelist(Long  propertyProductPricelist){
+        this.propertyProductPricelist = propertyProductPricelist ;
+        this.modify("property_product_pricelist",propertyProductPricelist);
+    }
+
+    /**
+     * 设置 [PARENT_ID]
+     */
+    public void setParentId(Long  parentId){
+        this.parentId = parentId ;
+        this.modify("parent_id",parentId);
+    }
+
+    /**
+     * 设置 [BARCODE]
+     */
+    public void setBarcode(String  barcode){
+        this.barcode = barcode ;
+        this.modify("barcode",barcode);
+    }
+
+    /**
+     * 设置 [REF]
+     */
+    public void setRef(String  ref){
+        this.ref = ref ;
+        this.modify("ref",ref);
+    }
+
 
 }
 

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/rest/Res_config_settingsResource.java

@@ -121,6 +121,16 @@ public class Res_config_settingsResource {
         return  ResponseEntity.status(HttpStatus.OK).body(res_config_settingsService.checkKey(res_config_settingsMapping.toDomain(res_config_settingsdto)));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_config_settings-Get_default-all')")
+    @ApiOperation(value = "获取配置", tags = {"配置设定" },  notes = "获取配置")
+	@RequestMapping(method = RequestMethod.GET, value = "/res_config_settings/get_default")
+    public ResponseEntity<Res_config_settingsDTO> get_default() {
+        Res_config_settings domain =new Res_config_settings();
+        domain = res_config_settingsService.get_default(domain);
+        Res_config_settingsDTO res_config_settingsdto = res_config_settingsMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(res_config_settingsdto);
+    }
+
     @PreAuthorize("hasPermission(this.res_config_settingsMapping.toDomain(#res_config_settingsdto),'iBizBusinessCentral-Res_config_settings-Save')")
     @ApiOperation(value = "保存配置设定", tags = {"配置设定" },  notes = "保存配置设定")
 	@RequestMapping(method = RequestMethod.POST, value = "/res_config_settings/save")

businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/dict/StaticDict.java

@@ -8663,6 +8663,30 @@ public class StaticDict {
     }
 
 
+    /**
+     * 代码表[合同状态快速分组]
+     */
+    @Getter
+    public enum HR_CONTRACT__STATE_GridGrouping {
+        ALL("all","所有"),
+        DRAFT("draft","新建"),
+        OPEN("open","运行中"),
+        CLOSE("close","过期"),
+        CANCEL("cancel","已取消");
+
+        private String value;
+        private String text;
+        private String valueSeparator="";
+        private String textSeparator="";
+        private String emptyText="";
+
+        HR_CONTRACT__STATE_GridGrouping(String value , String text) {
+            this.value=value;
+            this.text = text;
+        }
+    }
+
+
     /**
      * 代码表[STOCK_PICKING_TYPE__CODE]
      */