20221226 增加焊口序号

DataBase/版本日志/SGGLDB_V2022-12-26_001.sql

@@ -0,0 +1,51 @@
+
+ALTER VIEW [dbo].[View_HJGL_NoWeldJointFind]
+AS
+--δº¸º¸¿Ú²éÕÒ
+SELECT jot.WeldJointId,
+jot.WeldJointCode,
+(case when charindex('/',jot.WeldJointCode)>0
+then RIGHT(jot.WeldJointCode,CHARINDEX('/',REVERSE(jot.WeldJointCode))-1)
+else jot.WeldJointCode end) as WeldJointNum,
+jot.PipelineId,jot.WeldingDailyId,jot.JointAttribute,WeldType.WeldTypeCode,
+       method.WeldingMethodCode,jot.Dia,jot.Thickness, rod.ConsumablesCode AS WeldingRodCode
+      ,wire.ConsumablesCode AS WeldingWireCode,
+	  mat1.MaterialCode AS Material1Code ,mat2.MaterialCode AS Material2Code	
+FROM dbo.HJGL_WeldJoint jot
+LEFT JOIN dbo.HJGL_PreWeldingDaily pre ON pre.WeldJointId = jot.WeldJointId
+LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=jot.WeldTypeId
+LEFT JOIN Base_WeldingMethod AS method ON method.WeldingMethodId=jot.WeldingMethodId
+LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = jot.Material1Id
+LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = jot.Material2Id
+LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId=jot.WeldingWire
+LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId=jot.WeldingRod
+WHERE pre.PreWeldingDailyId IS NULL
+GO
+
+
+ALTER VIEW [dbo].[View_HJGL_WeldingTask]
+AS
+SELECT T.WeldTaskId,T.WeldJointId,T.CoverWelderId,T.BackingWelderId,
+       cov.WelderCode AS CoverWelderCode,back.WelderCode AS BackingWelderCode,
+	   case when jot.JointAttribute is not null then jot.JointAttribute else T.JointAttribute end as JointAttribute,
+       T.WeldingMode,T.ProjectId,T.UnitWorkId,T.UnitId,T.TaskDate,T.Tabler,T.TableDate,
+       jot.WeldJointCode,jot.Dia,jot.Thickness,jot.Size,jot.WeldingLocationId,
+       CASE WHEN jot.WeldingDailyId IS NULL THEN '·ñ' ELSE 'ÊÇ' END AS IsWelding,
+       P.PipelineCode,B.WeldTypeCode,M.WeldingMethodCode,L.WeldingLocationCode,
+	   t.CanWelderCode,t.CanWelderId ,rod.ConsumablesName AS WeldingRodCode,T.CanWeldingRodName,T.CanWeldingWireName,
+       wire.ConsumablesName AS WeldingWireCode,jot.WeldingDailyId,p.PipeArea,
+	   (case when charindex('/',jot.WeldJointCode)>0
+then RIGHT(jot.WeldJointCode,CHARINDEX('/',REVERSE(jot.WeldJointCode))-1)
+else jot.WeldJointCode end) as WeldJointNum
+from HJGL_WeldTask T 
+left join HJGL_WeldJoint jot on T.WeldJointId=jot.WeldJointId  
+LEFT JOIN dbo.SitePerson_Person cov ON cov.PersonId=t.CoverWelderId
+LEFT JOIN dbo.SitePerson_Person back ON back.PersonId=t.BackingWelderId
+LEFT join HJGL_Pipeline P on jot.PipelineId=P.PipelineId 
+left join Base_WeldType B on jot.WeldTypeId=B.WeldTypeId 
+LEFT join Base_WeldingMethod M on jot.WeldingMethodId=M.WeldingMethodId 
+left join Base_WeldingLocation L on jot.WeldingLocationId=L.WeldingLocationId
+LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId=jot.WeldingWire
+LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId=jot.WeldingRod
+
+GO

SGGL/FineUIPro.Web/ErrLog.txt

@@ -1,183 +1,192 @@
 
 错误信息开始=====>
-错误类型:JsonReaderException
+错误类型:IndexOutOfRangeException
-错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
+错误信息:无法找到列 WeldJointNum。
 错误堆栈:
-   在 Newtonsoft.Json.JsonTextReader.ParseValue()
+   在 System.Data.DataTable.ParseSortString(String sortString)
-   在 Newtonsoft.Json.JsonTextReader.Read()
+   在 System.Data.DataView.CheckSort(String sort)
-   在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
+   在 System.Data.DataView.set_Sort(String value)
-   在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
+   在 FineUIPro.Web.PageBase.GetPagedDataTable(Grid Grid1, DataTable tb) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\common\PageBase.cs:行号 497
-   在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
+   在 FineUIPro.Web.WeldingProcess.WeldingManage.WeldReportEdit.BindGrid(List`1 weldingDailyItem) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WeldingManage\WeldReportEdit.aspx.cs:行号 246
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
+   在 FineUIPro.Web.WeldingProcess.WeldingManage.WeldReportEdit.Page_Load(Object sender, EventArgs e) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WeldingManage\WeldReportEdit.aspx.cs:行号 68
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
-   在 BLL.WeatherService.GetWeather(String projectId) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\Common\WeatherService.cs:行号 90
-出错时间:12/25/2022 14:32:07
-出错时间:12/25/2022 14:32:07
-
-
-错误信息开始=====>
-错误类型:JsonReaderException
-错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
-错误堆栈:
-   在 Newtonsoft.Json.JsonTextReader.ParseValue()
-   在 Newtonsoft.Json.JsonTextReader.Read()
-   在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
-   在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
-   在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
-   在 BLL.WeatherService.GetWeather(String projectId) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\Common\WeatherService.cs:行号 90
-出错时间:12/25/2022 14:32:37
-出错时间:12/25/2022 14:32:37
-
-
-错误信息开始=====>
-错误类型:SqlException
-错误信息:传递给 LEFT 或 SUBSTRING 函数的长度参数无效。
-错误堆栈:
-   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
-   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
-   在 System.Data.SqlClient.SqlDataReader.TryHasMoreRows(Boolean& moreRows)
-   在 System.Data.SqlClient.SqlDataReader.TryReadInternal(Boolean setTimeout, Boolean& more)
-   在 System.Data.SqlClient.SqlDataReader.Read()
-   在 System.Data.Common.DataAdapter.FillLoadDataRow(SchemaMapping mapping)
-   在 System.Data.Common.DataAdapter.FillFromReader(DataSet dataset, DataTable datatable, String srcTable, DataReaderContainer dataReader, Int32 startRecord, Int32 maxRecords, DataColumn parentChapterColumn, Object parentChapterValue)
-   在 System.Data.Common.DataAdapter.Fill(DataTable[] dataTables, IDataReader dataReader, Int32 startRecord, Int32 maxRecords)
-   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
-   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
-   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
-   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\SQLHelper.cs:行号 312
-   在 FineUIPro.Web.HJGL.WPQ.WPQList.BindGrid() 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WPQ\WPQList.aspx.cs:行号 43
-   在 FineUIPro.Web.HJGL.WPQ.WPQList.Page_Load(Object sender, EventArgs e) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WPQ\WPQList.aspx.cs:行号 25
    在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
    在 System.EventHandler.Invoke(Object sender, EventArgs e)
    在 System.Web.UI.Control.OnLoad(EventArgs e)
    在 System.Web.UI.Control.LoadRecursive()
    在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:12/25/2022 14:32:54
+出错时间:12/26/2022 17:13:10
-出错文件:http://localhost:4909/HJGL/WPQ/WPQList.aspx
+出错文件:http://localhost:4909/HJGL/WeldingManage/WeldReportEdit.aspx?WeldingDailyId=7a2cf1c3-6253-4705-b2ed-208af534369b
 IP地址:::1
-操作人员:JT
+操作人员:李嘉威
 
-出错时间:12/25/2022 14:32:54
+出错时间:12/26/2022 17:13:10
 
 
 错误信息开始=====>
-错误类型:JsonReaderException
+错误类型:SqlException
-错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
+错误信息:列名 'WeldJointNum' 无效。
 错误堆栈:
-   在 Newtonsoft.Json.JsonTextReader.ParseValue()
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 Newtonsoft.Json.JsonTextReader.Read()
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
-   在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
-   在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
-   在 BLL.WeatherService.GetWeather(String projectId) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\Common\WeatherService.cs:行号 90
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
-出错时间:12/25/2022 14:40:09
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
-出错时间:12/25/2022 14:40:09
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.ExecuteReader()
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.FirstOrDefault[TSource](IQueryable`1 source, Expression`1 predicate)
+   在 FineUIPro.Web.WeldingProcess.WeldingManage.WeldReportEdit.BindGrid(List`1 weldingDailyItem) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WeldingManage\WeldReportEdit.aspx.cs:行号 209
+   在 FineUIPro.Web.WeldingProcess.WeldingManage.WeldReportEdit.Page_Load(Object sender, EventArgs e) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WeldingManage\WeldReportEdit.aspx.cs:行号 68
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:12/26/2022 17:20:43
+出错文件:http://localhost:4909/HJGL/WeldingManage/WeldReportEdit.aspx?WeldingDailyId=b58f14b3-6886-4b85-9d5e-cd7fec8c25b0
+IP地址:::1
+操作人员:李嘉威
+
+出错时间:12/26/2022 17:20:43
 
 
 错误信息开始=====>
-错误类型:JsonReaderException
+错误类型:SqlException
-错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
+错误信息:列名 'WeldJointNum' 无效。
 错误堆栈:
-   在 Newtonsoft.Json.JsonTextReader.ParseValue()
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 Newtonsoft.Json.JsonTextReader.Read()
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
-   在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
-   在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
-   在 BLL.WeatherService.GetWeather(String projectId) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\Common\WeatherService.cs:行号 90
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
-出错时间:12/25/2022 15:01:43
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
-出错时间:12/25/2022 15:01:43
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.ExecuteReader()
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.FirstOrDefault[TSource](IQueryable`1 source, Expression`1 predicate)
+   在 FineUIPro.Web.WeldingProcess.WeldingManage.WeldReportEdit.BindGrid(List`1 weldingDailyItem) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WeldingManage\WeldReportEdit.aspx.cs:行号 209
+   在 FineUIPro.Web.WeldingProcess.WeldingManage.WeldReportEdit.Page_Load(Object sender, EventArgs e) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WeldingManage\WeldReportEdit.aspx.cs:行号 68
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:12/26/2022 17:23:11
+出错文件:http://localhost:4909/HJGL/WeldingManage/WeldReportEdit.aspx?WeldingDailyId=7a2cf1c3-6253-4705-b2ed-208af534369b
+IP地址:::1
+操作人员:李嘉威
 
-System.InvalidOperationException: 可为空的对象必须具有一个值。
+出错时间:12/26/2022 17:23:11
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-System.InvalidOperationException: 可为空的对象必须具有一个值。
-   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
-   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
-
-错误信息开始=====>
-错误类型:JsonReaderException
-错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
-错误堆栈:
-   在 Newtonsoft.Json.JsonTextReader.ParseValue()
-   在 Newtonsoft.Json.JsonTextReader.Read()
-   在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
-   在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
-   在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
-   在 BLL.WeatherService.GetWeather(String projectId) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\Common\WeatherService.cs:行号 90
-出错时间:12/25/2022 15:22:19
-出错时间:12/25/2022 15:22:19
 
 
 错误信息开始=====>
-错误类型:JsonReaderException
+错误类型:SqlException
-错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
+错误信息:列名 'WeldJointNum' 无效。
 错误堆栈:
-   在 Newtonsoft.Json.JsonTextReader.ParseValue()
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 Newtonsoft.Json.JsonTextReader.Read()
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
-   在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
-   在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
-   在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
-   在 BLL.WeatherService.GetWeather(String projectId) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\Common\WeatherService.cs:行号 90
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
-出错时间:12/25/2022 15:55:30
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
-出错时间:12/25/2022 15:55:30
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.ExecuteReader()
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.FirstOrDefault[TSource](IQueryable`1 source, Expression`1 predicate)
+   在 FineUIPro.Web.WeldingProcess.WeldingManage.WeldReportEdit.BindGrid(List`1 weldingDailyItem) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WeldingManage\WeldReportEdit.aspx.cs:行号 209
+   在 FineUIPro.Web.WeldingProcess.WeldingManage.WeldReportEdit.Page_Load(Object sender, EventArgs e) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WeldingManage\WeldReportEdit.aspx.cs:行号 68
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:12/26/2022 17:33:50
+出错文件:http://localhost:4909/HJGL/WeldingManage/WeldReportEdit.aspx?WeldingDailyId=7a2cf1c3-6253-4705-b2ed-208af534369b
+IP地址:::1
+操作人员:李嘉威
 
+出错时间:12/26/2022 17:33:50
+
+
+错误信息开始=====>
+错误类型:ArgumentNullException
+错误信息:值不能为 null。
+参数名: source
+错误堆栈:
+   在 System.Linq.Enumerable.Where[TSource](IEnumerable`1 source, Func`2 predicate)
+   在 FineUIPro.Web.HJGL.WeldingManage.SelectTaskWeldJoint.InitTreeMenu() 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WeldingManage\SelectTaskWeldJoint.aspx.cs:行号 180
+   在 FineUIPro.Web.HJGL.WeldingManage.SelectTaskWeldJoint.Page_Load(Object sender, EventArgs e) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\WeldingManage\SelectTaskWeldJoint.aspx.cs:行号 158
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:12/26/2022 21:31:26
+出错文件:http://localhost:4909/HJGL/WeldingManage/SelectTaskWeldJoint.aspx?strList=476d4c23-155c-47c4-9cf8-8158034b0a1d%7C1af885ff-b778-46c6-a13d-a21b304ac835%7C2022-12-01
+IP地址:::1
+操作人员:李嘉威
+
+出错时间:12/26/2022 21:31:26
+
+
+错误信息开始=====>
+错误类型:ArgumentNullException
+错误信息:值不能为 null。
+参数名: source
+错误堆栈:
+   在 System.Linq.Enumerable.Where[TSource](IEnumerable`1 source, Func`2 predicate)
+   在 FineUIPro.Web.HJGL.PreDesign.PrePipeline.InitTreeMenu() 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\PreDesign\PrePipeline.aspx.cs:行号 84
+   在 FineUIPro.Web.HJGL.PreDesign.PrePipeline.Page_Load(Object sender, EventArgs e) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\FineUIPro.Web\HJGL\PreDesign\PrePipeline.aspx.cs:行号 23
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:12/26/2022 22:15:59
+出错文件:http://localhost:4909/HJGL/PreDesign/PrePipeline.aspx
+IP地址:::1
+操作人员:李嘉威
+
+出错时间:12/26/2022 22:15:59
+
+System.InvalidOperationException: 可为空的对象必须具有一个值。
+   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
+   在 System.Nullable`1.get_Value()
+   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
+System.InvalidOperationException: 可为空的对象必须具有一个值。
+   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
+   在 System.Nullable`1.get_Value()
+   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
+System.InvalidOperationException: 可为空的对象必须具有一个值。
+   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
+   在 System.Nullable`1.get_Value()
+   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284
+System.InvalidOperationException: 可为空的对象必须具有一个值。
+   在 System.ThrowHelper.ThrowInvalidOperationException(ExceptionResource resource)
+   在 System.Nullable`1.get_Value()
+   在 BLL.HJGL_MaterialService.isInStockByPipeline(String pipelineid, String projectid) 位置 E:\赛鼎\SGGL_SeDin_New\SGGL\BLL\HJGL\PreDesign\HJGL_MaterialService.cs:行号 284

SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs

@@ -144,6 +144,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             if (unitWork1.Count() > 0)
             {
                 foreach (var q in unitWork1)
+                {
+                    if (q != null)
                     {
                         int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count();
                         var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
@@ -164,6 +166,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
                         }
                     }
                 }
+            }
             if (unitWork2.Count() > 0)
             {
                 foreach (var q in unitWork2)

SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx

@@ -65,7 +65,7 @@
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
                             EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1" OnRowDataBound="Grid1_RowDataBound"   DisableUnselectableRows="true"
                             DataKeyNames="WeldJointId" AllowColumnLocking="true" EnableColumnLines="true"
-                            DataIDField="WeldJointId" EnableTextSelection="True" AllowSorting="true" SortField="WeldJointCode"
+                            DataIDField="WeldJointId" EnableTextSelection="True" AllowSorting="true" SortField="WeldJointNum"
                             SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true"
                             PageSize="1000" EnableCheckBoxSelect="true">
                             <Toolbars>
@@ -103,8 +103,10 @@
                                 </f:Toolbar>
                             </Toolbars>
                             <Columns>                            
-                                 <f:RowNumberField EnablePagingNumber="true" HeaderText="焊口序号"
+                                <f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
-                                                      Width="80px" HeaderTextAlign="Center" TextAlign="Center"/>
+                                    DataField="WeldJointNum" SortField="WeldJointNum" FieldType="String" HeaderTextAlign="Center"
+                                    TextAlign="Left" Width="90px" Locked="true">
+                                </f:RenderField>
                                 <f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
                                     DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
                                     TextAlign="Left" Width="140px" Locked="true">

SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs

@@ -642,7 +642,5 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
             };      
         }
-
-
     }
 }

SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs

@@ -7,12 +7,10 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.WeldingManage
+namespace FineUIPro.Web.HJGL.WeldingManage {
-{
     
     
-    public partial class SelectTaskWeldJoint
+    public partial class SelectTaskWeldJoint {
-    {
         
         /// <summary>
         /// form1 控件。

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx

@@ -88,12 +88,14 @@
                     <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接日报"
                         EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldTaskId,WeldJointId" EnableColumnLines="true" ForceFit="true"
                         AllowCellEditing="true" ClicksToEdit="1" DataIDField="WeldTaskId" AllowSorting="true" KeepCurrentSelection="true"
-                        SortField="PipelineCode,WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" 
+                        SortField="WeldJointNum" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" 
                         AllowPaging="false" IsDatabasePaging="true" PageSize="10000" EnableTextSelection="True">
                        
                         <Columns>
-                            <f:RowNumberField EnablePagingNumber="true" HeaderText="焊口序号"
+                            <f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
-                                Width="80px" HeaderTextAlign="Center" TextAlign="Center" />
+                                DataField="WeldJointNum" SortField="WeldJointNum" FieldType="String" HeaderTextAlign="Center"
+                                TextAlign="Left" Width="140px">
+                            </f:RenderField>
                             <f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
                                 DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
                                 TextAlign="Left" Width="180px" ExpandUnusedSpace="true">

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx

@@ -63,7 +63,10 @@
                                         </f:Button>
                                         <f:DropDownList ID="drpCanWelder" EnableEdit="true" runat="server" LabelWidth="140px">
                                         </f:DropDownList>
-                                        <f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click">
+                                        <f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click">                                        </f:Button>
+                                        <f:TextBox ID="txtPipelineCode" runat="server" Label="管线号" EmptyText="输入查询条件" LabelAlign="Right"></f:TextBox>
+                                       
+                                        <f:Button runat="server" ID="btnSearch" Icon="SystemSearch" ToolTip="查询" Text="查询" OnClick="btnSearch_Click">
                                         </f:Button>
                                         <f:ToolbarFill runat="server"></f:ToolbarFill>
                                         <f:DatePicker ID="txtTaskDate" Label="计划焊接日期" runat="server"

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs

@@ -178,8 +178,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
         private void BindGrid(List<Model.View_HJGL_WeldingTask> weldingTask)
         {
-
+            if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
+            {
+                weldingTask = weldingTask.Where(e => e.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
+            }
             DataTable tb = this.LINQToDataTable(weldingTask);
+           
             // 2.获取当前分页数据
             //var table = this.GetPagedDataTable(GridNewDynamic, tb1);
             Grid1.RecordCount = tb.Rows.Count;
@@ -1058,5 +1062,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             }
         }
         #endregion
+
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            //List<Model.View_HJGL_WeldingTask> GetWeldingTaskItem = this.CollectGridJointInfo();
+            DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
+            if (taskTime != null)
+            {
+                List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime));
+                this.BindGrid(GetWeldingTaskList);
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.designer.cs

@@ -156,6 +156,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// </remarks>
         protected global::FineUIPro.Button btnSaveWelder;
         
+        /// <summary>
+        /// txtPipelineCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPipelineCode;
+        
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+        
         /// <summary>
         /// txtTaskDate 控件。
         /// </summary>

SGGL/Model/Model.cs

@@ -347,12 +347,6 @@ namespace Model
     partial void InsertCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance);
     partial void UpdateCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance);
     partial void DeleteCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance);
-    partial void InsertCommon_FileManage(Common_FileManage instance);
-    partial void UpdateCommon_FileManage(Common_FileManage instance);
-    partial void DeleteCommon_FileManage(Common_FileManage instance);
-    partial void InsertCommon_FileManageType(Common_FileManageType instance);
-    partial void UpdateCommon_FileManageType(Common_FileManageType instance);
-    partial void DeleteCommon_FileManageType(Common_FileManageType instance);
     partial void InsertCostGoods_CostManage(CostGoods_CostManage instance);
     partial void UpdateCostGoods_CostManage(CostGoods_CostManage instance);
     partial void DeleteCostGoods_CostManage(CostGoods_CostManage instance);
@@ -2292,22 +2286,6 @@ namespace Model
 			}
 		}
 		
-		public System.Data.Linq.Table<Common_FileManage> Common_FileManage
-		{
-			get
-			{
-				return this.GetTable<Common_FileManage>();
-			}
-		}
-		
-		public System.Data.Linq.Table<Common_FileManageType> Common_FileManageType
-		{
-			get
-			{
-				return this.GetTable<Common_FileManageType>();
-			}
-		}
-		
 		public System.Data.Linq.Table<CostGoods_CostManage> CostGoods_CostManage
 		{
 			get
@@ -19117,7 +19095,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")]
 		public string ProjectName
 		{
 			get
@@ -50022,394 +50000,6 @@ namespace Model
 		}
 	}
 	
-	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Common_FileManage")]
-	public partial class Common_FileManage : INotifyPropertyChanging, INotifyPropertyChanged
-	{
-		
-		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-		
-		private int _FileId;
-		
-		private string _FileCode;
-		
-		private string _FileName;
-		
-		private string _FileSize;
-		
-		private string _FileType;
-		
-		private System.Data.Linq.Binary _FileContent;
-		
-		private string _BigType;
-		
-		private string _SmallType;
-		
-		private string _FileCreate;
-		
-		private System.Nullable<System.DateTime> _FileDate;
-		
-    #region 可扩展性方法定义
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnFileIdChanging(int value);
-    partial void OnFileIdChanged();
-    partial void OnFileCodeChanging(string value);
-    partial void OnFileCodeChanged();
-    partial void OnFileNameChanging(string value);
-    partial void OnFileNameChanged();
-    partial void OnFileSizeChanging(string value);
-    partial void OnFileSizeChanged();
-    partial void OnFileTypeChanging(string value);
-    partial void OnFileTypeChanged();
-    partial void OnFileContentChanging(System.Data.Linq.Binary value);
-    partial void OnFileContentChanged();
-    partial void OnBigTypeChanging(string value);
-    partial void OnBigTypeChanged();
-    partial void OnSmallTypeChanging(string value);
-    partial void OnSmallTypeChanged();
-    partial void OnFileCreateChanging(string value);
-    partial void OnFileCreateChanged();
-    partial void OnFileDateChanging(System.Nullable<System.DateTime> value);
-    partial void OnFileDateChanged();
-    #endregion
-		
-		public Common_FileManage()
-		{
-			OnCreated();
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileId", AutoSync=AutoSync.OnInsert, DbType="Int NOT NULL IDENTITY", IsPrimaryKey=true, IsDbGenerated=true)]
-		public int FileId
-		{
-			get
-			{
-				return this._FileId;
-			}
-			set
-			{
-				if ((this._FileId != value))
-				{
-					this.OnFileIdChanging(value);
-					this.SendPropertyChanging();
-					this._FileId = value;
-					this.SendPropertyChanged("FileId");
-					this.OnFileIdChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileCode", DbType="NVarChar(50)")]
-		public string FileCode
-		{
-			get
-			{
-				return this._FileCode;
-			}
-			set
-			{
-				if ((this._FileCode != value))
-				{
-					this.OnFileCodeChanging(value);
-					this.SendPropertyChanging();
-					this._FileCode = value;
-					this.SendPropertyChanged("FileCode");
-					this.OnFileCodeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileName", DbType="NVarChar(100)")]
-		public string FileName
-		{
-			get
-			{
-				return this._FileName;
-			}
-			set
-			{
-				if ((this._FileName != value))
-				{
-					this.OnFileNameChanging(value);
-					this.SendPropertyChanging();
-					this._FileName = value;
-					this.SendPropertyChanged("FileName");
-					this.OnFileNameChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileSize", DbType="NVarChar(50)")]
-		public string FileSize
-		{
-			get
-			{
-				return this._FileSize;
-			}
-			set
-			{
-				if ((this._FileSize != value))
-				{
-					this.OnFileSizeChanging(value);
-					this.SendPropertyChanging();
-					this._FileSize = value;
-					this.SendPropertyChanged("FileSize");
-					this.OnFileSizeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileType", DbType="NVarChar(50)")]
-		public string FileType
-		{
-			get
-			{
-				return this._FileType;
-			}
-			set
-			{
-				if ((this._FileType != value))
-				{
-					this.OnFileTypeChanging(value);
-					this.SendPropertyChanging();
-					this._FileType = value;
-					this.SendPropertyChanged("FileType");
-					this.OnFileTypeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileContent", DbType="Image", CanBeNull=true, UpdateCheck=UpdateCheck.Never)]
-		public System.Data.Linq.Binary FileContent
-		{
-			get
-			{
-				return this._FileContent;
-			}
-			set
-			{
-				if ((this._FileContent != value))
-				{
-					this.OnFileContentChanging(value);
-					this.SendPropertyChanging();
-					this._FileContent = value;
-					this.SendPropertyChanged("FileContent");
-					this.OnFileContentChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BigType", DbType="NVarChar(50)")]
-		public string BigType
-		{
-			get
-			{
-				return this._BigType;
-			}
-			set
-			{
-				if ((this._BigType != value))
-				{
-					this.OnBigTypeChanging(value);
-					this.SendPropertyChanging();
-					this._BigType = value;
-					this.SendPropertyChanged("BigType");
-					this.OnBigTypeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SmallType", DbType="NVarChar(50)")]
-		public string SmallType
-		{
-			get
-			{
-				return this._SmallType;
-			}
-			set
-			{
-				if ((this._SmallType != value))
-				{
-					this.OnSmallTypeChanging(value);
-					this.SendPropertyChanging();
-					this._SmallType = value;
-					this.SendPropertyChanged("SmallType");
-					this.OnSmallTypeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileCreate", DbType="NVarChar(50)")]
-		public string FileCreate
-		{
-			get
-			{
-				return this._FileCreate;
-			}
-			set
-			{
-				if ((this._FileCreate != value))
-				{
-					this.OnFileCreateChanging(value);
-					this.SendPropertyChanging();
-					this._FileCreate = value;
-					this.SendPropertyChanged("FileCreate");
-					this.OnFileCreateChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileDate", DbType="DateTime")]
-		public System.Nullable<System.DateTime> FileDate
-		{
-			get
-			{
-				return this._FileDate;
-			}
-			set
-			{
-				if ((this._FileDate != value))
-				{
-					this.OnFileDateChanging(value);
-					this.SendPropertyChanging();
-					this._FileDate = value;
-					this.SendPropertyChanged("FileDate");
-					this.OnFileDateChanged();
-				}
-			}
-		}
-		
-		public event PropertyChangingEventHandler PropertyChanging;
-		
-		public event PropertyChangedEventHandler PropertyChanged;
-		
-		protected virtual void SendPropertyChanging()
-		{
-			if ((this.PropertyChanging != null))
-			{
-				this.PropertyChanging(this, emptyChangingEventArgs);
-			}
-		}
-		
-		protected virtual void SendPropertyChanged(String propertyName)
-		{
-			if ((this.PropertyChanged != null))
-			{
-				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-			}
-		}
-	}
-	
-	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Common_FileManageType")]
-	public partial class Common_FileManageType : INotifyPropertyChanging, INotifyPropertyChanged
-	{
-		
-		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-		
-		private string _FileCode;
-		
-		private string _FileType;
-		
-		private System.Nullable<int> _SortIndex;
-		
-    #region 可扩展性方法定义
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnFileCodeChanging(string value);
-    partial void OnFileCodeChanged();
-    partial void OnFileTypeChanging(string value);
-    partial void OnFileTypeChanged();
-    partial void OnSortIndexChanging(System.Nullable<int> value);
-    partial void OnSortIndexChanged();
-    #endregion
-		
-		public Common_FileManageType()
-		{
-			OnCreated();
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
-		public string FileCode
-		{
-			get
-			{
-				return this._FileCode;
-			}
-			set
-			{
-				if ((this._FileCode != value))
-				{
-					this.OnFileCodeChanging(value);
-					this.SendPropertyChanging();
-					this._FileCode = value;
-					this.SendPropertyChanged("FileCode");
-					this.OnFileCodeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileType", DbType="NVarChar(50)")]
-		public string FileType
-		{
-			get
-			{
-				return this._FileType;
-			}
-			set
-			{
-				if ((this._FileType != value))
-				{
-					this.OnFileTypeChanging(value);
-					this.SendPropertyChanging();
-					this._FileType = value;
-					this.SendPropertyChanged("FileType");
-					this.OnFileTypeChanged();
-				}
-			}
-		}
-		
-		[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;
-		
-		protected virtual void SendPropertyChanging()
-		{
-			if ((this.PropertyChanging != null))
-			{
-				this.PropertyChanging(this, emptyChangingEventArgs);
-			}
-		}
-		
-		protected virtual void SendPropertyChanged(String propertyName)
-		{
-			if ((this.PropertyChanged != null))
-			{
-				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-			}
-		}
-	}
-	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_CostManage")]
 	public partial class CostGoods_CostManage : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -75301,7 +74891,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QRCode", DbType="VarChar(2000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QRCode", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string QRCode
 		{
 			get
@@ -209174,7 +208764,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")]
 		public string ProjectName
 		{
 			get
@@ -209727,7 +209317,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")]
 		public string ProjectName
 		{
 			get
@@ -212765,6 +212355,8 @@ namespace Model
 		
 		private string _WeldJointCode;
 		
+		private string _WeldJointNum;
+		
 		private string _PipelineId;
 		
 		private string _WeldingDailyId;
@@ -212823,6 +212415,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointNum", DbType="NVarChar(50)")]
+		public string WeldJointNum
+		{
+			get
+			{
+				return this._WeldJointNum;
+			}
+			set
+			{
+				if ((this._WeldJointNum != value))
+				{
+					this._WeldJointNum = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", DbType="NVarChar(50)")]
 		public string PipelineId
 		{
@@ -213815,6 +213423,8 @@ namespace Model
 		
 		private string _PipeArea;
 		
+		private string _WeldJointNum;
+		
 		public View_HJGL_WeldingTask()
 		{
 		}
@@ -214330,6 +213940,22 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointNum", DbType="NVarChar(50)")]
+		public string WeldJointNum
+		{
+			get
+			{
+				return this._WeldJointNum;
+			}
+			set
+			{
+				if ((this._WeldJointNum != value))
+				{
+					this._WeldJointNum = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_WeldJoint")]
@@ -220892,7 +220518,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")]
 		public string ProjectName
 		{
 			get
@@ -223930,7 +223556,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")]
 		public string ProjectName
 		{
 			get
@@ -225594,7 +225220,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")]
 		public string ProjectName
 		{
 			get