Skip to content

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

lab_gzf 发布系统代码

上级 42653428
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 879 行增加 和 879 行删除
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_partnerServiceImpl.java
浏览文件 @ 2743c1b6
...@@ -194,9 +194,6 @@ public class Res_partnerServiceImpl extends ServiceImpl<Res_partnerMapper, Res_p ...@@ -194,9 +194,6 @@ public class Res_partnerServiceImpl extends ServiceImpl<Res_partnerMapper, Res_p
protected cn.ibizlab.businesscentral.core.odoo_portal.service.IPortal_wizard_userService portalWizardUserService; protected cn.ibizlab.businesscentral.core.odoo_portal.service.IPortal_wizard_userService portalWizardUserService;
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_product.service.IProduct_supplierinfoService productSupplierinfoService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_project.service.IProject_projectService projectProjectService; protected cn.ibizlab.businesscentral.core.odoo_project.service.IProject_projectService projectProjectService;
@Autowired @Autowired
@Lazy @Lazy
...@@ -215,9 +212,6 @@ public class Res_partnerServiceImpl extends ServiceImpl<Res_partnerMapper, Res_p ...@@ -215,9 +212,6 @@ public class Res_partnerServiceImpl extends ServiceImpl<Res_partnerMapper, Res_p
protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_reportService purchaseReportService; protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_reportService purchaseReportService;
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisitionService purchaseRequisitionService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_rating.service.IRating_ratingService ratingRatingService; protected cn.ibizlab.businesscentral.core.odoo_rating.service.IRating_ratingService ratingRatingService;
@Autowired @Autowired
@Lazy @Lazy
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_supplierServiceImpl.java
浏览文件 @ 2743c1b6
...@@ -48,6 +48,15 @@ import org.springframework.util.StringUtils; ...@@ -48,6 +48,15 @@ import org.springframework.util.StringUtils;
@Service("Res_supplierServiceImpl") @Service("Res_supplierServiceImpl")
public class Res_supplierServiceImpl extends ServiceImpl<Res_supplierMapper, Res_supplier> implements IRes_supplierService { public class Res_supplierServiceImpl extends ServiceImpl<Res_supplierMapper, Res_supplier> implements IRes_supplierService {
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_product.service.IProduct_supplierinfoService productSupplierinfoService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_orderService purchaseOrderService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisitionService purchaseRequisitionService;
protected int batchSize = 500; protected int batchSize = 500;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/domain/Product_supplierinfo.java
浏览文件 @ 2743c1b6
...@@ -202,13 +202,6 @@ public class Product_supplierinfo extends EntityMP implements Serializable { ...@@ -202,13 +202,6 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
@JSONField(name = "write_uid_text") @JSONField(name = "write_uid_text")
@JsonProperty("write_uid_text") @JsonProperty("write_uid_text")
private String writeUidText; private String writeUidText;
/**
* 供应商
*/
@TableField(exist = false)
@JSONField(name = "name_text")
@JsonProperty("name_text")
private String nameText;
/** /**
* 产品模板 * 产品模板
*/ */
...@@ -249,6 +242,14 @@ public class Product_supplierinfo extends EntityMP implements Serializable { ...@@ -249,6 +242,14 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
@JSONField(name = "currency_id") @JSONField(name = "currency_id")
@JsonProperty("currency_id") @JsonProperty("currency_id")
private Long currencyId; private Long currencyId;
/**
* 最后更新人
*/
@DEField(name = "write_uid" , preType = DEPredefinedFieldType.UPDATEMAN)
@TableField(value = "write_uid")
@JSONField(name = "write_uid")
@JsonProperty("write_uid")
private Long writeUid;
/** /**
* 供应商 * 供应商
*/ */
...@@ -257,13 +258,12 @@ public class Product_supplierinfo extends EntityMP implements Serializable { ...@@ -257,13 +258,12 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
@JsonProperty("name") @JsonProperty("name")
private Long name; private Long name;
/** /**
* 最后更新人 * 供应商
*/ */
@DEField(name = "write_uid" , preType = DEPredefinedFieldType.UPDATEMAN) @TableField(exist = false)
@TableField(value = "write_uid") @JSONField(name = "name_text")
@JSONField(name = "write_uid") @JsonProperty("name_text")
@JsonProperty("write_uid") private String nameText;
private Long writeUid;
/** /**
* *
...@@ -271,7 +271,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable { ...@@ -271,7 +271,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_product.domain.Product_product odooProduct; private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier odooName;
/** /**
* *
...@@ -279,7 +279,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable { ...@@ -279,7 +279,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_product.domain.Product_template odooProductTmpl; private cn.ibizlab.businesscentral.core.odoo_product.domain.Product_product odooProduct;
/** /**
* *
...@@ -287,7 +287,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable { ...@@ -287,7 +287,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_company odooCompany; private cn.ibizlab.businesscentral.core.odoo_product.domain.Product_template odooProductTmpl;
/** /**
* *
...@@ -295,7 +295,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable { ...@@ -295,7 +295,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_currency odooCurrency; private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_company odooCompany;
/** /**
* *
...@@ -303,7 +303,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable { ...@@ -303,7 +303,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner odooName; private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_currency odooCurrency;
/** /**
* *
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/filter/Product_supplierinfoSearchContext.java
浏览文件 @ 2743c1b6
...@@ -110,20 +110,6 @@ public class Product_supplierinfoSearchContext extends QueryWrapperContext<Produ ...@@ -110,20 +110,6 @@ public class Product_supplierinfoSearchContext extends QueryWrapperContext<Produ
if(!ObjectUtils.isEmpty(this.n_write_uid_text_like)){ if(!ObjectUtils.isEmpty(this.n_write_uid_text_like)){
this.getSearchCond().like("write_uid_text", n_write_uid_text_like); this.getSearchCond().like("write_uid_text", n_write_uid_text_like);
} }
}
private String n_name_text_eq;//[供应商]
public void setN_name_text_eq(String n_name_text_eq) {
this.n_name_text_eq = n_name_text_eq;
if(!ObjectUtils.isEmpty(this.n_name_text_eq)){
this.getSearchCond().eq("name_text", n_name_text_eq);
}
}
private String n_name_text_like;//[供应商]
public void setN_name_text_like(String n_name_text_like) {
this.n_name_text_like = n_name_text_like;
if(!ObjectUtils.isEmpty(this.n_name_text_like)){
this.getSearchCond().like("name_text", n_name_text_like);
}
} }
private Long n_product_tmpl_id_eq;//[产品模板] private Long n_product_tmpl_id_eq;//[产品模板]
public void setN_product_tmpl_id_eq(Long n_product_tmpl_id_eq) { public void setN_product_tmpl_id_eq(Long n_product_tmpl_id_eq) {
...@@ -159,6 +145,13 @@ public class Product_supplierinfoSearchContext extends QueryWrapperContext<Produ ...@@ -159,6 +145,13 @@ public class Product_supplierinfoSearchContext extends QueryWrapperContext<Produ
if(!ObjectUtils.isEmpty(this.n_currency_id_eq)){ if(!ObjectUtils.isEmpty(this.n_currency_id_eq)){
this.getSearchCond().eq("currency_id", n_currency_id_eq); this.getSearchCond().eq("currency_id", n_currency_id_eq);
} }
}
private Long n_write_uid_eq;//[最后更新人]
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_name_eq;//[供应商] private Long n_name_eq;//[供应商]
public void setN_name_eq(Long n_name_eq) { public void setN_name_eq(Long n_name_eq) {
...@@ -167,18 +160,18 @@ public class Product_supplierinfoSearchContext extends QueryWrapperContext<Produ ...@@ -167,18 +160,18 @@ public class Product_supplierinfoSearchContext extends QueryWrapperContext<Produ
this.getSearchCond().eq("name", n_name_eq); this.getSearchCond().eq("name", n_name_eq);
} }
} }
private Long n_name_like;//[供应商] private String n_name_text_eq;//[供应商]
public void setN_name_like(Long n_name_like) { public void setN_name_text_eq(String n_name_text_eq) {
this.n_name_like = n_name_like; this.n_name_text_eq = n_name_text_eq;
if(!ObjectUtils.isEmpty(this.n_name_like)){ if(!ObjectUtils.isEmpty(this.n_name_text_eq)){
this.getSearchCond().like("name", n_name_like); this.getSearchCond().eq("name_text", n_name_text_eq);
} }
} }
private Long n_write_uid_eq;//[最后更新人] private String n_name_text_like;//[供应商]
public void setN_write_uid_eq(Long n_write_uid_eq) { public void setN_name_text_like(String n_name_text_like) {
this.n_write_uid_eq = n_write_uid_eq; this.n_name_text_like = n_name_text_like;
if(!ObjectUtils.isEmpty(this.n_write_uid_eq)){ if(!ObjectUtils.isEmpty(this.n_name_text_like)){
this.getSearchCond().eq("write_uid", n_write_uid_eq); this.getSearchCond().like("name_text", n_name_text_like);
} }
} }
...@@ -190,7 +183,7 @@ public class Product_supplierinfoSearchContext extends QueryWrapperContext<Produ ...@@ -190,7 +183,7 @@ public class Product_supplierinfoSearchContext extends QueryWrapperContext<Produ
this.query=query; this.query=query;
if(!StringUtils.isEmpty(query)){ if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper -> this.getSearchCond().and( wrapper ->
wrapper.like("name", query) wrapper.like("name_text", query)
); );
} }
} }
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/mapper/Product_supplierinfoMapper.java
浏览文件 @ 2743c1b6
...@@ -62,6 +62,8 @@ public interface Product_supplierinfoMapper extends BaseMapper<Product_supplieri ...@@ -62,6 +62,8 @@ public interface Product_supplierinfoMapper extends BaseMapper<Product_supplieri
@Delete("${sql}") @Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param); boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<Product_supplierinfo> selectByName(@Param("id") Serializable id) ;
List<Product_supplierinfo> selectByProductId(@Param("id") Serializable id) ; List<Product_supplierinfo> selectByProductId(@Param("id") Serializable id) ;
List<Product_supplierinfo> selectByProductTmplId(@Param("id") Serializable id) ; List<Product_supplierinfo> selectByProductTmplId(@Param("id") Serializable id) ;
...@@ -70,8 +72,6 @@ public interface Product_supplierinfoMapper extends BaseMapper<Product_supplieri ...@@ -70,8 +72,6 @@ public interface Product_supplierinfoMapper extends BaseMapper<Product_supplieri
List<Product_supplierinfo> selectByCurrencyId(@Param("id") Serializable id) ; List<Product_supplierinfo> selectByCurrencyId(@Param("id") Serializable id) ;
List<Product_supplierinfo> selectByName(@Param("id") Serializable id) ;
List<Product_supplierinfo> selectByCreateUid(@Param("id") Serializable id) ; List<Product_supplierinfo> selectByCreateUid(@Param("id") Serializable id) ;
List<Product_supplierinfo> selectByWriteUid(@Param("id") Serializable id) ; List<Product_supplierinfo> selectByWriteUid(@Param("id") Serializable id) ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/service/IProduct_supplierinfoService.java
浏览文件 @ 2743c1b6
...@@ -38,6 +38,8 @@ public interface IProduct_supplierinfoService extends IService<Product_supplieri ...@@ -38,6 +38,8 @@ public interface IProduct_supplierinfoService extends IService<Product_supplieri
boolean save(Product_supplierinfo et) ; boolean save(Product_supplierinfo et) ;
void saveBatch(List<Product_supplierinfo> list) ; void saveBatch(List<Product_supplierinfo> list) ;
Page<Product_supplierinfo> searchDefault(Product_supplierinfoSearchContext context) ; Page<Product_supplierinfo> searchDefault(Product_supplierinfoSearchContext context) ;
List<Product_supplierinfo> selectByName(Long id) ;
void removeByName(Long id) ;
List<Product_supplierinfo> selectByProductId(Long id) ; List<Product_supplierinfo> selectByProductId(Long id) ;
void removeByProductId(Long id) ; void removeByProductId(Long id) ;
List<Product_supplierinfo> selectByProductTmplId(Long id) ; List<Product_supplierinfo> selectByProductTmplId(Long id) ;
...@@ -46,8 +48,6 @@ public interface IProduct_supplierinfoService extends IService<Product_supplieri ...@@ -46,8 +48,6 @@ public interface IProduct_supplierinfoService extends IService<Product_supplieri
void removeByCompanyId(Long id) ; void removeByCompanyId(Long id) ;
List<Product_supplierinfo> selectByCurrencyId(Long id) ; List<Product_supplierinfo> selectByCurrencyId(Long id) ;
void removeByCurrencyId(Long id) ; void removeByCurrencyId(Long id) ;
List<Product_supplierinfo> selectByName(Long id) ;
void removeByName(Long id) ;
List<Product_supplierinfo> selectByCreateUid(Long id) ; List<Product_supplierinfo> selectByCreateUid(Long id) ;
void removeByCreateUid(Long id) ; void removeByCreateUid(Long id) ;
List<Product_supplierinfo> selectByWriteUid(Long id) ; List<Product_supplierinfo> selectByWriteUid(Long id) ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/service/impl/Product_supplierinfoServiceImpl.java
浏览文件 @ 2743c1b6
...@@ -48,6 +48,9 @@ import org.springframework.util.StringUtils; ...@@ -48,6 +48,9 @@ import org.springframework.util.StringUtils;
@Service("Product_supplierinfoServiceImpl") @Service("Product_supplierinfoServiceImpl")
public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplierinfoMapper, Product_supplierinfo> implements IProduct_supplierinfoService { public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplierinfoMapper, Product_supplierinfo> implements IProduct_supplierinfoService {
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_product.service.IProduct_productService productProductService; protected cn.ibizlab.businesscentral.core.odoo_product.service.IProduct_productService productProductService;
...@@ -62,9 +65,6 @@ public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplie ...@@ -62,9 +65,6 @@ public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplie
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_currencyService resCurrencyService; protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_currencyService resCurrencyService;
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partnerService resPartnerService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService; protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
protected int batchSize = 500; protected int batchSize = 500;
...@@ -173,6 +173,16 @@ public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplie ...@@ -173,6 +173,16 @@ public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplie
} }
@Override
public List<Product_supplierinfo> selectByName(Long id) {
return baseMapper.selectByName(id);
}
@Override
public void removeByName(Long id) {
this.remove(new QueryWrapper<Product_supplierinfo>().eq("name",id));
}
@Override @Override
public List<Product_supplierinfo> selectByProductId(Long id) { public List<Product_supplierinfo> selectByProductId(Long id) {
return baseMapper.selectByProductId(id); return baseMapper.selectByProductId(id);
...@@ -213,16 +223,6 @@ public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplie ...@@ -213,16 +223,6 @@ public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplie
this.remove(new QueryWrapper<Product_supplierinfo>().eq("currency_id",id)); this.remove(new QueryWrapper<Product_supplierinfo>().eq("currency_id",id));
} }
@Override
public List<Product_supplierinfo> selectByName(Long id) {
return baseMapper.selectByName(id);
}
@Override
public void removeByName(Long id) {
this.remove(new QueryWrapper<Product_supplierinfo>().eq("name",id));
}
@Override @Override
public List<Product_supplierinfo> selectByCreateUid(Long id) { public List<Product_supplierinfo> selectByCreateUid(Long id) {
return baseMapper.selectByCreateUid(id); return baseMapper.selectByCreateUid(id);
...@@ -260,6 +260,16 @@ public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplie ...@@ -260,6 +260,16 @@ public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplie
* @param et * @param et
*/ */
private void fillParentData(Product_supplierinfo et){ private void fillParentData(Product_supplierinfo et){
//实体关系[DER1N_PRODUCT_SUPPLIERINFO_RES_SUPPLIER_NAME]
if(!ObjectUtils.isEmpty(et.getName())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier odooName=et.getOdooName();
if(ObjectUtils.isEmpty(odooName)){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier majorEntity=resSupplierService.get(et.getName());
et.setOdooName(majorEntity);
odooName=majorEntity;
}
et.setNameText(odooName.getName());
}
//实体关系[DER1N_PRODUCT_SUPPLIERINFO__PRODUCT_PRODUCT__PRODUCT_ID] //实体关系[DER1N_PRODUCT_SUPPLIERINFO__PRODUCT_PRODUCT__PRODUCT_ID]
if(!ObjectUtils.isEmpty(et.getProductId())){ if(!ObjectUtils.isEmpty(et.getProductId())){
cn.ibizlab.businesscentral.core.odoo_product.domain.Product_product odooProduct=et.getOdooProduct(); cn.ibizlab.businesscentral.core.odoo_product.domain.Product_product odooProduct=et.getOdooProduct();
...@@ -302,16 +312,6 @@ public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplie ...@@ -302,16 +312,6 @@ public class Product_supplierinfoServiceImpl extends ServiceImpl<Product_supplie
} }
et.setCurrencyIdText(odooCurrency.getName()); et.setCurrencyIdText(odooCurrency.getName());
} }
//实体关系[DER1N_PRODUCT_SUPPLIERINFO__RES_PARTNER__NAME]
if(!ObjectUtils.isEmpty(et.getName())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner odooName=et.getOdooName();
if(ObjectUtils.isEmpty(odooName)){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner majorEntity=resPartnerService.get(et.getName());
et.setOdooName(majorEntity);
odooName=majorEntity;
}
et.setNameText(odooName.getName());
}
//实体关系[DER1N_PRODUCT_SUPPLIERINFO__RES_USERS__CREATE_UID] //实体关系[DER1N_PRODUCT_SUPPLIERINFO__RES_USERS__CREATE_UID]
if(!ObjectUtils.isEmpty(et.getCreateUid())){ if(!ObjectUtils.isEmpty(et.getCreateUid())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate=et.getOdooCreate(); cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate=et.getOdooCreate();
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/domain/Purchase_order.java
浏览文件 @ 2743c1b6
...@@ -464,13 +464,6 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -464,13 +464,6 @@ public class Purchase_order extends EntityMP implements Serializable {
@JSONField(name = "create_uid_text") @JSONField(name = "create_uid_text")
@JsonProperty("create_uid_text") @JsonProperty("create_uid_text")
private String createUidText; private String createUidText;
/**
* 供应商
*/
@TableField(exist = false)
@JSONField(name = "partner_id_text")
@JsonProperty("partner_id_text")
private String partnerIdText;
/** /**
* 交货到 * 交货到
*/ */
...@@ -493,14 +486,6 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -493,14 +486,6 @@ public class Purchase_order extends EntityMP implements Serializable {
@JSONField(name = "create_uid") @JSONField(name = "create_uid")
@JsonProperty("create_uid") @JsonProperty("create_uid")
private Long createUid; private Long createUid;
/**
* 供应商
*/
@DEField(name = "partner_id")
@TableField(value = "partner_id")
@JSONField(name = "partner_id")
@JsonProperty("partner_id")
private Long partnerId;
/** /**
* 代发货地址 * 代发货地址
*/ */
...@@ -588,6 +573,21 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -588,6 +573,21 @@ public class Purchase_order extends EntityMP implements Serializable {
@JSONField(name = "requisition_id_text") @JSONField(name = "requisition_id_text")
@JsonProperty("requisition_id_text") @JsonProperty("requisition_id_text")
private String requisitionIdText; private String requisitionIdText;
/**
* 供应商
*/
@DEField(name = "partner_id")
@TableField(value = "partner_id")
@JSONField(name = "partner_id")
@JsonProperty("partner_id")
private Long partnerId;
/**
* 供应商
*/
@TableField(exist = false)
@JSONField(name = "partner_id_text")
@JsonProperty("partner_id_text")
private String partnerIdText;
/** /**
* *
...@@ -603,7 +603,7 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -603,7 +603,7 @@ public class Purchase_order extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_fiscal_position odooFiscalPosition; private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier odooPartner;
/** /**
* *
...@@ -611,7 +611,7 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -611,7 +611,7 @@ public class Purchase_order extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_incoterms odooIncoterm; private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_fiscal_position odooFiscalPosition;
/** /**
* *
...@@ -619,7 +619,7 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -619,7 +619,7 @@ public class Purchase_order extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_payment_term odooPaymentTerm; private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_incoterms odooIncoterm;
/** /**
* *
...@@ -627,7 +627,7 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -627,7 +627,7 @@ public class Purchase_order extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_company odooCompany; private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_payment_term odooPaymentTerm;
/** /**
* *
...@@ -635,7 +635,7 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -635,7 +635,7 @@ public class Purchase_order extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_currency odooCurrency; private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_company odooCompany;
/** /**
* *
...@@ -643,7 +643,7 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -643,7 +643,7 @@ public class Purchase_order extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner odooDestAddress; private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_currency odooCurrency;
/** /**
* *
...@@ -651,7 +651,7 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -651,7 +651,7 @@ public class Purchase_order extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner odooPartner; private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner odooDestAddress;
/** /**
* *
...@@ -853,14 +853,6 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -853,14 +853,6 @@ public class Purchase_order extends EntityMP implements Serializable {
this.modify("origin",origin); this.modify("origin",origin);
} }
/**
* 设置 [供应商]
*/
public void setPartnerId(Long partnerId){
this.partnerId = partnerId ;
this.modify("partner_id",partnerId);
}
/** /**
* 设置 [代发货地址] * 设置 [代发货地址]
*/ */
...@@ -933,6 +925,14 @@ public class Purchase_order extends EntityMP implements Serializable { ...@@ -933,6 +925,14 @@ public class Purchase_order extends EntityMP implements Serializable {
this.modify("requisition_id",requisitionId); this.modify("requisition_id",requisitionId);
} }
/**
* 设置 [供应商]
*/
public void setPartnerId(Long partnerId){
this.partnerId = partnerId ;
this.modify("partner_id",partnerId);
}
@Override @Override
public Serializable getDefaultKey(boolean gen) { public Serializable getDefaultKey(boolean gen) {
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/domain/Purchase_requisition.java
浏览文件 @ 2743c1b6
...@@ -120,21 +120,6 @@ public class Purchase_requisition extends EntityMP implements Serializable { ...@@ -120,21 +120,6 @@ public class Purchase_requisition extends EntityMP implements Serializable {
@JSONField(name = "origin") @JSONField(name = "origin")
@JsonProperty("origin") @JsonProperty("origin")
private String origin; private String origin;
/**
* 供应商
*/
@DEField(name = "vendor_id")
@TableField(value = "vendor_id")
@JSONField(name = "vendor_id")
@JsonProperty("vendor_id")
private Long vendorId;
/**
* 供应商
*/
@TableField(exist = false)
@JSONField(name = "vendor_id_text")
@JsonProperty("vendor_id_text")
private String vendorIdText;
/** /**
* 订购日期 * 订购日期
*/ */
...@@ -191,6 +176,21 @@ public class Purchase_requisition extends EntityMP implements Serializable { ...@@ -191,6 +176,21 @@ public class Purchase_requisition extends EntityMP implements Serializable {
@JSONField(name = "order_count") @JSONField(name = "order_count")
@JsonProperty("order_count") @JsonProperty("order_count")
private Integer orderCount; private Integer orderCount;
/**
* 供应商
*/
@DEField(name = "vendor_id")
@TableField(value = "vendor_id")
@JSONField(name = "vendor_id")
@JsonProperty("vendor_id")
private Long vendorId;
/**
* 供应商
*/
@TableField(exist = false)
@JSONField(name = "vendor_id_text")
@JsonProperty("vendor_id_text")
private String vendorIdText;
/** /**
* *
...@@ -206,7 +206,7 @@ public class Purchase_requisition extends EntityMP implements Serializable { ...@@ -206,7 +206,7 @@ public class Purchase_requisition extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner odooVendor; private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier odooVendor;
/** /**
* *
...@@ -294,14 +294,6 @@ public class Purchase_requisition extends EntityMP implements Serializable { ...@@ -294,14 +294,6 @@ public class Purchase_requisition extends EntityMP implements Serializable {
this.modify("origin",origin); this.modify("origin",origin);
} }
/**
* 设置 [供应商]
*/
public void setVendorId(Long vendorId){
this.vendorId = vendorId ;
this.modify("vendor_id",vendorId);
}
/** /**
* 设置 [订购日期] * 设置 [订购日期]
*/ */
...@@ -372,6 +364,14 @@ public class Purchase_requisition extends EntityMP implements Serializable { ...@@ -372,6 +364,14 @@ public class Purchase_requisition extends EntityMP implements Serializable {
this.modify("state",state); this.modify("state",state);
} }
/**
* 设置 [供应商]
*/
public void setVendorId(Long vendorId){
this.vendorId = vendorId ;
this.modify("vendor_id",vendorId);
}
@Override @Override
public Serializable getDefaultKey(boolean gen) { public Serializable getDefaultKey(boolean gen) {
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/filter/Purchase_orderSearchContext.java
浏览文件 @ 2743c1b6
...@@ -173,20 +173,6 @@ public class Purchase_orderSearchContext extends QueryWrapperContext<Purchase_or ...@@ -173,20 +173,6 @@ public class Purchase_orderSearchContext extends QueryWrapperContext<Purchase_or
if(!ObjectUtils.isEmpty(this.n_create_uid_text_like)){ if(!ObjectUtils.isEmpty(this.n_create_uid_text_like)){
this.getSearchCond().like("create_uid_text", n_create_uid_text_like); this.getSearchCond().like("create_uid_text", n_create_uid_text_like);
} }
}
private String n_partner_id_text_eq;//[供应商]
public void setN_partner_id_text_eq(String n_partner_id_text_eq) {
this.n_partner_id_text_eq = n_partner_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_partner_id_text_eq)){
this.getSearchCond().eq("partner_id_text", n_partner_id_text_eq);
}
}
private String n_partner_id_text_like;//[供应商]
public void setN_partner_id_text_like(String n_partner_id_text_like) {
this.n_partner_id_text_like = n_partner_id_text_like;
if(!ObjectUtils.isEmpty(this.n_partner_id_text_like)){
this.getSearchCond().like("partner_id_text", n_partner_id_text_like);
}
} }
private String n_picking_type_id_text_eq;//[交货到] private String n_picking_type_id_text_eq;//[交货到]
public void setN_picking_type_id_text_eq(String n_picking_type_id_text_eq) { public void setN_picking_type_id_text_eq(String n_picking_type_id_text_eq) {
...@@ -222,13 +208,6 @@ public class Purchase_orderSearchContext extends QueryWrapperContext<Purchase_or ...@@ -222,13 +208,6 @@ public class Purchase_orderSearchContext extends QueryWrapperContext<Purchase_or
if(!ObjectUtils.isEmpty(this.n_create_uid_eq)){ if(!ObjectUtils.isEmpty(this.n_create_uid_eq)){
this.getSearchCond().eq("create_uid", n_create_uid_eq); this.getSearchCond().eq("create_uid", n_create_uid_eq);
} }
}
private Long n_partner_id_eq;//[供应商]
public void setN_partner_id_eq(Long n_partner_id_eq) {
this.n_partner_id_eq = n_partner_id_eq;
if(!ObjectUtils.isEmpty(this.n_partner_id_eq)){
this.getSearchCond().eq("partner_id", n_partner_id_eq);
}
} }
private Long n_dest_address_id_eq;//[代发货地址] private Long n_dest_address_id_eq;//[代发货地址]
public void setN_dest_address_id_eq(Long n_dest_address_id_eq) { public void setN_dest_address_id_eq(Long n_dest_address_id_eq) {
...@@ -314,6 +293,27 @@ public class Purchase_orderSearchContext extends QueryWrapperContext<Purchase_or ...@@ -314,6 +293,27 @@ public class Purchase_orderSearchContext extends QueryWrapperContext<Purchase_or
this.getSearchCond().like("requisition_id_text", n_requisition_id_text_like); this.getSearchCond().like("requisition_id_text", n_requisition_id_text_like);
} }
} }
private Long n_partner_id_eq;//[供应商]
public void setN_partner_id_eq(Long n_partner_id_eq) {
this.n_partner_id_eq = n_partner_id_eq;
if(!ObjectUtils.isEmpty(this.n_partner_id_eq)){
this.getSearchCond().eq("partner_id", n_partner_id_eq);
}
}
private String n_partner_id_text_eq;//[供应商]
public void setN_partner_id_text_eq(String n_partner_id_text_eq) {
this.n_partner_id_text_eq = n_partner_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_partner_id_text_eq)){
this.getSearchCond().eq("partner_id_text", n_partner_id_text_eq);
}
}
private String n_partner_id_text_like;//[供应商]
public void setN_partner_id_text_like(String n_partner_id_text_like) {
this.n_partner_id_text_like = n_partner_id_text_like;
if(!ObjectUtils.isEmpty(this.n_partner_id_text_like)){
this.getSearchCond().like("partner_id_text", n_partner_id_text_like);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/filter/Purchase_requisitionSearchContext.java
浏览文件 @ 2743c1b6
...@@ -75,27 +75,6 @@ public class Purchase_requisitionSearchContext extends QueryWrapperContext<Purch ...@@ -75,27 +75,6 @@ public class Purchase_requisitionSearchContext extends QueryWrapperContext<Purch
if(!ObjectUtils.isEmpty(this.n_create_uname_like)){ if(!ObjectUtils.isEmpty(this.n_create_uname_like)){
this.getSearchCond().like("create_uname", n_create_uname_like); this.getSearchCond().like("create_uname", n_create_uname_like);
} }
}
private Long n_vendor_id_eq;//[供应商]
public void setN_vendor_id_eq(Long n_vendor_id_eq) {
this.n_vendor_id_eq = n_vendor_id_eq;
if(!ObjectUtils.isEmpty(this.n_vendor_id_eq)){
this.getSearchCond().eq("vendor_id", n_vendor_id_eq);
}
}
private String n_vendor_id_text_eq;//[供应商]
public void setN_vendor_id_text_eq(String n_vendor_id_text_eq) {
this.n_vendor_id_text_eq = n_vendor_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_vendor_id_text_eq)){
this.getSearchCond().eq("vendor_id_text", n_vendor_id_text_eq);
}
}
private String n_vendor_id_text_like;//[供应商]
public void setN_vendor_id_text_like(String n_vendor_id_text_like) {
this.n_vendor_id_text_like = n_vendor_id_text_like;
if(!ObjectUtils.isEmpty(this.n_vendor_id_text_like)){
this.getSearchCond().like("vendor_id_text", n_vendor_id_text_like);
}
} }
private Long n_type_id_eq;//[申请类型] private Long n_type_id_eq;//[申请类型]
public void setN_type_id_eq(Long n_type_id_eq) { public void setN_type_id_eq(Long n_type_id_eq) {
...@@ -125,6 +104,27 @@ public class Purchase_requisitionSearchContext extends QueryWrapperContext<Purch ...@@ -125,6 +104,27 @@ public class Purchase_requisitionSearchContext extends QueryWrapperContext<Purch
this.getSearchCond().eq("state", n_state_eq); this.getSearchCond().eq("state", n_state_eq);
} }
} }
private Long n_vendor_id_eq;//[供应商]
public void setN_vendor_id_eq(Long n_vendor_id_eq) {
this.n_vendor_id_eq = n_vendor_id_eq;
if(!ObjectUtils.isEmpty(this.n_vendor_id_eq)){
this.getSearchCond().eq("vendor_id", n_vendor_id_eq);
}
}
private String n_vendor_id_text_eq;//[供应商]
public void setN_vendor_id_text_eq(String n_vendor_id_text_eq) {
this.n_vendor_id_text_eq = n_vendor_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_vendor_id_text_eq)){
this.getSearchCond().eq("vendor_id_text", n_vendor_id_text_eq);
}
}
private String n_vendor_id_text_like;//[供应商]
public void setN_vendor_id_text_like(String n_vendor_id_text_like) {
this.n_vendor_id_text_like = n_vendor_id_text_like;
if(!ObjectUtils.isEmpty(this.n_vendor_id_text_like)){
this.getSearchCond().like("vendor_id_text", n_vendor_id_text_like);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/mapper/Purchase_orderMapper.java
浏览文件 @ 2743c1b6
...@@ -65,6 +65,8 @@ public interface Purchase_orderMapper extends BaseMapper<Purchase_order>{ ...@@ -65,6 +65,8 @@ public interface Purchase_orderMapper extends BaseMapper<Purchase_order>{
List<Purchase_order> selectByRequisitionId(@Param("id") Serializable id) ; List<Purchase_order> selectByRequisitionId(@Param("id") Serializable id) ;
List<Purchase_order> selectByPartnerId(@Param("id") Serializable id) ;
List<Purchase_order> selectByFiscalPositionId(@Param("id") Serializable id) ; List<Purchase_order> selectByFiscalPositionId(@Param("id") Serializable id) ;
List<Purchase_order> selectByIncotermId(@Param("id") Serializable id) ; List<Purchase_order> selectByIncotermId(@Param("id") Serializable id) ;
...@@ -77,8 +79,6 @@ public interface Purchase_orderMapper extends BaseMapper<Purchase_order>{ ...@@ -77,8 +79,6 @@ public interface Purchase_orderMapper extends BaseMapper<Purchase_order>{
List<Purchase_order> selectByDestAddressId(@Param("id") Serializable id) ; List<Purchase_order> selectByDestAddressId(@Param("id") Serializable id) ;
List<Purchase_order> selectByPartnerId(@Param("id") Serializable id) ;
List<Purchase_order> selectByCreateUid(@Param("id") Serializable id) ; List<Purchase_order> selectByCreateUid(@Param("id") Serializable id) ;
List<Purchase_order> selectByUserId(@Param("id") Serializable id) ; List<Purchase_order> selectByUserId(@Param("id") Serializable id) ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/IPurchase_orderService.java
浏览文件 @ 2743c1b6
...@@ -45,6 +45,8 @@ public interface IPurchase_orderService extends IService<Purchase_order>{ ...@@ -45,6 +45,8 @@ public interface IPurchase_orderService extends IService<Purchase_order>{
Page<Purchase_order> searchOrder(Purchase_orderSearchContext context) ; Page<Purchase_order> searchOrder(Purchase_orderSearchContext context) ;
List<Purchase_order> selectByRequisitionId(Long id) ; List<Purchase_order> selectByRequisitionId(Long id) ;
void removeByRequisitionId(Long id) ; void removeByRequisitionId(Long id) ;
List<Purchase_order> selectByPartnerId(Long id) ;
void removeByPartnerId(Long id) ;
List<Purchase_order> selectByFiscalPositionId(Long id) ; List<Purchase_order> selectByFiscalPositionId(Long id) ;
void removeByFiscalPositionId(Long id) ; void removeByFiscalPositionId(Long id) ;
List<Purchase_order> selectByIncotermId(Long id) ; List<Purchase_order> selectByIncotermId(Long id) ;
...@@ -57,8 +59,6 @@ public interface IPurchase_orderService extends IService<Purchase_order>{ ...@@ -57,8 +59,6 @@ public interface IPurchase_orderService extends IService<Purchase_order>{
void removeByCurrencyId(Long id) ; void removeByCurrencyId(Long id) ;
List<Purchase_order> selectByDestAddressId(Long id) ; List<Purchase_order> selectByDestAddressId(Long id) ;
void removeByDestAddressId(Long id) ; void removeByDestAddressId(Long id) ;
List<Purchase_order> selectByPartnerId(Long id) ;
void removeByPartnerId(Long id) ;
List<Purchase_order> selectByCreateUid(Long id) ; List<Purchase_order> selectByCreateUid(Long id) ;
void removeByCreateUid(Long id) ; void removeByCreateUid(Long id) ;
List<Purchase_order> selectByUserId(Long id) ; List<Purchase_order> selectByUserId(Long id) ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/impl/Purchase_orderServiceImpl.java
浏览文件 @ 2743c1b6
...@@ -62,6 +62,9 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper, ...@@ -62,6 +62,9 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper,
protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisitionService purchaseRequisitionService; protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisitionService purchaseRequisitionService;
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_account.service.IAccount_fiscal_positionService accountFiscalPositionService; protected cn.ibizlab.businesscentral.core.odoo_account.service.IAccount_fiscal_positionService accountFiscalPositionService;
@Autowired @Autowired
@Lazy @Lazy
...@@ -229,6 +232,16 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper, ...@@ -229,6 +232,16 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper,
this.remove(new QueryWrapper<Purchase_order>().eq("requisition_id",id)); this.remove(new QueryWrapper<Purchase_order>().eq("requisition_id",id));
} }
@Override
public List<Purchase_order> selectByPartnerId(Long id) {
return baseMapper.selectByPartnerId(id);
}
@Override
public void removeByPartnerId(Long id) {
this.remove(new QueryWrapper<Purchase_order>().eq("partner_id",id));
}
@Override @Override
public List<Purchase_order> selectByFiscalPositionId(Long id) { public List<Purchase_order> selectByFiscalPositionId(Long id) {
return baseMapper.selectByFiscalPositionId(id); return baseMapper.selectByFiscalPositionId(id);
...@@ -289,16 +302,6 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper, ...@@ -289,16 +302,6 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper,
this.remove(new QueryWrapper<Purchase_order>().eq("dest_address_id",id)); this.remove(new QueryWrapper<Purchase_order>().eq("dest_address_id",id));
} }
@Override
public List<Purchase_order> selectByPartnerId(Long id) {
return baseMapper.selectByPartnerId(id);
}
@Override
public void removeByPartnerId(Long id) {
this.remove(new QueryWrapper<Purchase_order>().eq("partner_id",id));
}
@Override @Override
public List<Purchase_order> selectByCreateUid(Long id) { public List<Purchase_order> selectByCreateUid(Long id) {
return baseMapper.selectByCreateUid(id); return baseMapper.selectByCreateUid(id);
...@@ -375,6 +378,16 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper, ...@@ -375,6 +378,16 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper,
} }
et.setRequisitionIdText(odooRequisition.getName()); et.setRequisitionIdText(odooRequisition.getName());
} }
//实体关系[DER1N_PURCHASE_ORDER_RES_SUPPLIER_PARTNER_ID]
if(!ObjectUtils.isEmpty(et.getPartnerId())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier odooPartner=et.getOdooPartner();
if(ObjectUtils.isEmpty(odooPartner)){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier majorEntity=resSupplierService.get(et.getPartnerId());
et.setOdooPartner(majorEntity);
odooPartner=majorEntity;
}
et.setPartnerIdText(odooPartner.getName());
}
//实体关系[DER1N_PURCHASE_ORDER__ACCOUNT_FISCAL_POSITION__FISCAL_POSITION_ID] //实体关系[DER1N_PURCHASE_ORDER__ACCOUNT_FISCAL_POSITION__FISCAL_POSITION_ID]
if(!ObjectUtils.isEmpty(et.getFiscalPositionId())){ if(!ObjectUtils.isEmpty(et.getFiscalPositionId())){
cn.ibizlab.businesscentral.core.odoo_account.domain.Account_fiscal_position odooFiscalPosition=et.getOdooFiscalPosition(); cn.ibizlab.businesscentral.core.odoo_account.domain.Account_fiscal_position odooFiscalPosition=et.getOdooFiscalPosition();
...@@ -435,16 +448,6 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper, ...@@ -435,16 +448,6 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper,
} }
et.setDestAddressIdText(odooDestAddress.getName()); et.setDestAddressIdText(odooDestAddress.getName());
} }
//实体关系[DER1N_PURCHASE_ORDER__RES_PARTNER__PARTNER_ID]
if(!ObjectUtils.isEmpty(et.getPartnerId())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner odooPartner=et.getOdooPartner();
if(ObjectUtils.isEmpty(odooPartner)){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner majorEntity=resPartnerService.get(et.getPartnerId());
et.setOdooPartner(majorEntity);
odooPartner=majorEntity;
}
et.setPartnerIdText(odooPartner.getName());
}
//实体关系[DER1N_PURCHASE_ORDER__RES_USERS__CREATE_UID] //实体关系[DER1N_PURCHASE_ORDER__RES_USERS__CREATE_UID]
if(!ObjectUtils.isEmpty(et.getCreateUid())){ if(!ObjectUtils.isEmpty(et.getCreateUid())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate=et.getOdooCreate(); cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate=et.getOdooCreate();
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/impl/Purchase_requisitionServiceImpl.java
浏览文件 @ 2743c1b6
...@@ -59,7 +59,7 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis ...@@ -59,7 +59,7 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis
protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisition_typeService purchaseRequisitionTypeService; protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisition_typeService purchaseRequisitionTypeService;
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partnerService resPartnerService; protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService; protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
...@@ -279,11 +279,11 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis ...@@ -279,11 +279,11 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis
} }
et.setTypeIdText(odooType.getName()); et.setTypeIdText(odooType.getName());
} }
//实体关系[DER1N_PURCHASE_REQUISITION_RES_PARTNER_VENDOR_ID] //实体关系[DER1N_PURCHASE_REQUISITION_RES_SUPPLIER_VENDOR_ID]
if(!ObjectUtils.isEmpty(et.getVendorId())){ if(!ObjectUtils.isEmpty(et.getVendorId())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner odooVendor=et.getOdooVendor(); cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier odooVendor=et.getOdooVendor();
if(ObjectUtils.isEmpty(odooVendor)){ if(ObjectUtils.isEmpty(odooVendor)){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner majorEntity=resPartnerService.get(et.getVendorId()); cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier majorEntity=resSupplierService.get(et.getVendorId());
et.setOdooVendor(majorEntity); et.setOdooVendor(majorEntity);
odooVendor=majorEntity; odooVendor=majorEntity;
} }
......
businesscentral-core/src/main/resources/mapper/odoo_product/product_supplierinfo/Product_supplierinfoMapper.xml
浏览文件 @ 2743c1b6
...@@ -28,16 +28,18 @@ ...@@ -28,16 +28,18 @@
<result property="createUidText" column="create_uid_text" /> <result property="createUidText" column="create_uid_text" />
<result property="productIdText" column="product_id_text" /> <result property="productIdText" column="product_id_text" />
<result property="writeUidText" column="write_uid_text" /> <result property="writeUidText" column="write_uid_text" />
<result property="nameText" column="name_text" />
<result property="productTmplId" column="product_tmpl_id" /> <result property="productTmplId" column="product_tmpl_id" />
<result property="companyId" column="company_id" /> <result property="companyId" column="company_id" />
<result property="productId" column="product_id" /> <result property="productId" column="product_id" />
<result property="createUid" column="create_uid" /> <result property="createUid" column="create_uid" />
<result property="currencyId" column="currency_id" /> <result property="currencyId" column="currency_id" />
<result property="name" column="name" />
<result property="writeUid" column="write_uid" /> <result property="writeUid" column="write_uid" />
<result property="name" column="name" />
<result property="nameText" column="name_text" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooName" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier" column="name" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_supplierMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过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> <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"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
...@@ -47,13 +49,18 @@ ...@@ -47,13 +49,18 @@
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooCurrency" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_currency" column="currency_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_currencyMapper.selectById" fetchType="lazy"></association> <association property="odooCurrency" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_currency" column="currency_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_currencyMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooName" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner" column="name" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_partnerMapper.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> <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"为懒加载配置 --> <!--通过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> <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> </resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PRODUCT_SUPPLIERINFO_RES_SUPPLIER_NAME] -->
<select id="selectByName" resultMap="Product_supplierinfoResultMap">
select t1.* from (
<include refid="Default" />
) t1
where name=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PRODUCT_SUPPLIERINFO__PRODUCT_PRODUCT__PRODUCT_ID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PRODUCT_SUPPLIERINFO__PRODUCT_PRODUCT__PRODUCT_ID] -->
<select id="selectByProductId" resultMap="Product_supplierinfoResultMap"> <select id="selectByProductId" resultMap="Product_supplierinfoResultMap">
select t1.* from ( select t1.* from (
...@@ -81,13 +88,6 @@ ...@@ -81,13 +88,6 @@
<include refid="Default" /> <include refid="Default" />
) t1 ) t1
where currency_id=#{id} where currency_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PRODUCT_SUPPLIERINFO__RES_PARTNER__NAME] -->
<select id="selectByName" resultMap="Product_supplierinfoResultMap">
select t1.* from (
<include refid="Default" />
) t1
where name=#{id}
</select> </select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PRODUCT_SUPPLIERINFO__RES_USERS__CREATE_UID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PRODUCT_SUPPLIERINFO__RES_USERS__CREATE_UID] -->
<select id="selectByCreateUid" resultMap="Product_supplierinfoResultMap"> <select id="selectByCreateUid" resultMap="Product_supplierinfoResultMap">
......
businesscentral-core/src/main/resources/mapper/odoo_purchase/purchase_requisition/Purchase_requisitionMapper.xml
浏览文件 @ 2743c1b6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="Purchase_requisitionResultMap" databaseId="postgresql"> <select id="selectById" resultMap="Purchase_requisitionResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t61.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t51.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1 LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN RES_PARTNER t51 ON t1.VENDOR_ID = t51.ID LEFT JOIN PURCHASE_REQUISITION_TYPE t61 ON t1.TYPE_ID = t61.ID ) t1 where id=#{id}]]> <![CDATA[select t1.* from (SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t61.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1 LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN PURCHASE_REQUISITION_TYPE t51 ON t1.TYPE_ID = t51.ID LEFT JOIN RES_PARTNER t61 ON t1.VENDOR_ID = t61.ID ) t1 where id=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -18,20 +18,20 @@ ...@@ -18,20 +18,20 @@
<result property="writeUname" column="write_uname" /> <result property="writeUname" column="write_uname" />
<result property="createUname" column="create_uname" /> <result property="createUname" column="create_uname" />
<result property="LastUpdate" column="__last_update" /> <result property="LastUpdate" column="__last_update" />
<result property="vendorId" column="vendor_id" />
<result property="vendorIdText" column="vendor_id_text" />
<result property="orderingDate" column="ordering_date" /> <result property="orderingDate" column="ordering_date" />
<result property="dateEnd" column="date_end" /> <result property="dateEnd" column="date_end" />
<result property="scheduleDate" column="schedule_date" /> <result property="scheduleDate" column="schedule_date" />
<result property="typeId" column="type_id" /> <result property="typeId" column="type_id" />
<result property="typeIdText" column="type_id_text" /> <result property="typeIdText" column="type_id_text" />
<result property="orderCount" column="order_count" /> <result property="orderCount" column="order_count" />
<result property="vendorId" column="vendor_id" />
<result property="vendorIdText" column="vendor_id_text" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooType" javaType="cn.ibizlab.businesscentral.core.odoo_purchase.domain.Purchase_requisition_type" column="type_id" select="cn.ibizlab.businesscentral.core.odoo_purchase.mapper.Purchase_requisition_typeMapper.selectById" fetchType="lazy"></association> <association property="odooType" javaType="cn.ibizlab.businesscentral.core.odoo_purchase.domain.Purchase_requisition_type" column="type_id" select="cn.ibizlab.businesscentral.core.odoo_purchase.mapper.Purchase_requisition_typeMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooVendor" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner" column="vendor_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_partnerMapper.selectById" fetchType="lazy"></association> <association property="odooVendor" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier" column="vendor_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_supplierMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过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> <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"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
) t1 ) t1
where type_id=#{id} where type_id=#{id}
</select> </select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PURCHASE_REQUISITION_RES_PARTNER_VENDOR_ID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PURCHASE_REQUISITION_RES_SUPPLIER_VENDOR_ID] -->
<select id="selectByVendorId" resultMap="Purchase_requisitionResultMap"> <select id="selectByVendorId" resultMap="Purchase_requisitionResultMap">
select t1.* from ( select t1.* from (
<include refid="Default" /> <include refid="Default" />
...@@ -78,12 +78,12 @@ ...@@ -78,12 +78,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql"> <sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t61.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t51.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1 LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN RES_PARTNER t51 ON t1.VENDOR_ID = t51.ID LEFT JOIN PURCHASE_REQUISITION_TYPE t61 ON t1.TYPE_ID = t61.ID <![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t61.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1 LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN PURCHASE_REQUISITION_TYPE t51 ON t1.TYPE_ID = t51.ID LEFT JOIN RES_PARTNER t61 ON t1.VENDOR_ID = t61.ID
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="postgresql"> <sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t61.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t51.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1 LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN RES_PARTNER t51 ON t1.VENDOR_ID = t51.ID LEFT JOIN PURCHASE_REQUISITION_TYPE t61 ON t1.TYPE_ID = t61.ID <![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.VENDOR_ID, t61.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION t1 LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_USERS t31 ON t1.CREATE_UID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN PURCHASE_REQUISITION_TYPE t51 ON t1.TYPE_ID = t51.ID LEFT JOIN RES_PARTNER t61 ON t1.VENDOR_ID = t61.ID
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Product_supplierinfoDTO.java
浏览文件 @ 2743c1b6
...@@ -216,15 +216,6 @@ public class Product_supplierinfoDTO extends DTOBase implements Serializable { ...@@ -216,15 +216,6 @@ public class Product_supplierinfoDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]") @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String writeUidText; private String writeUidText;
/**
* 属性 [NAME_TEXT]
*
*/
@JSONField(name = "name_text")
@JsonProperty("name_text")
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String nameText;
/** /**
* 属性 [PRODUCT_TMPL_ID] * 属性 [PRODUCT_TMPL_ID]
* *
...@@ -271,6 +262,15 @@ public class Product_supplierinfoDTO extends DTOBase implements Serializable { ...@@ -271,6 +262,15 @@ public class Product_supplierinfoDTO extends DTOBase implements Serializable {
@NotNull(message = "[币种]不允许为空!") @NotNull(message = "[币种]不允许为空!")
private Long currencyId; private Long currencyId;
/**
* 属性 [WRITE_UID]
*
*/
@JSONField(name = "write_uid")
@JsonProperty("write_uid")
@JsonSerialize(using = ToStringSerializer.class)
private Long writeUid;
/** /**
* 属性 [NAME] * 属性 [NAME]
* *
...@@ -278,17 +278,16 @@ public class Product_supplierinfoDTO extends DTOBase implements Serializable { ...@@ -278,17 +278,16 @@ public class Product_supplierinfoDTO extends DTOBase implements Serializable {
@JSONField(name = "name") @JSONField(name = "name")
@JsonProperty("name") @JsonProperty("name")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@NotNull(message = "[供应商]不允许为空!")
private Long name; private Long name;
/** /**
* 属性 [WRITE_UID] * 属性 [NAME_TEXT]
* *
*/ */
@JSONField(name = "write_uid") @JSONField(name = "name_text")
@JsonProperty("write_uid") @JsonProperty("name_text")
@JsonSerialize(using = ToStringSerializer.class) @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private Long writeUid; private String nameText;
/** /**
......
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Purchase_orderDTO.java
浏览文件 @ 2743c1b6
...@@ -525,15 +525,6 @@ public class Purchase_orderDTO extends DTOBase implements Serializable { ...@@ -525,15 +525,6 @@ public class Purchase_orderDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]") @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String createUidText; private String createUidText;
/**
* 属性 [PARTNER_ID_TEXT]
*
*/
@JSONField(name = "partner_id_text")
@JsonProperty("partner_id_text")
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String partnerIdText;
/** /**
* 属性 [PICKING_TYPE_ID_TEXT] * 属性 [PICKING_TYPE_ID_TEXT]
* *
...@@ -561,16 +552,6 @@ public class Purchase_orderDTO extends DTOBase implements Serializable { ...@@ -561,16 +552,6 @@ public class Purchase_orderDTO extends DTOBase implements Serializable {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long createUid; private Long createUid;
/**
* 属性 [PARTNER_ID]
*
*/
@JSONField(name = "partner_id")
@JsonProperty("partner_id")
@JsonSerialize(using = ToStringSerializer.class)
@NotNull(message = "[供应商]不允许为空!")
private Long partnerId;
/** /**
* 属性 [DEST_ADDRESS_ID] * 属性 [DEST_ADDRESS_ID]
* *
...@@ -673,6 +654,24 @@ public class Purchase_orderDTO extends DTOBase implements Serializable { ...@@ -673,6 +654,24 @@ public class Purchase_orderDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String requisitionIdText; private String requisitionIdText;
/**
* 属性 [PARTNER_ID]
*
*/
@JSONField(name = "partner_id")
@JsonProperty("partner_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long partnerId;
/**
* 属性 [PARTNER_ID_TEXT]
*
*/
@JSONField(name = "partner_id_text")
@JsonProperty("partner_id_text")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String partnerIdText;
/** /**
* 设置 [ACCESS_TOKEN] * 设置 [ACCESS_TOKEN]
...@@ -810,14 +809,6 @@ public class Purchase_orderDTO extends DTOBase implements Serializable { ...@@ -810,14 +809,6 @@ public class Purchase_orderDTO extends DTOBase implements Serializable {
this.modify("origin",origin); this.modify("origin",origin);
} }
/**
* 设置 [PARTNER_ID]
*/
public void setPartnerId(Long partnerId){
this.partnerId = partnerId ;
this.modify("partner_id",partnerId);
}
/** /**
* 设置 [DEST_ADDRESS_ID] * 设置 [DEST_ADDRESS_ID]
*/ */
...@@ -890,6 +881,14 @@ public class Purchase_orderDTO extends DTOBase implements Serializable { ...@@ -890,6 +881,14 @@ public class Purchase_orderDTO extends DTOBase implements Serializable {
this.modify("requisition_id",requisitionId); this.modify("requisition_id",requisitionId);
} }
/**
* 设置 [PARTNER_ID]
*/
public void setPartnerId(Long partnerId){
this.partnerId = partnerId ;
this.modify("partner_id",partnerId);
}
} }
......
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Purchase_requisitionDTO.java
浏览文件 @ 2743c1b6
...@@ -120,24 +120,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable { ...@@ -120,24 +120,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String origin; private String origin;
/**
* 属性 [VENDOR_ID]
*
*/
@JSONField(name = "vendor_id")
@JsonProperty("vendor_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long vendorId;
/**
* 属性 [VENDOR_ID_TEXT]
*
*/
@JSONField(name = "vendor_id_text")
@JsonProperty("vendor_id_text")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String vendorIdText;
/** /**
* 属性 [ORDERING_DATE] * 属性 [ORDERING_DATE]
* *
...@@ -200,6 +182,24 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable { ...@@ -200,6 +182,24 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
@JsonProperty("order_count") @JsonProperty("order_count")
private Integer orderCount; private Integer orderCount;
/**
* 属性 [VENDOR_ID]
*
*/
@JSONField(name = "vendor_id")
@JsonProperty("vendor_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long vendorId;
/**
* 属性 [VENDOR_ID_TEXT]
*
*/
@JSONField(name = "vendor_id_text")
@JsonProperty("vendor_id_text")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String vendorIdText;
/** /**
* 设置 [NAME] * 设置 [NAME]
...@@ -249,14 +249,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable { ...@@ -249,14 +249,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
this.modify("origin",origin); this.modify("origin",origin);
} }
/**
* 设置 [VENDOR_ID]
*/
public void setVendorId(Long vendorId){
this.vendorId = vendorId ;
this.modify("vendor_id",vendorId);
}
/** /**
* 设置 [ORDERING_DATE] * 设置 [ORDERING_DATE]
*/ */
...@@ -297,6 +289,14 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable { ...@@ -297,6 +289,14 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
this.modify("state",state); this.modify("state",state);
} }
/**
* 设置 [VENDOR_ID]
*/
public void setVendorId(Long vendorId){
this.vendorId = vendorId ;
this.modify("vendor_id",vendorId);
}
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或