Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Property
Project
Project
Details
Activity
Releases
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
liudong1993
Property
Commits
bc7c25d3
Commit
bc7c25d3
authored
Jul 31, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
7057f432
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
SuppliesModule.cs
Property.Modele.FixedAssets/SuppliesModule.cs
+3
-1
SuppliesController.cs
Property.WebApi/Controllers/Property/SuppliesController.cs
+3
-1
No files found.
Property.Modele.FixedAssets/SuppliesModule.cs
View file @
bc7c25d3
...
...
@@ -2285,10 +2285,12 @@ namespace Property.Module.FixedAssets
/// <param name="checkId"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public
bool
RepeatSuppliesCheck
(
int
checkId
,
UserInfo
userInfo
)
public
bool
RepeatSuppliesCheck
(
int
checkId
,
string
StartTime
,
string
EndTime
,
UserInfo
userInfo
)
{
Dictionary
<
string
,
object
>
keyValues
=
new
Dictionary
<
string
,
object
>()
{
{
nameof
(
RB_Supplies_Check_Extend
.
CheckState
),
SuppliesCheckStatusEnum
.
InTheInventory
},
{
nameof
(
RB_Supplies_Check_Extend
.
StartDate
),
Convert
.
ToDateTime
(
StartTime
)},
{
nameof
(
RB_Supplies_Check_Extend
.
EndDate
),
Convert
.
ToDateTime
(
EndTime
)},
{
nameof
(
RB_Supplies_Check_Extend
.
UpdateBy
),
userInfo
.
EmployeeId
},
{
nameof
(
RB_Supplies_Check_Extend
.
UpdateDate
),
DateTime
.
Now
},
};
...
...
Property.WebApi/Controllers/Property/SuppliesController.cs
View file @
bc7c25d3
...
...
@@ -1777,6 +1777,8 @@ namespace Property.WebApi.Controllers.User
UserInfo
userInfo
=
CacheManager
.
User
.
UserReidsCache
.
GetUserLoginInfo
(
requestParm
.
uid
);
JObject
parms
=
JObject
.
Parse
(
requestParm
.
msg
.
ToString
());
int
CheckId
=
parms
.
GetInt
(
"CheckId"
,
0
);
string
StartTime
=
parms
.
GetStringValue
(
"StartTime"
);
string
EndTime
=
parms
.
GetStringValue
(
"EndTime"
);
if
(
CheckId
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递参数id"
);
...
...
@@ -1792,7 +1794,7 @@ namespace Property.WebApi.Controllers.User
return
ApiResult
.
Failed
(
"盘点单无法复盘"
);
}
bool
flag
=
suppliesModule
.
RepeatSuppliesCheck
(
CheckId
,
userInfo
);
bool
flag
=
suppliesModule
.
RepeatSuppliesCheck
(
CheckId
,
StartTime
,
EndTime
,
userInfo
);
if
(
flag
)
{
return
ApiResult
.
Success
();
...
...
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