Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
b54d28cb
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1430
Star
162
Fork
130
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Skyeye
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
b54d28cb
编写于
11月 14, 2021
作者:
Skyeye云
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
新增动态表单关联属性
上级
3981c066
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
140 addition
and
5 deletion
+140
-5
skyeye-common/src/main/java/com/skyeye/common/constans/ErpConstants.java
...rc/main/java/com/skyeye/common/constans/ErpConstants.java
+5
-4
skyeye-common/src/main/java/com/skyeye/common/constans/SystemFoundationSettingsConstants.java
...ye/common/constans/SystemFoundationSettingsConstants.java
+128
-0
skyeye-common/src/main/java/com/skyeye/eve/service/impl/SystemFoundationSettingsServiceImpl.java
...eve/service/impl/SystemFoundationSettingsServiceImpl.java
+5
-0
skyeye-common/src/main/resources/reqmapping/mapping/common.xml
...e-common/src/main/resources/reqmapping/mapping/common.xml
+2
-1
未找到文件。
skyeye-common/src/main/java/com/skyeye/common/constans/ErpConstants.java
浏览文件 @
b54d28cb
...
...
@@ -61,17 +61,18 @@ public class ErpConstants {
"../../tpl/salesoutlet/salesoutletadd.html"
,
1
,
true
,
1
),
OUT_IS_PURCHASE_RETURNS
(
"采购退货单"
,
"CGTH"
,
"6"
,
"com.skyeye.factory.impl.PurchaseReturnsFactory"
,
"../../tpl/purchasereturns/purchasereturnsadd.html"
,
1
,
true
,
1
),
OUT_IS_ALLOCATION
(
"调拨单"
,
"DBCK"
,
"7"
,
""
,
""
,
0
,
true
,
null
),
OUT_IS_RETAIL
(
"零售出库单"
,
"LSCK"
,
"8"
,
"com.skyeye.factory.impl.RetailOutLetFactory"
,
"../../tpl/retailoutlet/retailoutletadd.html"
,
1
,
true
,
1
),
OUT_IS_OTHERS
(
"其他出库单"
,
"QTCK"
,
"9"
,
"com.skyeye.factory.impl.OtherOutLetsFactory"
,
OUT_IS_OTHERS
(
"其他出库单"
,
"QTCK"
,
"9"
,
"com.skyeye.factory.impl.OtherOutLetsFactory"
,
"../../tpl/otheroutlets/otheroutletsadd.html"
,
1
,
true
,
1
),
// 采购单
PURCHASE_ORDER
(
"采购订单"
,
"CGDD"
,
"10"
,
"com.skyeye.factory.impl.PurchaseOrderFactory"
,
// 采购单
,
PURCHASE_ORDER
(
"采购订单"
,
"CGDD"
,
"10"
,
"com.skyeye.factory.impl.PurchaseOrderFactory"
,
"../../tpl/purchaseorder/purchaseorderadd.html"
,
1
,
true
,
2
),
// 销售单
OUTCHASE_ORDER
(
"销售订单"
,
"XSDD"
,
"11"
,
"com.skyeye.factory.impl.SalesOrderFactory"
,
"../../tpl/salesorder/salesorderadd.html"
,
1
,
true
,
1
),
// 调拨单
OUT_IS_ALLOCATION
(
"调拨单"
,
"DBCK"
,
"7"
,
""
,
""
,
0
,
true
,
null
),
// 拆分单
SPLIT_LIST_ORDER
(
"拆分订单"
,
"CFDD"
,
"12"
,
""
,
""
,
0
,
true
,
null
),
// 组装单
...
...
skyeye-common/src/main/java/com/skyeye/common/constans/SystemFoundationSettingsConstants.java
0 → 100644
浏览文件 @
b54d28cb
/*******************************************************************************
* Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye
******************************************************************************/
package
com.skyeye.common.constans
;
import
com.skyeye.common.util.SpringUtils
;
import
com.skyeye.eve.service.SystemFoundationSettingsService
;
import
net.sf.json.JSONObject
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
* @ClassName: SystemFoundationSettingsConstants
* @Description: 系统基础设置常量类
* @author: skyeye云系列--卫志强
* @date: 2021/11/13 14:43
* @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
* 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
*/
public
class
SystemFoundationSettingsConstants
{
public
static
enum
CustomWithDsFormObject
{
/*****************************ERP模块********************************/
// 入库
PUT_IS_PURCHASE
(
"ERP模块"
,
"采购入库单"
,
"CGRK"
,
new
ArrayList
<>()),
PUT_IS_SALES_RETURNS
(
"ERP模块"
,
"销售退货单"
,
"XSTH"
,
new
ArrayList
<>()),
PUT_IS_RETAIL_RETURNS
(
"ERP模块"
,
"零售退货单"
,
"LSTH"
,
new
ArrayList
<>()),
PUT_IS_OTHERS
(
"ERP模块"
,
"其他入库单"
,
"QTRK"
,
new
ArrayList
<>()),
// 出库
OUT_IS_SALES_OUTLET
(
"ERP模块"
,
"销售出库单"
,
"XSCK"
,
new
ArrayList
<>()),
OUT_IS_PURCHASE_RETURNS
(
"ERP模块"
,
"采购退货单"
,
"CGTH"
,
new
ArrayList
<>()),
OUT_IS_RETAIL
(
"ERP模块"
,
"零售出库单"
,
"LSCK"
,
new
ArrayList
<>()),
OUT_IS_OTHERS
(
"ERP模块"
,
"其他出库单"
,
"QTCK"
,
new
ArrayList
<>()),
// 采购单
PURCHASE_ORDER
(
"ERP模块"
,
"采购订单"
,
"CGDD"
,
new
ArrayList
<>()),
// 销售单
OUTCHASE_ORDER
(
"ERP模块"
,
"销售订单"
,
"XSDD"
,
new
ArrayList
<>());
// 所属模块
private
String
modelName
;
// 标题
private
String
title
;
// code为了区分类型
private
String
code
;
// 默认绑定的动态表单,需要包含表单id,表单名称,表单编码
private
List
<
Map
<
String
,
Object
>>
dsFormList
;
CustomWithDsFormObject
(
String
modelName
,
String
title
,
String
code
,
List
<
Map
<
String
,
Object
>>
dsFormList
){
this
.
modelName
=
modelName
;
this
.
title
=
title
;
this
.
code
=
code
;
this
.
dsFormList
=
dsFormList
;
}
/**
* 获取所有需要设置动添表单的类型
*
* @return 所有需要设置动添表单的类型
*/
public
static
Map
<
String
,
List
<
Map
<
String
,
Object
>>>
getCustomWithDsFormList
(){
List
<
Map
<
String
,
Object
>>
beans
=
new
ArrayList
<>();
for
(
CustomWithDsFormObject
q
:
CustomWithDsFormObject
.
values
()){
Map
<
String
,
Object
>
bean
=
new
HashMap
<>();
bean
.
put
(
"modelName"
,
q
.
getModelName
());
bean
.
put
(
"title"
,
q
.
getTitle
());
bean
.
put
(
"code"
,
q
.
getCode
());
bean
.
put
(
"dsFormList"
,
q
.
getDsFormList
());
beans
.
add
(
bean
);
}
Map
<
String
,
List
<
Map
<
String
,
Object
>>>
result
=
beans
.
stream
().
collect
(
Collectors
.
groupingBy
(
map
->
map
.
get
(
"modelName"
).
toString
()));
return
result
;
}
/**
* 根据code获取已经绑定的动态表单信息
*
* @param code 编码
* @return 已经绑定的动态表单信息
* @throws Exception
*/
public
static
List
<
Map
<
String
,
Object
>>
getDsFormListByCode
(
String
code
)
throws
Exception
{
// 获取动态表单关联的一些设置
List
<
Map
<
String
,
Object
>>
allDsFormList
=
getAllDsFormList
();
// 根据单据code获取已经设置的单据审批信息
Map
<
String
,
Object
>
thisDsFormList
=
allDsFormList
.
stream
().
filter
(
bean
->
code
.
equals
(
bean
.
get
(
"code"
).
toString
())).
findFirst
().
orElse
(
null
);
if
(
thisDsFormList
!=
null
&&
!
thisDsFormList
.
isEmpty
()){
return
(
List
<
Map
<
String
,
Object
>>)
thisDsFormList
.
get
(
"dsFormList"
);
}
return
new
ArrayList
<>();
}
private
static
List
<
Map
<
String
,
Object
>>
getAllDsFormList
()
throws
Exception
{
// 获取系统配置信息
SystemFoundationSettingsService
systemFoundationSettingsService
=
SpringUtils
.
getBean
(
SystemFoundationSettingsService
.
class
);
Map
<
String
,
Object
>
setting
=
systemFoundationSettingsService
.
getSystemFoundationSettings
();
// 获取动态表单关联的一些设置
String
customWithDsFormList
=
setting
.
get
(
"customWithDsFormList"
).
toString
();
Map
<
String
,
List
<
Map
<
String
,
Object
>>>
customWithDsForm
=
JSONObject
.
fromObject
(
customWithDsFormList
);
List
<
Map
<
String
,
Object
>>
allDsFormList
=
new
ArrayList
<>();
for
(
Map
.
Entry
<
String
,
List
<
Map
<
String
,
Object
>>>
entry
:
customWithDsForm
.
entrySet
())
{
allDsFormList
.
addAll
(
entry
.
getValue
());
}
return
allDsFormList
;
}
public
String
getModelName
()
{
return
modelName
;
}
public
String
getTitle
()
{
return
title
;
}
public
String
getCode
()
{
return
code
;
}
public
List
<
Map
<
String
,
Object
>>
getDsFormList
()
{
return
dsFormList
;
}
}
}
skyeye-common/src/main/java/com/skyeye/eve/service/impl/SystemFoundationSettingsServiceImpl.java
浏览文件 @
b54d28cb
...
...
@@ -7,6 +7,7 @@ package com.skyeye.eve.service.impl;
import
cn.hutool.json.JSONUtil
;
import
com.gexin.fastjson.JSON
;
import
com.skyeye.common.constans.ErpConstants
;
import
com.skyeye.common.constans.SystemFoundationSettingsConstants
;
import
com.skyeye.common.object.InputObject
;
import
com.skyeye.common.object.OutputObject
;
import
com.skyeye.common.util.ToolUtil
;
...
...
@@ -138,6 +139,10 @@ public class SystemFoundationSettingsServiceImpl implements SystemFoundationSett
if
(!
map
.
containsKey
(
"erpExamineBasicDesign"
)
||
ToolUtil
.
isBlank
(
map
.
get
(
"erpExamineBasicDesign"
).
toString
())){
map
.
put
(
"erpExamineBasicDesign"
,
JSON
.
toJSONString
(
ErpConstants
.
DepoTheadSubType
.
getNeedExamineOrderISOne
()));
}
// 动态表单关联的一些设置
if
(!
map
.
containsKey
(
"customWithDsFormList"
)
||
ToolUtil
.
isBlank
(
map
.
get
(
"customWithDsFormList"
).
toString
())){
map
.
put
(
"customWithDsFormList"
,
JSON
.
toJSONString
(
SystemFoundationSettingsConstants
.
CustomWithDsFormObject
.
getCustomWithDsFormList
()));
}
}
}
skyeye-common/src/main/resources/reqmapping/mapping/common.xml
浏览文件 @
b54d28cb
<?xml version="1.0" encoding="UTF-8"?>
<controller
modelName=
"公共模块"
>
<controller
modelName=
"
系统
公共模块"
>
<!--
- allUse 是否需要登录才能使用 1是 0否 2需要登陆才能访问,但无需授权 默认为否
-->
...
...
@@ -65,6 +65,7 @@
<property
id=
"yearHolidaysMation"
name=
"yearHolidaysMation"
ref=
"required,json"
var=
"年假信息"
/>
<property
id=
"abnormalMation"
name=
"abnormalMation"
ref=
"required,json"
var=
"异常考勤制度管理信息"
/>
<property
id=
"erpExamineBasicDesign"
name=
"erpExamineBasicDesign"
ref=
"required,json"
var=
"ERP单据审核的一些设置"
/>
<property
id=
"customWithDsFormList"
name=
"customWithDsFormList"
ref=
"required,json"
var=
"动态表单关联信息"
/>
</url>
<!-- 系统基础设置结束 -->
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录