提交代码
This commit is contained in:
parent
62a274ff1f
commit
550e142e88
|
|
@ -139,7 +139,8 @@ namespace BLL
|
|||
/// <param name="inspectionMachine"></param>
|
||||
public static void UpdateInspectionMachine(Model.Comprehensive_InspectionMachine inspectionMachine)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
Model.Comprehensive_InspectionMachine newInspectionMachine = db.Comprehensive_InspectionMachine.FirstOrDefault(e => e.InspectionMachineId == inspectionMachine.InspectionMachineId);
|
||||
if (newInspectionMachine != null)
|
||||
{
|
||||
|
|
@ -164,6 +165,7 @@ namespace BLL
|
|||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据主键删除机具校验
|
||||
|
|
|
|||
|
|
@ -459,7 +459,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
{
|
||||
Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine();
|
||||
oldViewInfo = oldViewInfos.FirstOrDefault(x => x.UnitId == unitInfo.UnitId
|
||||
&& x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][13].ToString().Trim()));
|
||||
&& x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][14].ToString().Trim()));
|
||||
if (oldViewInfo==null)
|
||||
{
|
||||
Model.Comprehensive_InspectionMachine Ins = new Model.Comprehensive_InspectionMachine();
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
<Use64BitIISExpress>false</Use64BitIISExpress>
|
||||
<IISExpressSSLPort />
|
||||
|
|
|
|||
|
|
@ -187,8 +187,8 @@ namespace FineUIPro.Web.TestRun
|
|||
private void InitDropDownList()
|
||||
{
|
||||
//SolutionTempleteTypeService.InitSolutionTempleteDropDownList(drpModelType, false);
|
||||
UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, CurrUser.LoginProjectId,
|
||||
Const.ProjectUnitType_2, false);
|
||||
UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId,
|
||||
false);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<appSettings>
|
||||
<!--连接字符串-->
|
||||
<!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
|
||||
<add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
|
||||
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
|
||||
<!--系统名称-->
|
||||
<add key="SystemName" value="智慧施工管理信息系统V1.0"/>
|
||||
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
|
||||
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
|
||||
</httpHandlers>
|
||||
<compilation debug="true" targetFramework="4.6.1"/>
|
||||
<compilation debug="false" targetFramework="4.6.1"/>
|
||||
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
|
||||
<authentication mode="Forms">
|
||||
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
|
||||
|
|
|
|||
|
|
@ -39688,8 +39688,6 @@ namespace Model
|
|||
|
||||
private EntitySet<Check_CheckRectify> _Check_CheckRectify;
|
||||
|
||||
private EntitySet<Check_CheckSpecialDetail> _Check_CheckSpecialDetail;
|
||||
|
||||
private EntitySet<Check_ContactList> _Check_ContactList;
|
||||
|
||||
private EntitySet<Check_IncentiveNotice> _Check_IncentiveNotice;
|
||||
|
|
@ -40081,7 +40079,6 @@ namespace Model
|
|||
this._Check_CheckDayDetail = new EntitySet<Check_CheckDayDetail>(new Action<Check_CheckDayDetail>(this.attach_Check_CheckDayDetail), new Action<Check_CheckDayDetail>(this.detach_Check_CheckDayDetail));
|
||||
this._Check_CheckInfo = new EntitySet<Check_CheckInfo>(new Action<Check_CheckInfo>(this.attach_Check_CheckInfo), new Action<Check_CheckInfo>(this.detach_Check_CheckInfo));
|
||||
this._Check_CheckRectify = new EntitySet<Check_CheckRectify>(new Action<Check_CheckRectify>(this.attach_Check_CheckRectify), new Action<Check_CheckRectify>(this.detach_Check_CheckRectify));
|
||||
this._Check_CheckSpecialDetail = new EntitySet<Check_CheckSpecialDetail>(new Action<Check_CheckSpecialDetail>(this.attach_Check_CheckSpecialDetail), new Action<Check_CheckSpecialDetail>(this.detach_Check_CheckSpecialDetail));
|
||||
this._Check_ContactList = new EntitySet<Check_ContactList>(new Action<Check_ContactList>(this.attach_Check_ContactList), new Action<Check_ContactList>(this.detach_Check_ContactList));
|
||||
this._Check_IncentiveNotice = new EntitySet<Check_IncentiveNotice>(new Action<Check_IncentiveNotice>(this.attach_Check_IncentiveNotice), new Action<Check_IncentiveNotice>(this.detach_Check_IncentiveNotice));
|
||||
this._Check_JointCheck = new EntitySet<Check_JointCheck>(new Action<Check_JointCheck>(this.attach_Check_JointCheck), new Action<Check_JointCheck>(this.detach_Check_JointCheck));
|
||||
|
|
@ -40989,19 +40986,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_Base_Unit", Storage="_Check_CheckSpecialDetail", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<Check_CheckSpecialDetail> Check_CheckSpecialDetail
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Check_CheckSpecialDetail;
|
||||
}
|
||||
set
|
||||
{
|
||||
this._Check_CheckSpecialDetail.Assign(value);
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ContactList_Base_Unit", Storage="_Check_ContactList", ThisKey="UnitId", OtherKey="SponsorUnitId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<Check_ContactList> Check_ContactList
|
||||
{
|
||||
|
|
@ -43291,18 +43275,6 @@ namespace Model
|
|||
entity.Base_Unit = null;
|
||||
}
|
||||
|
||||
private void attach_Check_CheckSpecialDetail(Check_CheckSpecialDetail entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.Base_Unit = this;
|
||||
}
|
||||
|
||||
private void detach_Check_CheckSpecialDetail(Check_CheckSpecialDetail entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.Base_Unit = null;
|
||||
}
|
||||
|
||||
private void attach_Check_ContactList(Check_ContactList entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
|
|
@ -62600,8 +62572,6 @@ namespace Model
|
|||
|
||||
private string _CheckOpinions;
|
||||
|
||||
private EntityRef<Base_Unit> _Base_Unit;
|
||||
|
||||
private EntityRef<WBS_UnitWork> _WBS_UnitWork;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
|
|
@ -62658,7 +62628,6 @@ namespace Model
|
|||
|
||||
public Check_CheckSpecialDetail()
|
||||
{
|
||||
this._Base_Unit = default(EntityRef<Base_Unit>);
|
||||
this._WBS_UnitWork = default(EntityRef<WBS_UnitWork>);
|
||||
OnCreated();
|
||||
}
|
||||
|
|
@ -62798,10 +62767,6 @@ namespace Model
|
|||
{
|
||||
if ((this._UnitId != value))
|
||||
{
|
||||
if (this._Base_Unit.HasLoadedOrAssignedValue)
|
||||
{
|
||||
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
|
||||
}
|
||||
this.OnUnitIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._UnitId = value;
|
||||
|
|
@ -63131,40 +63096,6 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
|
||||
public Base_Unit Base_Unit
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Base_Unit.Entity;
|
||||
}
|
||||
set
|
||||
{
|
||||
Base_Unit previousValue = this._Base_Unit.Entity;
|
||||
if (((previousValue != value)
|
||||
|| (this._Base_Unit.HasLoadedOrAssignedValue == false)))
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
if ((previousValue != null))
|
||||
{
|
||||
this._Base_Unit.Entity = null;
|
||||
previousValue.Check_CheckSpecialDetail.Remove(this);
|
||||
}
|
||||
this._Base_Unit.Entity = value;
|
||||
if ((value != null))
|
||||
{
|
||||
value.Check_CheckSpecialDetail.Add(this);
|
||||
this._UnitId = value.UnitId;
|
||||
}
|
||||
else
|
||||
{
|
||||
this._UnitId = default(string);
|
||||
}
|
||||
this.SendPropertyChanged("Base_Unit");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_ProjectData_WorkArea", Storage="_WBS_UnitWork", ThisKey="CheckArea", OtherKey="UnitWorkId", IsForeignKey=true)]
|
||||
public WBS_UnitWork WBS_UnitWork
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
<Use64BitIISExpress />
|
||||
<IISExpressSSLPort />
|
||||
|
|
|
|||
Loading…
Reference in New Issue