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
f8e7e0e0
Commit
f8e7e0e0
authored
Jan 28, 2021
by
xin.yang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
74428d22
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
en-US.js
Html/src/locale/lang/en-US.js
+3
-0
zh-CN.js
Html/src/locale/lang/zh-CN.js
+3
-0
ProductionBeatSetRepository.cs
...CncRepository/Repositories/ProductionBeatSetRepository.cs
+3
-2
No files found.
Html/src/locale/lang/en-US.js
View file @
f8e7e0e0
...
...
@@ -735,6 +735,9 @@ export default {
'9000510'
:
'数量必须是整数'
,
'9000511'
:
'管理类型填写单件或批次'
,
'9000512'
:
'状态填写可用或停用'
,
'9000513'
:
'请填写大于0的整数ID'
,
'9000514'
:
'请填写仓库名称'
,
'9000515'
:
'请填写仓库名称后面的储位层级'
,
'9100000'
:
'Departments cannot be empty'
,
'9100001'
:
'Position cannot be empty'
,
...
...
Html/src/locale/lang/zh-CN.js
View file @
f8e7e0e0
...
...
@@ -762,6 +762,9 @@ export default {
'9000510'
:
'数量必须是整数'
,
'9000511'
:
'管理类型填写单件或批次'
,
'9000512'
:
'状态填写可用或停用'
,
'9000513'
:
'请填写大于0的整数ID'
,
'9000514'
:
'请填写仓库名称'
,
'9000515'
:
'请填写仓库名称后面的储位层级'
,
'9100000'
:
'部门不能为空'
,
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.CncRepository/Repositories/ProductionBeatSetRepository.cs
View file @
f8e7e0e0
...
...
@@ -186,6 +186,7 @@ namespace Siger.Middlelayer.CncRepository.Repositories
}
}
var
index
=
0
;
var
maxTime
=
"2199-01-01 00:00:00"
.
ToDateTime
();
foreach
(
var
entity
in
beatSetEntities
)
{
var
beat
=
new
siger_project_beat_set
...
...
@@ -206,8 +207,8 @@ namespace Siger.Middlelayer.CncRepository.Repositories
updown_besat
=
entity
.
UpDownBesat
.
ToDouble
(),
yieldrate
=
entity
.
YieldRate
.
ToInt
(),
route_number
=
entity
.
RouteNumber
,
start_time
=
entity
.
StartTime
.
ToDateTime
(),
end_time
=
entity
.
EndTime
.
ToDateTime
().
AddDays
(
1
).
AddSeconds
(-
1
)
start_time
=
string
.
IsNullOrEmpty
(
entity
.
StartTime
)
?
DateTime
.
MinValue
:
entity
.
StartTime
.
ToDateTime
(),
end_time
=
string
.
IsNullOrEmpty
(
entity
.
EndTime
)
?
maxTime
:
entity
.
EndTime
.
ToDateTime
().
AddDays
(
1
).
AddSeconds
(-
1
)
};
_context
.
siger_project_beat_set
.
Add
(
beat
);
_context
.
SaveChanges
();
...
...
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