Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
W
weishida_DBbrower
Project
Project
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
潘栩锋
weishida_DBbrower
Commits
7ec77621
Commit
7ec77621
authored
Jun 19, 2019
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.支持 nMasterId
parent
3d25408e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
29 deletions
+18
-29
DBHelper.cs
WSDDBBrower/WSDDBBrower/Core/DBHelper.cs
+11
-5
DBViewerModel.cs
WSDDBBrower/WSDDBBrower/Core/DBViewerModel.cs
+3
-1
g_tgProcess.cs
WSDDBBrower/WSDDBBrower/Core/Model/g_tgProcess.cs
+2
-2
g_tgTech.cs
WSDDBBrower/WSDDBBrower/Core/Model/g_tgTech.cs
+2
-0
WSDDBBrowser.exe.config
执行包/WSDDBBrower/WSDDBBrowser.exe.config
+0
-21
No files found.
WSDDBBrower/WSDDBBrower/Core/DBHelper.cs
View file @
7ec77621
...
...
@@ -116,14 +116,20 @@ namespace WSDDBBrowser.Core
//找测厚数据 时间段在 温度时间内的
process
.
TGID
=
new
List
<
int
>();
//process.TGID.AddRange(
// from p in tgProcesses
// where
// IsContains(
// process.BeginTime, process.EndTime,
// (DateTime)p.tBeginTime, (DateTime)p.tEndTime,
// TimeSpan.FromMinutes(5)
// )
// select p.ide
//);
process
.
TGID
.
AddRange
(
from
p
in
tgProcesses
where
IsContains
(
process
.
BeginTime
,
process
.
EndTime
,
(
DateTime
)
p
.
tBeginTime
,
(
DateTime
)
p
.
tEndTime
,
TimeSpan
.
FromMinutes
(
2
)
)
p
.
nMasterId
==
sbProcess
.
nId
select
p
.
ide
);
if
(
process
.
TGID
.
Count
()
>
0
)
...
...
WSDDBBrower/WSDDBBrower/Core/DBViewerModel.cs
View file @
7ec77621
...
...
@@ -62,7 +62,7 @@ namespace WSDDBBrowser.Core
/// <summary>
/// 服务器 IP
/// </summary>
public
string
ServerIP
{
get
;
set
;
}
=
"192.168.0.186
"
;
public
string
ServerIP
{
get
;
set
;
}
=
@"192.168.0.186\sql2010
"
;
/// <summary>
/// 服务器 密码
...
...
@@ -191,6 +191,8 @@ namespace WSDDBBrowser.Core
//创建ScanDataItems
foreach
(
var
tech
in
processPack
.
Technologies
)
{
if
(
tech
.
bIsReal
==
false
)
continue
;
var
scanDataItem
=
new
ScanDataItem
();
scanDataItem
.
DeviceID
=
tech
.
cDeviceId
;
scanDataItem
.
DeviceName
=
tech
.
cDeviceName
;
...
...
WSDDBBrower/WSDDBBrower/Core/Model/g_tgProcess.cs
View file @
7ec77621
...
...
@@ -19,6 +19,7 @@ namespace WSDDBBrowser.Core.Model
public
int
?
nId
{
get
;
set
;
}
public
int
?
nMasterId
{
get
;
set
;
}
[
StringLength
(
50
)]
public
string
cOrderNo
{
get
;
set
;
}
...
...
@@ -40,7 +41,6 @@ namespace WSDDBBrowser.Core.Model
public
int
?
nSRBegin
{
get
;
set
;
}
public
int
?
nSREnd
{
get
;
set
;
}
public
int
?
nValLen
{
get
;
set
;
}
}
}
WSDDBBrower/WSDDBBrower/Core/Model/g_tgTech.cs
View file @
7ec77621
...
...
@@ -31,5 +31,7 @@ namespace WSDDBBrowser.Core.Model
[
Column
(
TypeName
=
"numeric"
)]
public
decimal
?
nCtrlLine
{
get
;
set
;
}
public
bool
?
bIsReal
{
get
;
set
;
}
}
}
执行包/WSDDBBrower/WSDDBBrowser.exe.config
deleted
100644 → 0
View file @
3d25408e
<?
xml
version
=
"1.0"
encoding
=
"utf-8"
?>
<
configuration
>
<
configSections
>
<!--
For
more
information
on
Entity
Framework
configuration
,
visit
http
://
go
.
microsoft
.
com
/
fwlink
/?
LinkID
=
237468
-->
<
section
name
=
"entityFramework"
type
=
"System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
requirePermission
=
"false"
/>
</
configSections
>
<
startup
>
<
supportedRuntime
version
=
"v4.0"
sku
=
".NETFramework,Version=v4.6.1"
/>
</
startup
>
<
entityFramework
>
<
defaultConnectionFactory
type
=
"System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework"
>
<
parameters
>
<
parameter
value
=
"mssqllocaldb"
/>
</
parameters
>
</
defaultConnectionFactory
>
<
providers
>
<
provider
invariantName
=
"System.Data.SqlClient"
type
=
"System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"
/>
</
providers
>
</
entityFramework
>
</
configuration
>
\ No newline at end of file
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