提交 fcb2d945 编写于 作者: ibizdev's avatar ibizdev

xignzi006 发布系统代码,后台体系[Spring Boot]

上级 6fa7463d
...@@ -22,14 +22,14 @@ public class Purchase_order_lineExService extends Purchase_order_lineServiceImpl ...@@ -22,14 +22,14 @@ public class Purchase_order_lineExService extends Purchase_order_lineServiceImpl
} }
/** /**
* 自定义行为[Calc_amount]用户扩展 * 自定义行为[Calc_price]用户扩展
* @param et * @param et
* @return * @return
*/ */
@Override @Override
@Transactional @Transactional
public Purchase_order_line calc_amount(Purchase_order_line et) { public Purchase_order_line calc_price(Purchase_order_line et) {
return super.calc_amount(et); return super.calc_price(et);
} }
/** /**
* 自定义行为[Product_change]用户扩展 * 自定义行为[Product_change]用户扩展
......
...@@ -186,13 +186,6 @@ public class Account_tax extends EntityMP implements Serializable { ...@@ -186,13 +186,6 @@ public class Account_tax extends EntityMP implements Serializable {
@JSONField(name = "cash_basis_base_account_id_text") @JSONField(name = "cash_basis_base_account_id_text")
@JsonProperty("cash_basis_base_account_id_text") @JsonProperty("cash_basis_base_account_id_text")
private String cashBasisBaseAccountIdText; private String cashBasisBaseAccountIdText;
/**
* 税应收科目
*/
@TableField(exist = false)
@JSONField(name = "cash_basis_account_id_text")
@JsonProperty("cash_basis_account_id_text")
private String cashBasisAccountIdText;
/** /**
* 隐藏现金收付制选项 * 隐藏现金收付制选项
*/ */
...@@ -214,20 +207,6 @@ public class Account_tax extends EntityMP implements Serializable { ...@@ -214,20 +207,6 @@ public class Account_tax extends EntityMP implements Serializable {
@JSONField(name = "company_id_text") @JSONField(name = "company_id_text")
@JsonProperty("company_id_text") @JsonProperty("company_id_text")
private String companyIdText; private String companyIdText;
/**
* 退款单的税率科目
*/
@TableField(exist = false)
@JSONField(name = "refund_account_id_text")
@JsonProperty("refund_account_id_text")
private String refundAccountIdText;
/**
* 税率科目
*/
@TableField(exist = false)
@JSONField(name = "account_id_text")
@JsonProperty("account_id_text")
private String accountIdText;
/** /**
* 最后更新人 * 最后更新人
*/ */
...@@ -242,22 +221,6 @@ public class Account_tax extends EntityMP implements Serializable { ...@@ -242,22 +221,6 @@ public class Account_tax 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;
/**
* 退款单的税率科目
*/
@DEField(name = "refund_account_id")
@TableField(value = "refund_account_id")
@JSONField(name = "refund_account_id")
@JsonProperty("refund_account_id")
private Long refundAccountId;
/**
* 税应收科目
*/
@DEField(name = "cash_basis_account_id")
@TableField(value = "cash_basis_account_id")
@JSONField(name = "cash_basis_account_id")
@JsonProperty("cash_basis_account_id")
private Long cashBasisAccountId;
/** /**
* 创建人 * 创建人
*/ */
...@@ -274,14 +237,6 @@ public class Account_tax extends EntityMP implements Serializable { ...@@ -274,14 +237,6 @@ public class Account_tax extends EntityMP implements Serializable {
@JSONField(name = "write_uid") @JSONField(name = "write_uid")
@JsonProperty("write_uid") @JsonProperty("write_uid")
private Long writeUid; private Long writeUid;
/**
* 税率科目
*/
@DEField(name = "account_id")
@TableField(value = "account_id")
@JSONField(name = "account_id")
@JsonProperty("account_id")
private Long accountId;
/** /**
* 基本税应收科目 * 基本税应收科目
*/ */
...@@ -307,22 +262,6 @@ public class Account_tax extends EntityMP implements Serializable { ...@@ -307,22 +262,6 @@ public class Account_tax extends EntityMP implements Serializable {
@JsonProperty("company_id") @JsonProperty("company_id")
private Long companyId; private Long companyId;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account odooAccount;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account odooCashBasisAccount;
/** /**
* *
*/ */
...@@ -331,14 +270,6 @@ public class Account_tax extends EntityMP implements Serializable { ...@@ -331,14 +270,6 @@ public class Account_tax extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account odooCashBasisBaseAccount; private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account odooCashBasisBaseAccount;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account odooRefundAccount;
/** /**
* *
*/ */
...@@ -461,30 +392,6 @@ public class Account_tax extends EntityMP implements Serializable { ...@@ -461,30 +392,6 @@ public class Account_tax extends EntityMP implements Serializable {
this.modify("include_base_amount",includeBaseAmount); this.modify("include_base_amount",includeBaseAmount);
} }
/**
* 设置 [退款单的税率科目]
*/
public void setRefundAccountId(Long refundAccountId){
this.refundAccountId = refundAccountId ;
this.modify("refund_account_id",refundAccountId);
}
/**
* 设置 [税应收科目]
*/
public void setCashBasisAccountId(Long cashBasisAccountId){
this.cashBasisAccountId = cashBasisAccountId ;
this.modify("cash_basis_account_id",cashBasisAccountId);
}
/**
* 设置 [税率科目]
*/
public void setAccountId(Long accountId){
this.accountId = accountId ;
this.modify("account_id",accountId);
}
/** /**
* 设置 [基本税应收科目] * 设置 [基本税应收科目]
*/ */
......
...@@ -68,20 +68,6 @@ public class Account_taxSearchContext extends QueryWrapperContext<Account_tax> { ...@@ -68,20 +68,6 @@ public class Account_taxSearchContext extends QueryWrapperContext<Account_tax> {
if(!ObjectUtils.isEmpty(this.n_cash_basis_base_account_id_text_like)){ if(!ObjectUtils.isEmpty(this.n_cash_basis_base_account_id_text_like)){
this.getSearchCond().like("cash_basis_base_account_id_text", n_cash_basis_base_account_id_text_like); this.getSearchCond().like("cash_basis_base_account_id_text", n_cash_basis_base_account_id_text_like);
} }
}
private String n_cash_basis_account_id_text_eq;//[税应收科目]
public void setN_cash_basis_account_id_text_eq(String n_cash_basis_account_id_text_eq) {
this.n_cash_basis_account_id_text_eq = n_cash_basis_account_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_cash_basis_account_id_text_eq)){
this.getSearchCond().eq("cash_basis_account_id_text", n_cash_basis_account_id_text_eq);
}
}
private String n_cash_basis_account_id_text_like;//[税应收科目]
public void setN_cash_basis_account_id_text_like(String n_cash_basis_account_id_text_like) {
this.n_cash_basis_account_id_text_like = n_cash_basis_account_id_text_like;
if(!ObjectUtils.isEmpty(this.n_cash_basis_account_id_text_like)){
this.getSearchCond().like("cash_basis_account_id_text", n_cash_basis_account_id_text_like);
}
} }
private String n_tax_group_id_text_eq;//[税组] private String n_tax_group_id_text_eq;//[税组]
public void setN_tax_group_id_text_eq(String n_tax_group_id_text_eq) { public void setN_tax_group_id_text_eq(String n_tax_group_id_text_eq) {
...@@ -110,34 +96,6 @@ public class Account_taxSearchContext extends QueryWrapperContext<Account_tax> { ...@@ -110,34 +96,6 @@ public class Account_taxSearchContext extends QueryWrapperContext<Account_tax> {
if(!ObjectUtils.isEmpty(this.n_company_id_text_like)){ if(!ObjectUtils.isEmpty(this.n_company_id_text_like)){
this.getSearchCond().like("company_id_text", n_company_id_text_like); this.getSearchCond().like("company_id_text", n_company_id_text_like);
} }
}
private String n_refund_account_id_text_eq;//[退款单的税率科目]
public void setN_refund_account_id_text_eq(String n_refund_account_id_text_eq) {
this.n_refund_account_id_text_eq = n_refund_account_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_refund_account_id_text_eq)){
this.getSearchCond().eq("refund_account_id_text", n_refund_account_id_text_eq);
}
}
private String n_refund_account_id_text_like;//[退款单的税率科目]
public void setN_refund_account_id_text_like(String n_refund_account_id_text_like) {
this.n_refund_account_id_text_like = n_refund_account_id_text_like;
if(!ObjectUtils.isEmpty(this.n_refund_account_id_text_like)){
this.getSearchCond().like("refund_account_id_text", n_refund_account_id_text_like);
}
}
private String n_account_id_text_eq;//[税率科目]
public void setN_account_id_text_eq(String n_account_id_text_eq) {
this.n_account_id_text_eq = n_account_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_account_id_text_eq)){
this.getSearchCond().eq("account_id_text", n_account_id_text_eq);
}
}
private String n_account_id_text_like;//[税率科目]
public void setN_account_id_text_like(String n_account_id_text_like) {
this.n_account_id_text_like = n_account_id_text_like;
if(!ObjectUtils.isEmpty(this.n_account_id_text_like)){
this.getSearchCond().like("account_id_text", n_account_id_text_like);
}
} }
private String n_write_uid_text_eq;//[最后更新人] private String n_write_uid_text_eq;//[最后更新人]
public void setN_write_uid_text_eq(String n_write_uid_text_eq) { public void setN_write_uid_text_eq(String n_write_uid_text_eq) {
...@@ -166,20 +124,6 @@ public class Account_taxSearchContext extends QueryWrapperContext<Account_tax> { ...@@ -166,20 +124,6 @@ public class Account_taxSearchContext extends QueryWrapperContext<Account_tax> {
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 Long n_refund_account_id_eq;//[退款单的税率科目]
public void setN_refund_account_id_eq(Long n_refund_account_id_eq) {
this.n_refund_account_id_eq = n_refund_account_id_eq;
if(!ObjectUtils.isEmpty(this.n_refund_account_id_eq)){
this.getSearchCond().eq("refund_account_id", n_refund_account_id_eq);
}
}
private Long n_cash_basis_account_id_eq;//[税应收科目]
public void setN_cash_basis_account_id_eq(Long n_cash_basis_account_id_eq) {
this.n_cash_basis_account_id_eq = n_cash_basis_account_id_eq;
if(!ObjectUtils.isEmpty(this.n_cash_basis_account_id_eq)){
this.getSearchCond().eq("cash_basis_account_id", n_cash_basis_account_id_eq);
}
} }
private Long n_create_uid_eq;//[创建人] private Long n_create_uid_eq;//[创建人]
public void setN_create_uid_eq(Long n_create_uid_eq) { public void setN_create_uid_eq(Long n_create_uid_eq) {
...@@ -194,13 +138,6 @@ public class Account_taxSearchContext extends QueryWrapperContext<Account_tax> { ...@@ -194,13 +138,6 @@ public class Account_taxSearchContext extends QueryWrapperContext<Account_tax> {
if(!ObjectUtils.isEmpty(this.n_write_uid_eq)){ if(!ObjectUtils.isEmpty(this.n_write_uid_eq)){
this.getSearchCond().eq("write_uid", n_write_uid_eq); this.getSearchCond().eq("write_uid", n_write_uid_eq);
} }
}
private Long n_account_id_eq;//[税率科目]
public void setN_account_id_eq(Long n_account_id_eq) {
this.n_account_id_eq = n_account_id_eq;
if(!ObjectUtils.isEmpty(this.n_account_id_eq)){
this.getSearchCond().eq("account_id", n_account_id_eq);
}
} }
private Long n_cash_basis_base_account_id_eq;//[基本税应收科目] private Long n_cash_basis_base_account_id_eq;//[基本税应收科目]
public void setN_cash_basis_base_account_id_eq(Long n_cash_basis_base_account_id_eq) { public void setN_cash_basis_base_account_id_eq(Long n_cash_basis_base_account_id_eq) {
......
...@@ -64,14 +64,8 @@ public interface Account_taxMapper extends BaseMapper<Account_tax>{ ...@@ -64,14 +64,8 @@ public interface Account_taxMapper extends BaseMapper<Account_tax>{
@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<Account_tax> selectByAccountId(@Param("id") Serializable id) ;
List<Account_tax> selectByCashBasisAccountId(@Param("id") Serializable id) ;
List<Account_tax> selectByCashBasisBaseAccountId(@Param("id") Serializable id) ; List<Account_tax> selectByCashBasisBaseAccountId(@Param("id") Serializable id) ;
List<Account_tax> selectByRefundAccountId(@Param("id") Serializable id) ;
List<Account_tax> selectByTaxGroupId(@Param("id") Serializable id) ; List<Account_tax> selectByTaxGroupId(@Param("id") Serializable id) ;
List<Account_tax> selectByCompanyId(@Param("id") Serializable id) ; List<Account_tax> selectByCompanyId(@Param("id") Serializable id) ;
......
...@@ -40,20 +40,10 @@ public interface IAccount_taxService extends IService<Account_tax>{ ...@@ -40,20 +40,10 @@ public interface IAccount_taxService extends IService<Account_tax>{
Page<Account_tax> searchDefault(Account_taxSearchContext context) ; Page<Account_tax> searchDefault(Account_taxSearchContext context) ;
Page<Account_tax> searchPurchase(Account_taxSearchContext context) ; Page<Account_tax> searchPurchase(Account_taxSearchContext context) ;
Page<Account_tax> searchSale(Account_taxSearchContext context) ; Page<Account_tax> searchSale(Account_taxSearchContext context) ;
List<Account_tax> selectByAccountId(Long id);
List<Account_tax> selectByAccountId(Collection<Long> ids);
void removeByAccountId(Long id);
List<Account_tax> selectByCashBasisAccountId(Long id);
void resetByCashBasisAccountId(Long id);
void resetByCashBasisAccountId(Collection<Long> ids);
void removeByCashBasisAccountId(Long id);
List<Account_tax> selectByCashBasisBaseAccountId(Long id); List<Account_tax> selectByCashBasisBaseAccountId(Long id);
void resetByCashBasisBaseAccountId(Long id); void resetByCashBasisBaseAccountId(Long id);
void resetByCashBasisBaseAccountId(Collection<Long> ids); void resetByCashBasisBaseAccountId(Collection<Long> ids);
void removeByCashBasisBaseAccountId(Long id); void removeByCashBasisBaseAccountId(Long id);
List<Account_tax> selectByRefundAccountId(Long id);
List<Account_tax> selectByRefundAccountId(Collection<Long> ids);
void removeByRefundAccountId(Long id);
List<Account_tax> selectByTaxGroupId(Long id); List<Account_tax> selectByTaxGroupId(Long id);
void resetByTaxGroupId(Long id); void resetByTaxGroupId(Long id);
void resetByTaxGroupId(Collection<Long> ids); void resetByTaxGroupId(Collection<Long> ids);
......
...@@ -215,12 +215,7 @@ public class Account_accountServiceImpl extends EBSServiceImpl<Account_accountMa ...@@ -215,12 +215,7 @@ public class Account_accountServiceImpl extends EBSServiceImpl<Account_accountMa
accountReconcileModelService.removeByAccountId(key); accountReconcileModelService.removeByAccountId(key);
accountReconcileModelService.removeBySecondAccountId(key); accountReconcileModelService.removeBySecondAccountId(key);
accountRegisterPaymentsService.resetByWriteoffAccountId(key); accountRegisterPaymentsService.resetByWriteoffAccountId(key);
if(!ObjectUtils.isEmpty(accountTaxService.selectByAccountId(key)))
throw new BadRequestAlertException("删除数据失败,当前数据存在关系实体[Account_tax]数据,无法删除!","","");
accountTaxService.resetByCashBasisAccountId(key);
accountTaxService.resetByCashBasisBaseAccountId(key); accountTaxService.resetByCashBasisBaseAccountId(key);
if(!ObjectUtils.isEmpty(accountTaxService.selectByRefundAccountId(key)))
throw new BadRequestAlertException("删除数据失败,当前数据存在关系实体[Account_tax]数据,无法删除!","","");
hrExpenseService.resetByAccountId(key); hrExpenseService.resetByAccountId(key);
resCompanyService.resetByPropertyStockAccountInputCategId(key); resCompanyService.resetByPropertyStockAccountInputCategId(key);
resCompanyService.resetByPropertyStockAccountOutputCategId(key); resCompanyService.resetByPropertyStockAccountOutputCategId(key);
...@@ -258,12 +253,7 @@ public class Account_accountServiceImpl extends EBSServiceImpl<Account_accountMa ...@@ -258,12 +253,7 @@ public class Account_accountServiceImpl extends EBSServiceImpl<Account_accountMa
accountReconcileModelService.removeByAccountId(idList); accountReconcileModelService.removeByAccountId(idList);
accountReconcileModelService.removeBySecondAccountId(idList); accountReconcileModelService.removeBySecondAccountId(idList);
accountRegisterPaymentsService.resetByWriteoffAccountId(idList); accountRegisterPaymentsService.resetByWriteoffAccountId(idList);
if(!ObjectUtils.isEmpty(accountTaxService.selectByAccountId(idList)))
throw new BadRequestAlertException("删除数据失败,当前数据存在关系实体[Account_tax]数据,无法删除!","","");
accountTaxService.resetByCashBasisAccountId(idList);
accountTaxService.resetByCashBasisBaseAccountId(idList); accountTaxService.resetByCashBasisBaseAccountId(idList);
if(!ObjectUtils.isEmpty(accountTaxService.selectByRefundAccountId(idList)))
throw new BadRequestAlertException("删除数据失败,当前数据存在关系实体[Account_tax]数据,无法删除!","","");
hrExpenseService.resetByAccountId(idList); hrExpenseService.resetByAccountId(idList);
resCompanyService.resetByPropertyStockAccountInputCategId(idList); resCompanyService.resetByPropertyStockAccountInputCategId(idList);
resCompanyService.resetByPropertyStockAccountOutputCategId(idList); resCompanyService.resetByPropertyStockAccountOutputCategId(idList);
......
...@@ -240,39 +240,6 @@ public class Account_taxServiceImpl extends EBSServiceImpl<Account_taxMapper, Ac ...@@ -240,39 +240,6 @@ public class Account_taxServiceImpl extends EBSServiceImpl<Account_taxMapper, Ac
} }
@Override
public List<Account_tax> selectByAccountId(Long id) {
return baseMapper.selectByAccountId(id);
}
@Override
public List<Account_tax> selectByAccountId(Collection<Long> ids) {
return this.list(new QueryWrapper<Account_tax>().in("id",ids));
}
@Override
public void removeByAccountId(Long id) {
this.remove(new QueryWrapper<Account_tax>().eq("account_id",id));
}
@Override
public List<Account_tax> selectByCashBasisAccountId(Long id) {
return baseMapper.selectByCashBasisAccountId(id);
}
@Override
public void resetByCashBasisAccountId(Long id) {
this.update(new UpdateWrapper<Account_tax>().set("cash_basis_account_id",null).eq("cash_basis_account_id",id));
}
@Override
public void resetByCashBasisAccountId(Collection<Long> ids) {
this.update(new UpdateWrapper<Account_tax>().set("cash_basis_account_id",null).in("cash_basis_account_id",ids));
}
@Override
public void removeByCashBasisAccountId(Long id) {
this.remove(new QueryWrapper<Account_tax>().eq("cash_basis_account_id",id));
}
@Override @Override
public List<Account_tax> selectByCashBasisBaseAccountId(Long id) { public List<Account_tax> selectByCashBasisBaseAccountId(Long id) {
return baseMapper.selectByCashBasisBaseAccountId(id); return baseMapper.selectByCashBasisBaseAccountId(id);
...@@ -292,20 +259,6 @@ public class Account_taxServiceImpl extends EBSServiceImpl<Account_taxMapper, Ac ...@@ -292,20 +259,6 @@ public class Account_taxServiceImpl extends EBSServiceImpl<Account_taxMapper, Ac
this.remove(new QueryWrapper<Account_tax>().eq("cash_basis_base_account_id",id)); this.remove(new QueryWrapper<Account_tax>().eq("cash_basis_base_account_id",id));
} }
@Override
public List<Account_tax> selectByRefundAccountId(Long id) {
return baseMapper.selectByRefundAccountId(id);
}
@Override
public List<Account_tax> selectByRefundAccountId(Collection<Long> ids) {
return this.list(new QueryWrapper<Account_tax>().in("id",ids));
}
@Override
public void removeByRefundAccountId(Long id) {
this.remove(new QueryWrapper<Account_tax>().eq("refund_account_id",id));
}
@Override @Override
public List<Account_tax> selectByTaxGroupId(Long id) { public List<Account_tax> selectByTaxGroupId(Long id) {
return baseMapper.selectByTaxGroupId(id); return baseMapper.selectByTaxGroupId(id);
...@@ -397,26 +350,6 @@ public class Account_taxServiceImpl extends EBSServiceImpl<Account_taxMapper, Ac ...@@ -397,26 +350,6 @@ public class Account_taxServiceImpl extends EBSServiceImpl<Account_taxMapper, Ac
* @param et * @param et
*/ */
private void fillParentData(Account_tax et){ private void fillParentData(Account_tax et){
//实体关系[DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__ACCOUNT_ID]
if(!ObjectUtils.isEmpty(et.getAccountId())){
cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account odooAccount=et.getOdooAccount();
if(ObjectUtils.isEmpty(odooAccount)){
cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account majorEntity=accountAccountService.get(et.getAccountId());
et.setOdooAccount(majorEntity);
odooAccount=majorEntity;
}
et.setAccountIdText(odooAccount.getName());
}
//实体关系[DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__CASH_BASIS_ACCOUNT_ID]
if(!ObjectUtils.isEmpty(et.getCashBasisAccountId())){
cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account odooCashBasisAccount=et.getOdooCashBasisAccount();
if(ObjectUtils.isEmpty(odooCashBasisAccount)){
cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account majorEntity=accountAccountService.get(et.getCashBasisAccountId());
et.setOdooCashBasisAccount(majorEntity);
odooCashBasisAccount=majorEntity;
}
et.setCashBasisAccountIdText(odooCashBasisAccount.getName());
}
//实体关系[DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__CASH_BASIS_BASE_ACCOUNT_ID] //实体关系[DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__CASH_BASIS_BASE_ACCOUNT_ID]
if(!ObjectUtils.isEmpty(et.getCashBasisBaseAccountId())){ if(!ObjectUtils.isEmpty(et.getCashBasisBaseAccountId())){
cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account odooCashBasisBaseAccount=et.getOdooCashBasisBaseAccount(); cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account odooCashBasisBaseAccount=et.getOdooCashBasisBaseAccount();
...@@ -427,16 +360,6 @@ public class Account_taxServiceImpl extends EBSServiceImpl<Account_taxMapper, Ac ...@@ -427,16 +360,6 @@ public class Account_taxServiceImpl extends EBSServiceImpl<Account_taxMapper, Ac
} }
et.setCashBasisBaseAccountIdText(odooCashBasisBaseAccount.getName()); et.setCashBasisBaseAccountIdText(odooCashBasisBaseAccount.getName());
} }
//实体关系[DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__REFUND_ACCOUNT_ID]
if(!ObjectUtils.isEmpty(et.getRefundAccountId())){
cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account odooRefundAccount=et.getOdooRefundAccount();
if(ObjectUtils.isEmpty(odooRefundAccount)){
cn.ibizlab.businesscentral.core.odoo_account.domain.Account_account majorEntity=accountAccountService.get(et.getRefundAccountId());
et.setOdooRefundAccount(majorEntity);
odooRefundAccount=majorEntity;
}
et.setRefundAccountIdText(odooRefundAccount.getName());
}
//实体关系[DER1N_ACCOUNT_TAX__ACCOUNT_TAX_GROUP__TAX_GROUP_ID] //实体关系[DER1N_ACCOUNT_TAX__ACCOUNT_TAX_GROUP__TAX_GROUP_ID]
if(!ObjectUtils.isEmpty(et.getTaxGroupId())){ if(!ObjectUtils.isEmpty(et.getTaxGroupId())){
cn.ibizlab.businesscentral.core.odoo_account.domain.Account_tax_group odooTaxGroup=et.getOdooTaxGroup(); cn.ibizlab.businesscentral.core.odoo_account.domain.Account_tax_group odooTaxGroup=et.getOdooTaxGroup();
......
...@@ -211,15 +211,15 @@ public class Purchase_order_lineServiceImpl extends EBSServiceImpl<Purchase_orde ...@@ -211,15 +211,15 @@ public class Purchase_order_lineServiceImpl extends EBSServiceImpl<Purchase_orde
@Override @Override
@Transactional @Transactional
public Purchase_order_line calc_amount(Purchase_order_line et) { public Purchase_order_line calc_amount(Purchase_order_line et) {
//自定义代码 calc_amountLogic.execute(et);
return et; return et ;
} }
@Override @Override
@Transactional @Transactional
public Purchase_order_line calc_price(Purchase_order_line et) { public Purchase_order_line calc_price(Purchase_order_line et) {
calc_amountLogic.execute(et); //自定义代码
return et ; return et;
} }
@Override @Override
......
...@@ -1051,30 +1051,12 @@ ...@@ -1051,30 +1051,12 @@
"entity_name":"ACCOUNT_REGISTER_PAYMENTS", "entity_name":"ACCOUNT_REGISTER_PAYMENTS",
"ref_entity_name":"ACCOUNT_ACCOUNT" "ref_entity_name":"ACCOUNT_ACCOUNT"
}, },
{"name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__ACCOUNT_ID",
"relation_type":"DER1N",
"code_name":"Odoo_account",
"entity_name":"ACCOUNT_TAX",
"ref_entity_name":"ACCOUNT_ACCOUNT"
},
{"name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__CASH_BASIS_ACCOUNT_ID",
"relation_type":"DER1N",
"code_name":"Odoo_cash_basis_account",
"entity_name":"ACCOUNT_TAX",
"ref_entity_name":"ACCOUNT_ACCOUNT"
},
{"name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__CASH_BASIS_BASE_ACCOUNT_ID", {"name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__CASH_BASIS_BASE_ACCOUNT_ID",
"relation_type":"DER1N", "relation_type":"DER1N",
"code_name":"Odoo_cash_basis_base_account", "code_name":"Odoo_cash_basis_base_account",
"entity_name":"ACCOUNT_TAX", "entity_name":"ACCOUNT_TAX",
"ref_entity_name":"ACCOUNT_ACCOUNT" "ref_entity_name":"ACCOUNT_ACCOUNT"
}, },
{"name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__REFUND_ACCOUNT_ID",
"relation_type":"DER1N",
"code_name":"Odoo_refund_account",
"entity_name":"ACCOUNT_TAX",
"ref_entity_name":"ACCOUNT_ACCOUNT"
},
{"name":"DER1N_HR_EXPENSE__ACCOUNT_ACCOUNT__ACCOUNT_ID", {"name":"DER1N_HR_EXPENSE__ACCOUNT_ACCOUNT__ACCOUNT_ID",
"relation_type":"DER1N", "relation_type":"DER1N",
"code_name":"Odoo_account", "code_name":"Odoo_account",
...@@ -27726,24 +27708,6 @@ ...@@ -27726,24 +27708,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"CASH_BASIS_ACCOUNT_ID_TEXT" ,
"codename":"Cash_basis_account_id_text",
"field_logic_name":"税应收科目",
"entity_name":"Account_tax",
"ref_de":"ACCOUNT_ACCOUNT",
"ref_field_name":"NAME",
"relation_name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__CASH_BASIS_ACCOUNT_ID",
"relation_codename":"Odoo_cash_basis_account",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":200,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"HIDE_TAX_EXIGIBILITY" , "fieldname":"HIDE_TAX_EXIGIBILITY" ,
"codename":"Hide_tax_exigibility", "codename":"Hide_tax_exigibility",
"field_logic_name":"隐藏现金收付制选项", "field_logic_name":"隐藏现金收付制选项",
...@@ -27797,42 +27761,6 @@ ...@@ -27797,42 +27761,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"REFUND_ACCOUNT_ID_TEXT" ,
"codename":"Refund_account_id_text",
"field_logic_name":"退款单的税率科目",
"entity_name":"Account_tax",
"ref_de":"ACCOUNT_ACCOUNT",
"ref_field_name":"NAME",
"relation_name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__REFUND_ACCOUNT_ID",
"relation_codename":"Odoo_refund_account",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":200,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"ACCOUNT_ID_TEXT" ,
"codename":"Account_id_text",
"field_logic_name":"税率科目",
"entity_name":"Account_tax",
"ref_de":"ACCOUNT_ACCOUNT",
"ref_field_name":"NAME",
"relation_name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__ACCOUNT_ID",
"relation_codename":"Odoo_account",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":200,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"WRITE_UID_TEXT" , "fieldname":"WRITE_UID_TEXT" ,
"codename":"Write_uid_text", "codename":"Write_uid_text",
"field_logic_name":"最后更新人", "field_logic_name":"最后更新人",
...@@ -27869,40 +27797,6 @@ ...@@ -27869,40 +27797,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"REFUND_ACCOUNT_ID" ,
"codename":"Refund_account_id",
"field_logic_name":"退款单的税率科目",
"entity_name":"Account_tax",
"ref_de":"ACCOUNT_ACCOUNT",
"ref_field_name":"ID",
"relation_name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__REFUND_ACCOUNT_ID",
"relation_codename":"Odoo_refund_account",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"CASH_BASIS_ACCOUNT_ID" ,
"codename":"Cash_basis_account_id",
"field_logic_name":"税应收科目",
"entity_name":"Account_tax",
"ref_de":"ACCOUNT_ACCOUNT",
"ref_field_name":"ID",
"relation_name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__CASH_BASIS_ACCOUNT_ID",
"relation_codename":"Odoo_cash_basis_account",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"CREATE_UID" , "fieldname":"CREATE_UID" ,
"codename":"Create_uid", "codename":"Create_uid",
"field_logic_name":"创建人", "field_logic_name":"创建人",
...@@ -27939,23 +27833,6 @@ ...@@ -27939,23 +27833,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"ACCOUNT_ID" ,
"codename":"Account_id",
"field_logic_name":"税率科目",
"entity_name":"Account_tax",
"ref_de":"ACCOUNT_ACCOUNT",
"ref_field_name":"ID",
"relation_name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__ACCOUNT_ID",
"relation_codename":"Odoo_account",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"CASH_BASIS_BASE_ACCOUNT_ID" , "fieldname":"CASH_BASIS_BASE_ACCOUNT_ID" ,
"codename":"Cash_basis_base_account_id", "codename":"Cash_basis_base_account_id",
"field_logic_name":"基本税应收科目", "field_logic_name":"基本税应收科目",
...@@ -28064,30 +27941,12 @@ ...@@ -28064,30 +27941,12 @@
} }
], ],
"parentEntitys":[ "parentEntitys":[
{"name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__ACCOUNT_ID",
"relation_type":"DER1N",
"code_name":"Odoo_account",
"entity_name":"ACCOUNT_TAX",
"ref_entity_name":"ACCOUNT_ACCOUNT"
},
{"name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__CASH_BASIS_ACCOUNT_ID",
"relation_type":"DER1N",
"code_name":"Odoo_cash_basis_account",
"entity_name":"ACCOUNT_TAX",
"ref_entity_name":"ACCOUNT_ACCOUNT"
},
{"name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__CASH_BASIS_BASE_ACCOUNT_ID", {"name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__CASH_BASIS_BASE_ACCOUNT_ID",
"relation_type":"DER1N", "relation_type":"DER1N",
"code_name":"Odoo_cash_basis_base_account", "code_name":"Odoo_cash_basis_base_account",
"entity_name":"ACCOUNT_TAX", "entity_name":"ACCOUNT_TAX",
"ref_entity_name":"ACCOUNT_ACCOUNT" "ref_entity_name":"ACCOUNT_ACCOUNT"
}, },
{"name":"DER1N_ACCOUNT_TAX__ACCOUNT_ACCOUNT__REFUND_ACCOUNT_ID",
"relation_type":"DER1N",
"code_name":"Odoo_refund_account",
"entity_name":"ACCOUNT_TAX",
"ref_entity_name":"ACCOUNT_ACCOUNT"
},
{"name":"DER1N_ACCOUNT_TAX__ACCOUNT_TAX_GROUP__TAX_GROUP_ID", {"name":"DER1N_ACCOUNT_TAX__ACCOUNT_TAX_GROUP__TAX_GROUP_ID",
"relation_type":"DER1N", "relation_type":"DER1N",
"code_name":"Odoo_tax_group", "code_name":"Odoo_tax_group",
...@@ -199,15 +199,6 @@ public class Account_taxDTO extends DTOBase implements Serializable { ...@@ -199,15 +199,6 @@ public class Account_taxDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]") @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String cashBasisBaseAccountIdText; private String cashBasisBaseAccountIdText;
/**
* 属性 [CASH_BASIS_ACCOUNT_ID_TEXT]
*
*/
@JSONField(name = "cash_basis_account_id_text")
@JsonProperty("cash_basis_account_id_text")
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String cashBasisAccountIdText;
/** /**
* 属性 [HIDE_TAX_EXIGIBILITY] * 属性 [HIDE_TAX_EXIGIBILITY]
* *
...@@ -234,24 +225,6 @@ public class Account_taxDTO extends DTOBase implements Serializable { ...@@ -234,24 +225,6 @@ public class Account_taxDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]") @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String companyIdText; private String companyIdText;
/**
* 属性 [REFUND_ACCOUNT_ID_TEXT]
*
*/
@JSONField(name = "refund_account_id_text")
@JsonProperty("refund_account_id_text")
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String refundAccountIdText;
/**
* 属性 [ACCOUNT_ID_TEXT]
*
*/
@JSONField(name = "account_id_text")
@JsonProperty("account_id_text")
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String accountIdText;
/** /**
* 属性 [WRITE_UID_TEXT] * 属性 [WRITE_UID_TEXT]
* *
...@@ -270,24 +243,6 @@ public class Account_taxDTO extends DTOBase implements Serializable { ...@@ -270,24 +243,6 @@ public class Account_taxDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]") @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String createUidText; private String createUidText;
/**
* 属性 [REFUND_ACCOUNT_ID]
*
*/
@JSONField(name = "refund_account_id")
@JsonProperty("refund_account_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long refundAccountId;
/**
* 属性 [CASH_BASIS_ACCOUNT_ID]
*
*/
@JSONField(name = "cash_basis_account_id")
@JsonProperty("cash_basis_account_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long cashBasisAccountId;
/** /**
* 属性 [CREATE_UID] * 属性 [CREATE_UID]
* *
...@@ -306,15 +261,6 @@ public class Account_taxDTO extends DTOBase implements Serializable { ...@@ -306,15 +261,6 @@ public class Account_taxDTO extends DTOBase implements Serializable {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long writeUid; private Long writeUid;
/**
* 属性 [ACCOUNT_ID]
*
*/
@JSONField(name = "account_id")
@JsonProperty("account_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long accountId;
/** /**
* 属性 [CASH_BASIS_BASE_ACCOUNT_ID] * 属性 [CASH_BASIS_BASE_ACCOUNT_ID]
* *
...@@ -433,30 +379,6 @@ public class Account_taxDTO extends DTOBase implements Serializable { ...@@ -433,30 +379,6 @@ public class Account_taxDTO extends DTOBase implements Serializable {
this.modify("include_base_amount",includeBaseAmount); this.modify("include_base_amount",includeBaseAmount);
} }
/**
* 设置 [REFUND_ACCOUNT_ID]
*/
public void setRefundAccountId(Long refundAccountId){
this.refundAccountId = refundAccountId ;
this.modify("refund_account_id",refundAccountId);
}
/**
* 设置 [CASH_BASIS_ACCOUNT_ID]
*/
public void setCashBasisAccountId(Long cashBasisAccountId){
this.cashBasisAccountId = cashBasisAccountId ;
this.modify("cash_basis_account_id",cashBasisAccountId);
}
/**
* 设置 [ACCOUNT_ID]
*/
public void setAccountId(Long accountId){
this.accountId = accountId ;
this.modify("account_id",accountId);
}
/** /**
* 设置 [CASH_BASIS_BASE_ACCOUNT_ID] * 设置 [CASH_BASIS_BASE_ACCOUNT_ID]
*/ */
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册