From 156883656d923bea50ee10c7452ea019384fc4ca Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 21 Sep 2026 17:05:59 +0800
Subject: [PATCH 1/8] 1
---
DataBase/版本日志/HJGLDB_DS_2026-09-21_gf.sql | 2 ++
HJGL_DS/FineUIPro.Web/Web.config | 4 ++--
HJGL_DS/WebAPI/WebAPI.csproj.user | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-09-21_gf.sql
diff --git a/DataBase/版本日志/HJGLDB_DS_2026-09-21_gf.sql b/DataBase/版本日志/HJGLDB_DS_2026-09-21_gf.sql
new file mode 100644
index 0000000..447a818
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2026-09-21_gf.sql
@@ -0,0 +1,2 @@
+alter table [dbo].[OAM_User] add IsSelfCreate bit null
+GO
\ No newline at end of file
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index f469b13..070a5f8 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
-
+
@@ -67,7 +67,7 @@
-
+
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index ef14066..28be9c4 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
-
+
- Debug|Any CPU
+ Release|Any CPU
FolderProfile
true
From 75123fa77ae6e45e08f1c74e7cd3a5b3f72f0dee Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 21 Sep 2026 17:36:20 +0800
Subject: [PATCH 2/8] 1
---
HJGL_DS/FineUIPro.Web/Global.asax.cs | 28 ++++++++++++++++++++++++++--
HJGL_DS/FineUIPro.Web/Web.config | 2 +-
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs
index 27002d0..b2992b4 100644
--- a/HJGL_DS/FineUIPro.Web/Global.asax.cs
+++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs
@@ -377,14 +377,28 @@
{
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;
if (oldCode.Count() == 0)
{
+ m++;
Model.HJGL_BS_WelderQualifiedProject welderQualifiedProject = new Model.HJGL_BS_WelderQualifiedProject();
welderQualifiedProject.WelderQualifiedProjectId = SQLHelper.GetNewID(typeof(Model.HJGL_BS_WelderQualifiedProject));
welderQualifiedProject.WED_ID = s.First().WED_ID;
@@ -397,6 +411,7 @@
}
else
{
+ k++;
string welderQualifiedProjectId = oldCode.First().WelderQualifiedProjectId;
DateTime? limitDate = q.MIDWelder_LimitDate;
BLL.HJGL_WelderQualifiedProjectService.UpdateWelderQualifiedLimitDate(welderQualifiedProjectId, limitDate, q.MIDWelder_sfxgjgbl, q.MIDWelder_jjsybl, q.MIDWelder_jjsy);
@@ -408,6 +423,7 @@
var oldCode = from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.First().WED_ID && x.QualifiedProjectCode == q.MIDWelder_QualifiedProjectCode && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x;
if (oldCode.Count() == 0)
{
+ n++;
Model.HJGL_BS_WelderQualifiedProject welderQualifiedProject = new Model.HJGL_BS_WelderQualifiedProject();
welderQualifiedProject.WelderQualifiedProjectId = SQLHelper.GetNewID(typeof(Model.HJGL_BS_WelderQualifiedProject));
welderQualifiedProject.WED_ID = s.First().WED_ID;
@@ -420,15 +436,23 @@
}
else
{
+ l++;
string welderQualifiedProjectId = oldCode.First().WelderQualifiedProjectId;
DateTime? limitDate = q.MIDWelder_LimitDate;
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 listStr = new List();
+ //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);
}
}
}
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 3c98f31..070a5f8 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
-
+
From 13b8bbf2fe2729680c31c8ff788e82858e866d80 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 21 Sep 2026 17:41:15 +0800
Subject: [PATCH 3/8] 1
---
HJGL_DS/FineUIPro.Web/Global.asax.cs | 4 ----
1 file changed, 4 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs
index b2992b4..26f47ca 100644
--- a/HJGL_DS/FineUIPro.Web/Global.asax.cs
+++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs
@@ -398,7 +398,6 @@
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;
if (oldCode.Count() == 0)
{
- m++;
Model.HJGL_BS_WelderQualifiedProject welderQualifiedProject = new Model.HJGL_BS_WelderQualifiedProject();
welderQualifiedProject.WelderQualifiedProjectId = SQLHelper.GetNewID(typeof(Model.HJGL_BS_WelderQualifiedProject));
welderQualifiedProject.WED_ID = s.First().WED_ID;
@@ -411,7 +410,6 @@
}
else
{
- k++;
string welderQualifiedProjectId = oldCode.First().WelderQualifiedProjectId;
DateTime? limitDate = q.MIDWelder_LimitDate;
BLL.HJGL_WelderQualifiedProjectService.UpdateWelderQualifiedLimitDate(welderQualifiedProjectId, limitDate, q.MIDWelder_sfxgjgbl, q.MIDWelder_jjsybl, q.MIDWelder_jjsy);
@@ -423,7 +421,6 @@
var oldCode = from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.First().WED_ID && x.QualifiedProjectCode == q.MIDWelder_QualifiedProjectCode && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x;
if (oldCode.Count() == 0)
{
- n++;
Model.HJGL_BS_WelderQualifiedProject welderQualifiedProject = new Model.HJGL_BS_WelderQualifiedProject();
welderQualifiedProject.WelderQualifiedProjectId = SQLHelper.GetNewID(typeof(Model.HJGL_BS_WelderQualifiedProject));
welderQualifiedProject.WED_ID = s.First().WED_ID;
@@ -436,7 +433,6 @@
}
else
{
- l++;
string welderQualifiedProjectId = oldCode.First().WelderQualifiedProjectId;
DateTime? limitDate = q.MIDWelder_LimitDate;
BLL.HJGL_WelderQualifiedProjectService.UpdateWelderQualifiedLimitDate(welderQualifiedProjectId, limitDate, q.MIDWelder_sfxgjgbl, q.MIDWelder_jjsybl, q.MIDWelder_jjsy);
From a9f54cdeb7392b98a1a0672ff82f50e7af9ea68c Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 22 Sep 2026 10:08:42 +0800
Subject: [PATCH 4/8] 1
---
DataBase/版本日志/HJGLDB_DS_2026-09-22_gf.sql | 2 +
.../PersonManage/HJGL_PersonManageService.cs | 3 +-
HJGL_DS/FineUIPro.Web/Global.asax.cs | 1 +
.../FineUIPro.Web/Welder/WelderManage.aspx | 2 +
.../FineUIPro.Web/Welder/WelderManage.aspx.cs | 43 +++++++++++++++--
.../Welder/WelderManage.aspx.designer.cs | 9 ++++
HJGL_DS/Model/Model.cs | 48 +++++++++++++++++++
7 files changed, 104 insertions(+), 4 deletions(-)
create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-09-22_gf.sql
diff --git a/DataBase/版本日志/HJGLDB_DS_2026-09-22_gf.sql b/DataBase/版本日志/HJGLDB_DS_2026-09-22_gf.sql
new file mode 100644
index 0000000..b4f3b77
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2026-09-22_gf.sql
@@ -0,0 +1,2 @@
+alter table HJGL_BS_Welder add IsSelfCreate bit null
+GO
\ No newline at end of file
diff --git a/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs b/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
index 508fac4..16c8f98 100644
--- a/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
+++ b/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;
diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs
index 26f47ca..37bd268 100644
--- a/HJGL_DS/FineUIPro.Web/Global.asax.cs
+++ b/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;
diff --git a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx
index b82a7d4..ed8da84 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx
+++ b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx
@@ -60,6 +60,8 @@
+
+
diff --git a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs
index c155032..3404e18 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs
@@ -158,6 +158,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 +239,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 +278,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 +784,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 +1020,7 @@ namespace FineUIPro.Web.Welder
this.InitTreeMenu();
this.BindGrid();
}
-
+
protected void TextBox_TextChanged(object sender, EventArgs e)
{
this.BindGrid();
diff --git a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs
index 0245454..205d790 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs
@@ -165,6 +165,15 @@ namespace FineUIPro.Web.Welder {
///
protected global::FineUIPro.Button btnSync;
+ ///
+ /// btnSync2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSync2;
+
///
/// btnNew 控件。
///
diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs
index 8f1b68e..e2ab772 100644
--- a/HJGL_DS/Model/Model.cs
+++ b/HJGL_DS/Model/Model.cs
@@ -26469,6 +26469,8 @@ namespace Model
private string _PhotoUrl;
+ private System.Nullable _IsSelfCreate;
+
private EntitySet _HJGL_BO_Batch;
private EntitySet _HJGL_BO_PreWeldReportMain;
@@ -26585,6 +26587,8 @@ namespace Model
partial void OnMaxHanTiaoChanged();
partial void OnPhotoUrlChanging(string value);
partial void OnPhotoUrlChanged();
+ partial void OnIsSelfCreateChanging(System.Nullable value);
+ partial void OnIsSelfCreateChanged();
#endregion
public HJGL_BS_Welder()
@@ -27431,6 +27435,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSelfCreate", DbType="Bit")]
+ public System.Nullable 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
{
@@ -102588,6 +102612,8 @@ namespace Model
private System.Nullable _IsUsed;
+ private System.Nullable _IsSelfCreate;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -102618,6 +102644,8 @@ namespace Model
partial void OnMID_HanTiaoChanged();
partial void OnIsUsedChanging(System.Nullable value);
partial void OnIsUsedChanged();
+ partial void OnIsSelfCreateChanging(System.Nullable value);
+ partial void OnIsSelfCreateChanged();
#endregion
public OAM_User()
@@ -102885,6 +102913,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSelfCreate", DbType="Bit")]
+ public System.Nullable 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;
From 159acc1d33e310f4e36a19f53e3accf8329e5389 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 22 Sep 2026 14:38:37 +0800
Subject: [PATCH 5/8] 1
---
.../WeldMat/UsingSentMat/UsingtMatSelect.aspx | 4 +++-
HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx | 6 ++++++
HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs | 6 +++++-
.../FineUIPro.Web/Welder/WelderManage.aspx.designer.cs | 9 +++++++++
4 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
index c659666..8aa8a03 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
@@ -88,7 +88,9 @@
-
+
+
diff --git a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx
index ed8da84..61116a9 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx
+++ b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx
@@ -57,6 +57,12 @@
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs
index 3404e18..ef5af77 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs
+++ b/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);
diff --git a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs
index 205d790..5e51eef 100644
--- a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.designer.cs
@@ -147,6 +147,15 @@ namespace FineUIPro.Web.Welder {
///
protected global::FineUIPro.TextBox txtClassS;
+ ///
+ /// rblIsSelfCreate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.RadioButtonList rblIsSelfCreate;
+
///
/// ToolbarFill1 控件。
///
From c2c229df637044ec0ffe906be96756dbd8fb48e9 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 22 Sep 2026 17:47:19 +0800
Subject: [PATCH 6/8] 1
---
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx | 2 +-
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs | 2 +-
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx
index 27d23e6..23aa1a3 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx
@@ -117,7 +117,7 @@
HeaderText="使用位置" HeaderTextAlign="Center" TextAlign="Center">
+ HeaderText="是否管道焊接" HeaderTextAlign="Center" TextAlign="Center">
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
index 6e3daaf..d29b6a3 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
+++ b/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,
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx
index 62ec827..994146d 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx
@@ -61,9 +61,9 @@
-
-
-
+
+
+
Date: Wed, 23 Sep 2026 11:03:18 +0800
Subject: [PATCH 7/8] 1
---
.../FineUIPro.Web/FineUIPro.Web.csproj.user | 4 ++--
.../UsingSentMat/UsingtMatSelect.aspx.cs | 4 ++--
.../PublishProfiles/FolderProfile.pubxml.user | 18 +++++++++---------
HJGL_DS/WebAPI/WebAPI.csproj.user | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index e3436b8..abef49a 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,8 +1,8 @@
-
+
true
- Release|Any CPU
+ Debug|Any CPU
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
index a333dd2..37deb70 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
+++ b/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("| {0} | ", column.HeaderText);
}
@@ -355,7 +355,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
sb.Append("");
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")
diff --git a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index e418995..15340f5 100644
--- a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -85,13 +85,13 @@
04/12/2024 09:54:20
- 09/10/2026 10:23:02
+ 09/23/2026 09:02:17
12/31/2025 16:32:37
- 09/10/2026 10:23:02
+ 09/23/2026 09:02:17
12/17/2020 21:32:28
@@ -121,10 +121,10 @@
07/25/2012 11:48:56
- 09/10/2026 10:23:01
+ 09/23/2026 09:02:10
- 09/10/2026 10:23:01
+ 09/23/2026 09:02:10
11/28/2018 02:07:34
@@ -295,13 +295,13 @@
05/24/2018 13:38:24
- 09/10/2026 10:23:03
+ 09/23/2026 09:02:22
07/28/2025 11:00:31
- 09/10/2026 10:23:03
+ 09/23/2026 09:02:22
02/01/2018 12:17:18
@@ -337,10 +337,10 @@
06/29/2015 16:49:52
- 09/10/2026 10:23:04
+ 09/23/2026 09:02:27
- 09/10/2026 10:23:04
+ 09/23/2026 09:02:27
01/23/2014 13:57:34
@@ -466,7 +466,7 @@
07/03/2024 11:01:07
- 09/10/2026 10:23:37
+ 09/23/2026 09:02:39
\ No newline at end of file
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index 28be9c4..a48b337 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
- Release|Any CPU
+ Debug|Any CPU
FolderProfile
true
From dcc9d3a34503ab11a23e2df978a302f6d927bc08 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 23 Sep 2026 15:45:26 +0800
Subject: [PATCH 8/8] 1
---
DataBase/版本日志/HJGLDB_DS_2026-09-23_gf.sql | 67 +++++++++++++++++++
1 file changed, 67 insertions(+)
create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-09-23_gf.sql
diff --git a/DataBase/版本日志/HJGLDB_DS_2026-09-23_gf.sql b/DataBase/版本日志/HJGLDB_DS_2026-09-23_gf.sql
new file mode 100644
index 0000000..7338ab9
--- /dev/null
+++ b/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= DATEADD(day, -1, CAST(GETDATE() AS date)) and usingMat.UsingDate= DATEADD(day, -1, CAST(GETDATE() AS date)) and report.JOT_WeldDate= DATEADD(day, -1, CAST(GETDATE() AS date)) and usingMat.UsingDate