Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
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
黄奎
mall.oytour.com
Commits
e47294ad
Commit
e47294ad
authored
Jul 10, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
94129344
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
PropertyModule.cs
Mall.Module.Property/PropertyModule.cs
+5
-8
No files found.
Mall.Module.Property/PropertyModule.cs
View file @
e47294ad
...
@@ -468,7 +468,8 @@ namespace Mall.Module.Property
...
@@ -468,7 +468,8 @@ namespace Mall.Module.Property
if
(
apir
.
resultCode
==
1
)
if
(
apir
.
resultCode
==
1
)
{
{
Dictionary
<
string
,
object
>
keyValues
=
new
Dictionary
<
string
,
object
>()
{
Dictionary
<
string
,
object
>
keyValues
=
new
Dictionary
<
string
,
object
>()
{
{
nameof
(
RB_Procurement_Extend
.
Remark
),
pRemark
+
" 自动生成采购单据:"
+
apir
.
data
.
ToString
()}
{
nameof
(
RB_Procurement_Extend
.
Remark
),
pRemark
+
" 自动生成采购单据:"
+
apir
.
data
.
ToString
()},
{
nameof
(
RB_Procurement_Extend
.
FinanceId
),
Convert
.
ToInt32
(
apir
.
data
.
ToString
())}
};
};
List
<
WhereHelper
>
wheres
=
new
List
<
WhereHelper
>()
{
List
<
WhereHelper
>
wheres
=
new
List
<
WhereHelper
>()
{
new
WhereHelper
(){
new
WhereHelper
(){
...
@@ -929,12 +930,8 @@ namespace Mall.Module.Property
...
@@ -929,12 +930,8 @@ namespace Mall.Module.Property
{
{
item
.
Images
=
"[]"
;
item
.
Images
=
"[]"
;
}
}
var
imglist
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
item
.
Images
);
item
.
ImageList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
item
.
Images
);
item
.
ImageList
=
new
List
<
string
>();
//foreach (var img in imglist)
//{
// item.ImageList.Add(Config.GetFileUrl(img));
//}
item
.
InventoryNum
=
iList
.
Where
(
x
=>
x
.
SuppliesId
==
item
.
Id
).
FirstOrDefault
()?.
Number
??
0
;
item
.
InventoryNum
=
iList
.
Where
(
x
=>
x
.
SuppliesId
==
item
.
Id
).
FirstOrDefault
()?.
Number
??
0
;
item
.
GoodsSpecificationList
=
new
List
<
string
>();
item
.
GoodsSpecificationList
=
new
List
<
string
>();
item
.
GoodsCategoryList
=
new
List
<
string
>();
item
.
GoodsCategoryList
=
new
List
<
string
>();
...
@@ -1134,7 +1131,7 @@ namespace Mall.Module.Property
...
@@ -1134,7 +1131,7 @@ namespace Mall.Module.Property
}
}
}
}
else
{
else
{
string
SpecificationName
=
"[
规格:"
+
item
.
DefaultSpecificationName
+
"]"
;
string
SpecificationName
=
"[
\"规格:"
+
item
.
DefaultSpecificationName
+
"\
"]"
;
var
mModel
=
mList
.
Where
(
x
=>
x
.
GoodsId
==
item
.
Id
&&
x
.
SpecificationKey
==
""
).
FirstOrDefault
();
var
mModel
=
mList
.
Where
(
x
=>
x
.
GoodsId
==
item
.
Id
&&
x
.
SpecificationKey
==
""
).
FirstOrDefault
();
if
(
mModel
==
null
)
if
(
mModel
==
null
)
{
{
...
...
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