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
4397f863
Commit
4397f863
authored
Jul 31, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
27e3eb04
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
1 deletion
+33
-1
SuppliesModule.cs
Property.Modele.FixedAssets/SuppliesModule.cs
+5
-1
SuppliesController.cs
Property.WebApi/Controllers/Property/SuppliesController.cs
+28
-0
No files found.
Property.Modele.FixedAssets/SuppliesModule.cs
View file @
4397f863
...
...
@@ -2252,7 +2252,11 @@ namespace Property.Module.FixedAssets
/// <returns></returns>
public
RB_Supplies_Check_Extend
GetSuppliesCheck
(
int
Id
)
{
return
supplies_CheckRepository
.
GetEntity
<
RB_Supplies_Check_Extend
>(
Id
);
var
model
=
supplies_CheckRepository
.
GetEntity
<
RB_Supplies_Check_Extend
>(
Id
);
if
(
model
!=
null
)
{
model
.
WarehouseName
=
supplies_WareHouseRepository
.
GetEntity
(
model
.
WarehouseId
??
0
)?.
Name
??
""
;
}
return
model
;
}
/// <summary>
...
...
Property.WebApi/Controllers/Property/SuppliesController.cs
View file @
4397f863
...
...
@@ -1686,6 +1686,34 @@ namespace Property.WebApi.Controllers.User
return
ApiResult
.
Success
(
""
,
list
.
Select
(
x
=>
new
{
Id
=
x
.
Value
,
Name
=
x
.
Key
}));
}
/// <summary>
/// 获取盘点单详情
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetSuppliesCheckModel
()
{
RequestParm
requestParm
=
GetRequestParm
();
UserInfo
userInfo
=
CacheManager
.
User
.
UserReidsCache
.
GetUserLoginInfo
(
requestParm
.
uid
);
JObject
parms
=
JObject
.
Parse
(
requestParm
.
msg
.
ToString
());
int
CheckId
=
parms
.
GetInt
(
"CheckId"
,
0
);
if
(
CheckId
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递参数id"
);
}
var
cmodel
=
suppliesModule
.
GetSuppliesCheck
(
CheckId
);
return
ApiResult
.
Success
(
""
,
new
{
cmodel
.
Id
,
cmodel
.
Periods
,
cmodel
.
WarehouseName
,
cmodel
.
WarehouseId
,
StartDate
=
cmodel
.
StartDate
.
HasValue
?
cmodel
.
StartDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
EndDate
=
cmodel
.
EndDate
.
HasValue
?
cmodel
.
EndDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
cmodel
.
CheckState
,
});
}
/// <summary>
/// 新增修改盘点单
/// </summary>
...
...
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