Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz商业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz商业套件
iBiz商业中心
提交
b75ee1b1
提交
b75ee1b1
编写于
10月 15, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 发布系统代码
上级
ba2d6387
变更
9
展开全部
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
110 行增加
和
3 行删除
+110
-3
Purchase_order.java
...nesscentral/core/odoo_purchase/domain/Purchase_order.java
+24
-0
Purchase_orderSearchContext.java
...ore/odoo_purchase/filter/Purchase_orderSearchContext.java
+7
-0
Purchase_orderMapper.java
...ntral/core/odoo_purchase/mapper/Purchase_orderMapper.java
+2
-0
IPurchase_orderService.java
...al/core/odoo_purchase/service/IPurchase_orderService.java
+2
-0
Purchase_orderServiceImpl.java
...odoo_purchase/service/impl/Purchase_orderServiceImpl.java
+13
-0
Purchase_requisitionServiceImpl.java
...urchase/service/impl/Purchase_requisitionServiceImpl.java
+3
-0
Purchase_orderMapper.xml
...per/odoo_purchase/purchase_order/Purchase_orderMapper.xml
+13
-3
iBizBusinessCentral.json
...core/src/main/resources/sysmodel/iBizBusinessCentral.json
+29
-0
Purchase_orderDTO.java
...n/ibizlab/businesscentral/core/dto/Purchase_orderDTO.java
+17
-0
未找到文件。
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/domain/Purchase_order.java
浏览文件 @
b75ee1b1
...
...
@@ -573,6 +573,22 @@ public class Purchase_order extends EntityMP implements Serializable {
@JSONField
(
name
=
"picking_type_id"
)
@JsonProperty
(
"picking_type_id"
)
private
Long
pickingTypeId
;
/**
* ID
*/
@DEField
(
name
=
"requisition_id"
)
@TableField
(
value
=
"requisition_id"
)
@JSONField
(
name
=
"requisition_id"
)
@JsonProperty
(
"requisition_id"
)
private
Long
requisitionId
;
/**
*
*/
@JsonIgnore
@JSONField
(
serialize
=
false
)
@TableField
(
exist
=
false
)
private
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
domain
.
Purchase_requisition
odooRequisition
;
/**
*
...
...
@@ -902,6 +918,14 @@ public class Purchase_order extends EntityMP implements Serializable {
this
.
modify
(
"picking_type_id"
,
pickingTypeId
);
}
/**
* 设置 [ID]
*/
public
void
setRequisitionId
(
Long
requisitionId
){
this
.
requisitionId
=
requisitionId
;
this
.
modify
(
"requisition_id"
,
requisitionId
);
}
@Override
public
Serializable
getDefaultKey
(
boolean
gen
)
{
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/filter/Purchase_orderSearchContext.java
浏览文件 @
b75ee1b1
...
...
@@ -293,6 +293,13 @@ public class Purchase_orderSearchContext extends QueryWrapperContext<Purchase_or
this
.
getSearchCond
().
eq
(
"picking_type_id"
,
n_picking_type_id_eq
);
}
}
private
Long
n_requisition_id_eq
;
//[ID]
public
void
setN_requisition_id_eq
(
Long
n_requisition_id_eq
)
{
this
.
n_requisition_id_eq
=
n_requisition_id_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_requisition_id_eq
)){
this
.
getSearchCond
().
eq
(
"requisition_id"
,
n_requisition_id_eq
);
}
}
/**
* 启用快速搜索
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/mapper/Purchase_orderMapper.java
浏览文件 @
b75ee1b1
...
...
@@ -62,6 +62,8 @@ public interface Purchase_orderMapper extends BaseMapper<Purchase_order>{
@Delete
(
"${sql}"
)
boolean
deleteBySQL
(
@Param
(
"sql"
)
String
sql
,
@Param
(
"et"
)
Map
param
);
List
<
Purchase_order
>
selectByRequisitionId
(
@Param
(
"id"
)
Serializable
id
)
;
List
<
Purchase_order
>
selectByFiscalPositionId
(
@Param
(
"id"
)
Serializable
id
)
;
List
<
Purchase_order
>
selectByIncotermId
(
@Param
(
"id"
)
Serializable
id
)
;
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/IPurchase_orderService.java
浏览文件 @
b75ee1b1
...
...
@@ -38,6 +38,8 @@ public interface IPurchase_orderService extends IService<Purchase_order>{
boolean
save
(
Purchase_order
et
)
;
void
saveBatch
(
List
<
Purchase_order
>
list
)
;
Page
<
Purchase_order
>
searchDefault
(
Purchase_orderSearchContext
context
)
;
List
<
Purchase_order
>
selectByRequisitionId
(
Long
id
)
;
void
removeByRequisitionId
(
Long
id
)
;
List
<
Purchase_order
>
selectByFiscalPositionId
(
Long
id
)
;
void
removeByFiscalPositionId
(
Long
id
)
;
List
<
Purchase_order
>
selectByIncotermId
(
Long
id
)
;
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/impl/Purchase_orderServiceImpl.java
浏览文件 @
b75ee1b1
...
...
@@ -59,6 +59,9 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper,
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_order_lineService
purchaseOrderLineService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
purchaseRequisitionService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_account
.
service
.
IAccount_fiscal_positionService
accountFiscalPositionService
;
@Autowired
@Lazy
...
...
@@ -188,6 +191,16 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper,
}
@Override
public
List
<
Purchase_order
>
selectByRequisitionId
(
Long
id
)
{
return
baseMapper
.
selectByRequisitionId
(
id
);
}
@Override
public
void
removeByRequisitionId
(
Long
id
)
{
this
.
remove
(
new
QueryWrapper
<
Purchase_order
>().
eq
(
"requisition_id"
,
id
));
}
@Override
public
List
<
Purchase_order
>
selectByFiscalPositionId
(
Long
id
)
{
return
baseMapper
.
selectByFiscalPositionId
(
id
);
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/impl/Purchase_requisitionServiceImpl.java
浏览文件 @
b75ee1b1
...
...
@@ -48,6 +48,9 @@ import org.springframework.util.StringUtils;
@Service
(
"Purchase_requisitionServiceImpl"
)
public
class
Purchase_requisitionServiceImpl
extends
ServiceImpl
<
Purchase_requisitionMapper
,
Purchase_requisition
>
implements
IPurchase_requisitionService
{
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_orderService
purchaseOrderService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisition_lineService
purchaseRequisitionLineService
;
...
...
businesscentral-core/src/main/resources/mapper/odoo_purchase/purchase_order/Purchase_orderMapper.xml
浏览文件 @
b75ee1b1
此差异已折叠。
点击以展开。
businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json
浏览文件 @
b75ee1b1
...
...
@@ -122057,6 +122057,23 @@
"data_type":"BIGINT",
"key_field":0,
"major_field":0
},
{
"fieldname":"REQUISITION_ID" ,
"codename":"Requisition_id",
"field_logic_name":"ID",
"entity_name":"Purchase_order",
"ref_de":"PURCHASE_REQUISITION",
"ref_field_name":"ID",
"relation_name":"DER1N_PURCHASE_ORDER_PURCHASE_REQUISITION_REQUISITION_ID",
"relation_codename":"Odoo_requisition",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"data_length":20,
"key_field":0,
"major_field":0
}
],
"subEntitys":[
...
...
@@ -122080,6 +122097,12 @@
}
],
"parentEntitys":[
{"name":"DER1N_PURCHASE_ORDER_PURCHASE_REQUISITION_REQUISITION_ID",
"relation_type":"DER1N",
"code_name":"Odoo_requisition",
"entity_name":"PURCHASE_ORDER",
"ref_entity_name":"PURCHASE_REQUISITION"
},
{"name":"DER1N_PURCHASE_ORDER__ACCOUNT_FISCAL_POSITION__FISCAL_POSITION_ID",
"relation_type":"DER1N",
"code_name":"Odoo_fiscal_position",
...
...
@@ -123966,6 +123989,12 @@
}
],
"subEntitys":[
{"name":"DER1N_PURCHASE_ORDER_PURCHASE_REQUISITION_REQUISITION_ID",
"relation_type":"DER1N",
"code_name":"Odoo_requisition",
"entity_name":"PURCHASE_ORDER",
"ref_entity_name":"PURCHASE_REQUISITION"
},
{"name":"DER1N_PURCHASE_REQUISITION_LINE_PURCHASE_REQUISITION_REQUISITION_ID",
"relation_type":"DER1N",
"code_name":"Requisition",
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Purchase_orderDTO.java
浏览文件 @
b75ee1b1
...
...
@@ -655,6 +655,15 @@ public class Purchase_orderDTO extends DTOBase implements Serializable {
@NotNull
(
message
=
"[交货到]不允许为空!"
)
private
Long
pickingTypeId
;
/**
* 属性 [REQUISITION_ID]
*
*/
@JSONField
(
name
=
"requisition_id"
)
@JsonProperty
(
"requisition_id"
)
@JsonSerialize
(
using
=
ToStringSerializer
.
class
)
private
Long
requisitionId
;
/**
* 设置 [ACCESS_TOKEN]
...
...
@@ -864,6 +873,14 @@ public class Purchase_orderDTO extends DTOBase implements Serializable {
this
.
modify
(
"picking_type_id"
,
pickingTypeId
);
}
/**
* 设置 [REQUISITION_ID]
*/
public
void
setRequisitionId
(
Long
requisitionId
){
this
.
requisitionId
=
requisitionId
;
this
.
modify
(
"requisition_id"
,
requisitionId
);
}
}
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录