Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz商业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz商业套件
iBiz商业中心
提交
df01222b
提交
df01222b
编写于
11月 04, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 发布系统代码 [Spring Boot,采购]
上级
8ecf4227
变更
14
隐藏空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
257 行增加
和
95 行删除
+257
-95
purchase-requisition-lines.ts
.../purchase-requisition-lines/purchase-requisition-lines.ts
+146
-9
purchase-requisition-line-service-base.ts
...equisition-line/purchase-requisition-line-service-base.ts
+42
-15
Dockerfile
...ral-app/businesscentral-app-hr/src/main/docker/Dockerfile
+1
-1
businesscentral-app-hr.yaml
...entral-app-hr/src/main/docker/businesscentral-app-hr.yaml
+1
-17
application-hr-prod.yml
...central-app-hr/src/main/resources/application-hr-prod.yml
+0
-4
Dockerfile
...pp/businesscentral-app-invoice/src/main/docker/Dockerfile
+1
-1
businesscentral-app-invoice.yaml
...-invoice/src/main/docker/businesscentral-app-invoice.yaml
+1
-17
Dockerfile
...p/businesscentral-app-purchase/src/main/docker/Dockerfile
+1
-1
businesscentral-app-purchase.yaml
...urchase/src/main/docker/businesscentral-app-purchase.yaml
+1
-17
IPurchase_requisition_lineService.java
...o_purchase/service/IPurchase_requisition_lineService.java
+1
-0
Purchase_requisition_lineServiceImpl.java
...se/service/impl/Purchase_requisition_lineServiceImpl.java
+7
-0
systemResource.json
...al-core/src/main/resources/permission/systemResource.json
+0
-8
Purchase_requisition_lineResource.java
...scentral/core/rest/Purchase_requisition_lineResource.java
+55
-0
config.xml
config.xml
+0
-5
未找到文件。
app_Purchase/src/mock/entity/purchase-requisition-lines/purchase-requisition-lines.ts
浏览文件 @
df01222b
...
@@ -896,6 +896,152 @@ mock.onPost(new RegExp(/^\/purchase_requisition_lines\/?([a-zA-Z0-9\-\;]{0,35})\
...
@@ -896,6 +896,152 @@ mock.onPost(new RegExp(/^\/purchase_requisition_lines\/?([a-zA-Z0-9\-\;]{0,35})\
});
});
// Product_change
mock
.
onPost
(
new
RegExp
(
/^
\/
res_suppliers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisitions
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})\/
product_change$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:purchase_requisition_line 方法: Product_change"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'id'
,
'id'
,
'id'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
res_suppliers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisitions
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})\/
product_change$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// Product_change
mock
.
onPost
(
new
RegExp
(
/^
\/
product_templates
\/([
a-zA-Z0-9
\-\;]{1,35})\/
product_products
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})\/
product_change$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:purchase_requisition_line 方法: Product_change"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'id'
,
'id'
,
'id'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
product_templates
\/([
a-zA-Z0-9
\-\;]{1,35})\/
product_products
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})\/
product_change$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// Product_change
mock
.
onPost
(
new
RegExp
(
/^
\/
purchase_requisitions
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})\/
product_change$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:purchase_requisition_line 方法: Product_change"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'id'
,
'id'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
purchase_requisitions
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})\/
product_change$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// Product_change
mock
.
onPost
(
new
RegExp
(
/^
\/
product_products
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})\/
product_change$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:purchase_requisition_line 方法: Product_change"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'id'
,
'id'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
product_products
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})\/
product_change$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// Product_change
mock
.
onPost
(
new
RegExp
(
/^
\/
purchase_requisition_lines
\/?([
a-zA-Z0-9
\-\;]{0,35})\/
product_change$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:purchase_requisition_line 方法: Product_change"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'id'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})\/
product_change$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
//let items = mockDatas ? mockDatas : [];
//let _items = items.find((item: any) => Object.is(item.id, tempValue.id));
let
data
=
JSON
.
parse
(
config
.
data
);
mockDatas
.
forEach
((
item
)
=>
{
if
(
item
[
'id'
]
==
tempValue
[
'id'
]
){
for
(
let
value
in
data
){
if
(
item
.
hasOwnProperty
(
value
)){
item
[
value
]
=
data
[
value
];
}
}
}
})
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
data
);
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
data
];
});
// Save
// Save
mock
.
onPost
(
new
RegExp
(
/^
\/
res_suppliers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisitions
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})\/
save$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onPost
(
new
RegExp
(
/^
\/
res_suppliers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisitions
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})\/
save$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:purchase_requisition_line 方法: Save"
);
console
.
groupCollapsed
(
"实体:purchase_requisition_line 方法: Save"
);
...
@@ -1328,15 +1474,6 @@ mock.onGet(new RegExp(/^\/purchase_requisition_lines\/fetchdefault(\?[\w-./?%&=,
...
@@ -1328,15 +1474,6 @@ mock.onGet(new RegExp(/^\/purchase_requisition_lines\/fetchdefault(\?[\w-./?%&=,
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// Remove
// Remove
mock
.
onDelete
(
new
RegExp
(
/^
\/
res_suppliers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisitions
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onDelete
(
new
RegExp
(
/^
\/
res_suppliers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisitions
\/([
a-zA-Z0-9
\-\;]{1,35})\/
purchase_requisition_lines
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
...
...
app_Purchase/src/service/purchase-requisition-line/purchase-requisition-line-service-base.ts
浏览文件 @
df01222b
...
@@ -388,6 +388,48 @@ export default class Purchase_requisition_lineServiceBase extends EntityService
...
@@ -388,6 +388,48 @@ export default class Purchase_requisition_lineServiceBase extends EntityService
return
res
;
return
res
;
}
}
/**
* Product_change接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof Purchase_requisition_lineServiceBase
*/
public
async
Product_change
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
res_supplier
&&
context
.
purchase_requisition
&&
context
.
purchase_requisition_line
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/res_suppliers/
${
context
.
res_supplier
}
/purchase_requisitions/
${
context
.
purchase_requisition
}
/purchase_requisition_lines/
${
context
.
purchase_requisition_line
}
/product_change`
,
data
,
isloading
);
return
res
;
}
if
(
context
.
product_template
&&
context
.
product_product
&&
context
.
purchase_requisition_line
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/product_templates/
${
context
.
product_template
}
/product_products/
${
context
.
product_product
}
/purchase_requisition_lines/
${
context
.
purchase_requisition_line
}
/product_change`
,
data
,
isloading
);
return
res
;
}
if
(
context
.
purchase_requisition
&&
context
.
purchase_requisition_line
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/purchase_requisitions/
${
context
.
purchase_requisition
}
/purchase_requisition_lines/
${
context
.
purchase_requisition_line
}
/product_change`
,
data
,
isloading
);
return
res
;
}
if
(
context
.
product_product
&&
context
.
purchase_requisition_line
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/product_products/
${
context
.
product_product
}
/purchase_requisition_lines/
${
context
.
purchase_requisition_line
}
/product_change`
,
data
,
isloading
);
return
res
;
}
let
res
:
any
=
Http
.
getInstance
().
post
(
`/purchase_requisition_lines/
${
context
.
purchase_requisition_line
}
/product_change`
,
data
,
isloading
);
return
res
;
}
/**
/**
* Save接口方法
* Save接口方法
*
*
...
@@ -467,19 +509,4 @@ export default class Purchase_requisition_lineServiceBase extends EntityService
...
@@ -467,19 +509,4 @@ export default class Purchase_requisition_lineServiceBase extends EntityService
let
res
:
any
=
Http
.
getInstance
().
get
(
`/purchase_requisition_lines/fetchdefault`
,
tempData
,
isloading
);
let
res
:
any
=
Http
.
getInstance
().
get
(
`/purchase_requisition_lines/fetchdefault`
,
tempData
,
isloading
);
return
res
;
return
res
;
}
}
/**
* Product_change接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof Purchase_requisition_lineServiceBase
*/
public
async
Product_change
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
appLogic
:
Product_changeLogic
=
new
Product_changeLogic
({
context
:
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
:
JSON
.
parse
(
JSON
.
stringify
(
data
))});
const
res
=
await
appLogic
.
onExecute
(
context
,
data
,
isloading
?
true
:
false
);
return
{
status
:
200
,
data
:
res
};
}
}
}
\ No newline at end of file
businesscentral-app/businesscentral-app-hr/src/main/docker/Dockerfile
浏览文件 @
df01222b
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-hr.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-hr.jar
EXPOSE
3111
0
EXPOSE
808
0
ADD
businesscentral-app-hr.jar /businesscentral-app-hr.jar
ADD
businesscentral-app-hr.jar /businesscentral-app-hr.jar
businesscentral-app/businesscentral-app-hr/src/main/docker/businesscentral-app-hr.yaml
浏览文件 @
df01222b
...
@@ -3,25 +3,9 @@ services:
...
@@ -3,25 +3,9 @@ services:
businesscentral-app-hr
:
businesscentral-app-hr
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-hr:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-hr:latest
ports
:
ports
:
-
"
31110:3111
0"
-
"
8080:808
0"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=31110
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.240.110
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=odoo
-
SPRING_DATASOURCE_PASSWORD=odoo
-
SPRING_DATASOURCE_URL=jdbc:postgresql://172.16.240.158:15432/odoo
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=org.postgresql.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=odoo
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
-
SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-
SEATA_ENABLED=true
deploy
:
deploy
:
resources
:
resources
:
limits
:
limits
:
...
...
businesscentral-app/businesscentral-app-hr/src/main/resources/application-hr-prod.yml
浏览文件 @
df01222b
...
@@ -83,10 +83,6 @@ zuul:
...
@@ -83,10 +83,6 @@ zuul:
path
:
/ir_attachments/**
path
:
/ir_attachments/**
serviceId
:
${ibiz.ref.service.ibizbusinesscentral-core:ibizbusinesscentral-core}
serviceId
:
${ibiz.ref.service.ibizbusinesscentral-core:ibizbusinesscentral-core}
stripPrefix
:
false
stripPrefix
:
false
mail_followers_mail_message_subtype_rel
:
path
:
/mail_followers_mail_message_subtype_rels/**
serviceId
:
${ibiz.ref.service.ibizbusinesscentral-core:ibizbusinesscentral-core}
stripPrefix
:
false
hr_skill_level
:
hr_skill_level
:
path
:
/hr_skill_levels/**
path
:
/hr_skill_levels/**
serviceId
:
${ibiz.ref.service.ibizbusinesscentral-core:ibizbusinesscentral-core}
serviceId
:
${ibiz.ref.service.ibizbusinesscentral-core:ibizbusinesscentral-core}
...
...
businesscentral-app/businesscentral-app-invoice/src/main/docker/Dockerfile
浏览文件 @
df01222b
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-invoice.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-invoice.jar
EXPOSE
3111
0
EXPOSE
808
0
ADD
businesscentral-app-invoice.jar /businesscentral-app-invoice.jar
ADD
businesscentral-app-invoice.jar /businesscentral-app-invoice.jar
businesscentral-app/businesscentral-app-invoice/src/main/docker/businesscentral-app-invoice.yaml
浏览文件 @
df01222b
...
@@ -3,25 +3,9 @@ services:
...
@@ -3,25 +3,9 @@ services:
businesscentral-app-invoice
:
businesscentral-app-invoice
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-invoice:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-invoice:latest
ports
:
ports
:
-
"
31110:3111
0"
-
"
8080:808
0"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=31110
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.240.110
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=odoo
-
SPRING_DATASOURCE_PASSWORD=odoo
-
SPRING_DATASOURCE_URL=jdbc:postgresql://172.16.240.158:15432/odoo
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=org.postgresql.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=odoo
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
-
SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-
SEATA_ENABLED=true
deploy
:
deploy
:
resources
:
resources
:
limits
:
limits
:
...
...
businesscentral-app/businesscentral-app-purchase/src/main/docker/Dockerfile
浏览文件 @
df01222b
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-purchase.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-purchase.jar
EXPOSE
3111
0
EXPOSE
808
0
ADD
businesscentral-app-purchase.jar /businesscentral-app-purchase.jar
ADD
businesscentral-app-purchase.jar /businesscentral-app-purchase.jar
businesscentral-app/businesscentral-app-purchase/src/main/docker/businesscentral-app-purchase.yaml
浏览文件 @
df01222b
...
@@ -3,25 +3,9 @@ services:
...
@@ -3,25 +3,9 @@ services:
businesscentral-app-purchase
:
businesscentral-app-purchase
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-purchase:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-purchase:latest
ports
:
ports
:
-
"
31110:3111
0"
-
"
8080:808
0"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=31110
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.240.110
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=odoo
-
SPRING_DATASOURCE_PASSWORD=odoo
-
SPRING_DATASOURCE_URL=jdbc:postgresql://172.16.240.158:15432/odoo
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=org.postgresql.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=odoo
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
-
SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-
SEATA_ENABLED=true
deploy
:
deploy
:
resources
:
resources
:
limits
:
limits
:
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/IPurchase_requisition_lineService.java
浏览文件 @
df01222b
...
@@ -35,6 +35,7 @@ public interface IPurchase_requisition_lineService extends IService<Purchase_req
...
@@ -35,6 +35,7 @@ public interface IPurchase_requisition_lineService extends IService<Purchase_req
Purchase_requisition_line
getDraft
(
Purchase_requisition_line
et
)
;
Purchase_requisition_line
getDraft
(
Purchase_requisition_line
et
)
;
Purchase_requisition_line
calc_price
(
Purchase_requisition_line
et
)
;
Purchase_requisition_line
calc_price
(
Purchase_requisition_line
et
)
;
boolean
checkKey
(
Purchase_requisition_line
et
)
;
boolean
checkKey
(
Purchase_requisition_line
et
)
;
Purchase_requisition_line
product_change
(
Purchase_requisition_line
et
)
;
boolean
save
(
Purchase_requisition_line
et
)
;
boolean
save
(
Purchase_requisition_line
et
)
;
void
saveBatch
(
List
<
Purchase_requisition_line
>
list
)
;
void
saveBatch
(
List
<
Purchase_requisition_line
>
list
)
;
Page
<
Purchase_requisition_line
>
searchDefault
(
Purchase_requisition_lineSearchContext
context
)
;
Page
<
Purchase_requisition_line
>
searchDefault
(
Purchase_requisition_lineSearchContext
context
)
;
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/impl/Purchase_requisition_lineServiceImpl.java
浏览文件 @
df01222b
...
@@ -192,6 +192,13 @@ public class Purchase_requisition_lineServiceImpl extends EBSServiceImpl<Purchas
...
@@ -192,6 +192,13 @@ public class Purchase_requisition_lineServiceImpl extends EBSServiceImpl<Purchas
public
boolean
checkKey
(
Purchase_requisition_line
et
)
{
public
boolean
checkKey
(
Purchase_requisition_line
et
)
{
return
(!
ObjectUtils
.
isEmpty
(
et
.
getId
()))&&(!
Objects
.
isNull
(
this
.
getById
(
et
.
getId
())));
return
(!
ObjectUtils
.
isEmpty
(
et
.
getId
()))&&(!
Objects
.
isNull
(
this
.
getById
(
et
.
getId
())));
}
}
@Override
@Transactional
public
Purchase_requisition_line
product_change
(
Purchase_requisition_line
et
)
{
product_changeLogic
.
execute
(
et
);
return
et
;
}
@Override
@Override
@Transactional
@Transactional
public
boolean
save
(
Purchase_requisition_line
et
)
{
public
boolean
save
(
Purchase_requisition_line
et
)
{
...
...
businesscentral-core/src/main/resources/permission/systemResource.json
浏览文件 @
df01222b
...
@@ -1996,14 +1996,6 @@
...
@@ -1996,14 +1996,6 @@
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
}]
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
}]
}
}
,
{
,
{
"dename"
:
"Mail_followers_mail_message_subtype_rel"
,
"delogicname"
:
"关注消息类型"
,
"sysmoudle"
:{
"id"
:
"ODOO_MAIL"
,
"name"
:
"[ODOO]讨论"
},
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"数据集"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
}]
}
,
{
"dename"
:
"Base_import_tests_models_complex"
,
"dename"
:
"Base_import_tests_models_complex"
,
"delogicname"
:
"测试:基本导入模型复合体"
,
"delogicname"
:
"测试:基本导入模型复合体"
,
"sysmoudle"
:{
"id"
:
"ODOO_BASE_IMPORT"
,
"name"
:
"[ODOO]基础导入"
},
"sysmoudle"
:{
"id"
:
"ODOO_BASE_IMPORT"
,
"name"
:
"[ODOO]基础导入"
},
...
...
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/rest/Purchase_requisition_lineResource.java
浏览文件 @
df01222b
...
@@ -131,6 +131,17 @@ public class Purchase_requisition_lineResource {
...
@@ -131,6 +131,17 @@ public class Purchase_requisition_lineResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_lineService
.
checkKey
(
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
)));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_lineService
.
checkKey
(
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
)));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_requisition_line-Product_change-all')"
)
@ApiOperation
(
value
=
"product_change"
,
tags
=
{
"采购申请行"
},
notes
=
"product_change"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/purchase_requisition_lines/{purchase_requisition_line_id}/product_change"
)
public
ResponseEntity
<
Purchase_requisition_lineDTO
>
product_change
(
@PathVariable
(
"purchase_requisition_line_id"
)
Long
purchase_requisition_line_id
,
@RequestBody
Purchase_requisition_lineDTO
purchase_requisition_linedto
)
{
Purchase_requisition_line
domain
=
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
);
domain
.
setId
(
purchase_requisition_line_id
);
domain
=
purchase_requisition_lineService
.
product_change
(
domain
);
purchase_requisition_linedto
=
purchase_requisition_lineMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_linedto
);
}
@PreAuthorize
(
"hasPermission(this.purchase_requisition_lineMapping.toDomain(#purchase_requisition_linedto),'iBizBusinessCentral-Purchase_requisition_line-Save')"
)
@PreAuthorize
(
"hasPermission(this.purchase_requisition_lineMapping.toDomain(#purchase_requisition_linedto),'iBizBusinessCentral-Purchase_requisition_line-Save')"
)
@ApiOperation
(
value
=
"保存采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"保存采购申请行"
)
@ApiOperation
(
value
=
"保存采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"保存采购申请行"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/purchase_requisition_lines/save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/purchase_requisition_lines/save"
)
...
@@ -265,6 +276,17 @@ public class Purchase_requisition_lineResource {
...
@@ -265,6 +276,17 @@ public class Purchase_requisition_lineResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_lineService
.
checkKey
(
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
)));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_lineService
.
checkKey
(
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
)));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_requisition_line-Product_change-all')"
)
@ApiOperation
(
value
=
"根据产品采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据产品采购申请行"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/product_products/{product_product_id}/purchase_requisition_lines/{purchase_requisition_line_id}/product_change"
)
public
ResponseEntity
<
Purchase_requisition_lineDTO
>
product_changeByProduct_product
(
@PathVariable
(
"product_product_id"
)
Long
product_product_id
,
@PathVariable
(
"purchase_requisition_line_id"
)
Long
purchase_requisition_line_id
,
@RequestBody
Purchase_requisition_lineDTO
purchase_requisition_linedto
)
{
Purchase_requisition_line
domain
=
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
);
domain
.
setProductId
(
product_product_id
);
domain
=
purchase_requisition_lineService
.
product_change
(
domain
)
;
purchase_requisition_linedto
=
purchase_requisition_lineMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_linedto
);
}
@PreAuthorize
(
"hasPermission(this.purchase_requisition_lineMapping.toDomain(#purchase_requisition_linedto),'iBizBusinessCentral-Purchase_requisition_line-Save')"
)
@PreAuthorize
(
"hasPermission(this.purchase_requisition_lineMapping.toDomain(#purchase_requisition_linedto),'iBizBusinessCentral-Purchase_requisition_line-Save')"
)
@ApiOperation
(
value
=
"根据产品保存采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据产品保存采购申请行"
)
@ApiOperation
(
value
=
"根据产品保存采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据产品保存采购申请行"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/product_products/{product_product_id}/purchase_requisition_lines/save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/product_products/{product_product_id}/purchase_requisition_lines/save"
)
...
@@ -405,6 +427,17 @@ public class Purchase_requisition_lineResource {
...
@@ -405,6 +427,17 @@ public class Purchase_requisition_lineResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_lineService
.
checkKey
(
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
)));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_lineService
.
checkKey
(
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
)));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_requisition_line-Product_change-all')"
)
@ApiOperation
(
value
=
"根据采购申请采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据采购申请采购申请行"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/purchase_requisitions/{purchase_requisition_id}/purchase_requisition_lines/{purchase_requisition_line_id}/product_change"
)
public
ResponseEntity
<
Purchase_requisition_lineDTO
>
product_changeByPurchase_requisition
(
@PathVariable
(
"purchase_requisition_id"
)
Long
purchase_requisition_id
,
@PathVariable
(
"purchase_requisition_line_id"
)
Long
purchase_requisition_line_id
,
@RequestBody
Purchase_requisition_lineDTO
purchase_requisition_linedto
)
{
Purchase_requisition_line
domain
=
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
);
domain
.
setRequisitionId
(
purchase_requisition_id
);
domain
=
purchase_requisition_lineService
.
product_change
(
domain
)
;
purchase_requisition_linedto
=
purchase_requisition_lineMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_linedto
);
}
@PreAuthorize
(
"hasPermission(this.purchase_requisition_lineMapping.toDomain(#purchase_requisition_linedto),'iBizBusinessCentral-Purchase_requisition_line-Save')"
)
@PreAuthorize
(
"hasPermission(this.purchase_requisition_lineMapping.toDomain(#purchase_requisition_linedto),'iBizBusinessCentral-Purchase_requisition_line-Save')"
)
@ApiOperation
(
value
=
"根据采购申请保存采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据采购申请保存采购申请行"
)
@ApiOperation
(
value
=
"根据采购申请保存采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据采购申请保存采购申请行"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/purchase_requisitions/{purchase_requisition_id}/purchase_requisition_lines/save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/purchase_requisitions/{purchase_requisition_id}/purchase_requisition_lines/save"
)
...
@@ -545,6 +578,17 @@ public class Purchase_requisition_lineResource {
...
@@ -545,6 +578,17 @@ public class Purchase_requisition_lineResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_lineService
.
checkKey
(
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
)));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_lineService
.
checkKey
(
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
)));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_requisition_line-Product_change-all')"
)
@ApiOperation
(
value
=
"根据产品模板产品采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据产品模板产品采购申请行"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/product_templates/{product_template_id}/product_products/{product_product_id}/purchase_requisition_lines/{purchase_requisition_line_id}/product_change"
)
public
ResponseEntity
<
Purchase_requisition_lineDTO
>
product_changeByProduct_templateProduct_product
(
@PathVariable
(
"product_template_id"
)
Long
product_template_id
,
@PathVariable
(
"product_product_id"
)
Long
product_product_id
,
@PathVariable
(
"purchase_requisition_line_id"
)
Long
purchase_requisition_line_id
,
@RequestBody
Purchase_requisition_lineDTO
purchase_requisition_linedto
)
{
Purchase_requisition_line
domain
=
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
);
domain
.
setProductId
(
product_product_id
);
domain
=
purchase_requisition_lineService
.
product_change
(
domain
)
;
purchase_requisition_linedto
=
purchase_requisition_lineMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_linedto
);
}
@PreAuthorize
(
"hasPermission(this.purchase_requisition_lineMapping.toDomain(#purchase_requisition_linedto),'iBizBusinessCentral-Purchase_requisition_line-Save')"
)
@PreAuthorize
(
"hasPermission(this.purchase_requisition_lineMapping.toDomain(#purchase_requisition_linedto),'iBizBusinessCentral-Purchase_requisition_line-Save')"
)
@ApiOperation
(
value
=
"根据产品模板产品保存采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据产品模板产品保存采购申请行"
)
@ApiOperation
(
value
=
"根据产品模板产品保存采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据产品模板产品保存采购申请行"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/product_templates/{product_template_id}/product_products/{product_product_id}/purchase_requisition_lines/save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/product_templates/{product_template_id}/product_products/{product_product_id}/purchase_requisition_lines/save"
)
...
@@ -685,6 +729,17 @@ public class Purchase_requisition_lineResource {
...
@@ -685,6 +729,17 @@ public class Purchase_requisition_lineResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_lineService
.
checkKey
(
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
)));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_lineService
.
checkKey
(
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
)));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_requisition_line-Product_change-all')"
)
@ApiOperation
(
value
=
"根据供应商采购申请采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据供应商采购申请采购申请行"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/res_suppliers/{res_supplier_id}/purchase_requisitions/{purchase_requisition_id}/purchase_requisition_lines/{purchase_requisition_line_id}/product_change"
)
public
ResponseEntity
<
Purchase_requisition_lineDTO
>
product_changeByRes_supplierPurchase_requisition
(
@PathVariable
(
"res_supplier_id"
)
Long
res_supplier_id
,
@PathVariable
(
"purchase_requisition_id"
)
Long
purchase_requisition_id
,
@PathVariable
(
"purchase_requisition_line_id"
)
Long
purchase_requisition_line_id
,
@RequestBody
Purchase_requisition_lineDTO
purchase_requisition_linedto
)
{
Purchase_requisition_line
domain
=
purchase_requisition_lineMapping
.
toDomain
(
purchase_requisition_linedto
);
domain
.
setRequisitionId
(
purchase_requisition_id
);
domain
=
purchase_requisition_lineService
.
product_change
(
domain
)
;
purchase_requisition_linedto
=
purchase_requisition_lineMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
purchase_requisition_linedto
);
}
@PreAuthorize
(
"hasPermission(this.purchase_requisition_lineMapping.toDomain(#purchase_requisition_linedto),'iBizBusinessCentral-Purchase_requisition_line-Save')"
)
@PreAuthorize
(
"hasPermission(this.purchase_requisition_lineMapping.toDomain(#purchase_requisition_linedto),'iBizBusinessCentral-Purchase_requisition_line-Save')"
)
@ApiOperation
(
value
=
"根据供应商采购申请保存采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据供应商采购申请保存采购申请行"
)
@ApiOperation
(
value
=
"根据供应商采购申请保存采购申请行"
,
tags
=
{
"采购申请行"
},
notes
=
"根据供应商采购申请保存采购申请行"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/res_suppliers/{res_supplier_id}/purchase_requisitions/{purchase_requisition_id}/purchase_requisition_lines/save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/res_suppliers/{res_supplier_id}/purchase_requisitions/{purchase_requisition_id}/purchase_requisition_lines/save"
)
...
...
config.xml
浏览文件 @
df01222b
...
@@ -37,11 +37,6 @@
...
@@ -37,11 +37,6 @@
git clone -b master $para2 ibizbusinesscentral/
git clone -b master $para2 ibizbusinesscentral/
export NODE_OPTIONS=--max-old-space-size=4096
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizbusinesscentral/
cd ibizbusinesscentral/
mvn clean package -Ppurchase
cd businesscentral-app/businesscentral-app-purchase
mvn -Ppurchase docker:build
mvn -Ppurchase docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-app-purchase.yaml iBizEE --with-registry-auth
</command>
</command>
</hudson.tasks.Shell>
</hudson.tasks.Shell>
</builders>
</builders>
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录