Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

DataBase/版本日志/SGGLDB_V2023-04-04_lpf.sql

@@ -0,0 +1,45 @@
+insert into Sys_ButtonToMenu values('83D0D6F5-402A-4F6F-9423-37DBB6693164','0CA58EC2-7934-49B3-A2C3-327FAD27C541','生成委托单','5')
+/****** Object:  View [dbo].[View_HJGL_NoWeldJointFind]    Script Date: 2023/4/3 16:14:26 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+ 
+
+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,
+jot.Dia,
+jot.DNDia,
+jot.Size,
+jot.Thickness, 
+jot.Remark,
+WeldType.WeldTypeCode,
+method.WeldingMethodCode,
+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 
+and jot.WeldJointId not in (select WeldJointId from HJGL_WeldJoint where IsTwoJoint = 1 and (AuditDate is null or AuditDate=''))
+GO
+
+

SGGL/BLL/Person/Person_PersonsService.cs

@@ -666,7 +666,7 @@ namespace BLL
                     JobNum = person.JobNum,
                     PersonName = person.PersonName,
                     Account = person.Account,
-                    Password = GetPersonPassWord(person.IdentityCard),
+                    Password = GetPersonPassWord(person.IdentityCard, person.Account),
                     IsOffice = person.IsOffice,
                     RoleIds = person.RoleIds,
                     IdentityCard = person.IdentityCard,
@@ -1102,19 +1102,22 @@ namespace BLL
         /// </summary>
         /// <param name="idCard"></param>
         /// <returns></returns>
-        public static string GetPersonPassWord(string idCard)
+        public static string GetPersonPassWord(string idCard,string Account)
         {
             string passWord = Funs.EncryptionPassword(Const.Password);
-            ////现场人员密码
+            if (string.IsNullOrEmpty(Account))
-            if (!string.IsNullOrEmpty(idCard))
             {
-                if (idCard.Length > 3)
+                ////现场人员密码
+                if (!string.IsNullOrEmpty(idCard))
                 {
-                    passWord = Funs.EncryptionPassword(idCard.Substring(idCard.Length - 4));
+                    if (idCard.Length > 3)
-                }
+                    {
-                else
+                        passWord = Funs.EncryptionPassword(idCard.Substring(idCard.Length - 4));
-                {
+                    }
-                    passWord = Funs.EncryptionPassword(idCard);
+                    else
+                    {
+                        passWord = Funs.EncryptionPassword(idCard);
+                    }
                 }
             }
             return passWord;

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="03/30/2023 14:31:12" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="04/03/2023 15:49:36" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGqdFBVtU86qKJnkKElUelG"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHL95wpPPwN6TqtHpqK4gKl"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="PrefabricatedComponents" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="PlanStartDate" DataType="System.String" PropName="CH_TrustMan"/>
@@ -122,6 +122,7 @@ namespace FastReport
       <Column Name="MaterialGroup" DataType="System.String"/>
       <Column Name="Remark" DataType="System.String"/>
       <Column Name="MetalType" DataType="System.String"/>
+      <Column Name="FlowingSection" DataType="System.String" PropName="Column"/>
     </TableDataSource>
     <TableDataSource Name="Data" ReferenceName="Data.Data" DataType="System.Int32" Enabled="true">
       <Column Name="CH_TrustID" DataType="System.String"/>
@@ -193,8 +194,8 @@ namespace FastReport
         </TableRow>
         <TableRow Name="Row4" Height="45.36">
           <TableCell Name="Cell26"/>
-          <TableCell Name="Cell16" Text="管线计划安装日期:" VertAlign="Center" Font="宋体, 11pt"/>
+          <TableCell Name="Cell16" Text="流水段:" VertAlign="Center" Font="宋体, 11pt"/>
-          <TableCell Name="Cell17" Border.Lines="Bottom" Text="[Table1.PlanStartDate]" VertAlign="Center" Font="宋体, 11pt"/>
+          <TableCell Name="Cell17" Border.Lines="Bottom" Text="[Table1.FlowingSection]" VertAlign="Center" Font="宋体, 11pt"/>
           <TableCell Name="Cell34" HorzAlign="Center" VertAlign="Center" Font="宋体, 11pt"/>
         </TableRow>
       </TableObject>

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs

@@ -363,7 +363,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
 
             string strSql = @"		SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,unitwork.UnitWorkName,
                                      com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,mat.PrefabricatedComponents,
-									 com.QRCode,com.State,CONVERT(varchar(100), pipe.PlanStartDate, 23) as PlanStartDate,pipe.PipelineCode,
+									 com.QRCode,com.State,CONVERT(varchar(100), pipe.PlanStartDate, 23) as PlanStartDate,pipe.PipelineCode,pipe.FlowingSection,
 									 ('PrePipeline$'+com.PipelineComponentId )as QRCode2,mater.*
                               FROM HJGL_Pipeline_Component com 
 							  LEFT JOIN HJGL_PipeLineMat mat ON mat.PipeLineMatId=com.PipeLineMatId

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

@@ -353,7 +353,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// <param name="e"></param>
         protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
         {
-            BindGrid();
+            Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
+            this.hdUnitWorkId.Text = string.Empty;
+            if (pipeline != null)
+            {
+                this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
+                this.BindGrid();
+            }
+            else
+            {
+                this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID;
+                NoAuditBindGrid();
+            }
+
+             
         }
         #endregion
 
@@ -944,7 +957,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
         protected void ckIsAudit_CheckedChanged(object sender, CheckedEventArgs e)
         {
-            BindGrid();
+            Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
+            this.hdUnitWorkId.Text = string.Empty;
+            if (pipeline != null)
+            {
+                this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
+                this.BindGrid();
+            }
+            else
+            {
+                this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID;
+                NoAuditBindGrid();
+            }
+
         }
     }
 }

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

@@ -123,6 +123,10 @@
                                 <f:RenderField HeaderText="材质2" ColumnID="Material2Code"
                                     DataField="Material2Code" FieldType="String"
                                     HeaderTextAlign="Center" TextAlign="Left" Width="140px" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                 <f:RenderField HeaderText="达因" ColumnID="Size"
+                                    DataField="Size" SortField="Size" FieldType="String"
+                                    HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="外径" ColumnID="Dia" DataField="Dia" SortField="Dia" 
                                     FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"  Width="120px"  >
@@ -136,8 +140,8 @@
                                 </f:RenderField>
                                 <f:RenderField HeaderText="焊缝类型" ColumnID="WeldTypeCode"
                                     DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String"
-                                    HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
+                                    HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true" Hidden="true">
-                                </f:RenderField>
+                                </f:RenderField>                            
                                 <f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodCode"
                                     DataField="WeldingMethodCode" SortField="WeldingMethodCode" FieldType="String"
                                     HeaderTextAlign="Center" TextAlign="Left" Width="140px" ExpandUnusedSpace="true" Hidden="true">

SGGL/Model/Model.cs

@@ -257822,6 +257822,8 @@ namespace Model
 		
 		private string _DNDia;
 		
+		private System.Nullable<decimal> _Size;
+		
 		private System.Nullable<decimal> _Thickness;
 		
 		private string _Remark;
@@ -257970,6 +257972,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Size", DbType="Decimal(8,3)")]
+		public System.Nullable<decimal> Size
+		{
+			get
+			{
+				return this._Size;
+			}
+			set
+			{
+				if ((this._Size != value))
+				{
+					this._Size = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Thickness", DbType="Decimal(8,3)")]
 		public System.Nullable<decimal> Thickness
 		{