From bb6197e0844545c366c467753f3f9390b19bd987 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Tue, 14 Oct 2025 00:24:59 +0800
Subject: [PATCH 1/2] 20251014
---
.../版本日志/HJGLDB_DS_2025-10-14_bwj.sql | 28 +++++++++++++++++++
.../HotProessManage/HotProessTrust.aspx.cs | 2 +-
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 DataBase/版本日志/HJGLDB_DS_2025-10-14_bwj.sql
diff --git a/DataBase/版本日志/HJGLDB_DS_2025-10-14_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-10-14_bwj.sql
new file mode 100644
index 0000000..a83199b
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2025-10-14_bwj.sql
@@ -0,0 +1,28 @@
+
+ALTER PROCEDURE [dbo].[HJGL_spCH_HotProessTrustItem]
+(
+ @HotProessTrustId nvarchar(50),
+ @ProessTypes nvarchar(50)=null
+)
+AS
+--ͨidȡίеϢ
+BEGIN
+
+
+select HotProessTrustId,ISO_IsoNo,JOT_JointNo,JOT_JointDesc,STE_Code,
+STRING_AGG((case when ProessTypes='1' then 'Ԥ'
+ when ProessTypes='2' then ''
+ when ProessTypes='3' then ''
+ when ProessTypes='4' then 'Ӧȴ'
+ when ProessTypes='5' then 'ȶ'
+ else ''end),'+') as ProessTypes from HJGL_View_CH_HotProessTrustItem TrustItem
+ where HotProessTrustId=@HotProessTrustId
+ and (ProessTypes=@ProessTypes or @ProessTypes is null)
+ group by HotProessTrustId,ISO_IsoNo,JOT_JointNo,JOT_JointDesc,STE_Code
+
+union
+
+select '99999999' as Number,'¿հ' AS ISO_IsoNo,null,null,null,null
+
+end
+go
\ No newline at end of file
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs
index 1a9bd4f..5fe9190 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs
@@ -717,7 +717,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
dt2.Columns.Add("ProessTypes");
DataView dv = tb2.DefaultView;//获取表视图
- dv.Sort = "Number ASC";//按照ID倒序排序
+ dv.Sort = "ISO_IsoNo,JOT_JointNo ASC";//按照ID倒序排序
tb2 = dv.ToTable();//转为表
DataRow[] rows2 = tb2.DefaultView.ToTable().Select();
int i = 0;
From 6d1418e7cca2aeca017d8a97edc8637b6cfbb750 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Thu, 16 Oct 2025 12:54:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=84=8A=E5=B7=A5=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
HJGL_DS/BLL/API/APIWeldServices.cs | 13 +++++++++----
.../common/WelderManage/WelderSave.aspx.cs | 2 +-
HJGL_DS/WebAPI/Controllers/WeldController.cs | 6 +++---
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/HJGL_DS/BLL/API/APIWeldServices.cs b/HJGL_DS/BLL/API/APIWeldServices.cs
index 8b3b19a..a346670 100644
--- a/HJGL_DS/BLL/API/APIWeldServices.cs
+++ b/HJGL_DS/BLL/API/APIWeldServices.cs
@@ -407,16 +407,21 @@ namespace BLL.API
///
///
///
- public static Model.ResponeData getProjectWelder(string projectId)
+ public static Model.ResponeData getProjectWelder(string projectId, string unitId, string date)
{
Model.ResponeData respone = new ResponeData();
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
+ DateTime dateTime =DateTime.Parse("1000-10-10");
+ if (!string.IsNullOrEmpty(date) && date != "null")
+ {
+ dateTime = DateTime.Parse(date);
+ }
var q = from pw in db.Project_Welder
- join w in db.HJGL_BS_Welder on pw.WED_ID equals w.WED_ID
- where pw.ProjectId == projectId
- where w.PhotoUrl !=null && pw.ExchangeTime ==null
+ join w in db.HJGL_BS_Welder on pw.WED_ID equals w.WED_ID
+ where w.PhotoUrl !=null && pw.ExchangeTime > dateTime
select w;
+
List res = new List();
foreach (var p in q)
{
diff --git a/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs b/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs
index 1968e8f..ebb145f 100644
--- a/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs
@@ -415,7 +415,7 @@
var pw = Funs.DB.Project_Welder.Where(x => x.WED_ID == WED_ID);
foreach(var w in pw)
{
- w.ExchangeTime = null;
+ w.ExchangeTime = DateTime.Now;
}
Funs.DB.SubmitChanges();
Alert.ShowInParent(PersonFace(welder), MessageBoxIcon.Warning);
diff --git a/HJGL_DS/WebAPI/Controllers/WeldController.cs b/HJGL_DS/WebAPI/Controllers/WeldController.cs
index ab5dc9f..1e9ee17 100644
--- a/HJGL_DS/WebAPI/Controllers/WeldController.cs
+++ b/HJGL_DS/WebAPI/Controllers/WeldController.cs
@@ -179,15 +179,14 @@ namespace WebAPI.Controllers
}
-
[HttpGet]
- public Model.ResponeData getProjectWelder(string projectId)
+ public Model.ResponeData getProjectWelder(string projectId, string unitId, string date)
{
Model.ResponeData respone = new ResponeData();
try
{
- return APIWeldServices.getProjectWelder(projectId);
+ return APIWeldServices.getProjectWelder(projectId, unitId, date);
}
catch (Exception e)
{
@@ -196,6 +195,7 @@ namespace WebAPI.Controllers
}
return respone;
}
+
[HttpGet]
public Model.ResponeData getUpdateWelderExchangeTime(string wedId,string projectId)
{