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

xignzi006 发布系统代码

上级 5af63265
......@@ -140,6 +140,9 @@ public class Res_currencyServiceImpl extends ServiceImpl<Res_currencyMapper, Res
protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_reportService purchaseReportService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisitionService purchaseRequisitionService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_companyService resCompanyService;
@Autowired
@Lazy
......
......@@ -230,6 +230,21 @@ public class Purchase_requisition extends EntityMP implements Serializable {
@JSONField(name = "company_name")
@JsonProperty("company_name")
private String companyName;
/**
* ID
*/
@DEField(name = "currency_id")
@TableField(value = "currency_id")
@JSONField(name = "currency_id")
@JsonProperty("currency_id")
private Long currencyId;
/**
* 币种
*/
@TableField(exist = false)
@JSONField(name = "currency_name")
@JsonProperty("currency_name")
private String currencyName;
/**
*
......@@ -247,6 +262,14 @@ public class Purchase_requisition extends EntityMP implements Serializable {
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_company odooCompany;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_currency odooCurrency;
/**
*
*/
......@@ -443,6 +466,14 @@ public class Purchase_requisition extends EntityMP implements Serializable {
this.modify("company_id",companyId);
}
/**
* 设置 [ID]
*/
public void setCurrencyId(Long currencyId){
this.currencyId = currencyId ;
this.modify("currency_id",currencyId);
}
@Override
public Serializable getDefaultKey(boolean gen) {
......
......@@ -167,6 +167,27 @@ public class Purchase_requisitionSearchContext extends QueryWrapperContext<Purch
this.getSearchCond().like("company_name", n_company_name_like);
}
}
private Long n_currency_id_eq;//[ID]
public void setN_currency_id_eq(Long n_currency_id_eq) {
this.n_currency_id_eq = n_currency_id_eq;
if(!ObjectUtils.isEmpty(this.n_currency_id_eq)){
this.getSearchCond().eq("currency_id", n_currency_id_eq);
}
}
private String n_currency_name_eq;//[币种]
public void setN_currency_name_eq(String n_currency_name_eq) {
this.n_currency_name_eq = n_currency_name_eq;
if(!ObjectUtils.isEmpty(this.n_currency_name_eq)){
this.getSearchCond().eq("currency_name", n_currency_name_eq);
}
}
private String n_currency_name_like;//[币种]
public void setN_currency_name_like(String n_currency_name_like) {
this.n_currency_name_like = n_currency_name_like;
if(!ObjectUtils.isEmpty(this.n_currency_name_like)){
this.getSearchCond().like("currency_name", n_currency_name_like);
}
}
/**
* 启用快速搜索
......
......@@ -66,6 +66,8 @@ public interface Purchase_requisitionMapper extends BaseMapper<Purchase_requisit
List<Purchase_requisition> selectByCompanyId(@Param("id") Serializable id) ;
List<Purchase_requisition> selectByCurrencyId(@Param("id") Serializable id) ;
List<Purchase_requisition> selectByVendorId(@Param("id") Serializable id) ;
List<Purchase_requisition> selectByCreateUid(@Param("id") Serializable id) ;
......
......@@ -48,6 +48,8 @@ public interface IPurchase_requisitionService extends IService<Purchase_requisit
void removeByTypeId(Long id) ;
List<Purchase_requisition> selectByCompanyId(Long id) ;
void removeByCompanyId(Long id) ;
List<Purchase_requisition> selectByCurrencyId(Long id) ;
void removeByCurrencyId(Long id) ;
List<Purchase_requisition> selectByVendorId(Long id) ;
void removeByVendorId(Long id) ;
List<Purchase_requisition> selectByCreateUid(Long id) ;
......
......@@ -62,6 +62,9 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_companyService resCompanyService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_currencyService resCurrencyService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
@Autowired
@Lazy
......@@ -235,6 +238,16 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis
this.remove(new QueryWrapper<Purchase_requisition>().eq("company_id",id));
}
@Override
public List<Purchase_requisition> selectByCurrencyId(Long id) {
return baseMapper.selectByCurrencyId(id);
}
@Override
public void removeByCurrencyId(Long id) {
this.remove(new QueryWrapper<Purchase_requisition>().eq("currency_id",id));
}
@Override
public List<Purchase_requisition> selectByVendorId(Long id) {
return baseMapper.selectByVendorId(id);
......@@ -313,6 +326,16 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis
}
et.setCompanyName(odooCompany.getName());
}
//实体关系[DER1N_PURCHASE_REQUISITION_RES_CURRENCY_CURRENCY_ID]
if(!ObjectUtils.isEmpty(et.getCurrencyId())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_currency odooCurrency=et.getOdooCurrency();
if(ObjectUtils.isEmpty(odooCurrency)){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_currency majorEntity=resCurrencyService.get(et.getCurrencyId());
et.setOdooCurrency(majorEntity);
odooCurrency=majorEntity;
}
et.setCurrencyName(odooCurrency.getName());
}
//实体关系[DER1N_PURCHASE_REQUISITION_RES_SUPPLIER_VENDOR_ID]
if(!ObjectUtils.isEmpty(et.getVendorId())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier odooVendor=et.getOdooVendor();
......
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select id="selectById" resultMap="Purchase_requisitionResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t51.QUANTITY_COPY, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.USER_ID, t81.NAME AS USER_NAME, 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 LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID ) t1 where id=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.CURRENCY_ID, t111.NAME AS CURRENCY_NAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t51.QUANTITY_COPY, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.USER_ID, t81.NAME AS USER_NAME, 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 LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID LEFT JOIN RES_CURRENCY t111 ON t1.CURRENCY_ID = t111.ID ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -31,6 +31,8 @@
<result property="userName" column="user_name" />
<result property="companyId" column="company_id" />
<result property="companyName" column="company_name" />
<result property="currencyId" column="currency_id" />
<result property="currencyName" column="currency_name" />
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
......@@ -38,6 +40,8 @@
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<association property="odooCompany" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_company" column="company_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_companyMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<association property="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"为懒加载配置 -->
<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"为懒加载配置 -->
<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>
......@@ -60,6 +64,13 @@
<include refid="Default" />
) t1
where company_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PURCHASE_REQUISITION_RES_CURRENCY_CURRENCY_ID] -->
<select id="selectByCurrencyId" resultMap="Purchase_requisitionResultMap">
select t1.* from (
<include refid="Default" />
) t1
where currency_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PURCHASE_REQUISITION_RES_SUPPLIER_VENDOR_ID] -->
<select id="selectByVendorId" resultMap="Purchase_requisitionResultMap">
......@@ -101,12 +112,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t51.QUANTITY_COPY, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.USER_ID, t81.NAME AS USER_NAME, 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 LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID
<![CDATA[ SELECT t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.CURRENCY_ID, t111.NAME AS CURRENCY_NAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t51.QUANTITY_COPY, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.USER_ID, t81.NAME AS USER_NAME, 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 LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID LEFT JOIN RES_CURRENCY t111 ON t1.CURRENCY_ID = t111.ID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t51.QUANTITY_COPY, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.USER_ID, t81.NAME AS USER_NAME, 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 LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID
<![CDATA[ SELECT t1.COMPANY_ID, t101.NAME AS COMPANY_NAME, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.CURRENCY_ID, t111.NAME AS CURRENCY_NAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORIGIN, t51.QUANTITY_COPY, t1.SCHEDULE_DATE, t1.STATE, t1.TYPE_ID, t51.NAME AS TYPE_ID_TEXT, t1.USER_ID, t81.NAME AS USER_NAME, 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 LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID LEFT JOIN RES_COMPANY t91 ON t1.COMPANY_ID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID LEFT JOIN RES_CURRENCY t111 ON t1.CURRENCY_ID = t111.ID
]]>
</sql>
</mapper>
......
......@@ -125025,6 +125025,39 @@
"data_length":100,
"key_field":0,
"major_field":0
},
{
"fieldname":"CURRENCY_ID" ,
"codename":"Currency_id",
"field_logic_name":"ID",
"entity_name":"Purchase_requisition",
"ref_de":"RES_CURRENCY",
"ref_field_name":"ID",
"relation_name":"DER1N_PURCHASE_REQUISITION_RES_CURRENCY_CURRENCY_ID",
"relation_codename":"Odoo_currency",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"major_field":0
},
{
"fieldname":"CURRENCY_NAME" ,
"codename":"Currency_name",
"field_logic_name":"币种",
"entity_name":"Purchase_requisition",
"ref_de":"RES_CURRENCY",
"ref_field_name":"NAME",
"relation_name":"DER1N_PURCHASE_REQUISITION_RES_CURRENCY_CURRENCY_ID",
"relation_codename":"Odoo_currency",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":3,
"key_field":0,
"major_field":0
}
],
"subEntitys":[
......@@ -125054,6 +125087,12 @@
"entity_name":"PURCHASE_REQUISITION",
"ref_entity_name":"RES_COMPANY"
},
{"name":"DER1N_PURCHASE_REQUISITION_RES_CURRENCY_CURRENCY_ID",
"relation_type":"DER1N",
"code_name":"Odoo_currency",
"entity_name":"PURCHASE_REQUISITION",
"ref_entity_name":"RES_CURRENCY"
},
{"name":"DER1N_PURCHASE_REQUISITION_RES_SUPPLIER_VENDOR_ID",
"relation_type":"DER1N",
"code_name":"Odoo_vendor",
......@@ -136504,6 +136543,12 @@
"entity_name":"PURCHASE_REPORT",
"ref_entity_name":"RES_CURRENCY"
},
{"name":"DER1N_PURCHASE_REQUISITION_RES_CURRENCY_CURRENCY_ID",
"relation_type":"DER1N",
"code_name":"Odoo_currency",
"entity_name":"PURCHASE_REQUISITION",
"ref_entity_name":"RES_CURRENCY"
},
{"name":"DER1N_RES_COMPANY__RES_CURRENCY__CURRENCY_ID",
"relation_type":"DER1N",
"code_name":"Odoo_currency",
......@@ -245,6 +245,24 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String companyName;
/**
* 属性 [CURRENCY_ID]
*
*/
@JSONField(name = "currency_id")
@JsonProperty("currency_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long currencyId;
/**
* 属性 [CURRENCY_NAME]
*
*/
@JSONField(name = "currency_name")
@JsonProperty("currency_name")
@Size(min = 0, max = 3, message = "内容长度必须小于等于[3]")
private String currencyName;
/**
* 设置 [NAME]
......@@ -358,6 +376,14 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
this.modify("company_id",companyId);
}
/**
* 设置 [CURRENCY_ID]
*/
public void setCurrencyId(Long currencyId){
this.currencyId = currencyId ;
this.modify("currency_id",currencyId);
}
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册