Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
data-center-auto
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
bltdc
data-center-auto
Commits
6c3f28a0
Commit
6c3f28a0
authored
Dec 09, 2021
by
zhoujinhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
监控操作新增说明
parent
115aa7f2
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
7 deletions
+13
-7
db_config.cs
AutoTurnOver.DB/db_config.cs
+4
-3
dc_base_monitor_status_log.cs
AutoTurnOver.Models/dc_base_monitor_status_log.cs
+5
-0
ConfigServices.cs
AutoTurnOver.Services/ConfigServices.cs
+2
-2
ConfigController.cs
AutoTurnOver/Controllers/ConfigController.cs
+2
-2
No files found.
AutoTurnOver.DB/db_config.cs
View file @
6c3f28a0
...
...
@@ -575,7 +575,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
/// <param name="monitor_status"></param>
/// <param name="user"></param>
/// <returns></returns>
public
static
string
BatchMonitorStatus
(
string
ids
,
int
monitor_status
,
int
time_type
,
UserData
user
)
public
static
string
BatchMonitorStatus
(
string
ids
,
int
monitor_status
,
int
time_type
,
UserData
user
,
string
explain
)
{
var
conn
=
_connection
;
if
(
monitor_status
!=
1
&&
monitor_status
!=
0
)
...
...
@@ -640,7 +640,8 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
date
=
DateTime
.
Now
,
monitor_status
=
monitor_status
.
ToString
(),
user_name
=
user
.
UserName
,
time_type
=
time_type
time_type
=
time_type
,
explain
=
explain
});
}
...
...
@@ -2423,7 +2424,7 @@ where 1 = 1 ";
search
.
rows
=
search
.
limit
;
sqlText
.
Append
(
@"
select t1.user_name,CASE WHEN t1.monitor_status=0 THEN '开启监控' ELSE '停止监控' END monitor_status,
DATE_FORMAT(t1.date,'%Y-%m-%d %H:%i::%s') create_time,t1.bailun_sku,t2.sku_title_cn,
DATE_FORMAT(t1.date,'%Y-%m-%d %H:%i::%s') create_time,t1.bailun_sku,t2.sku_title_cn,
t1.explain,
t1.warehouse_code,t3.warehouse_name,CASE WHEN t1.time_type =1 THEN '临时停止' WHEN t1.time_type = 2 THEN '永久停止' ELSE '' END time_type_str
from dc_base_monitor_status_log AS t1
LEFT JOIN dc_base_sku AS t2 ON t2.bailun_sku = t1.bailun_sku
...
...
AutoTurnOver.Models/dc_base_monitor_status_log.cs
View file @
6c3f28a0
...
...
@@ -17,5 +17,10 @@ namespace AutoTurnOver.Models
///
/// </summary>
public
int
?
time_type
{
get
;
set
;
}
/// <summary>
/// 监控状态修改说明
/// </summary>
public
string
explain
{
get
;
set
;
}
}
}
AutoTurnOver.Services/ConfigServices.cs
View file @
6c3f28a0
...
...
@@ -417,11 +417,11 @@ namespace AutoTurnOver.Services
return
DB
.
db_config
.
MonitorStatus
(
bailun_sku
,
warehouse_code
,
monitor_status
,
user
);
}
public
string
BatchMonitorStatus
(
string
ids
,
int
monitor_status
,
int
time_type
,
UserData
user
)
public
string
BatchMonitorStatus
(
string
ids
,
int
monitor_status
,
int
time_type
,
UserData
user
,
string
explain
)
{
try
{
return
DB
.
db_config
.
BatchMonitorStatus
(
ids
,
monitor_status
,
time_type
,
user
);
return
DB
.
db_config
.
BatchMonitorStatus
(
ids
,
monitor_status
,
time_type
,
user
,
explain
);
}
catch
(
Exception
ex
)
{
...
...
AutoTurnOver/Controllers/ConfigController.cs
View file @
6c3f28a0
...
...
@@ -305,11 +305,11 @@ namespace AutoTurnOver.Controllers
[
HttpGet
]
[
UseAction
]
[
BrowseLog
(
"Bailun_aims"
,
"触发【百伦自动周转系统】->【自动下单管理】->【自动周转列表】->【开启/停止监控】操作"
,
3
)]
public
JsonResult
BatchMonitorStatus
(
string
ids
,
int
monitor_status
,
int
time_type
)
public
JsonResult
BatchMonitorStatus
(
string
ids
,
int
monitor_status
,
int
time_type
,
string
explain
)
{
var
user
=
AutoUtility
.
GetUser
();
if
(
user
==
null
)
return
null
;
var
result
=
new
Services
.
ConfigServices
().
BatchMonitorStatus
(
ids
,
monitor_status
,
time_type
,
user
);
var
result
=
new
Services
.
ConfigServices
().
BatchMonitorStatus
(
ids
,
monitor_status
,
time_type
,
user
,
explain
);
return
new
JsonResult
(
result
);
}
...
...
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