Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-service-hmhj
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangweidong
patzn-cloud-service-hmhj
Commits
aeb90102
Commit
aeb90102
authored
Apr 23, 2023
by
lijingjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sql脚本提交;
parent
337d86fe
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
31 additions
and
5 deletions
+31
-5
StatisticsServiceImpl.java
...service/lims/hmhj/service/impl/StatisticsServiceImpl.java
+26
-5
新增菜单.sql
src/test/java/resources/db_sql/base/older/v112/新增菜单.sql
+0
-0
20210918__添加按钮.sql
.../java/resources/db_sql/base/older/v168/20210918__添加按钮.sql
+0
-0
20210923__添加菜单、按钮.sql
...va/resources/db_sql/base/older/v168/20210923__添加菜单、按钮.sql
+0
-0
20211113修改手机号.sql
...t/java/resources/db_sql/base/older/v170/20211113修改手机号.sql
+0
-0
20220630新增按钮.sql
...st/java/resources/db_sql/base/older/v178/20220630新增按钮.sql
+0
-0
20220822新增菜单及按钮.sql
...java/resources/db_sql/base/older/v182/20220822新增菜单及按钮.sql
+0
-0
新增菜单.sql
src/test/java/resources/db_sql/base/older/新增菜单.sql
+0
-0
20230420__新增菜单按钮.sql
...st/java/resources/db_sql/base/霍煤4月运维/20230420__新增菜单按钮.sql
+5
-0
No files found.
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/StatisticsServiceImpl.java
View file @
aeb90102
...
@@ -20,6 +20,7 @@ import com.patzn.cloud.service.lims.hmhj.mapper.StatisticsMapper;
...
@@ -20,6 +20,7 @@ import com.patzn.cloud.service.lims.hmhj.mapper.StatisticsMapper;
import
com.patzn.cloud.service.lims.hmhj.service.IStatisticsService
;
import
com.patzn.cloud.service.lims.hmhj.service.IStatisticsService
;
import
org.apache.commons.lang.time.DateUtils
;
import
org.apache.commons.lang.time.DateUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
...
@@ -51,6 +52,13 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
...
@@ -51,6 +52,13 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
@Resource
@Resource
private
ServiceProperties
serviceProperties
;
private
ServiceProperties
serviceProperties
;
@Value
(
"${spring.profiles.active}"
)
private
String
env
;
private
boolean
isProd
()
{
return
Objects
.
equals
(
env
,
"hmhj"
);
}
private
void
handleQueryTime
(
QueryDTO
queryDTO
)
{
private
void
handleQueryTime
(
QueryDTO
queryDTO
)
{
RestAssert
.
fail
(
null
==
queryDTO
.
getTimeS
(),
"起始时间不为空"
);
RestAssert
.
fail
(
null
==
queryDTO
.
getTimeS
(),
"起始时间不为空"
);
// 截至时间若为空,默认当前时间
// 截至时间若为空,默认当前时间
...
@@ -266,7 +274,22 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
...
@@ -266,7 +274,22 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
@Override
@Override
public
CenterCost
getCenterCost
(
StatsQueryDTO
queryDTO
)
{
public
CenterCost
getCenterCost
(
StatsQueryDTO
queryDTO
)
{
return
baseMapper
.
selectCenterCost
(
queryDTO
);
CenterCost
centerCost
=
baseMapper
.
selectCenterCost
(
queryDTO
);
if
(
Objects
.
isNull
(
centerCost
))
{
centerCost
=
new
CenterCost
();
}
// 跨服务查询出库信息
WmsInventoryDTO
dto
=
new
WmsInventoryDTO
();
dto
.
setType
(
"年入库"
);
List
<
WmsInventory
>
inventoryList
=
getInventoryList
(
dto
);
if
(
CollectionUtils
.
isNotEmpty
(
inventoryList
))
{
BigDecimal
consume
=
inventoryList
.
stream
()
.
map
(
WmsInventory:
:
getSumPrice
)
.
reduce
(
BigDecimal
.
ZERO
,
BigDecimal:
:
add
);
consume
=
consume
.
divide
(
new
BigDecimal
(
10000
));
centerCost
.
setConsume
(
consume
);
}
return
centerCost
;
}
}
@Override
@Override
...
@@ -292,22 +315,20 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
...
@@ -292,22 +315,20 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
map
.
put
(
"Unit"
,
dto
.
getUnit
());
map
.
put
(
"Unit"
,
dto
.
getUnit
());
}
}
// 若为开发环境,模拟测试数据
if
(!
isProd
())
{
dataList
=
getMockData
();
dataList
=
getMockData
();
if
(
true
)
{
return
dataList
.
stream
().
filter
(
d
->
{
return
dataList
.
stream
().
filter
(
d
->
{
boolean
f
=
true
;
boolean
f
=
true
;
if
(
StringUtils
.
isNotBlank
(
dto
.
getType
()))
{
if
(
StringUtils
.
isNotBlank
(
dto
.
getType
()))
{
f
=
d
.
getType
().
equals
(
dto
.
getType
());
f
=
d
.
getType
().
equals
(
dto
.
getType
());
}
}
if
(
StringUtils
.
isNotBlank
(
dto
.
getMaterialName
()))
{
if
(
StringUtils
.
isNotBlank
(
dto
.
getMaterialName
()))
{
f
=
f
&&
d
.
getMaterialName
().
contains
(
dto
.
getMaterialName
());
f
=
f
&&
d
.
getMaterialName
().
contains
(
dto
.
getMaterialName
());
}
}
if
(
StringUtils
.
isNotBlank
(
dto
.
getSpecification
()))
{
if
(
StringUtils
.
isNotBlank
(
dto
.
getSpecification
()))
{
f
=
f
&&
d
.
getSpecification
().
contains
(
dto
.
getSpecification
());
f
=
f
&&
d
.
getSpecification
().
contains
(
dto
.
getSpecification
());
}
}
if
(
StringUtils
.
isNotBlank
(
dto
.
getUnit
()))
{
if
(
StringUtils
.
isNotBlank
(
dto
.
getUnit
()))
{
f
=
f
&&
d
.
getUnit
().
contains
(
dto
.
getUnit
());
f
=
f
&&
d
.
getUnit
().
contains
(
dto
.
getUnit
());
}
}
...
...
src/test/java/resources/db_sql/base/v112/新增菜单.sql
→
src/test/java/resources/db_sql/base/
older/
v112/新增菜单.sql
View file @
aeb90102
File moved
src/test/java/resources/db_sql/base/v168/20210918__添加按钮.sql
→
src/test/java/resources/db_sql/base/
older/
v168/20210918__添加按钮.sql
View file @
aeb90102
File moved
src/test/java/resources/db_sql/base/v168/20210923__添加菜单、按钮.sql
→
src/test/java/resources/db_sql/base/
older/
v168/20210923__添加菜单、按钮.sql
View file @
aeb90102
File moved
src/test/java/resources/db_sql/base/v170/20211113修改手机号.sql
→
src/test/java/resources/db_sql/base/
older/
v170/20211113修改手机号.sql
View file @
aeb90102
File moved
src/test/java/resources/db_sql/base/v178/20220630新增按钮.sql
→
src/test/java/resources/db_sql/base/
older/
v178/20220630新增按钮.sql
View file @
aeb90102
File moved
src/test/java/resources/db_sql/base/v182/20220822新增菜单及按钮.sql
→
src/test/java/resources/db_sql/base/
older/
v182/20220822新增菜单及按钮.sql
View file @
aeb90102
File moved
src/test/java/resources/db_sql/base/新增菜单.sql
→
src/test/java/resources/db_sql/base/
older/
新增菜单.sql
View file @
aeb90102
File moved
src/test/java/resources/db_sql/base/霍煤4月运维/20230420__新增菜单按钮.sql
0 → 100644
View file @
aeb90102
/** meazty created 【库存及出入库】 at 2023/4/20 14:55 **/
/** meazty created 【库存及出入库】 at 2023/4/20 14:55 **/
INSERT
INTO
public
.
sys_resource
(
id
,
system_id
,
pid
,
"name"
,
"type"
,
code
,
uri
,
icon
,
remark
,
status
,
sort
,
ctime
,
ename
,
ltime
,
uid
,
lid
)
VALUES
(
1648882720316813313
,
1356148880450674689
,
1406411303447314433
,
'出库信息查询'
,
0
,
'out_stock_info'
,
'/hmhj/statistics_manage/out_stock_info'
,
'pt-config'
,
NULL
,
1
,
1
,
'2023-04-20 10:54:09.942'
,
NULL
,
NULL
,
0
,
NULL
),
(
1648882326043848705
,
1356148880450674689
,
1406411303447314433
,
'库存信息查询'
,
0
,
'inventory_info'
,
'/hmhj/statistics_manage/inventory_info'
,
'pt-config'
,
NULL
,
1
,
1
,
'2023-04-20 10:52:35.941'
,
NULL
,
'2023-04-20 10:54:17.205'
,
0
,
0
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment