Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS
This commit is contained in:
@@ -76,6 +76,11 @@ namespace BLL
|
|||||||
newJointInfo.JOT_Voltage = jointInfo.JOT_Voltage;
|
newJointInfo.JOT_Voltage = jointInfo.JOT_Voltage;
|
||||||
newJointInfo.PressureTestPackageNo = jointInfo.PressureTestPackageNo;
|
newJointInfo.PressureTestPackageNo = jointInfo.PressureTestPackageNo;
|
||||||
newJointInfo.IsGold = jointInfo.IsGold;
|
newJointInfo.IsGold = jointInfo.IsGold;
|
||||||
|
newJointInfo.X = jointInfo.X;
|
||||||
|
newJointInfo.Y = jointInfo.Y;
|
||||||
|
newJointInfo.X2 = jointInfo.X2;
|
||||||
|
newJointInfo.Y2 = jointInfo.Y2;
|
||||||
|
newJointInfo.AttachSourceId = jointInfo.AttachSourceId;
|
||||||
|
|
||||||
db.HJGL_PW_JointInfo.InsertOnSubmit(newJointInfo);
|
db.HJGL_PW_JointInfo.InsertOnSubmit(newJointInfo);
|
||||||
db.SubmitChanges();
|
db.SubmitChanges();
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<UseIISExpress>true</UseIISExpress>
|
<UseIISExpress>true</UseIISExpress>
|
||||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||||
<Use64BitIISExpress />
|
<Use64BitIISExpress />
|
||||||
<IISExpressSSLPort />
|
<IISExpressSSLPort />
|
||||||
<IISExpressAnonymousAuthentication />
|
<IISExpressAnonymousAuthentication />
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||||
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
|
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
|
||||||
<UseIISExpress>true</UseIISExpress>
|
<UseIISExpress>true</UseIISExpress>
|
||||||
<Use64BitIISExpress />
|
<Use64BitIISExpress />
|
||||||
|
|||||||
Reference in New Issue
Block a user