Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS

DataBase/版本日志/HJGLDB_DS_2026-09-21_gf.sql

@@ -0,0 +1,2 @@
+alter table [dbo].[OAM_User] add IsSelfCreate bit null
+GO

DataBase/版本日志/HJGLDB_DS_2026-09-22_gf.sql

@@ -0,0 +1,2 @@
+alter table HJGL_BS_Welder add IsSelfCreate bit null
+GO

DataBase/版本日志/HJGLDB_DS_2026-09-23_gf.sql

@@ -0,0 +1,67 @@
+
+CREATE VIEW [dbo].[View_UnitWeldPerformance]
+AS
+SELECT 
+    NEWID() AS Id,
+	'' as ProjectCode,
+	total.WED_Unit,
+	un.UnitCode,-- 单位代码
+	un.UnitName,--单位名称
+	-------------本期start
+    ISNULL(MRPerson.MRPersonNum,0) AS MRPersonNum, --维保在岗人数
+    ISNULL(TTPerson.TTPersonNum,0) AS TTPersonNum, --技改在岗人数
+    ISNULL(WeldJoint.totalSize,0) AS TotalSize, --当日焊接量
+    ISNULL(WorkProject.WorkProjectNum,0) AS WorkProjectNum --维保工作项数
+FROM 
+ --总达因值 --总焊口
+  (SELECT SUM(joint.JOT_Size) AS totalSize,COUNT(*) AS totalJoint
+			,joint.WED_Unit
+			FROM View_JointWelder joint
+				LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID 	 
+			WHERE  joint.DReportID IS NOT NULL and report.JOT_WeldDate >= '2026-01-01'
+			GROUP  BY joint.WED_Unit) AS total 
+			
+
+--维保在岗人数，有几个人领用了焊材就是几个人
+ LEFT JOIN (SELECT COUNT(usingMat.UsingMatId) AS MRPersonNum,
+            welder.WED_Unit
+            FROM dbo.HJGL_BS_Welder welder
+			left join dbo.Weld_UsingMat usingMat on usingMat.UsingMan=welder.WED_ID
+			WHERE usingMat.UsingDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and usingMat.UsingDate<CAST(GETDATE() AS date) 
+			GROUP BY welder.WED_Unit) AS MRPerson 
+			ON MRPerson.WED_Unit = total.WED_Unit 
+			   
+--技改在岗人数，当焊材领用时选择了管道焊接的人数
+ LEFT JOIN (SELECT COUNT(distinct usingMat.UsingMan) AS TTPersonNum,
+            welder.WED_Unit
+            FROM dbo.HJGL_BS_Welder welder
+			left join dbo.Weld_UsingMat usingMat on usingMat.UsingMan=welder.WED_ID
+			left join dbo.Weld_UsingPlan usingPlan on usingPlan.UsingPlanId=usingMat.UsingPlanId
+			WHERE usingMat.UsingDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and usingMat.UsingDate<CAST(GETDATE() AS date) and usingPlan.IsSteelStru=0
+			GROUP BY welder.WED_Unit) AS TTPerson 
+			ON TTPerson.WED_Unit = total.WED_Unit         
+  --当日焊接量，只统计自建焊工的总工作量
+  LEFT JOIN (SELECT SUM(joint.JOT_Size) AS totalSize
+			,joint.WED_Unit
+			FROM View_JointWelder joint
+			LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID 	 
+			LEFT JOIN HJGL_BS_Welder wed on wed.WED_ID=joint.Welder
+			WHERE  joint.DReportID IS NOT NULL and report.JOT_WeldDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and report.JOT_WeldDate<CAST(GETDATE() AS date) 
+			and wed.IsSelfCreate=1
+			GROUP  BY joint.WED_Unit) AS WeldJoint
+			ON WeldJoint.WED_Unit = total.WED_Unit        
+ --维保工作项数，自建焊工领用的项目数量
+ LEFT JOIN (SELECT COUNT(distinct usingMat.ProjectId) AS WorkProjectNum,
+            welder.WED_Unit
+            FROM dbo.HJGL_BS_Welder welder
+			left join dbo.Weld_UsingMat usingMat on usingMat.UsingMan=welder.WED_ID
+			WHERE usingMat.UsingDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and usingMat.UsingDate<CAST(GETDATE() AS date) 
+			and welder.IsSelfCreate=1
+			GROUP BY welder.WED_Unit) AS WorkProject
+			ON WorkProject.WED_Unit = total.WED_Unit              
+LEFT JOIN dbo.Base_Unit un ON un.UnitId=total.WED_Unit
+
+
+GO
+
+

HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs

@@ -52,7 +52,7 @@ namespace BLL
             newWelder.ProjectId = welder.ProjectId;
             newWelder.IdentityCard = welder.IdentityCard;
             newWelder.SignatureUrl = welder.SignatureUrl;
-
+            newWelder.IsSelfCreate = welder.IsSelfCreate;
             newWelder.MaxHanTiao = welder.MaxHanTiao;
             newWelder.MaxWeldingWire = welder.MaxWeldingWire;
 
@@ -95,6 +95,7 @@ namespace BLL
                 newWelder.MaxHanTiao = welder.MaxHanTiao;
                 newWelder.MaxWeldingWire = welder.MaxWeldingWire;
                 newWelder.IsOAM = welder.IsOAM;
+                newWelder.IsSelfCreate = welder.IsSelfCreate;
                 if (!string.IsNullOrEmpty(welder.PhotoUrl) && newWelder.PhotoUrl != welder.PhotoUrl)
                 {
                     newWelder.PhotoUrl = welder.PhotoUrl;

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

HJGL_DS/FineUIPro.Web/Global.asax.cs

@@ -340,6 +340,7 @@
                     newWelder.MaxHanTiao = q.MID_HanTiao;
                     newWelder.MaxWeldingWire = q.MID_WeldingWire;
                     newWelder.IsOAM = true;
+                    newWelder.IsSelfCreate = q.IsSelfCreate;
                     if (s.Count() > 0)
                     {
                         newWelder.WED_ID = s.First().WED_ID;
@@ -377,9 +378,22 @@
                 {
                     if (!string.IsNullOrEmpty(q.MIDWelder_QualifiedProjectCode))
                     {
-                        if (q.MIDWelder_QualifiedProjectCode.Contains("+"))
+                        if (q.MIDWelder_QualifiedProjectCode.Contains("+") || q.MIDWelder_QualifiedProjectCode.Contains("＋") || q.MIDWelder_QualifiedProjectCode.Contains("和"))
                         {
-                            string[] codes = q.MIDWelder_QualifiedProjectCode.Split('+');
+                            string[] codes = null;
+                            if (q.MIDWelder_QualifiedProjectCode.Contains("+"))
+                            {
+                                codes = q.MIDWelder_QualifiedProjectCode.Split('+');
+                            }
+                            if (q.MIDWelder_QualifiedProjectCode.Contains("＋"))
+                            {
+                                codes = q.MIDWelder_QualifiedProjectCode.Split('＋');
+                            }
+                            if (q.MIDWelder_QualifiedProjectCode.Contains("和"))
+                            {
+                                codes = q.MIDWelder_QualifiedProjectCode.Split('和');
+                            }
+
                             foreach (string c in codes)
                             {
                                 var oldCode = from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.First().WED_ID && x.QualifiedProjectCode == c && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x;
@@ -425,10 +439,17 @@
                                 BLL.HJGL_WelderQualifiedProjectService.UpdateWelderQualifiedLimitDate(welderQualifiedProjectId, limitDate, q.MIDWelder_sfxgjgbl, q.MIDWelder_jjsybl, q.MIDWelder_jjsy);
                             }
                         }
+
+
                         // 回写表OAM_UesrQualified
                         long welder_ID = q.MIDWelder_ID;
                         bool isSync = true;
                         BLL.HJGL_WelderQualifiedProjectService.UpdateOAWelderQue(welder_ID, isSync);
+
+                        //List<SqlParameter> listStr = new List<SqlParameter>();
+                        //listStr.Add(new SqlParameter("@MIDWelder_ID", q.MIDWelder_ID));
+                        //SqlParameter[] parameter = listStr.ToArray();
+                        //BLL.SQLHelper.ExecutSql("UPDATE dbo.OAM_UesrQualified SET IsSync=1 WHERE MIDWelder_ID=@MIDWelder_ID", parameter);
                     }
                 }
             }

HJGL_DS/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx

@@ -117,7 +117,7 @@
                         HeaderText="使用位置" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
                     <f:RenderField Width="90px" ColumnID="IsSteelStru" DataField="IsSteelStru" FieldType="String"
-                        HeaderText="是否钢结构" HeaderTextAlign="Center" TextAlign="Center">
+                        HeaderText="是否管道焊接" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
                     <f:RenderField Width="150px" ColumnID="STE_Name" DataField="STE_Name" FieldType="String"
                         HeaderText="焊件材质" HeaderTextAlign="Center" TextAlign="Center">

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs

@@ -141,7 +141,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
             string strSql = @"SELECT UsingPlan.UsingPlanId, UsingPlan.WeldId, UsingPlan.ProjectId, UsingPlan.UsePosition,TeamGroupId,UsingPlan.STE_Name,UnitStore.UnitStoreName,
                                      unit.UnitName AS UsingUnit,UsingPlan.Amount, UsingPlan.UsingManOne,  UsingPlan.InPutDate,
                                      CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime, UsingPlan.CancelDate,UsingPlan.IsNeedConfirm,
-                                     (CASE UsingPlan.IsSteelStru WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE '' END) AS IsSteelStru,
+                                     (CASE UsingPlan.IsSteelStru WHEN 1 THEN '否' WHEN 0 THEN '是' ELSE '' END) AS IsSteelStru,
                                      (CASE UsingPlan.IsSubmit WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE '' END) AS IsSubmit,
                                      (CASE UsingPlan.IsCancel WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE '' END) AS IsCancel,
                                      Weld.WeldCode,Weld.WeldName,Weld.WeldSpec,WeldType.WeldUnit,WeldType.WeldTypeName,

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx

@@ -61,9 +61,9 @@
             
             <f:FormRow ColumnWidths="50% 45% 5%">
                 <Items> 
-                    <f:DropDownList ID="drpIsSteelStru" runat="server" Label="是否钢结构" LabelAlign="Right"  Required="true" ShowRedStar="true" >
+                    <f:DropDownList ID="drpIsSteelStru" runat="server" Label="是否管道焊接" LabelAlign="Right" LabelWidth="120px"  Required="true" ShowRedStar="true" >
-                        <f:ListItem Text="否" Value="0" />
+                        <f:ListItem Text="是" Value="0" />
-                        <f:ListItem Text="是" Value="1" />
+                        <f:ListItem Text="否" Value="1" />
                     </f:DropDownList>  
                    
                     <f:TextBox ID="txtUsingManOne" runat="server" Label="领料人" LabelAlign="Right" Readonly="true"

HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx

@@ -88,7 +88,9 @@
                     <f:RenderField Width="120px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
                         HeaderText="施工号" HeaderTextAlign="Center" TextAlign="Center" SortField="ProjectCode">
                     </f:RenderField>
-                    
+                    <f:RenderField Width="120px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
+                        HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Center" SortField="ProjectName">
+                    </f:RenderField>
                     <f:RenderField Width="150px" ColumnID="WeldName" DataField="WeldName" FieldType="String"
                         HeaderText="焊材牌号" HeaderTextAlign="Center" TextAlign="Center" SortField="WeldName">
                     </f:RenderField>

HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs

@@ -343,7 +343,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
             BindGrid();
             foreach (GridColumn column in grid.Columns)
             {
-                if (column.ColumnIndex < 24)
+                if (column.ColumnIndex < 25)
                 {
                     sb.AppendFormat("<td>{0}</td>", column.HeaderText);
                 }
@@ -355,7 +355,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                 sb.Append("<tr>");
                 foreach (GridColumn column in grid.Columns)
                 {
-                    if (column.ColumnIndex < 24)
+                    if (column.ColumnIndex < 25)
                     {
                         string html = row.Values[column.ColumnIndex].ToString();
                         if (column.ColumnID == "tfNumber")

HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx

@@ -57,9 +57,17 @@
                                 <f:TextBox ID="txtClassS" runat="server" Label="焊工等级" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
                                     Width="170px" LabelWidth="70px">
                                 </f:TextBox>
+                                <f:RadioButtonList runat="server" ID="rblIsSelfCreate" Width="260px" AutoPostBack="true" Label="焊工类型" LabelAlign="Right"
+                                        OnSelectedIndexChanged="TextBox_TextChanged">
+                                        <f:RadioItem Selected="true" Value="2" Text="全部" />
+                                        <f:RadioItem Value="1" Text="自建" />
+                                        <f:RadioItem Value="0" Text="外协" />
+                                    </f:RadioButtonList>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnSync" Text="同步" Icon="PackageIn" runat="server" OnClick="btnSync_Click"  ToolTip="从OA同步焊工信息及焊工合格项目">
                                 </f:Button>
+                                <f:Button ID="btnSync2" Text="同步2" Icon="PackageIn" runat="server" OnClick="btnSync2_Click"  ToolTip="从OA同步焊工信息及焊工合格项目" Hidden="true">
+                                </f:Button>
                                 <f:Button ID="btnNew" Text="增加" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
                                 </f:Button>
                                 <f:Button ID="btnIn" Text="导入" Icon="PackageIn" runat="server" OnClick="btnIn_Click" Hidden="true">

HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs

@@ -119,7 +119,11 @@ namespace FineUIPro.Web.Welder
                 strSql += " AND Welder.WED_Class LIKE @WED_Class";
                 listStr.Add(new SqlParameter("@WED_Class", "%" + this.txtClassS.Text.Trim() + "%"));
             }
-
+            if (this.rblIsSelfCreate.SelectedValue != "2")
+            {
+                strSql += " AND Welder.IsSelfCreate = @IsSelfCreate";
+                listStr.Add(new SqlParameter("@IsSelfCreate", this.rblIsSelfCreate.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -158,6 +162,42 @@ namespace FineUIPro.Web.Welder
         }
         #endregion
 
+        protected void btnSync2_Click(object sender, EventArgs e)
+        {
+            var welders = from x in Funs.DB.OAM_User select x;
+            foreach (var q in welders)
+            {
+                var s = from x in Funs.DB.HJGL_BS_Welder where x.IdentityCard == q.MID_IdentityCard select x;
+                var u = BLL.Base_UnitService.GetUnit2(q.MID_Unit);
+                if (u != null)
+                {
+                    Model.HJGL_BS_Welder newWelder = new Model.HJGL_BS_Welder();
+                    newWelder.WED_Code = q.MID_Code;
+                    newWelder.WED_Name = q.MID_Name;
+                    newWelder.WED_Unit = u.UnitId;
+                    newWelder.WED_Sex = q.MID_Sex;
+                    newWelder.IdentityCard = q.MID_IdentityCard;
+                    newWelder.WED_WorkCode = q.MID_WordCode;
+                    newWelder.WED_IfOnGuard = q.MID_IfOnGuard;
+                    newWelder.WED_Remark = q.MID_Remark;
+
+                    newWelder.MaxHanTiao = q.MID_HanTiao;
+                    newWelder.MaxWeldingWire = q.MID_WeldingWire;
+                    newWelder.IsOAM = true;
+                    newWelder.IsSelfCreate = q.IsSelfCreate;
+                    if (s.Count() > 0)
+                    {
+                        newWelder.WED_ID = s.First().WED_ID;
+                        BLL.HJGL_PersonManageService.UpdateBSWelder(newWelder);
+                    }
+                    else
+                    {
+                        BLL.HJGL_PersonManageService.AddBSWelder(newWelder);
+                    }
+                }
+            }
+        }
+
         protected void btnSync_Click(object sender, EventArgs e)
         {
             if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_WelderMenuId, Const.BtnSync))
@@ -203,6 +243,7 @@ namespace FineUIPro.Web.Welder
                         newWelder.MaxHanTiao = q.MID_HanTiao;
                         newWelder.MaxWeldingWire = q.MID_WeldingWire;
                         newWelder.IsOAM = true;
+                        newWelder.IsSelfCreate = q.IsSelfCreate;
                         if (s.Count() > 0)
                         {
                             a++;
@@ -241,7 +282,7 @@ namespace FineUIPro.Web.Welder
                     {
                         if (!string.IsNullOrEmpty(q.MIDWelder_QualifiedProjectCode))
                         {
-                            if (q.MIDWelder_QualifiedProjectCode.Contains("+") || q.MIDWelder_QualifiedProjectCode.Contains("＋")|| q.MIDWelder_QualifiedProjectCode.Contains("和"))
+                            if (q.MIDWelder_QualifiedProjectCode.Contains("+") || q.MIDWelder_QualifiedProjectCode.Contains("＋") || q.MIDWelder_QualifiedProjectCode.Contains("和"))
                             {
                                 string[] codes = null;
                                 if (q.MIDWelder_QualifiedProjectCode.Contains("+"))
@@ -747,7 +788,7 @@ namespace FineUIPro.Web.Welder
             {
                 foreach (var q in quas)
                 {
-                    if (q.MIDWelder_QualifiedProjectCode.Contains("+") || q.MIDWelder_QualifiedProjectCode.Contains("＋")|| q.MIDWelder_QualifiedProjectCode.Contains("和"))
+                    if (q.MIDWelder_QualifiedProjectCode.Contains("+") || q.MIDWelder_QualifiedProjectCode.Contains("＋") || q.MIDWelder_QualifiedProjectCode.Contains("和"))
                     {
                         string[] codes = null;
                         if (q.MIDWelder_QualifiedProjectCode.Contains("+"))
@@ -983,7 +1024,7 @@ namespace FineUIPro.Web.Welder
             this.InitTreeMenu();
             this.BindGrid();
         }
-     
+
         protected void TextBox_TextChanged(object sender, EventArgs e)
         {
             this.BindGrid();

HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs

@@ -147,6 +147,15 @@ namespace FineUIPro.Web.Welder {
         /// </remarks>
         protected global::FineUIPro.TextBox txtClassS;
         
+        /// <summary>
+        /// rblIsSelfCreate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsSelfCreate;
+        
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -165,6 +174,15 @@ namespace FineUIPro.Web.Welder {
         /// </remarks>
         protected global::FineUIPro.Button btnSync;
         
+        /// <summary>
+        /// btnSync2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSync2;
+        
         /// <summary>
         /// btnNew 控件。
         /// </summary>

HJGL_DS/Model/Model.cs

@@ -26508,6 +26508,8 @@ namespace Model
 		
 		private string _PhotoUrl;
 		
+		private System.Nullable<bool> _IsSelfCreate;
+		
 		private EntitySet<HJGL_BO_Batch> _HJGL_BO_Batch;
 		
 		private EntitySet<HJGL_BO_PreWeldReportMain> _HJGL_BO_PreWeldReportMain;
@@ -26624,6 +26626,8 @@ namespace Model
     partial void OnMaxHanTiaoChanged();
     partial void OnPhotoUrlChanging(string value);
     partial void OnPhotoUrlChanged();
+    partial void OnIsSelfCreateChanging(System.Nullable<bool> value);
+    partial void OnIsSelfCreateChanged();
     #endregion
 		
 		public HJGL_BS_Welder()
@@ -27470,6 +27474,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSelfCreate", DbType="Bit")]
+		public System.Nullable<bool> IsSelfCreate
+		{
+			get
+			{
+				return this._IsSelfCreate;
+			}
+			set
+			{
+				if ((this._IsSelfCreate != value))
+				{
+					this.OnIsSelfCreateChanging(value);
+					this.SendPropertyChanging();
+					this._IsSelfCreate = value;
+					this.SendPropertyChanged("IsSelfCreate");
+					this.OnIsSelfCreateChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_BO_Batch_HJGL_BS_Welder", Storage="_HJGL_BO_Batch", ThisKey="WED_ID", OtherKey="WED_ID", DeleteRule="NO ACTION")]
 		public EntitySet<HJGL_BO_Batch> HJGL_BO_Batch
 		{
@@ -103258,6 +103282,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsUsed;
 		
+		private System.Nullable<bool> _IsSelfCreate;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -103288,6 +103314,8 @@ namespace Model
     partial void OnMID_HanTiaoChanged();
     partial void OnIsUsedChanging(System.Nullable<bool> value);
     partial void OnIsUsedChanged();
+    partial void OnIsSelfCreateChanging(System.Nullable<bool> value);
+    partial void OnIsSelfCreateChanged();
     #endregion
 		
 		public OAM_User()
@@ -103555,6 +103583,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSelfCreate", DbType="Bit")]
+		public System.Nullable<bool> IsSelfCreate
+		{
+			get
+			{
+				return this._IsSelfCreate;
+			}
+			set
+			{
+				if ((this._IsSelfCreate != value))
+				{
+					this.OnIsSelfCreateChanging(value);
+					this.SendPropertyChanging();
+					this._IsSelfCreate = value;
+					this.SendPropertyChanged("IsSelfCreate");
+					this.OnIsSelfCreateChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;

HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -85,13 +85,13 @@
       <publishTime>04/12/2024 09:54:20</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>09/10/2026 10:23:02</publishTime>
+      <publishTime>09/23/2026 09:02:17</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>12/31/2025 16:32:37</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>09/10/2026 10:23:02</publishTime>
+      <publishTime>09/23/2026 09:02:17</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/17/2020 21:32:28</publishTime>
@@ -121,10 +121,10 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>09/10/2026 10:23:01</publishTime>
+      <publishTime>09/23/2026 09:02:10</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>09/10/2026 10:23:01</publishTime>
+      <publishTime>09/23/2026 09:02:10</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>11/28/2018 02:07:34</publishTime>
@@ -295,13 +295,13 @@
       <publishTime>05/24/2018 13:38:24</publishTime>
     </File>
     <File Include="bin/SgManager.AI.dll">
-      <publishTime>09/10/2026 10:23:03</publishTime>
+      <publishTime>09/23/2026 09:02:22</publishTime>
     </File>
     <File Include="bin/SgManager.AI.dll.config">
       <publishTime>07/28/2025 11:00:31</publishTime>
     </File>
     <File Include="bin/SgManager.AI.pdb">
-      <publishTime>09/10/2026 10:23:03</publishTime>
+      <publishTime>09/23/2026 09:02:22</publishTime>
     </File>
     <File Include="bin/System.Net.Http.Formatting.dll">
       <publishTime>02/01/2018 12:17:18</publishTime>
@@ -337,10 +337,10 @@
       <publishTime>06/29/2015 16:49:52</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>09/10/2026 10:23:04</publishTime>
+      <publishTime>09/23/2026 09:02:27</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>09/10/2026 10:23:04</publishTime>
+      <publishTime>09/23/2026 09:02:27</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 13:57:34</publishTime>
@@ -466,7 +466,7 @@
       <publishTime>07/03/2024 11:01:07</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>09/10/2026 10:23:37</publishTime>
+      <publishTime>09/23/2026 09:02:39</publishTime>
     </File>
   </ItemGroup>
 </Project>

HJGL_DS/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />