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
09a722c9
Commit
09a722c9
authored
Apr 28, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
物料详情
parent
3d508526
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
61 additions
and
3 deletions
+61
-3
SuppliesModule.cs
Property.Modele.FixedAssets/SuppliesModule.cs
+27
-0
LoginController.cs
Property.WebApi/Controllers/Login/LoginController.cs
+0
-3
SuppliesController.cs
Property.WebApi/Controllers/Property/SuppliesController.cs
+34
-0
No files found.
Property.Modele.FixedAssets/SuppliesModule.cs
View file @
09a722c9
...
...
@@ -56,6 +56,33 @@ namespace Property.Module.FixedAssets
private
readonly
RB_Supplies_ApplyforWeekdayRepository
supplies_ApplyforWeekdayRepository
=
new
RB_Supplies_ApplyforWeekdayRepository
();
private
readonly
RB_Supplies_ApplyforSpecialRepository
supplies_ApplyforSpecialRepository
=
new
RB_Supplies_ApplyforSpecialRepository
();
/// <summary>
/// 获取物料详情
/// </summary>
/// <param name="materialId"></param>
/// <returns></returns>
public
RB_Supplies_Material_Extend
GetMaterialInfo
(
int
materialId
)
{
var
model
=
supplies_MaterialRepository
.
GetEntity
(
materialId
).
RefMapperTo
<
RB_Supplies_Material_Extend
>();
if
(
model
==
null
)
{
return
new
RB_Supplies_Material_Extend
();
}
if
(
model
.
Images
==
""
||
model
.
Images
==
null
)
{
model
.
Images
=
"[]"
;
}
var
imglist
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
model
.
Images
);
model
.
ImageList
=
new
List
<
string
>();
foreach
(
var
img
in
imglist
)
{
model
.
ImageList
.
Add
(
Config
.
GetFileUrl
(
img
));
}
return
model
;
}
/// <summary>
/// 获取物料档案分页列表
/// </summary>
...
...
Property.WebApi/Controllers/Login/LoginController.cs
View file @
09a722c9
...
...
@@ -57,9 +57,6 @@ namespace Property.WebApi.Controllers.Login
{
Domain
=
Domain
.
Replace
(
"zc"
,
""
);
//资产管理专用
}
if
(
Domain
.
Contains
(
"test"
))
{
Domain
=
Domain
.
Replace
(
"test"
,
""
);
//资产管理测试专用
}
var
gmodel
=
loginModule
.
GetGroupByDomain
(
new
RB_Group_Extend
{
Domain
=
Domain
}).
FirstOrDefault
();
if
(
gmodel
==
null
)
{
...
...
Property.WebApi/Controllers/Property/SuppliesController.cs
View file @
09a722c9
...
...
@@ -56,6 +56,40 @@ namespace Property.WebApi.Controllers.User
return
ApiResult
.
Success
(
""
,
pagelist
);
}
/// <summary>
/// 获取物料详情
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetMaterialInfo
()
{
var
requestParm
=
GetRequestParm
();
JObject
parms
=
JObject
.
Parse
(
requestParm
.
msg
.
ToString
());
int
MaterialId
=
parms
.
GetInt
(
"MaterialId"
,
0
);
if
(
MaterialId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
}
var
model
=
suppliesModule
.
GetMaterialInfo
(
MaterialId
);
return
ApiResult
.
Success
(
""
,
new
{
model
.
Id
,
model
.
Name
,
model
.
CategoryId
,
model
.
CategoryName
,
model
.
BrandName
,
model
.
Money
,
model
.
Units
,
model
.
ImageList
,
model
.
Remark
,
model
.
SupplierName
,
model
.
Barcode
,
model
.
ReservedStock
,
model
.
SafetyStock
,
model
.
SuppliesModel
,
model
.
SuppliesNum
});
}
/// <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