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
46ab806f
Commit
46ab806f
authored
Jan 27, 2021
by
xin.yang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
818b8888
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
8 deletions
+20
-8
BeatAllocationController.cs
...Apis/Siger.ApiCNC/Controllers/BeatAllocationController.cs
+20
-8
No files found.
Server/Apis/Siger.ApiCNC/Controllers/BeatAllocationController.cs
View file @
46ab806f
...
...
@@ -67,10 +67,15 @@ namespace Siger.ApiCNC.Controllers
throw
new
ServerException
(
800293
);
}
var
start
=
request
.
start_time
.
ToDateTime
();
var
end
=
request
.
end_time
.
ToDateTime
().
AddDays
(
1
).
AddSeconds
(-
1
);
var
maxTime
=
"2199-01-01 00:00:00"
.
ToDateTime
();
bool
timSet
=
!
string
.
IsNullOrEmpty
(
request
.
start_time
)
&&
!
string
.
IsNullOrEmpty
(
request
.
end_time
);
var
start
=
timSet
?
request
.
start_time
.
ToDateTime
()
:
DateTime
.
MinValue
;
var
end
=
timSet
?
request
.
end_time
.
ToDateTime
().
AddDays
(
1
).
AddSeconds
(-
1
)
:
maxTime
;
var
entities
=
await
_beatSetRepository
.
GetListAsync
(
q
=>
q
.
status
==
(
int
)
RowState
.
Valid
&&
q
.
process_number
==
request
.
program_number
if
(
timSet
)
{
var
entities
=
await
_beatSetRepository
.
GetListAsync
(
q
=>
q
.
status
==
(
int
)
RowState
.
Valid
&&
q
.
process_number
==
request
.
program_number
&&
q
.
machineID
==
request
.
machineID
&&
q
.
projectID
==
ProjectId
);
if
(
entities
.
Any
())
{
...
...
@@ -91,6 +96,7 @@ namespace Siger.ApiCNC.Controllers
}
}
}
}
var
product
=
_productRepository
.
Get
(
q
=>
q
.
id
==
request
.
product_name
.
ToInt
()
&&
q
.
projectid
==
ProjectId
&&
q
.
status
==
(
int
)
RowState
.
Valid
);
...
...
@@ -115,8 +121,8 @@ namespace Siger.ApiCNC.Controllers
route_name
=
request
.
route_name
,
updown_besat
=
request
.
updown_besat
.
ToDouble
(),
yieldrate
=
request
.
yieldratio
,
start_time
=
start
,
end_time
=
end
start_time
=
timSet
?
start
:
DateTime
.
MinValue
,
end_time
=
timSet
?
end
:
maxTime
};
await
_beatSetRepository
.
InsertAsync
(
beatSet
);
if
(
await
_unitOfWork
.
CommitAsync
()
>
0
)
...
...
@@ -138,6 +144,11 @@ namespace Siger.ApiCNC.Controllers
throw
new
ServerException
(
800293
);
}
var
maxTime
=
"2199-01-01 00:00:00"
.
ToDateTime
();
bool
timSet
=
!
string
.
IsNullOrEmpty
(
request
.
start_time
)
&&
!
string
.
IsNullOrEmpty
(
request
.
end_time
);
if
(
timSet
)
{
var
start
=
request
.
start_time
.
ToDateTime
();
var
end
=
request
.
end_time
.
ToDateTime
().
AddDays
(
1
).
AddSeconds
(-
1
);
...
...
@@ -163,6 +174,7 @@ namespace Siger.ApiCNC.Controllers
}
}
}
}
var
beatSet
=
await
_beatSetRepository
.
GetAsync
(
request
.
id
);
if
(
beatSet
==
null
||
beatSet
.
status
!=
(
int
)
RowState
.
Valid
)
...
...
@@ -171,7 +183,7 @@ namespace Siger.ApiCNC.Controllers
}
beatSet
.
daily_standard_output
=
request
.
daily_standard_output
;
beatSet
.
edit_time
=
DateTime
.
Now
;
beatSet
.
edit_time
=
timSet
?
DateTime
.
Now
:
DateTime
.
MinValue
;
//beatSet.machineID = request.machineID;
//beatSet.section_id = request.sectionid;
beatSet
.
standard_besat
=
request
.
standard_besat
;
...
...
@@ -180,8 +192,8 @@ namespace Siger.ApiCNC.Controllers
//beatSet.route_name = request.route_name;
beatSet
.
updown_besat
=
request
.
updown_besat
.
ToDouble
();
beatSet
.
yieldrate
=
request
.
yieldratio
;
beatSet
.
start_time
=
request
.
start_time
.
ToDateTime
()
;
beatSet
.
end_time
=
request
.
end_time
.
ToDateTime
().
AddDays
(
1
).
AddSeconds
(-
1
)
;
beatSet
.
start_time
=
timSet
?
request
.
start_time
.
ToDateTime
()
:
DateTime
.
MinValue
;
beatSet
.
end_time
=
timSet
?
request
.
end_time
.
ToDateTime
().
AddDays
(
1
).
AddSeconds
(-
1
)
:
maxTime
;
await
_beatSetRepository
.
UpdateAsync
(
beatSet
);
if
(
await
_unitOfWork
.
CommitAsync
()
>
0
)
...
...
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