Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz商业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz商业套件
iBiz商业中心
提交
5c5c9a47
提交
5c5c9a47
编写于
11月 05, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 发布系统代码 [Spring Boot,员工]
上级
3be99750
变更
47
展开全部
显示空白字符变更
内嵌
并排
正在显示
47 个修改的文件
包含
1741 行增加
和
157 行删除
+1741
-157
view-config.json
app_HR/public/assets/json/view-config.json
+2
-12
auth-service-register.ts
app_HR/src/authservice/auth-service-register.ts
+0
-1
app-picker.vue
app_HR/src/components/app-picker/app-picker.vue
+2
-0
en-US.ts
app_HR/src/locale/lang/en-US.ts
+0
-2
zh-CN.ts
app_HR/src/locale/lang/zh-CN.ts
+0
-2
hr-contract_en_US.ts
...c/locale/lanres/entities/hr-contract/hr-contract_en_US.ts
+17
-2
hr-contract_zh_CN.ts
...c/locale/lanres/entities/hr-contract/hr-contract_zh_CN.ts
+17
-2
index.ts
app_HR/src/mock/index.ts
+0
-1
viewconfig.ts
app_HR/src/mock/viewconfig/viewconfig.ts
+2
-10
hr-employee-master-tab-info-view-base.tsx
...r-tab-info-view/hr-employee-master-tab-info-view-base.tsx
+12
-0
page-register.ts
app_HR/src/pages/odoo-hr/hrindex-view/page-register.ts
+1
-2
router.ts
app_HR/src/pages/odoo-hr/hrindex-view/router.ts
+18
-32
entity-service-register.ts
app_HR/src/service/entity-service-register.ts
+0
-1
state.ts
app_HR/src/store/modules/view-action/state.ts
+0
-10
studio-view-layout.less
...tudio-core/components/studio-view/studio-view-layout.less
+1
-1
FormControlBase.tsx
app_HR/src/studio-core/widgets/FormControlBase.tsx
+5
-0
GridControlBase.tsx
app_HR/src/studio-core/widgets/GridControlBase.tsx
+5
-0
ui-service-register.ts
app_HR/src/uiservice/ui-service-register.ts
+0
-1
master-message-portlet-base.tsx
...pp/master-message-portlet/master-message-portlet-base.tsx
+195
-0
master-message-portlet-model.ts
...pp/master-message-portlet/master-message-portlet-model.ts
+21
-0
master-message-portlet-service.ts
.../master-message-portlet/master-message-portlet-service.ts
+11
-0
master-message-portlet.html
...ts/app/master-message-portlet/master-message-portlet.html
+5
-0
master-message-portlet.vue
...ets/app/master-message-portlet/master-message-portlet.vue
+22
-0
control-service.ts
app_HR/src/widgets/control-service.ts
+1
-0
main-grid-base.tsx
app_HR/src/widgets/hr-contract/main-grid/main-grid-base.tsx
+233
-0
main-grid-model.ts
app_HR/src/widgets/hr-contract/main-grid/main-grid-model.ts
+86
-16
main-grid-service.ts
...HR/src/widgets/hr-contract/main-grid/main-grid-service.ts
+60
-0
main-grid.html
app_HR/src/widgets/hr-contract/main-grid/main-grid.html
+200
-0
master-summary-dashboard.vue
...yee/master-summary-dashboard/master-summary-dashboard.vue
+1
-1
remark-form.html
app_HR/src/widgets/mail-message/remark-form/remark-form.html
+0
-1
send-form.html
app_HR/src/widgets/mail-message/send-form/send-form.html
+0
-1
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
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
Purchase_requisitionServiceImpl.java
...urchase/service/impl/Purchase_requisitionServiceImpl.java
+10
-0
IPurchase_requisitionRemove__MSDenyLogic.java
...rvice/logic/IPurchase_requisitionRemove__MSDenyLogic.java
+18
-0
IPurchase_requisitionUpdate__MSDenyLogic.java
...rvice/logic/IPurchase_requisitionUpdate__MSDenyLogic.java
+18
-0
Purchase_requisitionRemove__MSDenyLogicImpl.java
...gic/impl/Purchase_requisitionRemove__MSDenyLogicImpl.java
+67
-0
Purchase_requisitionUpdate__MSDenyLogicImpl.java
...gic/impl/Purchase_requisitionUpdate__MSDenyLogicImpl.java
+67
-0
Purchase_requisitionRemove__MSDenyRule.drl
...esources/rules/Purchase_requisitionRemove__MSDenyRule.drl
+151
-0
Purchase_requisitionRemove__MSDenyRuleFlow.bpmn
...ces/rules/Purchase_requisitionRemove__MSDenyRuleFlow.bpmn
+168
-0
Purchase_requisitionUpdate__MSDenyRule.drl
...esources/rules/Purchase_requisitionUpdate__MSDenyRule.drl
+151
-0
Purchase_requisitionUpdate__MSDenyRuleFlow.bpmn
...ces/rules/Purchase_requisitionUpdate__MSDenyRuleFlow.bpmn
+168
-0
config.xml
config.xml
+0
-5
未找到文件。
app_HR/public/assets/json/view-config.json
浏览文件 @
5c5c9a47
...
@@ -429,16 +429,6 @@
...
@@ -429,16 +429,6 @@
"viewtag"
:
"77fff7ed484c53f4b0261ea30086dff3"
,
"viewtag"
:
"77fff7ed484c53f4b0261ea30086dff3"
,
"memo"
:
"系统自动添加"
"memo"
:
"系统自动添加"
},
},
"mail_followers_mail_message_subtype_relpickupgridview"
:
{
"title"
:
"关注消息类型选择表格视图"
,
"caption"
:
"关注消息类型"
,
"viewtype"
:
"DEPICKUPGRIDVIEW"
,
"viewmodule"
:
"odoo_mail"
,
"viewname"
:
"mail_followers_mail_message_subtype_relPickupGridView"
,
"viewfilename"
:
"mail-followers-mail-message-subtype-rel-pickup-grid-view"
,
"viewtag"
:
"7b8521e7692b779d3eab70073008d561"
,
"memo"
:
"系统自动添加"
},
"resource_calendareditview"
:
{
"resource_calendareditview"
:
{
"title"
:
"资源工作时间编辑视图"
,
"title"
:
"资源工作时间编辑视图"
,
"caption"
:
"资源工作时间"
,
"caption"
:
"资源工作时间"
,
...
@@ -520,7 +510,7 @@
...
@@ -520,7 +510,7 @@
"memo"
:
"系统自动添加"
"memo"
:
"系统自动添加"
},
},
"hr_contractbasicquickview"
:
{
"hr_contractbasicquickview"
:
{
"title"
:
"快速新建视图"
,
"title"
:
"
合同
快速新建视图"
,
"caption"
:
"快速新建"
,
"caption"
:
"快速新建"
,
"viewtype"
:
"DEOPTVIEW"
,
"viewtype"
:
"DEOPTVIEW"
,
"viewmodule"
:
"odoo_hr"
,
"viewmodule"
:
"odoo_hr"
,
...
@@ -760,7 +750,7 @@
...
@@ -760,7 +750,7 @@
"memo"
:
"系统自动添加"
"memo"
:
"系统自动添加"
},
},
"hr_contractbasiceditview"
:
{
"hr_contractbasiceditview"
:
{
"title"
:
"
配置
信息编辑视图"
,
"title"
:
"
合同
信息编辑视图"
,
"caption"
:
"合同"
,
"caption"
:
"合同"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewmodule"
:
"odoo_hr"
,
"viewmodule"
:
"odoo_hr"
,
...
...
app_HR/src/authservice/auth-service-register.ts
浏览文件 @
5c5c9a47
...
@@ -57,7 +57,6 @@ export class AuthServiceRegister {
...
@@ -57,7 +57,6 @@ export class AuthServiceRegister {
this
.
allAuthService
.
set
(
'survey_survey'
,
()
=>
import
(
'@/authservice/survey-survey/survey-survey-auth-service'
));
this
.
allAuthService
.
set
(
'survey_survey'
,
()
=>
import
(
'@/authservice/survey-survey/survey-survey-auth-service'
));
this
.
allAuthService
.
set
(
'account_analytic_account'
,
()
=>
import
(
'@/authservice/account-analytic-account/account-analytic-account-auth-service'
));
this
.
allAuthService
.
set
(
'account_analytic_account'
,
()
=>
import
(
'@/authservice/account-analytic-account/account-analytic-account-auth-service'
));
this
.
allAuthService
.
set
(
'ir_attachment'
,
()
=>
import
(
'@/authservice/ir-attachment/ir-attachment-auth-service'
));
this
.
allAuthService
.
set
(
'ir_attachment'
,
()
=>
import
(
'@/authservice/ir-attachment/ir-attachment-auth-service'
));
this
.
allAuthService
.
set
(
'mail_followers_mail_message_subtype_rel'
,
()
=>
import
(
'@/authservice/mail-followers-mail-message-subtype-rel/mail-followers-mail-message-subtype-rel-auth-service'
));
this
.
allAuthService
.
set
(
'hr_skill_level'
,
()
=>
import
(
'@/authservice/hr-skill-level/hr-skill-level-auth-service'
));
this
.
allAuthService
.
set
(
'hr_skill_level'
,
()
=>
import
(
'@/authservice/hr-skill-level/hr-skill-level-auth-service'
));
this
.
allAuthService
.
set
(
'hr_department'
,
()
=>
import
(
'@/authservice/hr-department/hr-department-auth-service'
));
this
.
allAuthService
.
set
(
'hr_department'
,
()
=>
import
(
'@/authservice/hr-department/hr-department-auth-service'
));
this
.
allAuthService
.
set
(
'gamification_goal'
,
()
=>
import
(
'@/authservice/gamification-goal/gamification-goal-auth-service'
));
this
.
allAuthService
.
set
(
'gamification_goal'
,
()
=>
import
(
'@/authservice/gamification-goal/gamification-goal-auth-service'
));
...
...
app_HR/src/components/app-picker/app-picker.vue
浏览文件 @
5c5c9a47
...
@@ -344,6 +344,8 @@ export default class AppPicker extends Vue {
...
@@ -344,6 +344,8 @@ export default class AppPicker extends Vue {
public
onSelectOpen
(
flag
:
boolean
):
void
{
public
onSelectOpen
(
flag
:
boolean
):
void
{
this
.
open
=
flag
;
this
.
open
=
flag
;
if
(
this
.
open
)
{
if
(
this
.
open
)
{
// 清空旧数据
this
.
items
=
[];
//设置下拉列表的最大宽度
//设置下拉列表的最大宽度
this
.
setDropdownWidth
();
this
.
setDropdownWidth
();
this
.
onSearch
(
this
.
curvalue
,
null
,
true
);
this
.
onSearch
(
this
.
curvalue
,
null
,
true
);
...
...
app_HR/src/locale/lang/en-US.ts
浏览文件 @
5c5c9a47
...
@@ -18,7 +18,6 @@ import res_users_en_US from '@locale/lanres/entities/res-users/res-users_en_US';
...
@@ -18,7 +18,6 @@ import res_users_en_US from '@locale/lanres/entities/res-users/res-users_en_US';
import
survey_survey_en_US
from
'@locale/lanres/entities/survey-survey/survey-survey_en_US'
;
import
survey_survey_en_US
from
'@locale/lanres/entities/survey-survey/survey-survey_en_US'
;
import
account_analytic_account_en_US
from
'@locale/lanres/entities/account-analytic-account/account-analytic-account_en_US'
;
import
account_analytic_account_en_US
from
'@locale/lanres/entities/account-analytic-account/account-analytic-account_en_US'
;
import
ir_attachment_en_US
from
'@locale/lanres/entities/ir-attachment/ir-attachment_en_US'
;
import
ir_attachment_en_US
from
'@locale/lanres/entities/ir-attachment/ir-attachment_en_US'
;
import
mail_followers_mail_message_subtype_rel_en_US
from
'@locale/lanres/entities/mail-followers-mail-message-subtype-rel/mail-followers-mail-message-subtype-rel_en_US'
;
import
hr_skill_level_en_US
from
'@locale/lanres/entities/hr-skill-level/hr-skill-level_en_US'
;
import
hr_skill_level_en_US
from
'@locale/lanres/entities/hr-skill-level/hr-skill-level_en_US'
;
import
hr_department_en_US
from
'@locale/lanres/entities/hr-department/hr-department_en_US'
;
import
hr_department_en_US
from
'@locale/lanres/entities/hr-department/hr-department_en_US'
;
import
gamification_goal_en_US
from
'@locale/lanres/entities/gamification-goal/gamification-goal_en_US'
;
import
gamification_goal_en_US
from
'@locale/lanres/entities/gamification-goal/gamification-goal_en_US'
;
...
@@ -305,7 +304,6 @@ const data: any = {
...
@@ -305,7 +304,6 @@ const data: any = {
survey_survey
:
survey_survey_en_US
,
survey_survey
:
survey_survey_en_US
,
account_analytic_account
:
account_analytic_account_en_US
,
account_analytic_account
:
account_analytic_account_en_US
,
ir_attachment
:
ir_attachment_en_US
,
ir_attachment
:
ir_attachment_en_US
,
mail_followers_mail_message_subtype_rel
:
mail_followers_mail_message_subtype_rel_en_US
,
hr_skill_level
:
hr_skill_level_en_US
,
hr_skill_level
:
hr_skill_level_en_US
,
hr_department
:
hr_department_en_US
,
hr_department
:
hr_department_en_US
,
gamification_goal
:
gamification_goal_en_US
,
gamification_goal
:
gamification_goal_en_US
,
...
...
app_HR/src/locale/lang/zh-CN.ts
浏览文件 @
5c5c9a47
...
@@ -18,7 +18,6 @@ import res_users_zh_CN from '@locale/lanres/entities/res-users/res-users_zh_CN';
...
@@ -18,7 +18,6 @@ import res_users_zh_CN from '@locale/lanres/entities/res-users/res-users_zh_CN';
import
survey_survey_zh_CN
from
'@locale/lanres/entities/survey-survey/survey-survey_zh_CN'
;
import
survey_survey_zh_CN
from
'@locale/lanres/entities/survey-survey/survey-survey_zh_CN'
;
import
account_analytic_account_zh_CN
from
'@locale/lanres/entities/account-analytic-account/account-analytic-account_zh_CN'
;
import
account_analytic_account_zh_CN
from
'@locale/lanres/entities/account-analytic-account/account-analytic-account_zh_CN'
;
import
ir_attachment_zh_CN
from
'@locale/lanres/entities/ir-attachment/ir-attachment_zh_CN'
;
import
ir_attachment_zh_CN
from
'@locale/lanres/entities/ir-attachment/ir-attachment_zh_CN'
;
import
mail_followers_mail_message_subtype_rel_zh_CN
from
'@locale/lanres/entities/mail-followers-mail-message-subtype-rel/mail-followers-mail-message-subtype-rel_zh_CN'
;
import
hr_skill_level_zh_CN
from
'@locale/lanres/entities/hr-skill-level/hr-skill-level_zh_CN'
;
import
hr_skill_level_zh_CN
from
'@locale/lanres/entities/hr-skill-level/hr-skill-level_zh_CN'
;
import
hr_department_zh_CN
from
'@locale/lanres/entities/hr-department/hr-department_zh_CN'
;
import
hr_department_zh_CN
from
'@locale/lanres/entities/hr-department/hr-department_zh_CN'
;
import
gamification_goal_zh_CN
from
'@locale/lanres/entities/gamification-goal/gamification-goal_zh_CN'
;
import
gamification_goal_zh_CN
from
'@locale/lanres/entities/gamification-goal/gamification-goal_zh_CN'
;
...
@@ -304,7 +303,6 @@ const data: any = {
...
@@ -304,7 +303,6 @@ const data: any = {
survey_survey
:
survey_survey_zh_CN
,
survey_survey
:
survey_survey_zh_CN
,
account_analytic_account
:
account_analytic_account_zh_CN
,
account_analytic_account
:
account_analytic_account_zh_CN
,
ir_attachment
:
ir_attachment_zh_CN
,
ir_attachment
:
ir_attachment_zh_CN
,
mail_followers_mail_message_subtype_rel
:
mail_followers_mail_message_subtype_rel_zh_CN
,
hr_skill_level
:
hr_skill_level_zh_CN
,
hr_skill_level
:
hr_skill_level_zh_CN
,
hr_department
:
hr_department_zh_CN
,
hr_department
:
hr_department_zh_CN
,
gamification_goal
:
gamification_goal_zh_CN
,
gamification_goal
:
gamification_goal_zh_CN
,
...
...
app_HR/src/locale/lanres/entities/hr-contract/hr-contract_en_US.ts
浏览文件 @
5c5c9a47
...
@@ -62,7 +62,7 @@ export default {
...
@@ -62,7 +62,7 @@ export default {
},
},
basicquickview
:
{
basicquickview
:
{
caption
:
"快速新建"
,
caption
:
"快速新建"
,
title
:
"快速新建视图"
,
title
:
"
合同
快速新建视图"
,
},
},
gridview
:
{
gridview
:
{
caption
:
"合同"
,
caption
:
"合同"
,
...
@@ -70,7 +70,7 @@ export default {
...
@@ -70,7 +70,7 @@ export default {
},
},
basiceditview
:
{
basiceditview
:
{
caption
:
"合同"
,
caption
:
"合同"
,
title
:
"
配置
信息编辑视图"
,
title
:
"
合同
信息编辑视图"
,
},
},
},
},
main_form
:
{
main_form
:
{
...
@@ -169,6 +169,21 @@ export default {
...
@@ -169,6 +169,21 @@ export default {
nodata
:
""
,
nodata
:
""
,
columns
:
{
columns
:
{
name
:
"合同参考"
,
name
:
"合同参考"
,
company_id_text
:
"公司"
,
department_id_text
:
"部门"
,
employee_id_text
:
"员工"
,
job_id_text
:
"工作岗位"
,
date_start
:
"开始日期"
,
date_end
:
"结束日期"
,
trial_date_end
:
"试用期结束"
,
resource_calendar_id_text
:
"工作安排"
,
state
:
"状态"
,
wage
:
"工资"
,
notes
:
"备注"
,
company_id
:
"公司"
,
department_id
:
"部门"
,
job_id
:
"工作岗位"
,
resource_calendar_id
:
"工作安排"
,
},
},
uiactions
:
{
uiactions
:
{
},
},
...
...
app_HR/src/locale/lanres/entities/hr-contract/hr-contract_zh_CN.ts
浏览文件 @
5c5c9a47
...
@@ -62,7 +62,7 @@ export default {
...
@@ -62,7 +62,7 @@ export default {
},
},
basicquickview
:
{
basicquickview
:
{
caption
:
"快速新建"
,
caption
:
"快速新建"
,
title
:
"快速新建视图"
,
title
:
"
合同
快速新建视图"
,
},
},
gridview
:
{
gridview
:
{
caption
:
"合同"
,
caption
:
"合同"
,
...
@@ -70,7 +70,7 @@ export default {
...
@@ -70,7 +70,7 @@ export default {
},
},
basiceditview
:
{
basiceditview
:
{
caption
:
"合同"
,
caption
:
"合同"
,
title
:
"
配置
信息编辑视图"
,
title
:
"
合同
信息编辑视图"
,
},
},
},
},
main_form
:
{
main_form
:
{
...
@@ -169,6 +169,21 @@ export default {
...
@@ -169,6 +169,21 @@ export default {
nodata
:
""
,
nodata
:
""
,
columns
:
{
columns
:
{
name
:
"合同参考"
,
name
:
"合同参考"
,
company_id_text
:
"公司"
,
department_id_text
:
"部门"
,
employee_id_text
:
"员工"
,
job_id_text
:
"工作岗位"
,
date_start
:
"开始日期"
,
date_end
:
"结束日期"
,
trial_date_end
:
"试用期结束"
,
resource_calendar_id_text
:
"工作安排"
,
state
:
"状态"
,
wage
:
"工资"
,
notes
:
"备注"
,
company_id
:
"公司"
,
department_id
:
"部门"
,
job_id
:
"工作岗位"
,
resource_calendar_id
:
"工作安排"
,
},
},
uiactions
:
{
uiactions
:
{
},
},
...
...
app_HR/src/mock/index.ts
浏览文件 @
5c5c9a47
...
@@ -25,7 +25,6 @@ import './entity/res-userss/res-userss';
...
@@ -25,7 +25,6 @@ import './entity/res-userss/res-userss';
import
'./entity/survey-surveys/survey-surveys'
;
import
'./entity/survey-surveys/survey-surveys'
;
import
'./entity/account-analytic-accounts/account-analytic-accounts'
;
import
'./entity/account-analytic-accounts/account-analytic-accounts'
;
import
'./entity/ir-attachments/ir-attachments'
;
import
'./entity/ir-attachments/ir-attachments'
;
import
'./entity/mail-followers-mail-message-subtype-rels/mail-followers-mail-message-subtype-rels'
;
import
'./entity/hr-skill-levels/hr-skill-levels'
;
import
'./entity/hr-skill-levels/hr-skill-levels'
;
import
'./entity/hr-departments/hr-departments'
;
import
'./entity/hr-departments/hr-departments'
;
import
'./entity/gamification-goals/gamification-goals'
;
import
'./entity/gamification-goals/gamification-goals'
;
...
...
app_HR/src/mock/viewconfig/viewconfig.ts
浏览文件 @
5c5c9a47
...
@@ -351,14 +351,6 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
...
@@ -351,14 +351,6 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname"
:
"product_productPickupView"
,
"viewname"
:
"product_productPickupView"
,
"viewtag"
:
"77fff7ed484c53f4b0261ea30086dff3"
"viewtag"
:
"77fff7ed484c53f4b0261ea30086dff3"
},
},
"mail_followers_mail_message_subtype_relpickupgridview"
:
{
"title"
:
"关注消息类型选择表格视图"
,
"caption"
:
"关注消息类型"
,
"viewtype"
:
"DEPICKUPGRIDVIEW"
,
"viewmodule"
:
"odoo_mail"
,
"viewname"
:
"mail_followers_mail_message_subtype_relPickupGridView"
,
"viewtag"
:
"7b8521e7692b779d3eab70073008d561"
},
"resource_calendareditview"
:
{
"resource_calendareditview"
:
{
"title"
:
"资源工作时间编辑视图"
,
"title"
:
"资源工作时间编辑视图"
,
"caption"
:
"资源工作时间"
,
"caption"
:
"资源工作时间"
,
...
@@ -424,7 +416,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
...
@@ -424,7 +416,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag"
:
"8a0a72f7bbc73f7c61a121435a54fc98"
"viewtag"
:
"8a0a72f7bbc73f7c61a121435a54fc98"
},
},
"hr_contractbasicquickview"
:
{
"hr_contractbasicquickview"
:
{
"title"
:
"快速新建视图"
,
"title"
:
"
合同
快速新建视图"
,
"caption"
:
"快速新建"
,
"caption"
:
"快速新建"
,
"viewtype"
:
"DEOPTVIEW"
,
"viewtype"
:
"DEOPTVIEW"
,
"viewmodule"
:
"odoo_hr"
,
"viewmodule"
:
"odoo_hr"
,
...
@@ -616,7 +608,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
...
@@ -616,7 +608,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag"
:
"caea8adbddf79caf7193b69f6f159a19"
"viewtag"
:
"caea8adbddf79caf7193b69f6f159a19"
},
},
"hr_contractbasiceditview"
:
{
"hr_contractbasiceditview"
:
{
"title"
:
"
配置
信息编辑视图"
,
"title"
:
"
合同
信息编辑视图"
,
"caption"
:
"合同"
,
"caption"
:
"合同"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewmodule"
:
"odoo_hr"
,
"viewmodule"
:
"odoo_hr"
,
...
...
app_HR/src/pages/odoo-hr/hr-employee-master-tab-info-view/hr-employee-master-tab-info-view-base.tsx
浏览文件 @
5c5c9a47
...
@@ -57,6 +57,18 @@ export class Hr_employeeMasterTabInfoViewBase extends TabExpViewBase {
...
@@ -57,6 +57,18 @@ export class Hr_employeeMasterTabInfoViewBase extends TabExpViewBase {
*/
*/
public
appUIService
:
Hr_employeeUIService
=
new
Hr_employeeUIService
(
this
.
$store
);
public
appUIService
:
Hr_employeeUIService
=
new
Hr_employeeUIService
(
this
.
$store
);
/**
* 自定义视图导航上下文集合
*
* @protected
* @type {*}
* @memberof Hr_employeeMasterTabInfoViewBase
*/
protected
customViewNavContexts
:
any
=
{
'N_RES_MODEL_EQ'
:
{
isRawValue
:
true
,
value
:
'hr.employee'
},
'N_RES_ID_EQ'
:
{
isRawValue
:
false
,
value
:
'hr_employee'
}
};
/**
/**
* 是否显示信息栏
* 是否显示信息栏
*
*
...
...
app_HR/src/pages/odoo-hr/hrindex-view/page-register.ts
浏览文件 @
5c5c9a47
...
@@ -23,7 +23,6 @@ export const PageComponents = {
...
@@ -23,7 +23,6 @@ export const PageComponents = {
Vue
.
component
(
'mail-activity-edit-view'
,
()
=>
import
(
'@pages/odoo-mail/mail-activity-edit-view/mail-activity-edit-view.vue'
));
Vue
.
component
(
'mail-activity-edit-view'
,
()
=>
import
(
'@pages/odoo-mail/mail-activity-edit-view/mail-activity-edit-view.vue'
));
Vue
.
component
(
'account-analytic-line-edit-view'
,
()
=>
import
(
'@pages/odoo-account/account-analytic-line-edit-view/account-analytic-line-edit-view.vue'
));
Vue
.
component
(
'account-analytic-line-edit-view'
,
()
=>
import
(
'@pages/odoo-account/account-analytic-line-edit-view/account-analytic-line-edit-view.vue'
));
Vue
.
component
(
'res-company-pickup-view'
,
()
=>
import
(
'@pages/odoo-base/res-company-pickup-view/res-company-pickup-view.vue'
));
Vue
.
component
(
'res-company-pickup-view'
,
()
=>
import
(
'@pages/odoo-base/res-company-pickup-view/res-company-pickup-view.vue'
));
Vue
.
component
(
'mail-followers-mail-message-subtype-rel-pickup-grid-view'
,
()
=>
import
(
'@pages/odoo-mail/mail-followers-mail-message-subtype-rel-pickup-grid-view/mail-followers-mail-message-subtype-rel-pickup-grid-view.vue'
));
Vue
.
component
(
'hr-employee-master-grid-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-employee-master-grid-view/hr-employee-master-grid-view.vue'
));
Vue
.
component
(
'hr-employee-master-grid-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-employee-master-grid-view/hr-employee-master-grid-view.vue'
));
Vue
.
component
(
'hr-department-master-grid-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-department-master-grid-view/hr-department-master-grid-view.vue'
));
Vue
.
component
(
'hr-department-master-grid-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-department-master-grid-view/hr-department-master-grid-view.vue'
));
Vue
.
component
(
'hr-skill-level-line-edit'
,
()
=>
import
(
'@pages/odoo-hr/hr-skill-level-line-edit/hr-skill-level-line-edit.vue'
));
Vue
.
component
(
'hr-skill-level-line-edit'
,
()
=>
import
(
'@pages/odoo-hr/hr-skill-level-line-edit/hr-skill-level-line-edit.vue'
));
...
@@ -32,8 +31,8 @@ export const PageComponents = {
...
@@ -32,8 +31,8 @@ export const PageComponents = {
Vue
.
component
(
'hr-job-pickup-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-job-pickup-view/hr-job-pickup-view.vue'
));
Vue
.
component
(
'hr-job-pickup-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-job-pickup-view/hr-job-pickup-view.vue'
));
Vue
.
component
(
'maintenance-equipment-grid-view'
,
()
=>
import
(
'@pages/odoo-maintenance/maintenance-equipment-grid-view/maintenance-equipment-grid-view.vue'
));
Vue
.
component
(
'maintenance-equipment-grid-view'
,
()
=>
import
(
'@pages/odoo-maintenance/maintenance-equipment-grid-view/maintenance-equipment-grid-view.vue'
));
Vue
.
component
(
'hr-department-pickup-grid-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-department-pickup-grid-view/hr-department-pickup-grid-view.vue'
));
Vue
.
component
(
'hr-department-pickup-grid-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-department-pickup-grid-view/hr-department-pickup-grid-view.vue'
));
Vue
.
component
(
'hr-leave-edit-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-leave-edit-view/hr-leave-edit-view.vue'
));
Vue
.
component
(
'hr-skill-edit-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-skill-edit-view/hr-skill-edit-view.vue'
));
Vue
.
component
(
'hr-skill-edit-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-skill-edit-view/hr-skill-edit-view.vue'
));
Vue
.
component
(
'hr-leave-edit-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-leave-edit-view/hr-leave-edit-view.vue'
));
Vue
.
component
(
'mail-message-remark-view'
,
()
=>
import
(
'@pages/odoo-mail/mail-message-remark-view/mail-message-remark-view.vue'
));
Vue
.
component
(
'mail-message-remark-view'
,
()
=>
import
(
'@pages/odoo-mail/mail-message-remark-view/mail-message-remark-view.vue'
));
Vue
.
component
(
'res-users-pickup-grid-view'
,
()
=>
import
(
'@pages/odoo-base/res-users-pickup-grid-view/res-users-pickup-grid-view.vue'
));
Vue
.
component
(
'res-users-pickup-grid-view'
,
()
=>
import
(
'@pages/odoo-base/res-users-pickup-grid-view/res-users-pickup-grid-view.vue'
));
Vue
.
component
(
'hr-department-master-tab-info-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-department-master-tab-info-view/hr-department-master-tab-info-view.vue'
));
Vue
.
component
(
'hr-department-master-tab-info-view'
,
()
=>
import
(
'@pages/odoo-hr/hr-department-master-tab-info-view/hr-department-master-tab-info-view.vue'
));
...
...
app_HR/src/pages/odoo-hr/hrindex-view/router.ts
浏览文件 @
5c5c9a47
...
@@ -442,20 +442,6 @@ const router = new Router({
...
@@ -442,20 +442,6 @@ const router = new Router({
},
},
component
:
()
=>
import
(
'@pages/odoo-base/res-company-pickup-view/res-company-pickup-view.vue'
),
component
:
()
=>
import
(
'@pages/odoo-base/res-company-pickup-view/res-company-pickup-view.vue'
),
},
},
{
path
:
'mail_followers_mail_message_subtype_rels/:mail_followers_mail_message_subtype_rel?/pickupgridview/:pickupgridview?'
,
meta
:
{
caption
:
'entities.mail_followers_mail_message_subtype_rel.views.pickupgridview.caption'
,
info
:
''
,
parameters
:
[
{
pathName
:
'hrindexview'
,
parameterName
:
'hrindexview'
},
{
pathName
:
'mail_followers_mail_message_subtype_rels'
,
parameterName
:
'mail_followers_mail_message_subtype_rel'
},
{
pathName
:
'pickupgridview'
,
parameterName
:
'pickupgridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/odoo-mail/mail-followers-mail-message-subtype-rel-pickup-grid-view/mail-followers-mail-message-subtype-rel-pickup-grid-view.vue'
),
},
{
{
path
:
'hr_employees/:hr_employee?/mastergridview/:mastergridview?'
,
path
:
'hr_employees/:hr_employee?/mastergridview/:mastergridview?'
,
meta
:
{
meta
:
{
...
@@ -599,62 +585,62 @@ const router = new Router({
...
@@ -599,62 +585,62 @@ const router = new Router({
component
:
()
=>
import
(
'@pages/odoo-hr/hr-department-pickup-grid-view/hr-department-pickup-grid-view.vue'
),
component
:
()
=>
import
(
'@pages/odoo-hr/hr-department-pickup-grid-view/hr-department-pickup-grid-view.vue'
),
},
},
{
{
path
:
'hr_
employees/:hr_employee?/hr_leaves/:hr_leave
?/editview/:editview?'
,
path
:
'hr_
skill_types/:hr_skill_type?/hr_skills/:hr_skill
?/editview/:editview?'
,
meta
:
{
meta
:
{
caption
:
'entities.hr_
leave
.views.editview.caption'
,
caption
:
'entities.hr_
skill
.views.editview.caption'
,
info
:
''
,
info
:
''
,
parameters
:
[
parameters
:
[
{
pathName
:
'hrindexview'
,
parameterName
:
'hrindexview'
},
{
pathName
:
'hrindexview'
,
parameterName
:
'hrindexview'
},
{
pathName
:
'hr_
employees'
,
parameterName
:
'hr_employe
e'
},
{
pathName
:
'hr_
skill_types'
,
parameterName
:
'hr_skill_typ
e'
},
{
pathName
:
'hr_
leaves'
,
parameterName
:
'hr_leave
'
},
{
pathName
:
'hr_
skills'
,
parameterName
:
'hr_skill
'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
],
],
requireAuth
:
true
,
requireAuth
:
true
,
},
},
component
:
()
=>
import
(
'@pages/odoo-hr/hr-
leave-edit-view/hr-leave
-edit-view.vue'
),
component
:
()
=>
import
(
'@pages/odoo-hr/hr-
skill-edit-view/hr-skill
-edit-view.vue'
),
},
},
{
{
path
:
'hr_
leaves/:hr_leave
?/editview/:editview?'
,
path
:
'hr_
skills/:hr_skill
?/editview/:editview?'
,
meta
:
{
meta
:
{
caption
:
'entities.hr_
leave
.views.editview.caption'
,
caption
:
'entities.hr_
skill
.views.editview.caption'
,
info
:
''
,
info
:
''
,
parameters
:
[
parameters
:
[
{
pathName
:
'hrindexview'
,
parameterName
:
'hrindexview'
},
{
pathName
:
'hrindexview'
,
parameterName
:
'hrindexview'
},
{
pathName
:
'hr_
leaves'
,
parameterName
:
'hr_leave
'
},
{
pathName
:
'hr_
skills'
,
parameterName
:
'hr_skill
'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
],
],
requireAuth
:
true
,
requireAuth
:
true
,
},
},
component
:
()
=>
import
(
'@pages/odoo-hr/hr-
leave-edit-view/hr-leave
-edit-view.vue'
),
component
:
()
=>
import
(
'@pages/odoo-hr/hr-
skill-edit-view/hr-skill
-edit-view.vue'
),
},
},
{
{
path
:
'hr_
skill_types/:hr_skill_type?/hr_skills/:hr_skill
?/editview/:editview?'
,
path
:
'hr_
employees/:hr_employee?/hr_leaves/:hr_leave
?/editview/:editview?'
,
meta
:
{
meta
:
{
caption
:
'entities.hr_
skill
.views.editview.caption'
,
caption
:
'entities.hr_
leave
.views.editview.caption'
,
info
:
''
,
info
:
''
,
parameters
:
[
parameters
:
[
{
pathName
:
'hrindexview'
,
parameterName
:
'hrindexview'
},
{
pathName
:
'hrindexview'
,
parameterName
:
'hrindexview'
},
{
pathName
:
'hr_
skill_types'
,
parameterName
:
'hr_skill_typ
e'
},
{
pathName
:
'hr_
employees'
,
parameterName
:
'hr_employe
e'
},
{
pathName
:
'hr_
skills'
,
parameterName
:
'hr_skill
'
},
{
pathName
:
'hr_
leaves'
,
parameterName
:
'hr_leave
'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
],
],
requireAuth
:
true
,
requireAuth
:
true
,
},
},
component
:
()
=>
import
(
'@pages/odoo-hr/hr-
skill-edit-view/hr-skill
-edit-view.vue'
),
component
:
()
=>
import
(
'@pages/odoo-hr/hr-
leave-edit-view/hr-leave
-edit-view.vue'
),
},
},
{
{
path
:
'hr_
skills/:hr_skill
?/editview/:editview?'
,
path
:
'hr_
leaves/:hr_leave
?/editview/:editview?'
,
meta
:
{
meta
:
{
caption
:
'entities.hr_
skill
.views.editview.caption'
,
caption
:
'entities.hr_
leave
.views.editview.caption'
,
info
:
''
,
info
:
''
,
parameters
:
[
parameters
:
[
{
pathName
:
'hrindexview'
,
parameterName
:
'hrindexview'
},
{
pathName
:
'hrindexview'
,
parameterName
:
'hrindexview'
},
{
pathName
:
'hr_
skills'
,
parameterName
:
'hr_skill
'
},
{
pathName
:
'hr_
leaves'
,
parameterName
:
'hr_leave
'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
],
],
requireAuth
:
true
,
requireAuth
:
true
,
},
},
component
:
()
=>
import
(
'@pages/odoo-hr/hr-
skill-edit-view/hr-skill
-edit-view.vue'
),
component
:
()
=>
import
(
'@pages/odoo-hr/hr-
leave-edit-view/hr-leave
-edit-view.vue'
),
},
},
{
{
path
:
'mail_messages/:mail_message?/remarkview/:remarkview?'
,
path
:
'mail_messages/:mail_message?/remarkview/:remarkview?'
,
...
...
app_HR/src/service/entity-service-register.ts
浏览文件 @
5c5c9a47
...
@@ -57,7 +57,6 @@ export class EntityServiceRegister {
...
@@ -57,7 +57,6 @@ export class EntityServiceRegister {
this
.
allEntityService
.
set
(
'survey_survey'
,
()
=>
import
(
'@/service/survey-survey/survey-survey-service'
));
this
.
allEntityService
.
set
(
'survey_survey'
,
()
=>
import
(
'@/service/survey-survey/survey-survey-service'
));
this
.
allEntityService
.
set
(
'account_analytic_account'
,
()
=>
import
(
'@/service/account-analytic-account/account-analytic-account-service'
));
this
.
allEntityService
.
set
(
'account_analytic_account'
,
()
=>
import
(
'@/service/account-analytic-account/account-analytic-account-service'
));
this
.
allEntityService
.
set
(
'ir_attachment'
,
()
=>
import
(
'@/service/ir-attachment/ir-attachment-service'
));
this
.
allEntityService
.
set
(
'ir_attachment'
,
()
=>
import
(
'@/service/ir-attachment/ir-attachment-service'
));
this
.
allEntityService
.
set
(
'mail_followers_mail_message_subtype_rel'
,
()
=>
import
(
'@/service/mail-followers-mail-message-subtype-rel/mail-followers-mail-message-subtype-rel-service'
));
this
.
allEntityService
.
set
(
'hr_skill_level'
,
()
=>
import
(
'@/service/hr-skill-level/hr-skill-level-service'
));
this
.
allEntityService
.
set
(
'hr_skill_level'
,
()
=>
import
(
'@/service/hr-skill-level/hr-skill-level-service'
));
this
.
allEntityService
.
set
(
'hr_department'
,
()
=>
import
(
'@/service/hr-department/hr-department-service'
));
this
.
allEntityService
.
set
(
'hr_department'
,
()
=>
import
(
'@/service/hr-department/hr-department-service'
));
this
.
allEntityService
.
set
(
'gamification_goal'
,
()
=>
import
(
'@/service/gamification-goal/gamification-goal-service'
));
this
.
allEntityService
.
set
(
'gamification_goal'
,
()
=>
import
(
'@/service/gamification-goal/gamification-goal-service'
));
...
...
app_HR/src/store/modules/view-action/state.ts
浏览文件 @
5c5c9a47
...
@@ -198,7 +198,6 @@ export const viewstate: any = {
...
@@ -198,7 +198,6 @@ export const viewstate: any = {
viewaction
:
''
,
viewaction
:
''
,
viewdatachange
:
false
,
viewdatachange
:
false
,
refviews
:
[
refviews
:
[
'7b8521e7692b779d3eab70073008d561'
,
'b0816566792fd556e775203e4dfa964b'
,
'b0816566792fd556e775203e4dfa964b'
,
],
],
},
},
...
@@ -332,15 +331,6 @@ export const viewstate: any = {
...
@@ -332,15 +331,6 @@ export const viewstate: any = {
'9e9b93bac1ef049bb6e24b2d217aae7a'
,
'9e9b93bac1ef049bb6e24b2d217aae7a'
,
],
],
},
},
{
viewtag
:
'7b8521e7692b779d3eab70073008d561'
,
viewmodule
:
'odoo_mail'
,
viewname
:
'mail_followers_mail_message_subtype_relPickupGridView'
,
viewaction
:
''
,
viewdatachange
:
false
,
refviews
:
[
],
},
{
{
viewtag
:
'820c1678c0c8d641e261ae2dca273657'
,
viewtag
:
'820c1678c0c8d641e261ae2dca273657'
,
viewmodule
:
'odoo_base'
,
viewmodule
:
'odoo_base'
,
...
...
app_HR/src/studio-core/components/studio-view/studio-view-layout.less
浏览文件 @
5c5c9a47
...
@@ -180,7 +180,7 @@
...
@@ -180,7 +180,7 @@
>.app-tree-exp-bar-left {
>.app-tree-exp-bar-left {
height: 100%;
height: 100%;
overflow: auto;
>.tree-exp-bar-header {
>.tree-exp-bar-header {
height: 36px;
height: 36px;
font-size: 16px;
font-size: 16px;
...
...
app_HR/src/studio-core/widgets/FormControlBase.tsx
浏览文件 @
5c5c9a47
...
@@ -601,6 +601,11 @@ export class FormControlBase extends MainControlBase {
...
@@ -601,6 +601,11 @@ export class FormControlBase extends MainControlBase {
for
(
let
i
=
0
;
i
<
rule
[
name
].
length
;
i
++
){
for
(
let
i
=
0
;
i
<
rule
[
name
].
length
;
i
++
){
let
item
:
any
=
rule
[
name
][
i
];
let
item
:
any
=
rule
[
name
][
i
];
let
dataValue
=
item
.
deName
?
this
.
data
[
this
.
service
.
getItemNameByDeName
(
item
.
deName
)]:
""
;
let
dataValue
=
item
.
deName
?
this
.
data
[
this
.
service
.
getItemNameByDeName
(
item
.
deName
)]:
""
;
// 为空值时,属性值规则不做校验
if
(
dataValue
===
null
||
dataValue
===
undefined
||
dataValue
===
""
){
startOp
(
true
);
return
falg
;
}
// 常规规则
// 常规规则
if
(
item
.
type
==
'SIMPLE'
){
if
(
item
.
type
==
'SIMPLE'
){
startOp
(
!
this
.
$verify
.
checkFieldSimpleRule
(
dataValue
,
item
.
condOP
,
item
.
paramValue
,
item
.
ruleInfo
,
item
.
paramType
,
this
.
data
,
item
.
isKeyCond
));
startOp
(
!
this
.
$verify
.
checkFieldSimpleRule
(
dataValue
,
item
.
condOP
,
item
.
paramValue
,
item
.
ruleInfo
,
item
.
paramType
,
this
.
data
,
item
.
isKeyCond
));
...
...
app_HR/src/studio-core/widgets/GridControlBase.tsx
浏览文件 @
5c5c9a47
...
@@ -1332,6 +1332,11 @@ export class GridControlBase extends MDControlBase {
...
@@ -1332,6 +1332,11 @@ export class GridControlBase extends MDControlBase {
for
(
let
i
=
0
;
i
<
rule
[
name
].
length
;
i
++
){
for
(
let
i
=
0
;
i
<
rule
[
name
].
length
;
i
++
){
let
item
:
any
=
rule
[
name
][
i
];
let
item
:
any
=
rule
[
name
][
i
];
// let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
// let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
// 为空值时,属性值规则不做校验
if
(
value
===
null
||
value
===
undefined
||
value
===
""
){
startOp
(
true
);
return
falg
;
}
// 常规规则
// 常规规则
if
(
item
.
type
==
'SIMPLE'
){
if
(
item
.
type
==
'SIMPLE'
){
startOp
(
!
this
.
$verify
.
checkFieldSimpleRule
(
value
,
item
.
condOP
,
item
.
paramValue
,
item
.
ruleInfo
,
item
.
paramType
,
this
.
curEditRowData
,
item
.
isKeyCond
));
startOp
(
!
this
.
$verify
.
checkFieldSimpleRule
(
value
,
item
.
condOP
,
item
.
paramValue
,
item
.
ruleInfo
,
item
.
paramType
,
this
.
curEditRowData
,
item
.
isKeyCond
));
...
...
app_HR/src/uiservice/ui-service-register.ts
浏览文件 @
5c5c9a47
...
@@ -57,7 +57,6 @@ export class UIServiceRegister {
...
@@ -57,7 +57,6 @@ export class UIServiceRegister {
this
.
allUIService
.
set
(
'survey_survey'
,
()
=>
import
(
'@/uiservice/survey-survey/survey-survey-ui-service'
));
this
.
allUIService
.
set
(
'survey_survey'
,
()
=>
import
(
'@/uiservice/survey-survey/survey-survey-ui-service'
));
this
.
allUIService
.
set
(
'account_analytic_account'
,
()
=>
import
(
'@/uiservice/account-analytic-account/account-analytic-account-ui-service'
));
this
.
allUIService
.
set
(
'account_analytic_account'
,
()
=>
import
(
'@/uiservice/account-analytic-account/account-analytic-account-ui-service'
));
this
.
allUIService
.
set
(
'ir_attachment'
,
()
=>
import
(
'@/uiservice/ir-attachment/ir-attachment-ui-service'
));
this
.
allUIService
.
set
(
'ir_attachment'
,
()
=>
import
(
'@/uiservice/ir-attachment/ir-attachment-ui-service'
));
this
.
allUIService
.
set
(
'mail_followers_mail_message_subtype_rel'
,
()
=>
import
(
'@/uiservice/mail-followers-mail-message-subtype-rel/mail-followers-mail-message-subtype-rel-ui-service'
));
this
.
allUIService
.
set
(
'hr_skill_level'
,
()
=>
import
(
'@/uiservice/hr-skill-level/hr-skill-level-ui-service'
));
this
.
allUIService
.
set
(
'hr_skill_level'
,
()
=>
import
(
'@/uiservice/hr-skill-level/hr-skill-level-ui-service'
));
this
.
allUIService
.
set
(
'hr_department'
,
()
=>
import
(
'@/uiservice/hr-department/hr-department-ui-service'
));
this
.
allUIService
.
set
(
'hr_department'
,
()
=>
import
(
'@/uiservice/hr-department/hr-department-ui-service'
));
this
.
allUIService
.
set
(
'gamification_goal'
,
()
=>
import
(
'@/uiservice/gamification-goal/gamification-goal-ui-service'
));
this
.
allUIService
.
set
(
'gamification_goal'
,
()
=>
import
(
'@/uiservice/gamification-goal/gamification-goal-ui-service'
));
...
...
app_HR/src/widgets/app/master-message-portlet/master-message-portlet-base.tsx
0 → 100644
浏览文件 @
5c5c9a47
import
{
Prop
,
Provide
,
Emit
,
Model
}
from
'vue-property-decorator'
;
import
{
Subject
,
Subscription
}
from
'rxjs'
;
import
{
UIActionTool
,
Util
,
ViewTool
}
from
'@/utils'
;
import
{
Watch
,
MainControlBase
}
from
'@/studio-core'
;
import
MasterMessageService
from
'./master-message-portlet-service'
;
import
{
Environment
}
from
'@/environments/environment'
;
import
UIService
from
'@/uiservice/ui-service'
;
/**
* dashboard_sysportlet2部件基类
*
* @export
* @class MainControlBase
* @extends {MasterMessagePortletBase}
*/
export
class
MasterMessagePortletBase
extends
MainControlBase
{
/**
* 获取部件类型
*
* @protected
* @type {string}
* @memberof MasterMessagePortletBase
*/
protected
controlType
:
string
=
'PORTLET'
;
/**
* 建构部件服务对象
*
* @type {MasterMessageService}
* @memberof MasterMessagePortletBase
*/
public
service
:
MasterMessageService
=
new
MasterMessageService
({
$store
:
this
.
$store
});
/**
* 长度
*
* @type {number}
* @memberof MasterMessage
*/
@
Prop
()
public
height
?:
number
;
/**
* 宽度
*
* @type {number}
* @memberof MasterMessage
*/
@
Prop
()
public
width
?:
number
;
/**
* 门户部件类型
*
* @type {number}
* @memberof MasterMessageBase
*/
public
portletType
:
string
=
'view'
;
/**
* 界面行为模型数据
*
* @memberof MasterMessageBase
*/
public
uiactionModel
:
any
=
{
}
/**
* 是否自适应大小
*
* @returns {boolean}
* @memberof MasterMessageBase
*/
@
Prop
({
default
:
false
})
public
isAdaptiveSize
!
:
boolean
;
/**
* 获取多项数据
*
* @returns {any[]}
* @memberof MasterMessageBase
*/
public
getDatas
():
any
[]
{
return
[];
}
/**
* 获取单项树
*
* @returns {*}
* @memberof MasterMessageBase
*/
public
getData
():
any
{
return
{};
}
/**
* 获取高度
*
* @returns {any[]}
* @memberof MasterMessageBase
*/
get
getHeight
():
any
{
if
(
!
this
.
$util
.
isEmpty
(
this
.
height
)
&&
!
this
.
$util
.
isNumberNaN
(
this
.
height
)){
if
(
this
.
height
==
0
){
return
'auto'
;
}
else
{
return
this
.
height
+
'px'
;
}
}
else
{
return
'auto'
;
}
}
/**
* vue 生命周期
*
* @memberof MasterMessageBase
*/
public
created
()
{
this
.
afterCreated
();
}
/**
* 执行created后的逻辑
*
* @memberof MasterMessageBase
*/
public
afterCreated
(){
if
(
this
.
viewState
)
{
this
.
viewStateEvent
=
this
.
viewState
.
subscribe
(({
tag
,
action
,
data
})
=>
{
if
(
Object
.
is
(
tag
,
"all-portlet"
)
&&
Object
.
is
(
action
,
'loadmodel'
)){
this
.
calcUIActionAuthState
(
data
);
}
if
(
!
Object
.
is
(
tag
,
this
.
name
))
{
return
;
}
const
refs
:
any
=
this
.
$refs
;
Object
.
keys
(
refs
).
forEach
((
_name
:
string
)
=>
{
this
.
viewState
.
next
({
tag
:
_name
,
action
:
action
,
data
:
data
});
});
});
}
}
/**
* vue 生命周期
*
* @memberof MasterMessageBase
*/
public
destroyed
()
{
this
.
afterDestroy
();
}
/**
* 执行destroyed后的逻辑
*
* @memberof MasterMessageBase
*/
public
afterDestroy
()
{
if
(
this
.
viewStateEvent
)
{
this
.
viewStateEvent
.
unsubscribe
();
}
}
/**
* 计算界面行为权限
*
* @memberof MasterMessageBase
*/
public
calcUIActionAuthState
(
data
:
any
=
{})
{
// 如果是操作栏,不计算权限
if
(
this
.
portletType
&&
Object
.
is
(
'actionbar'
,
this
.
portletType
))
{
return
;
}
let
_this
:
any
=
this
;
let
uiservice
:
any
=
_this
.
appUIService
?
_this
.
appUIService
:
new
UIService
(
_this
.
$store
);
if
(
_this
.
uiactionModel
){
ViewTool
.
calcActionItemAuthState
(
data
,
_this
.
uiactionModel
,
uiservice
);
}
}
/**
* 刷新
*
* @memberof MasterMessageBase
*/
public
refresh
(
args
?:
any
)
{
this
.
viewState
.
next
({
tag
:
'mail_messageMainView'
,
action
:
'refresh'
,
data
:
args
});
}
}
app_HR/src/widgets/app/master-message-portlet/master-message-portlet-model.ts
0 → 100644
浏览文件 @
5c5c9a47
/**
* MasterMessage 部件模型
*
* @export
* @class MasterMessageModel
*/
export
default
class
MasterMessageModel
{
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof MasterMessageModel
*/
public
getDataItems
():
any
[]
{
return
[
]
}
}
app_HR/src/widgets/app/master-message-portlet/master-message-portlet-service.ts
0 → 100644
浏览文件 @
5c5c9a47
import
{
Http
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
/**
* MasterMessage 部件服务对象
*
* @export
* @class MasterMessageService
*/
export
default
class
MasterMessageService
extends
ControlService
{
}
app_HR/src/widgets/app/master-message-portlet/master-message-portlet.html
0 → 100644
浏览文件 @
5c5c9a47
<div
class=
'portlet master-message '
:style=
"{}"
>
<div
class=
"portlet-without-title"
>
<mail-message-main-view
:portletState=
"viewState"
:viewUsage=
"4"
:viewdata=
"JSON.stringify(context)"
:viewDefaultUsage=
"false"
></mail-message-main-view>
</div>
</div>
app_HR/src/widgets/app/master-message-portlet/master-message-portlet.vue
0 → 100644
浏览文件 @
5c5c9a47
<
template
src=
"./master-message-portlet.html"
/>
<script
lang=
'tsx'
>
import
{ Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { MasterMessagePortletBase } from './master-message-portlet-base';
/**
* dashboard_sysportlet2部件
*
* @export
* @class MasterMessagePortlet
* @extends {MasterMessagePortletBase}
*/
@Component({
components: {
}
})
@VueLifeCycleProcessing()
export default class MasterMessagePortlet extends MasterMessagePortletBase { }
</script>
app_HR/src/widgets/control-service.ts
浏览文件 @
5c5c9a47
...
@@ -319,6 +319,7 @@ export default class ControlService {
...
@@ -319,6 +319,7 @@ export default class ControlService {
return
false
;
return
false
;
}
}
let
dataItems
:
any
[]
=
model
.
getDataItems
();
let
dataItems
:
any
[]
=
model
.
getDataItems
();
prop
=
prop
.
replace
(
/
([
A-Z
])
/g
,
"_$1"
).
toLowerCase
();
let
data
:
any
=
dataItems
.
find
((
item
:
any
)
=>
{
let
data
:
any
=
dataItems
.
find
((
item
:
any
)
=>
{
return
Object
.
is
(
prop
,
item
.
prop
);
return
Object
.
is
(
prop
,
item
.
prop
);
});
});
...
...
app_HR/src/widgets/hr-contract/main-grid/main-grid-base.tsx
浏览文件 @
5c5c9a47
此差异已折叠。
点击以展开。
app_HR/src/widgets/hr-contract/main-grid/main-grid-model.ts
浏览文件 @
5c5c9a47
...
@@ -31,24 +31,98 @@ export default class MainModel {
...
@@ -31,24 +31,98 @@ export default class MainModel {
prop
:
'name'
,
prop
:
'name'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
name
:
'company_id_text'
,
prop
:
'company_id_text'
,
dataType
:
'PICKUPTEXT'
,
isEditable
:
true
},
{
name
:
'department_id_text'
,
prop
:
'department_id_text'
,
dataType
:
'PICKUPTEXT'
,
isEditable
:
true
},
{
name
:
'employee_id_text'
,
prop
:
'employee_id_text'
,
dataType
:
'PICKUPTEXT'
,
isEditable
:
true
},
{
name
:
'job_id_text'
,
prop
:
'job_id_text'
,
dataType
:
'PICKUPTEXT'
,
isEditable
:
true
},
{
name
:
'date_start'
,
prop
:
'date_start'
,
dataType
:
'DATE'
,
isEditable
:
true
},
{
name
:
'date_end'
,
prop
:
'date_end'
,
dataType
:
'DATE'
,
isEditable
:
true
},
{
name
:
'trial_date_end'
,
prop
:
'trial_date_end'
,
dataType
:
'DATE'
,
isEditable
:
true
},
{
name
:
'resource_calendar_id_text'
,
prop
:
'resource_calendar_id_text'
,
dataType
:
'PICKUPTEXT'
,
isEditable
:
true
},
{
name
:
'state'
,
prop
:
'state'
,
dataType
:
'SSCODELIST'
,
isEditable
:
true
},
{
name
:
'wage'
,
prop
:
'wage'
,
dataType
:
'FLOAT'
,
},
{
name
:
'notes'
,
prop
:
'notes'
,
dataType
:
'LONGTEXT'
,
isEditable
:
true
},
{
{
name
:
'company_id'
,
name
:
'company_id'
,
prop
:
'company_id'
,
prop
:
'company_id'
,
dataType
:
'PICKUP'
,
dataType
:
'PICKUP'
,
isEditable
:
true
},
},
{
{
name
:
'
write_u
id'
,
name
:
'
department_
id'
,
prop
:
'
write_u
id'
,
prop
:
'
department_
id'
,
dataType
:
'PICKUP'
,
dataType
:
'PICKUP'
,
isEditable
:
true
},
{
name
:
'job_id'
,
prop
:
'job_id'
,
dataType
:
'PICKUP'
,
isEditable
:
true
},
},
{
{
name
:
'resource_calendar_id'
,
name
:
'resource_calendar_id'
,
prop
:
'resource_calendar_id'
,
prop
:
'resource_calendar_id'
,
dataType
:
'PICKUP'
,
dataType
:
'PICKUP'
,
isEditable
:
true
},
},
{
{
name
:
'
department_
id'
,
name
:
'
write_u
id'
,
prop
:
'
department_
id'
,
prop
:
'
write_u
id'
,
dataType
:
'PICKUP'
,
dataType
:
'PICKUP'
,
},
},
{
{
...
@@ -56,21 +130,11 @@ export default class MainModel {
...
@@ -56,21 +130,11 @@ export default class MainModel {
prop
:
'create_uid'
,
prop
:
'create_uid'
,
dataType
:
'PICKUP'
,
dataType
:
'PICKUP'
,
},
},
{
name
:
'employee_id'
,
prop
:
'employee_id'
,
dataType
:
'PICKUP'
,
},
{
{
name
:
'srfmajortext'
,
name
:
'srfmajortext'
,
prop
:
'name'
,
prop
:
'name'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
name
:
'hr_responsible_id'
,
prop
:
'hr_responsible_id'
,
dataType
:
'PICKUP'
,
},
{
{
name
:
'srfdataaccaction'
,
name
:
'srfdataaccaction'
,
prop
:
'id'
,
prop
:
'id'
,
...
@@ -83,8 +147,14 @@ export default class MainModel {
...
@@ -83,8 +147,14 @@ export default class MainModel {
isEditable
:
true
isEditable
:
true
},
},
{
{
name
:
'job_id'
,
name
:
'employee_id'
,
prop
:
'job_id'
,
prop
:
'employee_id'
,
dataType
:
'PICKUP'
,
isEditable
:
true
},
{
name
:
'hr_responsible_id'
,
prop
:
'hr_responsible_id'
,
dataType
:
'PICKUP'
,
dataType
:
'PICKUP'
,
},
},
{
{
...
...
app_HR/src/widgets/hr-contract/main-grid/main-grid-service.ts
浏览文件 @
5c5c9a47
...
@@ -3,6 +3,11 @@ import { Util, Errorlog } from '@/utils';
...
@@ -3,6 +3,11 @@ import { Util, Errorlog } from '@/utils';
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
Hr_contractService
from
'@/service/hr-contract/hr-contract-service'
;
import
Hr_contractService
from
'@/service/hr-contract/hr-contract-service'
;
import
MainModel
from
'./main-grid-model'
;
import
MainModel
from
'./main-grid-model'
;
import
Hr_departmentService
from
'@/service/hr-department/hr-department-service'
;
import
Resource_calendarService
from
'@/service/resource-calendar/resource-calendar-service'
;
import
Res_companyService
from
'@/service/res-company/res-company-service'
;
import
Hr_employeeService
from
'@/service/hr-employee/hr-employee-service'
;
import
Hr_jobService
from
'@/service/hr-job/hr-job-service'
;
/**
/**
...
@@ -59,6 +64,46 @@ export default class MainService extends ControlService {
...
@@ -59,6 +64,46 @@ export default class MainService extends ControlService {
private
remoteCopyData
:
any
=
{};
private
remoteCopyData
:
any
=
{};
/**
* HR 部门服务对象
*
* @type {Hr_departmentService}
* @memberof MainService
*/
public
hr_departmentService
:
Hr_departmentService
=
new
Hr_departmentService
();
/**
* 资源工作时间服务对象
*
* @type {Resource_calendarService}
* @memberof MainService
*/
public
resource_calendarService
:
Resource_calendarService
=
new
Resource_calendarService
();
/**
* 公司服务对象
*
* @type {Res_companyService}
* @memberof MainService
*/
public
res_companyService
:
Res_companyService
=
new
Res_companyService
();
/**
* 员工服务对象
*
* @type {Hr_employeeService}
* @memberof MainService
*/
public
hr_employeeService
:
Hr_employeeService
=
new
Hr_employeeService
();
/**
* 工作岗位服务对象
*
* @type {Hr_jobService}
* @memberof MainService
*/
public
hr_jobService
:
Hr_jobService
=
new
Hr_jobService
();
/**
/**
* 处理数据
* 处理数据
*
*
...
@@ -100,6 +145,21 @@ export default class MainService extends ControlService {
...
@@ -100,6 +145,21 @@ export default class MainService extends ControlService {
public
getItems
(
serviceName
:
string
,
interfaceName
:
string
,
context
:
any
=
{},
data
:
any
,
isloading
?:
boolean
):
Promise
<
any
[]
>
{
public
getItems
(
serviceName
:
string
,
interfaceName
:
string
,
context
:
any
=
{},
data
:
any
,
isloading
?:
boolean
):
Promise
<
any
[]
>
{
data
.
page
=
data
.
page
?
data
.
page
:
0
;
data
.
page
=
data
.
page
?
data
.
page
:
0
;
data
.
size
=
data
.
size
?
data
.
size
:
1000
;
data
.
size
=
data
.
size
?
data
.
size
:
1000
;
if
(
Object
.
is
(
serviceName
,
'Hr_departmentService'
)
&&
Object
.
is
(
interfaceName
,
'FetchDefault'
))
{
return
this
.
doItems
(
this
.
hr_departmentService
.
FetchDefault
(
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
,
isloading
),
'id'
,
'hr_department'
);
}
if
(
Object
.
is
(
serviceName
,
'Resource_calendarService'
)
&&
Object
.
is
(
interfaceName
,
'FetchDefault'
))
{
return
this
.
doItems
(
this
.
resource_calendarService
.
FetchDefault
(
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
,
isloading
),
'id'
,
'resource_calendar'
);
}
if
(
Object
.
is
(
serviceName
,
'Res_companyService'
)
&&
Object
.
is
(
interfaceName
,
'FetchDefault'
))
{
return
this
.
doItems
(
this
.
res_companyService
.
FetchDefault
(
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
,
isloading
),
'id'
,
'res_company'
);
}
if
(
Object
.
is
(
serviceName
,
'Hr_employeeService'
)
&&
Object
.
is
(
interfaceName
,
'FetchDefault'
))
{
return
this
.
doItems
(
this
.
hr_employeeService
.
FetchDefault
(
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
,
isloading
),
'id'
,
'hr_employee'
);
}
if
(
Object
.
is
(
serviceName
,
'Hr_jobService'
)
&&
Object
.
is
(
interfaceName
,
'FetchDefault'
))
{
return
this
.
doItems
(
this
.
hr_jobService
.
FetchDefault
(
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
,
isloading
),
'id'
,
'hr_job'
);
}
return
Promise
.
reject
([])
return
Promise
.
reject
([])
}
}
...
...
app_HR/src/widgets/hr-contract/main-grid/main-grid.html
浏览文件 @
5c5c9a47
此差异已折叠。
点击以展开。
app_HR/src/widgets/hr-employee/master-summary-dashboard/master-summary-dashboard.vue
浏览文件 @
5c5c9a47
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
import
{ Component } from 'vue-property-decorator';
import
{ Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { VueLifeCycleProcessing } from '@/studio-core';
import { MasterSummaryDashboardBase } from './master-summary-dashboard-base';
import { MasterSummaryDashboardBase } from './master-summary-dashboard-base';
import view_dashboard_sysportlet2 from '@widgets/
hr-employee
/master-message-portlet/master-message-portlet.vue';
import view_dashboard_sysportlet2 from '@widgets/
app
/master-message-portlet/master-message-portlet.vue';
import view_dashboard_sysportlet1 from '@widgets/hr-employee/master-summary-portlet/master-summary-portlet.vue';
import view_dashboard_sysportlet1 from '@widgets/hr-employee/master-summary-portlet/master-summary-portlet.vue';
...
...
app_HR/src/widgets/mail-message/remark-form/remark-form.html
浏览文件 @
5c5c9a47
...
@@ -21,7 +21,6 @@
...
@@ -21,7 +21,6 @@
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.button1.visible"
:style=
"{}"
:lg=
"{ span: 24, offset: 0 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.button1.visible"
:style=
"{}"
:lg=
"{ span: 24, offset: 0 }"
>
<i-button
type=
"primary"
@
click=
"button1_click($event)"
<i-button
type=
"primary"
@
click=
"button1_click($event)"
style=
""
>
style=
""
>
<span
>
{{$t('entities.mail_message.remark_form.details.button1')}}
</span>
<span
>
{{$t('entities.mail_message.remark_form.details.button1')}}
</span>
</i-button>
</i-button>
...
...
app_HR/src/widgets/mail-message/send-form/send-form.html
浏览文件 @
5c5c9a47
...
@@ -31,7 +31,6 @@
...
@@ -31,7 +31,6 @@
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.button1.visible"
:style=
"{}"
:lg=
"{ span: 24, offset: 0 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.button1.visible"
:style=
"{}"
:lg=
"{ span: 24, offset: 0 }"
>
<i-button
type=
"primary"
@
click=
"button1_click($event)"
<i-button
type=
"primary"
@
click=
"button1_click($event)"
style=
""
>
style=
""
>
<span
>
{{$t('entities.mail_message.send_form.details.button1')}}
</span>
<span
>
{{$t('entities.mail_message.send_form.details.button1')}}
</span>
</i-button>
</i-button>
...
...
businesscentral-app/businesscentral-app-hr/src/main/docker/Dockerfile
浏览文件 @
5c5c9a47
...
@@ -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
浏览文件 @
5c5c9a47
...
@@ -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-invoice/src/main/docker/Dockerfile
浏览文件 @
5c5c9a47
...
@@ -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
浏览文件 @
5c5c9a47
...
@@ -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
浏览文件 @
5c5c9a47
...
@@ -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
浏览文件 @
5c5c9a47
...
@@ -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/impl/Purchase_requisitionServiceImpl.java
浏览文件 @
5c5c9a47
...
@@ -79,6 +79,14 @@ public class Purchase_requisitionServiceImpl extends EBSServiceImpl<Purchase_req
...
@@ -79,6 +79,14 @@ public class Purchase_requisitionServiceImpl extends EBSServiceImpl<Purchase_req
@Lazy
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
service
.
IStock_warehouseService
stockWarehouseService
;
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_stock
.
service
.
IStock_warehouseService
stockWarehouseService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
logic
.
IPurchase_requisitionUpdate__MSDenyLogic
update__msdenyLogic
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
logic
.
IPurchase_requisitionRemove__MSDenyLogic
remove__msdenyLogic
;
protected
int
batchSize
=
500
;
protected
int
batchSize
=
500
;
public
String
getIrModel
(){
public
String
getIrModel
(){
...
@@ -149,6 +157,8 @@ public class Purchase_requisitionServiceImpl extends EBSServiceImpl<Purchase_req
...
@@ -149,6 +157,8 @@ public class Purchase_requisitionServiceImpl extends EBSServiceImpl<Purchase_req
@Override
@Override
@Transactional
@Transactional
public
boolean
remove
(
Long
key
)
{
public
boolean
remove
(
Long
key
)
{
Purchase_requisition
et
=
new
Purchase_requisition
();
et
.
set
(
"id"
,
key
);
purchaseRequisitionLineService
.
removeByRequisitionId
(
key
);
purchaseRequisitionLineService
.
removeByRequisitionId
(
key
);
boolean
result
=
removeById
(
key
);
boolean
result
=
removeById
(
key
);
return
result
;
return
result
;
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/logic/IPurchase_requisitionRemove__MSDenyLogic.java
0 → 100644
浏览文件 @
5c5c9a47
package
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
logic
;
import
java.sql.Timestamp
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.HashMap
;
import
cn.ibizlab.businesscentral.core.odoo_purchase.domain.Purchase_requisition
;
/**
* 关系型数据实体[Remove__MSDeny] 对象
*/
public
interface
IPurchase_requisitionRemove__MSDenyLogic
{
void
execute
(
Purchase_requisition
et
)
;
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/logic/IPurchase_requisitionUpdate__MSDenyLogic.java
0 → 100644
浏览文件 @
5c5c9a47
package
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
logic
;
import
java.sql.Timestamp
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.HashMap
;
import
cn.ibizlab.businesscentral.core.odoo_purchase.domain.Purchase_requisition
;
/**
* 关系型数据实体[Update__MSDeny] 对象
*/
public
interface
IPurchase_requisitionUpdate__MSDenyLogic
{
void
execute
(
Purchase_requisition
et
)
;
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/logic/impl/Purchase_requisitionRemove__MSDenyLogicImpl.java
0 → 100644
浏览文件 @
5c5c9a47
package
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
logic
.
impl
;
import
java.sql.Timestamp
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.HashMap
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.kie.api.runtime.KieSession
;
import
org.kie.api.runtime.KieContainer
;
import
cn.ibizlab.businesscentral.core.odoo_purchase.service.logic.IPurchase_requisitionRemove__MSDenyLogic
;
import
cn.ibizlab.businesscentral.core.odoo_purchase.domain.Purchase_requisition
;
/**
* 关系型数据实体[Remove__MSDeny] 对象
*/
@Slf4j
@Service
public
class
Purchase_requisitionRemove__MSDenyLogicImpl
implements
IPurchase_requisitionRemove__MSDenyLogic
{
@Autowired
private
KieContainer
kieContainer
;
@Autowired
private
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
purchase_requisitionservice
;
public
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
getPurchase_requisitionService
()
{
return
this
.
purchase_requisitionservice
;
}
@Autowired
private
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
iBzSysDefaultService
;
public
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
getIBzSysDefaultService
()
{
return
this
.
iBzSysDefaultService
;
}
public
void
execute
(
Purchase_requisition
et
){
KieSession
kieSession
=
null
;
try
{
kieSession
=
kieContainer
.
newKieSession
();
kieSession
.
insert
(
et
);
kieSession
.
setGlobal
(
"purchase_requisitionremove__msdenydefault"
,
et
);
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
domain
.
Purchase_requisition
purchase_requisitionremove__msdenytemp
=
new
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
domain
.
Purchase_requisition
();
kieSession
.
insert
(
purchase_requisitionremove__msdenytemp
);
kieSession
.
setGlobal
(
"purchase_requisitionremove__msdenytemp"
,
purchase_requisitionremove__msdenytemp
);
kieSession
.
setGlobal
(
"purchase_requisitionservice"
,
purchase_requisitionservice
);
kieSession
.
setGlobal
(
"iBzSysPurchase_requisitionDefaultService"
,
iBzSysDefaultService
);
kieSession
.
setGlobal
(
"curuser"
,
cn
.
ibizlab
.
businesscentral
.
util
.
security
.
AuthenticationUser
.
getAuthenticationUser
());
kieSession
.
startProcess
(
"cn.ibizlab.businesscentral.core.odoo_purchase.service.logic.purchase_requisitionremove__msdeny"
);
}
catch
(
Exception
e
){
throw
new
RuntimeException
(
"执行[行为[Remove]主状态拒绝逻辑]处理逻辑发生异常"
+
e
);
}
finally
{
if
(
kieSession
!=
null
)
kieSession
.
destroy
();
}
}
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/logic/impl/Purchase_requisitionUpdate__MSDenyLogicImpl.java
0 → 100644
浏览文件 @
5c5c9a47
package
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
logic
.
impl
;
import
java.sql.Timestamp
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.HashMap
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.kie.api.runtime.KieSession
;
import
org.kie.api.runtime.KieContainer
;
import
cn.ibizlab.businesscentral.core.odoo_purchase.service.logic.IPurchase_requisitionUpdate__MSDenyLogic
;
import
cn.ibizlab.businesscentral.core.odoo_purchase.domain.Purchase_requisition
;
/**
* 关系型数据实体[Update__MSDeny] 对象
*/
@Slf4j
@Service
public
class
Purchase_requisitionUpdate__MSDenyLogicImpl
implements
IPurchase_requisitionUpdate__MSDenyLogic
{
@Autowired
private
KieContainer
kieContainer
;
@Autowired
private
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
purchase_requisitionservice
;
public
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
getPurchase_requisitionService
()
{
return
this
.
purchase_requisitionservice
;
}
@Autowired
private
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
iBzSysDefaultService
;
public
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
getIBzSysDefaultService
()
{
return
this
.
iBzSysDefaultService
;
}
public
void
execute
(
Purchase_requisition
et
){
KieSession
kieSession
=
null
;
try
{
kieSession
=
kieContainer
.
newKieSession
();
kieSession
.
insert
(
et
);
kieSession
.
setGlobal
(
"purchase_requisitionupdate__msdenydefault"
,
et
);
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
domain
.
Purchase_requisition
purchase_requisitionupdate__msdenytemp
=
new
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
domain
.
Purchase_requisition
();
kieSession
.
insert
(
purchase_requisitionupdate__msdenytemp
);
kieSession
.
setGlobal
(
"purchase_requisitionupdate__msdenytemp"
,
purchase_requisitionupdate__msdenytemp
);
kieSession
.
setGlobal
(
"purchase_requisitionservice"
,
purchase_requisitionservice
);
kieSession
.
setGlobal
(
"iBzSysPurchase_requisitionDefaultService"
,
iBzSysDefaultService
);
kieSession
.
setGlobal
(
"curuser"
,
cn
.
ibizlab
.
businesscentral
.
util
.
security
.
AuthenticationUser
.
getAuthenticationUser
());
kieSession
.
startProcess
(
"cn.ibizlab.businesscentral.core.odoo_purchase.service.logic.purchase_requisitionupdate__msdeny"
);
}
catch
(
Exception
e
){
throw
new
RuntimeException
(
"执行[行为[Update]主状态拒绝逻辑]处理逻辑发生异常"
+
e
);
}
finally
{
if
(
kieSession
!=
null
)
kieSession
.
destroy
();
}
}
}
businesscentral-core/src/main/resources/rules/Purchase_requisitionRemove__MSDenyRule.drl
0 → 100644
浏览文件 @
5c5c9a47
package
cn
.
ibizlab
.
businesscentral
.
odoo_purchase
.
logic
.
purchase_requisitionlogic
.
remove__msdeny
;
import
java
.
util
.
Map
;
import
java
.
util
.
HashMap
;
import
com
.
alibaba
.
fastjson
.
JSONObject
;
import
org
.
springframework
.
util
.
StringUtils
;
import
org
.
springframework
.
util
.
ObjectUtils
;
import
cn
.
ibizlab
.
businesscentral
.
util
.
errors
.
BadRequestAlertException
;
global
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
domain
.
Purchase_requisition
purchase_requisitionremove__msdenydefault
;
global
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
domain
.
Purchase_requisition
purchase_requisitionremove__msdenytemp
;
global
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
purchase_requisitionservice
;
global
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
iBzSysPurchase_requisitionDefaultService
;
global
cn
.
ibizlab
.
businesscentral
.
util
.
security
.
AuthenticationUser
curuser
;
no
-
loop
//
逻辑处理节点
[
开始
]
rule
"begin"
ruleflow
-
group
"purchase_requisitionremove__msdenybegin"
when
then
end
//
逻辑处理节点
[
状态
[
多提供商
-
草稿
]
拒绝
[
remove
]
操作
]
rule
"denybymulti_draft"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybymulti_draft"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
单一提供商
-
已确认
]
拒绝
[
remove
]
操作
]
rule
"denybysigle_in_progress"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybysigle_in_progress"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
多提供商
-
出价选择
]
拒绝
[
remove
]
操作
]
rule
"denybymulti_open"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybymulti_open"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
准备临时参数
]
rule
"preparetemp"
ruleflow
-
group
"purchase_requisitionremove__msdenypreparetemp"
when
then
purchase_requisitionremove__msdenytemp
.
set
(
"id"
,
purchase_requisitionremove__msdenydefault
.
get
(
"id"
));
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
获取数据
]
rule
"get"
ruleflow
-
group
"purchase_requisitionremove__msdenyget"
when
then
cn
.
ibizlab
.
businesscentral
.
util
.
helper
.
CachedBeanCopier
.
copy
(
purchase_requisitionservice
.
get
(
purchase_requisitionremove__msdenytemp
.
getId
()),
purchase_requisitionremove__msdenytemp
);
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
多提供商
-
已关闭
]
拒绝
[
remove
]
操作
]
rule
"denybymulti_done"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybymulti_done"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
多提供商
-
已取消
]
拒绝
[
remove
]
操作
]
rule
"denybymulti_cancel"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybymulti_cancel"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
单一提供商
-
已取消
]
拒绝
[
remove
]
操作
]
rule
"denybysigle_cancel"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybysigle_cancel"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
单一提供商
-
正在进行
]
拒绝
[
remove
]
操作
]
rule
"denybysigle_ongoing"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybysigle_ongoing"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
单一提供商
-
已关闭
]
拒绝
[
remove
]
操作
]
rule
"denybysigle_done"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybysigle_done"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
单一提供商
-
草稿
]
拒绝
[
remove
]
操作
]
rule
"denybysigle_draft"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybysigle_draft"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
单一提供商
-
出价选择
]
拒绝
[
remove
]
操作
]
rule
"denybysigle_open"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybysigle_open"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
多提供商
-
正在进行
]
拒绝
[
remove
]
操作
]
rule
"denybymulti_ongoing"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybymulti_ongoing"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
多提供商
-
已确认
]
拒绝
[
remove
]
操作
]
rule
"denybymulti_in_progress"
ruleflow
-
group
"purchase_requisitionremove__msdenydenybymulti_in_progress"
when
then
update
(
purchase_requisitionremove__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionremove__msdenytemp
);//
更新
fact
中变量值
end
businesscentral-core/src/main/resources/rules/Purchase_requisitionRemove__MSDenyRuleFlow.bpmn
0 → 100644
浏览文件 @
5c5c9a47
此差异已折叠。
点击以展开。
businesscentral-core/src/main/resources/rules/Purchase_requisitionUpdate__MSDenyRule.drl
0 → 100644
浏览文件 @
5c5c9a47
package
cn
.
ibizlab
.
businesscentral
.
odoo_purchase
.
logic
.
purchase_requisitionlogic
.
update__msdeny
;
import
java
.
util
.
Map
;
import
java
.
util
.
HashMap
;
import
com
.
alibaba
.
fastjson
.
JSONObject
;
import
org
.
springframework
.
util
.
StringUtils
;
import
org
.
springframework
.
util
.
ObjectUtils
;
import
cn
.
ibizlab
.
businesscentral
.
util
.
errors
.
BadRequestAlertException
;
global
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
domain
.
Purchase_requisition
purchase_requisitionupdate__msdenydefault
;
global
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
domain
.
Purchase_requisition
purchase_requisitionupdate__msdenytemp
;
global
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
purchase_requisitionservice
;
global
cn
.
ibizlab
.
businesscentral
.
core
.
odoo_purchase
.
service
.
IPurchase_requisitionService
iBzSysPurchase_requisitionDefaultService
;
global
cn
.
ibizlab
.
businesscentral
.
util
.
security
.
AuthenticationUser
curuser
;
no
-
loop
//
逻辑处理节点
[
状态
[
多提供商
-
已关闭
]
拒绝
[
update
]
操作
]
rule
"denybymulti_done"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybymulti_done"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
单一提供商
-
已取消
]
拒绝
[
update
]
操作
]
rule
"denybysigle_cancel"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybysigle_cancel"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
多提供商
-
正在进行
]
拒绝
[
update
]
操作
]
rule
"denybymulti_ongoing"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybymulti_ongoing"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
开始
]
rule
"begin"
ruleflow
-
group
"purchase_requisitionupdate__msdenybegin"
when
then
end
//
逻辑处理节点
[
状态
[
单一提供商
-
已确认
]
拒绝
[
update
]
操作
]
rule
"denybysigle_in_progress"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybysigle_in_progress"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
准备临时参数
]
rule
"preparetemp"
ruleflow
-
group
"purchase_requisitionupdate__msdenypreparetemp"
when
then
purchase_requisitionupdate__msdenytemp
.
set
(
"id"
,
purchase_requisitionupdate__msdenydefault
.
get
(
"id"
));
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
单一提供商
-
草稿
]
拒绝
[
update
]
操作
]
rule
"denybysigle_draft"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybysigle_draft"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
多提供商
-
草稿
]
拒绝
[
update
]
操作
]
rule
"denybymulti_draft"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybymulti_draft"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
多提供商
-
已确认
]
拒绝
[
update
]
操作
]
rule
"denybymulti_in_progress"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybymulti_in_progress"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
单一提供商
-
已关闭
]
拒绝
[
update
]
操作
]
rule
"denybysigle_done"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybysigle_done"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
多提供商
-
出价选择
]
拒绝
[
update
]
操作
]
rule
"denybymulti_open"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybymulti_open"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
单一提供商
-
出价选择
]
拒绝
[
update
]
操作
]
rule
"denybysigle_open"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybysigle_open"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
单一提供商
-
正在进行
]
拒绝
[
update
]
操作
]
rule
"denybysigle_ongoing"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybysigle_ongoing"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
获取数据
]
rule
"get"
ruleflow
-
group
"purchase_requisitionupdate__msdenyget"
when
then
cn
.
ibizlab
.
businesscentral
.
util
.
helper
.
CachedBeanCopier
.
copy
(
purchase_requisitionservice
.
get
(
purchase_requisitionupdate__msdenytemp
.
getId
()),
purchase_requisitionupdate__msdenytemp
);
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
状态
[
多提供商
-
已取消
]
拒绝
[
update
]
操作
]
rule
"denybymulti_cancel"
ruleflow
-
group
"purchase_requisitionupdate__msdenydenybymulti_cancel"
when
then
update
(
purchase_requisitionupdate__msdenydefault
);//
更新
fact
中变量值
update
(
purchase_requisitionupdate__msdenytemp
);//
更新
fact
中变量值
end
businesscentral-core/src/main/resources/rules/Purchase_requisitionUpdate__MSDenyRuleFlow.bpmn
0 → 100644
浏览文件 @
5c5c9a47
此差异已折叠。
点击以展开。
config.xml
浏览文件 @
5c5c9a47
...
@@ -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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录