Skip to content

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

xignzi006 发布系统代码

上级 19dbccad
显示空白字符变更
内嵌 并排
正在显示 包含 3 行增加 和 159 行删除
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/domain/Purchase_requisition.java
浏览文件 @ e190adb9
...@@ -112,23 +112,6 @@ public class Purchase_requisition extends EntityMP implements Serializable { ...@@ -112,23 +112,6 @@ public class Purchase_requisition extends EntityMP implements Serializable {
@JSONField(name = "__last_update" , format="yyyy-MM-dd HH:mm:ss") @JSONField(name = "__last_update" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("__last_update") @JsonProperty("__last_update")
private Timestamp LastUpdate; private Timestamp LastUpdate;
/**
* 活动状态
*/
@DEField(name = "activity_state")
@TableField(value = "activity_state")
@JSONField(name = "activity_state")
@JsonProperty("activity_state")
private String activityState;
/**
* 下一活动截止日期
*/
@DEField(name = "activity_date_deadline")
@TableField(value = "activity_date_deadline")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "activity_date_deadline" , format="yyyy-MM-dd")
@JsonProperty("activity_date_deadline")
private Timestamp activityDateDeadline;
/** /**
* 源单据 * 源单据
*/ */
...@@ -136,14 +119,6 @@ public class Purchase_requisition extends EntityMP implements Serializable { ...@@ -136,14 +119,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 = "order_count")
@TableField(value = "order_count")
@JSONField(name = "order_count")
@JsonProperty("order_count")
private Integer orderCount;
/** /**
* 供应商 * 供应商
*/ */
...@@ -296,32 +271,6 @@ public class Purchase_requisition extends EntityMP implements Serializable { ...@@ -296,32 +271,6 @@ public class Purchase_requisition extends EntityMP implements Serializable {
this.modify("create_uid",createUid); this.modify("create_uid",createUid);
} }
/**
* 设置 [活动状态]
*/
public void setActivityState(String activityState){
this.activityState = activityState ;
this.modify("activity_state",activityState);
}
/**
* 设置 [下一活动截止日期]
*/
public void setActivityDateDeadline(Timestamp activityDateDeadline){
this.activityDateDeadline = activityDateDeadline ;
this.modify("activity_date_deadline",activityDateDeadline);
}
/**
* 格式化日期 [下一活动截止日期]
*/
public String formatActivityDateDeadline(){
if (this.activityDateDeadline == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(activityDateDeadline);
}
/** /**
* 设置 [源单据] * 设置 [源单据]
*/ */
...@@ -330,14 +279,6 @@ public class Purchase_requisition extends EntityMP implements Serializable { ...@@ -330,14 +279,6 @@ public class Purchase_requisition extends EntityMP implements Serializable {
this.modify("origin",origin); this.modify("origin",origin);
} }
/**
* 设置 [采购订单数]
*/
public void setOrderCount(Integer orderCount){
this.orderCount = orderCount ;
this.modify("order_count",orderCount);
}
/** /**
* 设置 [供应商] * 设置 [供应商]
*/ */
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/filter/Purchase_requisitionSearchContext.java
浏览文件 @ e190adb9
...@@ -75,13 +75,6 @@ public class Purchase_requisitionSearchContext extends QueryWrapperContext<Purch ...@@ -75,13 +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 String n_activity_state_eq;//[活动状态]
public void setN_activity_state_eq(String n_activity_state_eq) {
this.n_activity_state_eq = n_activity_state_eq;
if(!ObjectUtils.isEmpty(this.n_activity_state_eq)){
this.getSearchCond().eq("activity_state", n_activity_state_eq);
}
} }
private Long n_vendor_id_eq;//[供应商] private Long n_vendor_id_eq;//[供应商]
public void setN_vendor_id_eq(Long n_vendor_id_eq) { public void setN_vendor_id_eq(Long n_vendor_id_eq) {
......
businesscentral-core/src/main/resources/mapper/odoo_purchase/purchase_requisition/Purchase_requisitionMapper.xml
浏览文件 @ e190adb9
...@@ -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.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.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.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}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -18,9 +18,6 @@ ...@@ -18,9 +18,6 @@
<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="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="vendorId" column="vendor_id" />
<result property="vendorIdText" column="vendor_id_text" /> <result property="vendorIdText" column="vendor_id_text" />
<result property="orderingDate" column="ordering_date" /> <result property="orderingDate" column="ordering_date" />
...@@ -80,12 +77,12 @@ ...@@ -80,12 +77,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql"> <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.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORDER_COUNT, t1.ORIGIN, t1.SCHEDULE_DATE, 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.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
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="postgresql"> <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.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORDER_COUNT, t1.ORIGIN, t1.SCHEDULE_DATE, 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.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
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json
浏览文件 @ e190adb9
...@@ -123835,31 +123835,6 @@ ...@@ -123835,31 +123835,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"ACTIVITY_STATE" ,
"codename":"Activity_state",
"field_logic_name":"活动状态",
"entity_name":"Purchase_requisition",
"field_type":"SSCODELIST",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":60,
"key_field":0,
"major_field":0
},
{
"fieldname":"ACTIVITY_DATE_DEADLINE" ,
"codename":"Activity_date_deadline",
"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":"ORIGIN" , "fieldname":"ORIGIN" ,
"codename":"Origin", "codename":"Origin",
"field_logic_name":"源单据", "field_logic_name":"源单据",
...@@ -123873,18 +123848,6 @@ ...@@ -123873,18 +123848,6 @@
"major_field":0 "major_field":0
}, },
{ {
"fieldname":"ORDER_COUNT" ,
"codename":"Order_count",
"field_logic_name":"采购订单数",
"entity_name":"Purchase_requisition",
"field_type":"INT",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"key_field":0,
"major_field":0
},
{
"fieldname":"VENDOR_ID" , "fieldname":"VENDOR_ID" ,
"codename":"Vendor_id", "codename":"Vendor_id",
"field_logic_name":"供应商", "field_logic_name":"供应商",
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Purchase_requisitionDTO.java
浏览文件 @ e190adb9
...@@ -111,24 +111,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable { ...@@ -111,24 +111,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
@JsonProperty("__last_update") @JsonProperty("__last_update")
private Timestamp LastUpdate; private Timestamp LastUpdate;
/**
* 属性 [ACTIVITY_STATE]
*
*/
@JSONField(name = "activity_state")
@JsonProperty("activity_state")
@Size(min = 0, max = 60, message = "内容长度必须小于等于[60]")
private String activityState;
/**
* 属性 [ACTIVITY_DATE_DEADLINE]
*
*/
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "activity_date_deadline" , format="yyyy-MM-dd")
@JsonProperty("activity_date_deadline")
private Timestamp activityDateDeadline;
/** /**
* 属性 [ORIGIN] * 属性 [ORIGIN]
* *
...@@ -138,14 +120,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable { ...@@ -138,14 +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;
/**
* 属性 [ORDER_COUNT]
*
*/
@JSONField(name = "order_count")
@JsonProperty("order_count")
private Integer orderCount;
/** /**
* 属性 [VENDOR_ID] * 属性 [VENDOR_ID]
* *
...@@ -250,22 +224,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable { ...@@ -250,22 +224,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
this.modify("create_uid",createUid); this.modify("create_uid",createUid);
} }
/**
* 设置 [ACTIVITY_STATE]
*/
public void setActivityState(String activityState){
this.activityState = activityState ;
this.modify("activity_state",activityState);
}
/**
* 设置 [ACTIVITY_DATE_DEADLINE]
*/
public void setActivityDateDeadline(Timestamp activityDateDeadline){
this.activityDateDeadline = activityDateDeadline ;
this.modify("activity_date_deadline",activityDateDeadline);
}
/** /**
* 设置 [ORIGIN] * 设置 [ORIGIN]
*/ */
...@@ -274,14 +232,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable { ...@@ -274,14 +232,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
this.modify("origin",origin); this.modify("origin",origin);
} }
/**
* 设置 [ORDER_COUNT]
*/
public void setOrderCount(Integer orderCount){
this.orderCount = orderCount ;
this.modify("order_count",orderCount);
}
/** /**
* 设置 [VENDOR_ID] * 设置 [VENDOR_ID]
*/ */
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或