diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo
index ab83a5a7..b1a52360 100644
Binary files a/.vs/SGGL_SeDin_New/v17/.wsuo and b/.vs/SGGL_SeDin_New/v17/.wsuo differ
diff --git a/DataBase/版本日志/SGGLDB_V2024-11-14.sql b/DataBase/版本日志/SGGLDB_V2024-11-14.sql
new file mode 100644
index 00000000..dbcdb6be
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2024-11-14.sql
@@ -0,0 +1,6 @@
+
+alter table dbo.Tw_InputDetail
+ add SortIndex int
+go
+
+update PHTGL_ActionPlanFormation_Sch1 set PlanningContent='分包商资质标准' where ActionPlanItemID='ACBF5487-0C83-4E91-847F-B5BB3F59968A'
diff --git a/SGGL/BLL/CLGL/TwInOutplandetailService.cs b/SGGL/BLL/CLGL/TwInOutplandetailService.cs
index 209b4374..5d419c90 100644
--- a/SGGL/BLL/CLGL/TwInOutplandetailService.cs
+++ b/SGGL/BLL/CLGL/TwInOutplandetailService.cs
@@ -30,7 +30,7 @@ namespace BLL
from mat in mm.DefaultIfEmpty()
join master in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals master.Id into masters
from master in masters.DefaultIfEmpty()
- join stock in Funs.DB.Tw_MaterialStock on new { x.MaterialCode, master.WarehouseCode } equals new { MaterialCode = stock.PipeLineMatCode, stock.WarehouseCode } into st
+ join stock in Funs.DB.Tw_MaterialStock on new { x.MaterialCode, master.WarehouseCode,master.ProjectId } equals new { MaterialCode = stock.PipeLineMatCode, stock.WarehouseCode, stock .ProjectId} into st
from stock in st.DefaultIfEmpty()
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
diff --git a/SGGL/BLL/CLGL/TwInputdetailService.cs b/SGGL/BLL/CLGL/TwInputdetailService.cs
index eef2c6e9..33329c0d 100644
--- a/SGGL/BLL/CLGL/TwInputdetailService.cs
+++ b/SGGL/BLL/CLGL/TwInputdetailService.cs
@@ -35,6 +35,7 @@ namespace BLL
(string.IsNullOrEmpty(table.InputMasterId) || x.InputMasterId.Contains(table.InputMasterId)) &&
(string.IsNullOrEmpty(table.PipelineComponentId) || x.PipelineComponentId.Contains(table.PipelineComponentId)) &&
(string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode))
+ orderby x.SortIndex
select new Model.Tw_InOutDetailOutput
{
Id = x.Id,
@@ -45,7 +46,8 @@ namespace BLL
ActNum = x.ActNum,
PipelineComponentCode = y.PipelineComponentCode,
MaterialName = mat.MaterialName,
- MaterialDef = mat.MaterialDef
+ MaterialDef = mat.MaterialDef,
+ SortIndex = x.SortIndex
}
;
@@ -88,6 +90,7 @@ namespace BLL
MaterialCode = newtable.MaterialCode,
PlanNum = newtable.PlanNum,
ActNum = newtable.ActNum,
+ SortIndex = newtable.SortIndex
};
Funs.DB.Tw_InputDetail.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@@ -105,6 +108,7 @@ namespace BLL
table.MaterialCode = newtable.MaterialCode;
table.PlanNum = newtable.PlanNum;
table.ActNum = newtable.ActNum;
+ table.SortIndex = newtable.SortIndex;
Funs.DB.SubmitChanges();
}
@@ -128,7 +132,7 @@ namespace BLL
from mat in mm.DefaultIfEmpty()
join y in Funs.DB.Tw_InputMaster on x.InputMasterId equals y.Id
where inputMasterIds.Contains(x.InputMasterId)
- orderby y.CusBillCode , x.MaterialCode
+ orderby y.CusBillCode,x.SortIndex
select new
{
入库单编号 = y.CusBillCode,
diff --git a/SGGL/BLL/CLGL/TwInputmasterService.cs b/SGGL/BLL/CLGL/TwInputmasterService.cs
index 81df4031..c1910943 100644
--- a/SGGL/BLL/CLGL/TwInputmasterService.cs
+++ b/SGGL/BLL/CLGL/TwInputmasterService.cs
@@ -294,6 +294,7 @@ namespace BLL
MaterialCode = detail.MaterialCode,
PlanNum = detail.PlanNum,
ActNum = detail.ActNum,
+ SortIndex = detail.SortIndex,
};
TwInputdetailService.Add(detailTable);
TwMaterialstockService.UpdateStockNum(master.ProjectId, detail.MaterialCode, master.WarehouseCode, TwConst.InOutType.入库, detailTable.ActNum);
diff --git a/SGGL/BLL/CLGL/TwOutputdetailService..cs b/SGGL/BLL/CLGL/TwOutputdetailService..cs
index 8b323214..73366d9e 100644
--- a/SGGL/BLL/CLGL/TwOutputdetailService..cs
+++ b/SGGL/BLL/CLGL/TwOutputdetailService..cs
@@ -31,7 +31,7 @@ namespace BLL
from mat in mm.DefaultIfEmpty()
join master in Funs.DB.Tw_OutputMaster on x.OutputMasterId equals master.Id into masters
from master in masters.DefaultIfEmpty()
- join stock in Funs.DB.Tw_MaterialStock on new { x.MaterialCode,master.WarehouseCode} equals new { MaterialCode=stock.PipeLineMatCode,stock.WarehouseCode } into st
+ join stock in Funs.DB.Tw_MaterialStock on new { x.MaterialCode, master.WarehouseCode, master.ProjectId } equals new { MaterialCode = stock.PipeLineMatCode, stock.WarehouseCode, stock.ProjectId } into st
from stock in st.DefaultIfEmpty()
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx
index aaa8e40c..0e4e5728 100644
--- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx
@@ -65,9 +65,9 @@
-
-
+ --%>
diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.designer.cs
index 401d9af5..1608b59e 100644
--- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.designer.cs
@@ -149,15 +149,6 @@ namespace FineUIPro.Web.CLGL
///
protected global::FineUIPro.Button btnImport;
- ///
- /// btnOut 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Button btnOut;
-
///
/// lblNumber 控件。
///
diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx
index aa49ef31..cf9dfd03 100644
--- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx
@@ -59,7 +59,12 @@
DataIDField="Id" EnableColumnLines="true" Height="400" EnableBigData="true"
EnableTextSelection="True">
-
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.designer.cs
index 9a638dc0..0a082e71 100644
--- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.designer.cs
@@ -140,6 +140,15 @@ namespace FineUIPro.Web.CLGL
///
protected global::FineUIPro.Grid Grid1;
+ ///
+ /// Label1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label Label1;
+
///
/// tbActNum 控件。
///
diff --git a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs
index 9902df49..2d8fd973 100644
--- a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs
@@ -330,9 +330,9 @@ namespace FineUIPro.Web.CLGL
List tw_PrintMasters = new List();
List tw_PrintDetails = new List();
Model.Tw_PrintMaster printMaster = new Model.Tw_PrintMaster
- {
+ {
- ReqUnitName = result.ReqUnitName,
+ ReqUnitName = UnitService.GetUnitNameByUnitId(Person_PersonsService.GetPerson_PersonsById(result.CreateMan).UnitId),
CusBillCode = result.CusBillCode,
CreateDate = result.CreateDate.Value.ToString("yyyy-MM-dd"),
ProjectName = ProjectService.GetProjectNameByProjectId(result.ProjectId),
@@ -382,6 +382,7 @@ namespace FineUIPro.Web.CLGL
var tw_PrintDetail = (from x in Funs.DB.Tw_InputDetail
join y in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
where x.InputMasterId == Id
+ orderby x.SortIndex
select new Model.Tw_PrintDetail
{
SortIndex = 0,
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx b/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx
index 9e1654af..d18c601f 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
}
-
+
@@ -154,7 +154,7 @@ namespace FastReport
-
+
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/材料入库计划单.frx b/SGGL/FineUIPro.Web/File/Fastreport/材料入库计划单.frx
index 9f3ef5a2..92f84e74 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/材料入库计划单.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/材料入库计划单.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
}
-
+
diff --git a/SGGL/FineUIPro.Web/File/Word/PHTGL/施工招标实施计划审批表.docx b/SGGL/FineUIPro.Web/File/Word/PHTGL/施工招标实施计划审批表.docx
index a20abf44..501843d4 100644
--- a/SGGL/FineUIPro.Web/File/Word/PHTGL/施工招标实施计划审批表.docx
+++ b/SGGL/FineUIPro.Web/File/Word/PHTGL/施工招标实施计划审批表.docx
@@ -54,7 +54,7 @@
<>
<>
8
- 短名单资质标准
+ 分包商资质标准
<>
<>
9
@@ -119,7 +119,7 @@
关键说明
- 短名单资质标准确定
+ 分包商资质标准确定
针对性的评标策略
评标办法评估与选择
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanFormationEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanFormationEdit.aspx
index f86df09f..525e4f5a 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanFormationEdit.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanFormationEdit.aspx
@@ -206,7 +206,7 @@
-
+
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index bd5ee153..dc445768 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -12037,7 +12037,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
public string ApproveIdea
{
get
@@ -154478,7 +154478,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
public string AttentPerson
{
get
@@ -185437,7 +185437,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
public string ProjectDescription
{
get
@@ -185557,7 +185557,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
public string CalculationRule
{
get
@@ -185617,7 +185617,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
public string ConstructionSubcontractor
{
get
@@ -186001,7 +186001,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
public System.Nullable WorkPackageEstimate
{
get
@@ -186306,16 +186306,6 @@ namespace Model
private string _ProjectId;
- private string _ContractId;
-
- private string _OrderCode;
-
- private System.Nullable _OrderInDate;
-
- private System.Nullable _OrderOutDate;
-
- private string _MaterialRequisitionUnit;
-
private System.Nullable _State;
private string _InvoiceCode;
@@ -186344,6 +186334,16 @@ namespace Model
private string _CreateUser;
+ private string _ContractId;
+
+ private System.Nullable _OrderInDate;
+
+ private string _OrderCode;
+
+ private System.Nullable _OrderOutDate;
+
+ private string _MaterialRequisitionUnit;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -186352,16 +186352,6 @@ namespace Model
partial void OnInvoiceIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
- partial void OnContractIdChanging(string value);
- partial void OnContractIdChanged();
- partial void OnOrderCodeChanging(string value);
- partial void OnOrderCodeChanged();
- partial void OnOrderInDateChanging(System.Nullable value);
- partial void OnOrderInDateChanged();
- partial void OnOrderOutDateChanging(System.Nullable value);
- partial void OnOrderOutDateChanged();
- partial void OnMaterialRequisitionUnitChanging(string value);
- partial void OnMaterialRequisitionUnitChanged();
partial void OnStateChanging(System.Nullable value);
partial void OnStateChanged();
partial void OnInvoiceCodeChanging(string value);
@@ -186390,6 +186380,16 @@ namespace Model
partial void OnCreateDateChanged();
partial void OnCreateUserChanging(string value);
partial void OnCreateUserChanged();
+ partial void OnContractIdChanging(string value);
+ partial void OnContractIdChanged();
+ partial void OnOrderInDateChanging(System.Nullable value);
+ partial void OnOrderInDateChanged();
+ partial void OnOrderCodeChanging(string value);
+ partial void OnOrderCodeChanged();
+ partial void OnOrderOutDateChanging(System.Nullable value);
+ partial void OnOrderOutDateChanged();
+ partial void OnMaterialRequisitionUnitChanging(string value);
+ partial void OnMaterialRequisitionUnitChanged();
#endregion
public PHTGL_Invoice()
@@ -186437,106 +186437,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
- public string ContractId
- {
- get
- {
- return this._ContractId;
- }
- set
- {
- if ((this._ContractId != value))
- {
- this.OnContractIdChanging(value);
- this.SendPropertyChanging();
- this._ContractId = value;
- this.SendPropertyChanged("ContractId");
- this.OnContractIdChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
- public string OrderCode
- {
- get
- {
- return this._OrderCode;
- }
- set
- {
- if ((this._OrderCode != value))
- {
- this.OnOrderCodeChanging(value);
- this.SendPropertyChanging();
- this._OrderCode = value;
- this.SendPropertyChanged("OrderCode");
- this.OnOrderCodeChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
- public System.Nullable OrderInDate
- {
- get
- {
- return this._OrderInDate;
- }
- set
- {
- if ((this._OrderInDate != value))
- {
- this.OnOrderInDateChanging(value);
- this.SendPropertyChanging();
- this._OrderInDate = value;
- this.SendPropertyChanged("OrderInDate");
- this.OnOrderInDateChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
- public System.Nullable OrderOutDate
- {
- get
- {
- return this._OrderOutDate;
- }
- set
- {
- if ((this._OrderOutDate != value))
- {
- this.OnOrderOutDateChanging(value);
- this.SendPropertyChanging();
- this._OrderOutDate = value;
- this.SendPropertyChanged("OrderOutDate");
- this.OnOrderOutDateChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
- public string MaterialRequisitionUnit
- {
- get
- {
- return this._MaterialRequisitionUnit;
- }
- set
- {
- if ((this._MaterialRequisitionUnit != value))
- {
- this.OnMaterialRequisitionUnitChanging(value);
- this.SendPropertyChanging();
- this._MaterialRequisitionUnit = value;
- this.SendPropertyChanged("MaterialRequisitionUnit");
- this.OnMaterialRequisitionUnitChanged();
- }
- }
- }
-
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
public System.Nullable State
{
@@ -186817,6 +186717,106 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
+ public string ContractId
+ {
+ get
+ {
+ return this._ContractId;
+ }
+ set
+ {
+ if ((this._ContractId != value))
+ {
+ this.OnContractIdChanging(value);
+ this.SendPropertyChanging();
+ this._ContractId = value;
+ this.SendPropertyChanged("ContractId");
+ this.OnContractIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
+ public System.Nullable OrderInDate
+ {
+ get
+ {
+ return this._OrderInDate;
+ }
+ set
+ {
+ if ((this._OrderInDate != value))
+ {
+ this.OnOrderInDateChanging(value);
+ this.SendPropertyChanging();
+ this._OrderInDate = value;
+ this.SendPropertyChanged("OrderInDate");
+ this.OnOrderInDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
+ public string OrderCode
+ {
+ get
+ {
+ return this._OrderCode;
+ }
+ set
+ {
+ if ((this._OrderCode != value))
+ {
+ this.OnOrderCodeChanging(value);
+ this.SendPropertyChanging();
+ this._OrderCode = value;
+ this.SendPropertyChanged("OrderCode");
+ this.OnOrderCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
+ public System.Nullable OrderOutDate
+ {
+ get
+ {
+ return this._OrderOutDate;
+ }
+ set
+ {
+ if ((this._OrderOutDate != value))
+ {
+ this.OnOrderOutDateChanging(value);
+ this.SendPropertyChanging();
+ this._OrderOutDate = value;
+ this.SendPropertyChanged("OrderOutDate");
+ this.OnOrderOutDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
+ public string MaterialRequisitionUnit
+ {
+ get
+ {
+ return this._MaterialRequisitionUnit;
+ }
+ set
+ {
+ if ((this._MaterialRequisitionUnit != value))
+ {
+ this.OnMaterialRequisitionUnitChanging(value);
+ this.SendPropertyChanging();
+ this._MaterialRequisitionUnit = value;
+ this.SendPropertyChanged("MaterialRequisitionUnit");
+ this.OnMaterialRequisitionUnitChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -260102,6 +260102,8 @@ namespace Model
private System.Nullable _ActNum;
+ private System.Nullable _SortIndex;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -260118,6 +260120,8 @@ namespace Model
partial void OnPlanNumChanged();
partial void OnActNumChanging(System.Nullable value);
partial void OnActNumChanged();
+ partial void OnSortIndexChanging(System.Nullable value);
+ partial void OnSortIndexChanged();
#endregion
public Tw_InputDetail()
@@ -260245,6 +260249,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
+ public System.Nullable SortIndex
+ {
+ get
+ {
+ return this._SortIndex;
+ }
+ set
+ {
+ if ((this._SortIndex != value))
+ {
+ this.OnSortIndexChanging(value);
+ this.SendPropertyChanging();
+ this._SortIndex = value;
+ this.SendPropertyChanged("SortIndex");
+ this.OnSortIndexChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -302047,7 +302071,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
public string Name
{
get
@@ -302624,7 +302648,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -302815,7 +302839,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -308126,7 +308150,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -309598,7 +309622,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -319149,7 +319173,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")]
public string ContractNo
{
get
@@ -319169,7 +319193,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")]
public string UnitWorks
{
get