入库单修改，增加入库明细序号，修改入库单打印模板。

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'

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)) &&

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,

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);

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)) &&

SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx

@@ -65,9 +65,9 @@
                                                 </f:Button>
                                                 <f:Button ID="btnImport" Text="导入" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
                                                 </f:Button>
-                                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
+                                               <%-- <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
                                                     EnableAjax="false" DisableControlBeforePostBack="false">
-                                                </f:Button>
+                                                </f:Button>--%>
                                             </Items>
                                         </f:Toolbar>
                                     </Toolbars>

SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.designer.cs

@@ -149,15 +149,6 @@ namespace FineUIPro.Web.CLGL
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
-        /// <summary>
-        /// btnOut 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnOut;
-
         /// <summary>
         /// lblNumber 控件。
         /// </summary>

SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx

@@ -59,7 +59,12 @@
                         DataIDField="Id" EnableColumnLines="true" Height="400" EnableBigData="true"  
                         EnableTextSelection="True">
                         <Columns> 
-                            
+                            <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                                             TextAlign="Center">
+                                <ItemTemplate>
+                                    <asp:Label ID="Label1" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                </ItemTemplate>
+                            </f:TemplateField> 
                             <f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
                                 FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
                             </f:RenderField>

SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.designer.cs

@@ -140,6 +140,15 @@ namespace FineUIPro.Web.CLGL
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
 
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
         /// <summary>
         /// tbActNum 控件。
         /// </summary>

SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs

@@ -330,9 +330,9 @@ namespace FineUIPro.Web.CLGL
             List<Model.Tw_PrintMaster> tw_PrintMasters = new List<Model.Tw_PrintMaster>();
             List<Model.Tw_PrintDetail> tw_PrintDetails = new List<Model.Tw_PrintDetail>();
             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,

SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/07/2024 16:15:13" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/14/2024 15:01:58" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREljhlknPe0ucx4RV8UxTdJ"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRE58amxPqMQ7WmKl5O5d2cK"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
@@ -154,7 +154,7 @@ namespace FastReport
           <TableCell Name="Cell323" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
           <TableCell Name="Cell324" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
           <TableCell Name="Cell325" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
-          <TableCell Name="Cell326" Border.Lines="All" Text="领料单位：[Table1.ReqUnitName]" VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="4"/>
+          <TableCell Name="Cell326" Border.Lines="All" Text="入库单位：[Table1.ReqUnitName]" VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="4"/>
           <TableCell Name="Cell327" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
           <TableCell Name="Cell328" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
           <TableCell Name="Cell330" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>

SGGL/FineUIPro.Web/File/Fastreport/材料入库计划单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/12/2024 17:52:38" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/14/2024 14:57:38" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHMXAe/qW0Qw+G7jVNzqKIC"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGXnEOHTYOWgB9BnZw69mb2"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanFormationEdit.aspx

@@ -206,7 +206,7 @@
 
                 <f:FormRow>
                     <Items>
-                        <f:Label ID="Label10" runat="server" CssClass="widthBlod" Text="七、	短名单资质标准确定"></f:Label>
+                        <f:Label ID="Label10" runat="server" CssClass="widthBlod" Text="七、	分包商资质标准确定"></f:Label>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>

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<decimal> WorkPackageEstimate
 		{
 			get
@@ -186306,16 +186306,6 @@ namespace Model
 		
 		private string _ProjectId;
 		
-		private string _ContractId;
-		
-		private string _OrderCode;
-		
-		private System.Nullable<System.DateTime> _OrderInDate;
-		
-		private System.Nullable<System.DateTime> _OrderOutDate;
-		
-		private string _MaterialRequisitionUnit;
-		
 		private System.Nullable<int> _State;
 		
 		private string _InvoiceCode;
@@ -186344,6 +186334,16 @@ namespace Model
 		
 		private string _CreateUser;
 		
+		private string _ContractId;
+		
+		private System.Nullable<System.DateTime> _OrderInDate;
+		
+		private string _OrderCode;
+		
+		private System.Nullable<System.DateTime> _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<System.DateTime> value);
-    partial void OnOrderInDateChanged();
-    partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
-    partial void OnOrderOutDateChanged();
-    partial void OnMaterialRequisitionUnitChanging(string value);
-    partial void OnMaterialRequisitionUnitChanged();
     partial void OnStateChanging(System.Nullable<int> 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<System.DateTime> value);
+    partial void OnOrderInDateChanged();
+    partial void OnOrderCodeChanging(string value);
+    partial void OnOrderCodeChanged();
+    partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> 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<System.DateTime> 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<System.DateTime> 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<int> 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<System.DateTime> 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<System.DateTime> 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<decimal> _ActNum;
 		
+		private System.Nullable<int> _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<decimal> value);
     partial void OnActNumChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> 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<int> 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