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
c5855c4d
Commit
c5855c4d
authored
Mar 12, 2021
by
泽锋 李
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
8c7f8c9b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
4 deletions
+27
-4
dc_base_storage_capacity_dao.cs
AutoTurnOver.DB/dc_base_storage_capacity_dao.cs
+1
-1
ApiController.cs
AutoTurnOver/Controllers/ApiController.cs
+26
-3
No files found.
AutoTurnOver.DB/dc_base_storage_capacity_dao.cs
View file @
c5855c4d
...
@@ -47,7 +47,7 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where
...
@@ -47,7 +47,7 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where
if
(
m
.
btime
!=
null
)
if
(
m
.
btime
!=
null
)
{
{
sql
+=
" and t1.update_date>=@btime "
;
sql
+=
" and t1.update_date>=@btime "
;
parameters
.
Add
(
"
update_dat
e"
,
m
.
btime
);
parameters
.
Add
(
"
btim
e"
,
m
.
btime
);
}
}
if
(
m
.
etime
!=
null
)
if
(
m
.
etime
!=
null
)
{
{
...
...
AutoTurnOver/Controllers/ApiController.cs
View file @
c5855c4d
...
@@ -204,9 +204,16 @@ namespace AutoTurnOver.Controllers
...
@@ -204,9 +204,16 @@ namespace AutoTurnOver.Controllers
[
HttpGet
(
"GetStorageCapacityGetPage"
)]
[
HttpGet
(
"GetStorageCapacityGetPage"
)]
public
ActionResult
<
RequestResultDto
>
GetStorageCapacityGetPage
([
FromQuery
]
dc_base_storage_capacity_search_dto
search
,
[
FromQuery
]
int
page
,
[
FromQuery
]
int
rows
)
public
ActionResult
<
RequestResultDto
>
GetStorageCapacityGetPage
([
FromQuery
]
dc_base_storage_capacity_search_dto
search
,
[
FromQuery
]
int
page
,
[
FromQuery
]
int
rows
)
{
{
try
{
var
totel
=
0
;
var
totel
=
0
;
return
new
RequestResultDto
{
success
=
true
,
data
=
new
StorageCapacityServices
().
StorageCapacityList
(
search
,(
page
-
1
)*
rows
,
rows
,
ref
totel
)
};
return
new
RequestResultDto
{
success
=
true
,
data
=
new
StorageCapacityServices
().
StorageCapacityList
(
search
,
(
page
-
1
)
*
rows
,
rows
,
ref
totel
)
};
}
catch
(
Exception
ex
)
{
return
new
RequestResultDto
{
success
=
false
,
message
=
ex
.
Message
};
}
}
}
/// <summary>
/// <summary>
/// 查询库容
/// 查询库容
...
@@ -216,8 +223,15 @@ namespace AutoTurnOver.Controllers
...
@@ -216,8 +223,15 @@ namespace AutoTurnOver.Controllers
[
HttpPost
(
"StorageCapacityGetList"
)]
[
HttpPost
(
"StorageCapacityGetList"
)]
public
ActionResult
<
RequestResultDto
>
GetStorageCapacityGetList
([
FromBody
]
dc_base_storage_capacity_query_dto
search
)
public
ActionResult
<
RequestResultDto
>
GetStorageCapacityGetList
([
FromBody
]
dc_base_storage_capacity_query_dto
search
)
{
{
try
{
return
new
RequestResultDto
{
success
=
true
,
data
=
new
StorageCapacityServices
().
GetList
(
search
)
};
}
catch
(
Exception
ex
)
{
return
new
RequestResultDto
{
success
=
false
,
message
=
ex
.
Message
};
}
return
new
RequestResultDto
{
success
=
true
,
data
=
new
StorageCapacityServices
().
GetList
(
search
)
};
}
}
/// <summary>
/// <summary>
...
@@ -228,9 +242,17 @@ namespace AutoTurnOver.Controllers
...
@@ -228,9 +242,17 @@ namespace AutoTurnOver.Controllers
[
HttpPost
(
"StorageCapacityAddLog"
)]
[
HttpPost
(
"StorageCapacityAddLog"
)]
public
ActionResult
<
RequestResultDto
>
StorageCapacityAddLog
([
FromBody
]
dc_base_storage_capacity_log
search
)
public
ActionResult
<
RequestResultDto
>
StorageCapacityAddLog
([
FromBody
]
dc_base_storage_capacity_log
search
)
{
{
try
{
new
StorageCapacityServices
().
AddLog
(
search
);
new
StorageCapacityServices
().
AddLog
(
search
);
return
new
RequestResultDto
{
success
=
true
};
return
new
RequestResultDto
{
success
=
true
};
}
}
catch
(
Exception
ex
)
{
return
new
RequestResultDto
{
success
=
false
,
message
=
ex
.
Message
};
}
}
}
}
}
}
\ No newline at end of file
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