Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
Laisi_AutoMES2
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
jiawei.su
Laisi_AutoMES2
Commits
0079fa2d
Commit
0079fa2d
authored
Jan 26, 2021
by
xin.yang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
816766fb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
FixtureTools.cs
.../Siger.Middlelayer.Utility/ImportEntities/FixtureTools.cs
+1
-1
AutomationFixtureToolsProductRepository.cs
...y/Repositories/AutomationFixtureToolsProductRepository.cs
+2
-2
No files found.
Server/Common/Siger.Middlelayer.Utility/ImportEntities/FixtureTools.cs
View file @
0079fa2d
...
...
@@ -85,7 +85,7 @@ namespace Siger.Middlelayer.Utility.ImportEntities
[
ExcelColumn
(
"*工装名称"
)]
public
string
FixtureTool
{
get
;
set
;
}
[
ExcelColumn
(
"*产品
名称
"
)]
[
ExcelColumn
(
"*产品
编号
"
)]
public
string
Product
{
get
;
set
;
}
[
ExcelColumn
(
"备注"
)]
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsProductRepository.cs
View file @
0079fa2d
...
...
@@ -152,7 +152,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
{
rowIndex
++;
if
(
string
.
IsNullOrEmpty
(
item
.
FixtureTool
)
||
string
.
IsNullOrEmpty
(
item
.
Product
)
||
string
.
IsNullOrEmpty
(
item
.
Product
)
)
if
(
string
.
IsNullOrEmpty
(
item
.
FixtureTool
)
||
string
.
IsNullOrEmpty
(
item
.
Product
))
{
errors
.
Add
(
$"
{
rowIndex
}
,
{(
int
)
RequestEnum
.
ParameterMiss
}
"
);
}
...
...
@@ -161,7 +161,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
{
errors
.
Add
(
$"
{
rowIndex
}
,
{(
int
)
RequestEnum
.
FixtureToolNotFound
}
"
);
}
var
product
=
_context
.
siger_project_product
.
FirstOrDefault
(
q
=>
q
.
projectid
==
projectid
&&
q
.
status
==
(
int
)
RowState
.
Valid
&&
q
.
nam
e
==
item
.
Product
);
var
product
=
_context
.
siger_project_product
.
FirstOrDefault
(
q
=>
q
.
projectid
==
projectid
&&
q
.
status
==
(
int
)
RowState
.
Valid
&&
q
.
cod
e
==
item
.
Product
);
if
(
product
==
null
)
{
errors
.
Add
(
$"
{
rowIndex
}
,
{(
int
)
RequestEnum
.
ProductNotFound
}
"
);
...
...
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