diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
index 7d002b8d..a5bfa9f8 100644
--- a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
@@ -139,29 +139,31 @@ namespace BLL
///
public static void UpdateInspectionMachine(Model.Comprehensive_InspectionMachine inspectionMachine)
{
- Model.SGGLDB db = Funs.DB;
- Model.Comprehensive_InspectionMachine newInspectionMachine = db.Comprehensive_InspectionMachine.FirstOrDefault(e => e.InspectionMachineId == inspectionMachine.InspectionMachineId);
- if (newInspectionMachine != null)
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
- newInspectionMachine.ProjectId = inspectionMachine.ProjectId;
- newInspectionMachine.UnitId = inspectionMachine.UnitId;
- newInspectionMachine.InspectionMachineCode = inspectionMachine.InspectionMachineCode;
- newInspectionMachine.InspectionMachineName = inspectionMachine.InspectionMachineName;
- newInspectionMachine.SpecificationModel = inspectionMachine.SpecificationModel;
- newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK;
- newInspectionMachine.InspectionType = inspectionMachine.InspectionType;
- newInspectionMachine.NextTestDate = inspectionMachine.NextTestDate;
- newInspectionMachine.TestCycle = inspectionMachine.TestCycle;
- newInspectionMachine.IsVerification = inspectionMachine.IsVerification;
- newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate;
- newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl;
- newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId;
- newInspectionMachine.IsOnSite = inspectionMachine.IsOnSite;
- newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
- newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
- newInspectionMachine.Status = inspectionMachine.Status;
- newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode;
- db.SubmitChanges();
+ Model.Comprehensive_InspectionMachine newInspectionMachine = db.Comprehensive_InspectionMachine.FirstOrDefault(e => e.InspectionMachineId == inspectionMachine.InspectionMachineId);
+ if (newInspectionMachine != null)
+ {
+ newInspectionMachine.ProjectId = inspectionMachine.ProjectId;
+ newInspectionMachine.UnitId = inspectionMachine.UnitId;
+ newInspectionMachine.InspectionMachineCode = inspectionMachine.InspectionMachineCode;
+ newInspectionMachine.InspectionMachineName = inspectionMachine.InspectionMachineName;
+ newInspectionMachine.SpecificationModel = inspectionMachine.SpecificationModel;
+ newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK;
+ newInspectionMachine.InspectionType = inspectionMachine.InspectionType;
+ newInspectionMachine.NextTestDate = inspectionMachine.NextTestDate;
+ newInspectionMachine.TestCycle = inspectionMachine.TestCycle;
+ newInspectionMachine.IsVerification = inspectionMachine.IsVerification;
+ newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate;
+ newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl;
+ newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId;
+ newInspectionMachine.IsOnSite = inspectionMachine.IsOnSite;
+ newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
+ newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
+ newInspectionMachine.Status = inspectionMachine.Status;
+ newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode;
+ db.SubmitChanges();
+ }
}
}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
index 06dba038..2360fcd0 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
@@ -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();
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index 63722353..cb873201 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
- Debug|Any CPU
+ Release|Any CPU
true
false
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs
index 11f99973..951ff6d7 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs
@@ -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);
}
///
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 9fc55c34..963148f2 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -12,7 +12,7 @@
-
+
@@ -77,7 +77,7 @@
-
+
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 2b748888..cd4039c8 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -39688,8 +39688,6 @@ namespace Model
private EntitySet _Check_CheckRectify;
- private EntitySet _Check_CheckSpecialDetail;
-
private EntitySet _Check_ContactList;
private EntitySet _Check_IncentiveNotice;
@@ -40081,7 +40079,6 @@ namespace Model
this._Check_CheckDayDetail = new EntitySet(new Action(this.attach_Check_CheckDayDetail), new Action(this.detach_Check_CheckDayDetail));
this._Check_CheckInfo = new EntitySet(new Action(this.attach_Check_CheckInfo), new Action(this.detach_Check_CheckInfo));
this._Check_CheckRectify = new EntitySet(new Action(this.attach_Check_CheckRectify), new Action(this.detach_Check_CheckRectify));
- this._Check_CheckSpecialDetail = new EntitySet(new Action(this.attach_Check_CheckSpecialDetail), new Action(this.detach_Check_CheckSpecialDetail));
this._Check_ContactList = new EntitySet(new Action(this.attach_Check_ContactList), new Action(this.detach_Check_ContactList));
this._Check_IncentiveNotice = new EntitySet(new Action(this.attach_Check_IncentiveNotice), new Action(this.detach_Check_IncentiveNotice));
this._Check_JointCheck = new EntitySet(new Action(this.attach_Check_JointCheck), new Action(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
- {
- 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
{
@@ -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;
-
private EntityRef _WBS_UnitWork;
#region 可扩展性方法定义
@@ -62658,7 +62628,6 @@ namespace Model
public Check_CheckSpecialDetail()
{
- this._Base_Unit = default(EntityRef);
this._WBS_UnitWork = default(EntityRef);
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
{
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 5fe155da..bd497c6b 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
- Debug|Any CPU
+ Release|Any CPU
true