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

xignzi006 发布系统代码

上级 d166b51e
......@@ -156,14 +156,6 @@ public class Res_company extends EntityMP implements Serializable {
@JSONField(name = "account_dashboard_onboarding_state")
@JsonProperty("account_dashboard_onboarding_state")
private String accountDashboardOnboardingState;
/**
* 连接在一起的库存移动的日期变化传播的最小差值。
*/
@DEField(name = "propagation_minimum_delta")
@TableField(value = "propagation_minimum_delta")
@JSONField(name = "propagation_minimum_delta")
@JsonProperty("propagation_minimum_delta")
private Integer propagationMinimumDelta;
/**
* 创建时间
*/
......@@ -181,14 +173,6 @@ public class Res_company extends EntityMP implements Serializable {
@JSONField(name = "snailmail_color")
@JsonProperty("snailmail_color")
private Boolean snailmailColor;
/**
* 逾期追款消息
*/
@DEField(name = "overdue_msg")
@TableField(value = "overdue_msg")
@JSONField(name = "overdue_msg")
@JsonProperty("overdue_msg")
private String overdueMsg;
/**
* 城市
*/
......@@ -204,14 +188,6 @@ public class Res_company extends EntityMP implements Serializable {
@JSONField(name = "account_setup_coa_state")
@JsonProperty("account_setup_coa_state")
private String accountSetupCoaState;
/**
* 默认信息类型
*/
@DEField(name = "invoice_reference_type")
@TableField(value = "invoice_reference_type")
@JSONField(name = "invoice_reference_type")
@JsonProperty("invoice_reference_type")
private String invoiceReferenceType;
/**
* 预设邮件
*/
......@@ -366,14 +342,6 @@ public class Res_company extends EntityMP implements Serializable {
@JSONField(name = "nomenclature_id")
@JsonProperty("nomenclature_id")
private Integer nomenclatureId;
/**
* Google+账户
*/
@DEField(name = "social_googleplus")
@TableField(value = "social_googleplus")
@JSONField(name = "social_googleplus")
@JsonProperty("social_googleplus")
private String socialGoogleplus;
/**
* 入职支付收单机构的状态
*/
......@@ -487,14 +455,6 @@ public class Res_company extends EntityMP implements Serializable {
@JSONField(name = "manufacturing_lead")
@JsonProperty("manufacturing_lead")
private Double manufacturingLead;
/**
* 默认条款和条件
*/
@DEField(name = "sale_note")
@TableField(value = "sale_note")
@JSONField(name = "sale_note")
@JsonProperty("sale_note")
private String saleNote;
/**
* 再次验证金额
*/
......@@ -1248,14 +1208,6 @@ public class Res_company extends EntityMP implements Serializable {
this.modify("account_dashboard_onboarding_state",accountDashboardOnboardingState);
}
/**
* 设置 [连接在一起的库存移动的日期变化传播的最小差值。]
*/
public void setPropagationMinimumDelta(Integer propagationMinimumDelta){
this.propagationMinimumDelta = propagationMinimumDelta ;
this.modify("propagation_minimum_delta",propagationMinimumDelta);
}
/**
* 设置 [颜色]
*/
......@@ -1264,14 +1216,6 @@ public class Res_company extends EntityMP implements Serializable {
this.modify("snailmail_color",snailmailColor);
}
/**
* 设置 [逾期追款消息]
*/
public void setOverdueMsg(String overdueMsg){
this.overdueMsg = overdueMsg ;
this.modify("overdue_msg",overdueMsg);
}
/**
* 设置 [科目状态]
*/
......@@ -1280,14 +1224,6 @@ public class Res_company extends EntityMP implements Serializable {
this.modify("account_setup_coa_state",accountSetupCoaState);
}
/**
* 设置 [默认信息类型]
*/
public void setInvoiceReferenceType(String invoiceReferenceType){
this.invoiceReferenceType = invoiceReferenceType ;
this.modify("invoice_reference_type",invoiceReferenceType);
}
/**
* 设置 [使用anglo-saxon会计]
*/
......@@ -1402,14 +1338,6 @@ public class Res_company extends EntityMP implements Serializable {
this.modify("nomenclature_id",nomenclatureId);
}
/**
* 设置 [Google+账户]
*/
public void setSocialGoogleplus(String socialGoogleplus){
this.socialGoogleplus = socialGoogleplus ;
this.modify("social_googleplus",socialGoogleplus);
}
/**
* 设置 [入职支付收单机构的状态]
*/
......@@ -1514,14 +1442,6 @@ public class Res_company extends EntityMP implements Serializable {
this.modify("manufacturing_lead",manufacturingLead);
}
/**
* 设置 [默认条款和条件]
*/
public void setSaleNote(String saleNote){
this.saleNote = saleNote ;
this.modify("sale_note",saleNote);
}
/**
* 设置 [再次验证金额]
*/
......
......@@ -1696,13 +1696,6 @@ public class Res_config_settings extends EntityMP implements Serializable {
@JSONField(name = "module_pos_mercury")
@JsonProperty("module_pos_mercury")
private Boolean modulePosMercury;
/**
* 交流
*/
@TableField(exist = false)
@JSONField(name = "invoice_reference_type")
@JsonProperty("invoice_reference_type")
private String invoiceReferenceType;
/**
* 公司货币
*/
......@@ -1781,13 +1774,6 @@ public class Res_config_settings extends EntityMP implements Serializable {
@JSONField(name = "digest_id_text")
@JsonProperty("digest_id_text")
private String digestIdText;
/**
* 条款及条件
*/
@TableField(exist = false)
@JSONField(name = "sale_note")
@JsonProperty("sale_note")
private String saleNote;
/**
* 用作通过注册创建的新用户的模版
*/
......@@ -1921,13 +1907,6 @@ public class Res_config_settings extends EntityMP implements Serializable {
@JSONField(name = "purchase_tax_id")
@JsonProperty("purchase_tax_id")
private Long purchaseTaxId;
/**
* 传播的最小差值
*/
@TableField(exist = false)
@JSONField(name = "propagation_minimum_delta")
@JsonProperty("propagation_minimum_delta")
private Integer propagationMinimumDelta;
/**
* 默认报价有效期(日)
*/
......
......@@ -70,6 +70,55 @@ public class Res_supplier extends EntityMP implements Serializable {
@JSONField(name = "company_type")
@JsonProperty("company_type")
private String companyType;
/**
* 电话
*/
@TableField(value = "phone")
@JSONField(name = "phone")
@JsonProperty("phone")
private String phone;
/**
* 工作岗位
*/
@TableField(value = "ibizfunction")
@JSONField(name = "ibizfunction")
@JsonProperty("ibizfunction")
private String ibizfunction;
/**
* 手机
*/
@TableField(value = "mobile")
@JSONField(name = "mobile")
@JsonProperty("mobile")
private String mobile;
/**
* 税号
*/
@TableField(value = "vat")
@JSONField(name = "vat")
@JsonProperty("vat")
private String vat;
/**
* EMail
*/
@TableField(value = "email")
@JSONField(name = "email")
@JsonProperty("email")
private String email;
/**
* 网站网址
*/
@TableField(exist = false)
@JSONField(name = "website_url")
@JsonProperty("website_url")
private String websiteUrl;
/**
* 标签
*/
@TableField(exist = false)
@JSONField(name = "category_id")
@JsonProperty("category_id")
private String categoryId;
......@@ -89,6 +138,46 @@ public class Res_supplier extends EntityMP implements Serializable {
this.modify("type",type);
}
/**
* 设置 [电话]
*/
public void setPhone(String phone){
this.phone = phone ;
this.modify("phone",phone);
}
/**
* 设置 [工作岗位]
*/
public void setIbizfunction(String ibizfunction){
this.ibizfunction = ibizfunction ;
this.modify("ibizfunction",ibizfunction);
}
/**
* 设置 [手机]
*/
public void setMobile(String mobile){
this.mobile = mobile ;
this.modify("mobile",mobile);
}
/**
* 设置 [税号]
*/
public void setVat(String vat){
this.vat = vat ;
this.modify("vat",vat);
}
/**
* 设置 [EMail]
*/
public void setEmail(String email){
this.email = email ;
this.modify("email",email);
}
@Override
public Serializable getDefaultKey(boolean gen) {
......
......@@ -54,13 +54,6 @@ public class Res_companySearchContext extends QueryWrapperContext<Res_company> {
if(!ObjectUtils.isEmpty(this.n_account_setup_coa_state_eq)){
this.getSearchCond().eq("account_setup_coa_state", n_account_setup_coa_state_eq);
}
}
private String n_invoice_reference_type_eq;//[默认信息类型]
public void setN_invoice_reference_type_eq(String n_invoice_reference_type_eq) {
this.n_invoice_reference_type_eq = n_invoice_reference_type_eq;
if(!ObjectUtils.isEmpty(this.n_invoice_reference_type_eq)){
this.getSearchCond().eq("invoice_reference_type", n_invoice_reference_type_eq);
}
}
private String n_account_setup_bank_data_state_eq;//[有待被确认的银行数据步骤的状态]
public void setN_account_setup_bank_data_state_eq(String n_account_setup_bank_data_state_eq) {
......
......@@ -189,7 +189,6 @@ public class Res_config_settingsServiceImpl extends ServiceImpl<Res_config_setti
et.setOdooCompany(majorEntity);
odooCompany=majorEntity;
}
et.setInvoiceReferenceType(odooCompany.getInvoiceReferenceType());
et.setCompanyCurrencyId(odooCompany.getCurrencyId());
et.setTaxExigibility(odooCompany.getTaxExigibility());
et.setAccountBankReconciliationStart(odooCompany.getAccountBankReconciliationStart());
......@@ -199,7 +198,6 @@ public class Res_config_settingsServiceImpl extends ServiceImpl<Res_config_setti
et.setPaperformatId(odooCompany.getPaperformatId());
et.setPortalConfirmationSign(odooCompany.getPortalConfirmationSign());
et.setCurrencyId(odooCompany.getCurrencyId());
et.setSaleNote(odooCompany.getSaleNote());
et.setInvoiceIsPrint(odooCompany.getInvoiceIsPrint());
et.setResourceCalendarId(odooCompany.getResourceCalendarId());
et.setPoLock(odooCompany.getPoLock());
......@@ -215,7 +213,6 @@ public class Res_config_settingsServiceImpl extends ServiceImpl<Res_config_setti
et.setSecurityLead(odooCompany.getSecurityLead());
et.setExternalReportLayoutId(odooCompany.getExternalReportLayoutId());
et.setPurchaseTaxId(odooCompany.getAccountPurchaseTaxId());
et.setPropagationMinimumDelta(odooCompany.getPropagationMinimumDelta());
et.setQuotationValidityDays(odooCompany.getQuotationValidityDays());
et.setTaxCalculationRoundingMethod(odooCompany.getTaxCalculationRoundingMethod());
et.setCurrencyExchangeJournalId(odooCompany.getCurrencyExchangeJournalId());
......
......@@ -215,6 +215,9 @@ public class Res_partnerServiceImpl extends ServiceImpl<Res_partnerMapper, Res_p
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_rating.service.IRating_ratingService ratingRatingService;
@Autowired
@Lazy
......
......@@ -144,6 +144,56 @@ public class Purchase_requisition extends EntityMP implements Serializable {
@JSONField(name = "order_count")
@JsonProperty("order_count")
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;
/**
* 订购日期
*/
@DEField(name = "ordering_date")
@TableField(value = "ordering_date")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "ordering_date" , format="yyyy-MM-dd")
@JsonProperty("ordering_date")
private Timestamp orderingDate;
/**
* 申请截止日期
*/
@DEField(name = "date_end")
@TableField(value = "date_end")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "date_end" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("date_end")
private Timestamp dateEnd;
/**
* 交货日期
*/
@DEField(name = "schedule_date")
@TableField(value = "schedule_date")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "schedule_date" , format="yyyy-MM-dd")
@JsonProperty("schedule_date")
private Timestamp scheduleDate;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner odooVendor;
/**
*
......@@ -265,6 +315,68 @@ public class Purchase_requisition extends EntityMP implements Serializable {
this.modify("order_count",orderCount);
}
/**
* 设置 [供应商]
*/
public void setVendorId(Long vendorId){
this.vendorId = vendorId ;
this.modify("vendor_id",vendorId);
}
/**
* 设置 [订购日期]
*/
public void setOrderingDate(Timestamp orderingDate){
this.orderingDate = orderingDate ;
this.modify("ordering_date",orderingDate);
}
/**
* 格式化日期 [订购日期]
*/
public String formatOrderingDate(){
if (this.orderingDate == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(orderingDate);
}
/**
* 设置 [申请截止日期]
*/
public void setDateEnd(Timestamp dateEnd){
this.dateEnd = dateEnd ;
this.modify("date_end",dateEnd);
}
/**
* 格式化日期 [申请截止日期]
*/
public String formatDateEnd(){
if (this.dateEnd == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return sdf.format(dateEnd);
}
/**
* 设置 [交货日期]
*/
public void setScheduleDate(Timestamp scheduleDate){
this.scheduleDate = scheduleDate ;
this.modify("schedule_date",scheduleDate);
}
/**
* 格式化日期 [交货日期]
*/
public String formatScheduleDate(){
if (this.scheduleDate == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(scheduleDate);
}
@Override
public Serializable getDefaultKey(boolean gen) {
......
......@@ -83,6 +83,27 @@ public class Purchase_requisitionSearchContext extends QueryWrapperContext<Purch
this.getSearchCond().eq("activity_state", n_activity_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);
}
}
/**
* 启用快速搜索
......
......@@ -62,6 +62,8 @@ public interface Purchase_requisitionMapper extends BaseMapper<Purchase_requisit
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<Purchase_requisition> selectByVendorId(@Param("id") Serializable id) ;
List<Purchase_requisition> selectByCreateUid(@Param("id") Serializable id) ;
List<Purchase_requisition> selectByWriteUid(@Param("id") Serializable id) ;
......
......@@ -38,6 +38,8 @@ public interface IPurchase_requisitionService extends IService<Purchase_requisit
boolean save(Purchase_requisition et) ;
void saveBatch(List<Purchase_requisition> list) ;
Page<Purchase_requisition> searchDefault(Purchase_requisitionSearchContext context) ;
List<Purchase_requisition> selectByVendorId(Long id) ;
void removeByVendorId(Long id) ;
List<Purchase_requisition> selectByCreateUid(Long id) ;
void removeByCreateUid(Long id) ;
List<Purchase_requisition> selectByWriteUid(Long id) ;
......
......@@ -53,6 +53,9 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis
protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisition_lineService purchaseRequisitionLineService;
@Autowired
@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 int batchSize = 500;
......@@ -161,6 +164,16 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis
}
@Override
public List<Purchase_requisition> selectByVendorId(Long id) {
return baseMapper.selectByVendorId(id);
}
@Override
public void removeByVendorId(Long id) {
this.remove(new QueryWrapper<Purchase_requisition>().eq("vendor_id",id));
}
@Override
public List<Purchase_requisition> selectByCreateUid(Long id) {
return baseMapper.selectByCreateUid(id);
......@@ -198,6 +211,16 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis
* @param et
*/
private void fillParentData(Purchase_requisition et){
//实体关系[DER1N_PURCHASE_REQUISITION_RES_PARTNER_VENDOR_ID]
if(!ObjectUtils.isEmpty(et.getVendorId())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner odooVendor=et.getOdooVendor();
if(ObjectUtils.isEmpty(odooVendor)){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner majorEntity=resPartnerService.get(et.getVendorId());
et.setOdooVendor(majorEntity);
odooVendor=majorEntity;
}
et.setVendorIdText(odooVendor.getName());
}
//实体关系[DER1N_PURCHASE_REQUISITION_RES_USERS_CREATE_UID]
if(!ObjectUtils.isEmpty(et.getCreateUid())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate=et.getOdooCreate();
......
......@@ -218,7 +218,6 @@
<result property="moduleHrRecruitmentSurvey" column="module_hr_recruitment_survey" />
<result property="moduleMrpWorkorder" column="module_mrp_workorder" />
<result property="modulePosMercury" column="module_pos_mercury" />
<result property="invoiceReferenceType" column="invoice_reference_type" />
<result property="companyCurrencyId" column="company_currency_id" />
<result property="taxExigibility" column="tax_exigibility" />
<result property="writeUidText" column="write_uid_text" />
......@@ -230,7 +229,6 @@
<result property="portalConfirmationSign" column="portal_confirmation_sign" />
<result property="currencyId" column="currency_id" />
<result property="digestIdText" column="digest_id_text" />
<result property="saleNote" column="sale_note" />
<result property="authSignupTemplateUserIdText" column="auth_signup_template_user_id_text" />
<result property="invoiceIsPrint" column="invoice_is_print" />
<result property="depositDefaultProductIdText" column="deposit_default_product_id_text" />
......@@ -250,7 +248,6 @@
<result property="securityLead" column="security_lead" />
<result property="externalReportLayoutId" column="external_report_layout_id" />
<result property="purchaseTaxId" column="purchase_tax_id" />
<result property="propagationMinimumDelta" column="propagation_minimum_delta" />
<result property="quotationValidityDays" column="quotation_validity_days" />
<result property="taxCalculationRoundingMethod" column="tax_calculation_rounding_method" />
<result property="currencyExchangeJournalId" column="currency_exchange_journal_id" />
......
......@@ -5,13 +5,15 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select id="selectById" resultMap="Res_supplierResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.ID, t1.NAME, t1.TYPE FROM RES_PARTNER t1 ) t1 where id=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.EMAIL, t1.IBIZFUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1 ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="Res_supplierResultMap" type="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_supplier" autoMapping="true">
<id property="id" column="id" /><!--主键字段映射-->
<result property="companyType" column="company_type" />
<result property="websiteUrl" column="website_url" />
<result property="categoryId" column="category_id" />
</resultMap>
......@@ -28,12 +30,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.ID, t1.NAME, t1.TYPE FROM RES_PARTNER t1
<![CDATA[ SELECT t1.EMAIL, t1.IBIZFUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.ID, t1.NAME, t1.TYPE FROM RES_PARTNER t1
<![CDATA[ SELECT t1.EMAIL, t1.IBIZFUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1
]]>
</sql>
</mapper>
......
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select id="selectById" resultMap="Purchase_requisitionResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.ID, t1.NAME, t1.ORDER_COUNT, t1.ORIGIN, 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 ) t1 where id=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORDER_COUNT, t1.ORIGIN, t1.SCHEDULE_DATE, 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 ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -21,14 +21,28 @@
<result property="activityState" column="activity_state" />
<result property="activityDateDeadline" column="activity_date_deadline" />
<result property="orderCount" column="order_count" />
<result property="vendorId" column="vendor_id" />
<result property="vendorIdText" column="vendor_id_text" />
<result property="orderingDate" column="ordering_date" />
<result property="dateEnd" column="date_end" />
<result property="scheduleDate" column="schedule_date" />
<!--通过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>
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<association property="odooCreate" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="create_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<association property="odooWrite" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="write_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PURCHASE_REQUISITION_RES_PARTNER_VENDOR_ID] -->
<select id="selectByVendorId" resultMap="Purchase_requisitionResultMap">
select t1.* from (
<include refid="Default" />
) t1
where vendor_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PURCHASE_REQUISITION_RES_USERS_CREATE_UID] -->
<select id="selectByCreateUid" resultMap="Purchase_requisitionResultMap">
select t1.* from (
......@@ -55,12 +69,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.ID, t1.NAME, t1.ORDER_COUNT, t1.ORIGIN, 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
<![CDATA[ SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORDER_COUNT, t1.ORIGIN, t1.SCHEDULE_DATE, 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
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.ID, t1.NAME, t1.ORDER_COUNT, t1.ORIGIN, 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
<![CDATA[ SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORDER_COUNT, t1.ORIGIN, t1.SCHEDULE_DATE, 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
]]>
</sql>
</mapper>
......
......@@ -123966,6 +123966,75 @@
"data_type":"INT",
"key_field":0,
"major_field":0
},
{
"fieldname":"VENDOR_ID" ,
"codename":"Vendor_id",
"field_logic_name":"供应商",
"entity_name":"Purchase_requisition",
"ref_de":"RES_PARTNER",
"ref_field_name":"ID",
"relation_name":"DER1N_PURCHASE_REQUISITION_RES_PARTNER_VENDOR_ID",
"relation_codename":"Odoo_vendor",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"major_field":0
},
{
"fieldname":"VENDOR_ID_TEXT" ,
"codename":"Vendor_id_text",
"field_logic_name":"供应商",
"entity_name":"Purchase_requisition",
"ref_de":"RES_PARTNER",
"ref_field_name":"NAME",
"relation_name":"DER1N_PURCHASE_REQUISITION_RES_PARTNER_VENDOR_ID",
"relation_codename":"Odoo_vendor",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"major_field":0
},
{
"fieldname":"ORDERING_DATE" ,
"codename":"Ordering_date",
"field_logic_name":"订购日期",
"entity_name":"Purchase_requisition",
"field_type":"DATE",
"nullable":1,
"physical_field":1,
"data_type":"DATETIME",
"key_field":0,
"major_field":0
},
{
"fieldname":"DATE_END" ,
"codename":"Date_end",
"field_logic_name":"申请截止日期",
"entity_name":"Purchase_requisition",
"field_type":"DATETIME",
"nullable":1,
"physical_field":1,
"data_type":"DATETIME",
"key_field":0,
"major_field":0
},
{
"fieldname":"SCHEDULE_DATE" ,
"codename":"Schedule_date",
"field_logic_name":"交货日期",
"entity_name":"Purchase_requisition",
"field_type":"DATE",
"nullable":1,
"physical_field":1,
"data_type":"DATETIME",
"key_field":0,
"major_field":0
}
],
"subEntitys":[
......@@ -123977,6 +124046,12 @@
}
],
"parentEntitys":[
{"name":"DER1N_PURCHASE_REQUISITION_RES_PARTNER_VENDOR_ID",
"relation_type":"DER1N",
"code_name":"Odoo_vendor",
"entity_name":"PURCHASE_REQUISITION",
"ref_entity_name":"RES_PARTNER"
},
{"name":"DER1N_PURCHASE_REQUISITION_RES_USERS_CREATE_UID",
"relation_type":"DER1N",
"code_name":"Odoo_create",
......@@ -128116,18 +128191,6 @@
"major_field":0
},
{
"fieldname":"PROPAGATION_MINIMUM_DELTA" ,
"codename":"Propagation_minimum_delta",
"field_logic_name":"连接在一起的库存移动的日期变化传播的最小差值。",
"entity_name":"Res_company",
"field_type":"INT",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"key_field":0,
"major_field":0
},
{
"fieldname":"CREATE_DATE" ,
"codename":"Create_date",
"field_logic_name":"创建时间",
......@@ -128153,19 +128216,6 @@
"major_field":0
},
{
"fieldname":"OVERDUE_MSG" ,
"codename":"Overdue_msg",
"field_logic_name":"逾期追款消息",
"entity_name":"Res_company",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":1,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"major_field":0
},
{
"fieldname":"CITY" ,
"codename":"City",
"field_logic_name":"城市",
......@@ -128193,20 +128243,6 @@
"major_field":0
},
{
"fieldname":"INVOICE_REFERENCE_TYPE" ,
"codename":"Invoice_reference_type",
"field_logic_name":"默认信息类型",
"entity_name":"Res_company",
"field_type":"SSCODELIST",
"dict":"RES_COMPANY__INVOICE_REFERENCE_TYPE",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":200,
"key_field":0,
"major_field":0
},
{
"fieldname":"CATCHALL" ,
"codename":"Catchall",
"field_logic_name":"预设邮件",
......@@ -128459,19 +128495,6 @@
"major_field":0
},
{
"fieldname":"SOCIAL_GOOGLEPLUS" ,
"codename":"Social_googleplus",
"field_logic_name":"Google+账户",
"entity_name":"Res_company",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"major_field":0
},
{
"fieldname":"PAYMENT_ACQUIRER_ONBOARDING_STATE" ,
"codename":"Payment_acquirer_onboarding_state",
"field_logic_name":"入职支付收单机构的状态",
......@@ -128659,19 +128682,6 @@
"major_field":0
},
{
"fieldname":"SALE_NOTE" ,
"codename":"Sale_note",
"field_logic_name":"默认条款和条件",
"entity_name":"Res_company",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":1,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"major_field":0
},
{
"fieldname":"PO_DOUBLE_VALIDATION_AMOUNT" ,
"codename":"Po_double_validation_amount",
"field_logic_name":"再次验证金额",
......@@ -133323,24 +133333,6 @@
"major_field":0
},
{
"fieldname":"INVOICE_REFERENCE_TYPE" ,
"codename":"Invoice_reference_type",
"field_logic_name":"交流",
"entity_name":"Res_config_settings",
"ref_de":"RES_COMPANY",
"ref_field_name":"INVOICE_REFERENCE_TYPE",
"relation_name":"DER1N_RES_CONFIG_SETTINGS__RES_COMPANY__COMPANY_ID",
"relation_codename":"Odoo_company",
"field_type":"PICKUPDATA",
"dict":"RES_COMPANY__INVOICE_REFERENCE_TYPE",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":200,
"key_field":0,
"major_field":0
},
{
"fieldname":"COMPANY_CURRENCY_ID" ,
"codename":"Company_currency_id",
"field_logic_name":"公司货币",
......@@ -133519,23 +133511,6 @@
"major_field":0
},
{
"fieldname":"SALE_NOTE" ,
"codename":"Sale_note",
"field_logic_name":"条款及条件",
"entity_name":"Res_config_settings",
"ref_de":"RES_COMPANY",
"ref_field_name":"SALE_NOTE",
"relation_name":"DER1N_RES_CONFIG_SETTINGS__RES_COMPANY__COMPANY_ID",
"relation_codename":"Odoo_company",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":0,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"major_field":0
},
{
"fieldname":"AUTH_SIGNUP_TEMPLATE_USER_ID_TEXT" ,
"codename":"Auth_signup_template_user_id_text",
"field_logic_name":"用作通过注册创建的新用户的模版",
......@@ -133850,22 +133825,6 @@
"major_field":0
},
{
"fieldname":"PROPAGATION_MINIMUM_DELTA" ,
"codename":"Propagation_minimum_delta",
"field_logic_name":"传播的最小差值",
"entity_name":"Res_config_settings",
"ref_de":"RES_COMPANY",
"ref_field_name":"PROPAGATION_MINIMUM_DELTA",
"relation_name":"DER1N_RES_CONFIG_SETTINGS__RES_COMPANY__COMPANY_ID",
"relation_codename":"Odoo_company",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":0,
"data_type":"INT",
"key_field":0,
"major_field":0
},
{
"fieldname":"QUOTATION_VALIDITY_DAYS" ,
"codename":"Quotation_validity_days",
"field_logic_name":"默认报价有效期(日)",
......@@ -138945,6 +138904,12 @@
"entity_name":"PURCHASE_REPORT",
"ref_entity_name":"RES_PARTNER"
},
{"name":"DER1N_PURCHASE_REQUISITION_RES_PARTNER_VENDOR_ID",
"relation_type":"DER1N",
"code_name":"Odoo_vendor",
"entity_name":"PURCHASE_REQUISITION",
"ref_entity_name":"RES_PARTNER"
},
{"name":"DER1N_RATING_RATING__RES_PARTNER__PARTNER_ID",
"relation_type":"DER1N",
"code_name":"Odoo_partner",
......@@ -140642,6 +140607,97 @@
"data_length":200,
"key_field":0,
"major_field":0
},
{
"fieldname":"PHONE" ,
"codename":"Phone",
"field_logic_name":"电话",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"major_field":0
},
{
"fieldname":"IBIZFUNCTION" ,
"codename":"Ibizfunction",
"field_logic_name":"工作岗位",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"major_field":0
},
{
"fieldname":"MOBILE" ,
"codename":"Mobile",
"field_logic_name":"手机",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"major_field":0
},
{
"fieldname":"VAT" ,
"codename":"Vat",
"field_logic_name":"税号",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"major_field":0
},
{
"fieldname":"EMAIL" ,
"codename":"Email",
"field_logic_name":"EMail",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"major_field":0
},
{
"fieldname":"WEBSITE_URL" ,
"codename":"Website_url",
"field_logic_name":"网站网址",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"major_field":0
},
{
"fieldname":"CATEGORY_ID" ,
"codename":"Category_id",
"field_logic_name":"标签",
"entity_name":"Res_supplier",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":0,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"major_field":0
}
],
"subEntitys":[
......@@ -160,14 +160,6 @@ public class Res_companyDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String accountDashboardOnboardingState;
/**
* 属性 [PROPAGATION_MINIMUM_DELTA]
*
*/
@JSONField(name = "propagation_minimum_delta")
@JsonProperty("propagation_minimum_delta")
private Integer propagationMinimumDelta;
/**
* 属性 [CREATE_DATE]
*
......@@ -185,15 +177,6 @@ public class Res_companyDTO extends DTOBase implements Serializable {
@JsonProperty("snailmail_color")
private Boolean snailmailColor;
/**
* 属性 [OVERDUE_MSG]
*
*/
@JSONField(name = "overdue_msg")
@JsonProperty("overdue_msg")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String overdueMsg;
/**
* 属性 [CITY]
*
......@@ -212,15 +195,6 @@ public class Res_companyDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String accountSetupCoaState;
/**
* 属性 [INVOICE_REFERENCE_TYPE]
*
*/
@JSONField(name = "invoice_reference_type")
@JsonProperty("invoice_reference_type")
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String invoiceReferenceType;
/**
* 属性 [CATCHALL]
*
......@@ -394,15 +368,6 @@ public class Res_companyDTO extends DTOBase implements Serializable {
@JsonProperty("nomenclature_id")
private Integer nomenclatureId;
/**
* 属性 [SOCIAL_GOOGLEPLUS]
*
*/
@JSONField(name = "social_googleplus")
@JsonProperty("social_googleplus")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String socialGoogleplus;
/**
* 属性 [PAYMENT_ACQUIRER_ONBOARDING_STATE]
*
......@@ -528,15 +493,6 @@ public class Res_companyDTO extends DTOBase implements Serializable {
@NotNull(message = "[制造提前期(日)]不允许为空!")
private Double manufacturingLead;
/**
* 属性 [SALE_NOTE]
*
*/
@JSONField(name = "sale_note")
@JsonProperty("sale_note")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String saleNote;
/**
* 属性 [PO_DOUBLE_VALIDATION_AMOUNT]
*
......@@ -1225,14 +1181,6 @@ public class Res_companyDTO extends DTOBase implements Serializable {
this.modify("account_dashboard_onboarding_state",accountDashboardOnboardingState);
}
/**
* 设置 [PROPAGATION_MINIMUM_DELTA]
*/
public void setPropagationMinimumDelta(Integer propagationMinimumDelta){
this.propagationMinimumDelta = propagationMinimumDelta ;
this.modify("propagation_minimum_delta",propagationMinimumDelta);
}
/**
* 设置 [SNAILMAIL_COLOR]
*/
......@@ -1241,14 +1189,6 @@ public class Res_companyDTO extends DTOBase implements Serializable {
this.modify("snailmail_color",snailmailColor);
}
/**
* 设置 [OVERDUE_MSG]
*/
public void setOverdueMsg(String overdueMsg){
this.overdueMsg = overdueMsg ;
this.modify("overdue_msg",overdueMsg);
}
/**
* 设置 [ACCOUNT_SETUP_COA_STATE]
*/
......@@ -1257,14 +1197,6 @@ public class Res_companyDTO extends DTOBase implements Serializable {
this.modify("account_setup_coa_state",accountSetupCoaState);
}
/**
* 设置 [INVOICE_REFERENCE_TYPE]
*/
public void setInvoiceReferenceType(String invoiceReferenceType){
this.invoiceReferenceType = invoiceReferenceType ;
this.modify("invoice_reference_type",invoiceReferenceType);
}
/**
* 设置 [ANGLO_SAXON_ACCOUNTING]
*/
......@@ -1369,14 +1301,6 @@ public class Res_companyDTO extends DTOBase implements Serializable {
this.modify("nomenclature_id",nomenclatureId);
}
/**
* 设置 [SOCIAL_GOOGLEPLUS]
*/
public void setSocialGoogleplus(String socialGoogleplus){
this.socialGoogleplus = socialGoogleplus ;
this.modify("social_googleplus",socialGoogleplus);
}
/**
* 设置 [PAYMENT_ACQUIRER_ONBOARDING_STATE]
*/
......@@ -1481,14 +1405,6 @@ public class Res_companyDTO extends DTOBase implements Serializable {
this.modify("manufacturing_lead",manufacturingLead);
}
/**
* 设置 [SALE_NOTE]
*/
public void setSaleNote(String saleNote){
this.saleNote = saleNote ;
this.modify("sale_note",saleNote);
}
/**
* 设置 [PO_DOUBLE_VALIDATION_AMOUNT]
*/
......
......@@ -1767,15 +1767,6 @@ public class Res_config_settingsDTO extends DTOBase implements Serializable {
@JsonProperty("module_pos_mercury")
private Boolean modulePosMercury;
/**
* 属性 [INVOICE_REFERENCE_TYPE]
*
*/
@JSONField(name = "invoice_reference_type")
@JsonProperty("invoice_reference_type")
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String invoiceReferenceType;
/**
* 属性 [COMPANY_CURRENCY_ID]
*
......@@ -1871,15 +1862,6 @@ public class Res_config_settingsDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String digestIdText;
/**
* 属性 [SALE_NOTE]
*
*/
@JSONField(name = "sale_note")
@JsonProperty("sale_note")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String saleNote;
/**
* 属性 [AUTH_SIGNUP_TEMPLATE_USER_ID_TEXT]
*
......@@ -2042,14 +2024,6 @@ public class Res_config_settingsDTO extends DTOBase implements Serializable {
@JsonSerialize(using = ToStringSerializer.class)
private Long purchaseTaxId;
/**
* 属性 [PROPAGATION_MINIMUM_DELTA]
*
*/
@JSONField(name = "propagation_minimum_delta")
@JsonProperty("propagation_minimum_delta")
private Integer propagationMinimumDelta;
/**
* 属性 [QUOTATION_VALIDITY_DAYS]
*
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册