From e65af5417f7adce54fba00c599b64556692aab3e Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 16 Jan 2026 14:10:34 +0800
Subject: [PATCH 1/4] 1
---
HJGL_DS/FineUIPro.Web/Web.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index fa1a616..2689427 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -67,7 +67,7 @@
-
+
From 2cce1d0e4e5933bfbf5105f8ba365f6948b9591e Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 16 Jan 2026 14:18:41 +0800
Subject: [PATCH 2/4] 1
---
.../HJGL/WeldingManage/JointInfo.aspx.cs | 28 +++++++++++++++++--
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
index 6e59051..7f7e1a6 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
@@ -499,6 +499,23 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (judgementDelete(rowID, isShow))
{
isDelete = true;
+ Model.SGGLDB db = Funs.DB;
+ var hotProessTrustItem = db.HJGL_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == rowID);
+ if (hotProessTrustItem != null)
+ {
+ db.HJGL_CH_HotProessTrustItem.DeleteOnSubmit(hotProessTrustItem);
+ }
+ var hotProessItem = db.HJGL_HotProessItem.FirstOrDefault(x => x.JOT_ID == rowID);
+ if (hotProessItem != null)
+ {
+ db.HJGL_HotProessItem.DeleteOnSubmit(hotProessItem);
+ }
+ var hotProessResult = db.HJGL_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == rowID);
+ if (hotProessResult != null)
+ {
+ db.HJGL_CH_HotProessResult.DeleteOnSubmit(hotProessResult);
+ }
+ db.SubmitChanges();
BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID); //删除批明细
BLL.HJGL_PW_JointInfoService.DeleteJointInfo(rowID);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊口信息");
@@ -1051,10 +1068,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
private bool judgementDelete(string id, bool isShow)
{
string content = string.Empty;
- if (BLL.Funs.DB.HJGL_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == id) != null
- || BLL.Funs.DB.HJGL_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == id) != null)
+ //if (BLL.Funs.DB.HJGL_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == id) != null
+ // || BLL.Funs.DB.HJGL_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == id) != null)
+ //{
+ // content = "该焊口已进行热处理委托，不能删除！";
+ //}
+ var joint = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(id);
+ if (!string.IsNullOrEmpty(joint.DReportID))
{
- content = "该焊口已进行热处理委托，不能删除！";
+ content = "该焊口已提交焊接记录，不能删除！";
}
var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailByJotId(id);
if (batchDetail != null)
From 3943a1f9ef266e05be508d46df117c9f8cfb32b0 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 16 Jan 2026 14:40:38 +0800
Subject: [PATCH 3/4] 1
---
DataBase/版本日志/HJGLDB_DS_2026-01-16_gf.sql | 137 ++++++++++++++++++
.../HJGL/WeldingReport/HJGLData.aspx | 4 +
2 files changed, 141 insertions(+)
create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-01-16_gf.sql
diff --git a/DataBase/版本日志/HJGLDB_DS_2026-01-16_gf.sql b/DataBase/版本日志/HJGLDB_DS_2026-01-16_gf.sql
new file mode 100644
index 0000000..5dc466b
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2026-01-16_gf.sql
@@ -0,0 +1,137 @@
+
+ALTER PROC [dbo].[HJGL_sp_StatisticsSampleTable]
+ @projectId NVARCHAR(50) = NULL,
+ @iso_isoNo VARCHAR(50) = NULL,
+ @isHotPress bit = NULL,
+ @Welded NVARCHAR(50) =NULL,
+ @ndtType NVARCHAR(10) = NULL,
+ @ndtResult NVARCHAR(20)=NULL
+
+AS
+/*********ͳ ܴ2022.11.30********/
+SELECT
+JointInfo.JOT_ID,
+project.ProjectCode, --ʩ
+IsoInfo.PressureTestPackageNo,--ѹ
+IsoInfo.ISO_ID,
+IsoInfo.ISO_IsoNo, --ߺ
+'1-'+IsoClass.ISC_IsoName+'-'+Ser.SER_Code+'-'+Steel.STE_Code AS ISO_Code, --ܵ
+IsoClass.ISC_IsoName, --ܵȼ
+Ser.SER_Name, --
+IsoInfo.ISO_DesignPress, --ѹ
+IsoInfo.PipeLineClass, --ܵ
+JointInfo.JOT_JointNo, --
+JointInfo.JOT_JointDesc, --
+JointInfo.JOT_Location, --λ
+WeldMethod.WME_Name, --ӷ
+JointType.JOTY_Code, --
+JointType.JOTY_Group,
+Sort1,Sort2,Sort3,Sort4,Sort5,
+IsoInfo.ISO_Insulator, --
+IsoInfo.ISO_DesignTemperature, --¶
+IsoInfo.ISO_TestPress, --ѹ
+(CASE WHEN WeldMat.WMT_MatCode IS NOT NULL AND WeldSilk.WMT_MatCode IS NOT NULL and WeldMat.WMT_MatCode!=WeldSilk.WMT_MatCode
+ THEN WeldMat.WMT_MatCode + '/' + WeldSilk.WMT_MatCode
+ WHEN WeldMat.WMT_MatCode IS NOT NULL THEN WeldMat.WMT_MatCode
+ ELSE ISNULL(WeldSilk.WMT_MatCode,'') END) AS WeldMatSilkCode,
+(CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN Welder1.WED_Code+'/'+Welder2.WED_Code ELSE Welder1.WED_Code END) AS WED_Code,
+--Welder1.WED_Code,--
+Steel.STE_Code,--
+Steel.STE_Name,--
+NDTRate.NDTR_Name,--Ӧ
+(CASE WHEN JointInfo.Jot_WeldingDate IS NOT NULL THEN JointInfo.Jot_WeldingDate
+ ELSE WeldReportMain.JOT_WeldDate END) AS JOT_WeldDate, --
+JointInfo.JOT_Size,--羭
+Batch.BatchCode,--
+BatchDetail.NDT, --ⷽʽId
+(CASE WHEN BatchDetail.PointType=2 THEN 'K' ELSE '' END) AS PointType,--ĺ
+JointInfo.JOT_Dia,--ֱ
+JointInfo.JOT_Sch, --ں
+(CASE WHEN JointInfo.RT_TrustCode IS NOT NULL THEN '' ELSE '' END) AS RTTrust, --RTί
+JointInfo.RT_TrustCode, --RTίе
+JointInfo.RT_TrustDate AS RTTrustDate, --ί
+
+ JointInfo.RTFeedbackDate, --ⷴ
+ JointInfo.RT_States AS RTTestResult,--RT
+
+ (CASE WHEN JointInfo.UT_TrustCode IS NOT NULL THEN '' ELSE '' END) AS UTTrust,--UTί
+ JointInfo.UT_States AS UTTestResult,--UT
+
+ (CASE WHEN JointInfo.MT_TrustCode IS NOT NULL THEN '' ELSE '' END) AS MTTrust,--MTί
+ JointInfo.MT_States AS MTTestResult,--MT
+
+ (CASE WHEN JointInfo.PT_TrustCode IS NOT NULL THEN '' ELSE '' END) AS PTTrust,--PTί
+ JointInfo.PT_TrustCode, --PTίе
+ JointInfo.PT_TrustDate, --PTί
+ JointInfo.PT_States AS PTTestResult,--PT
+
+ (CASE WHEN JointInfo.PAUT_TrustCode IS NOT NULL THEN '' ELSE '' END) AS PAUTTrust, --PAUTί
+ JointInfo.PAUT_TrustCode, --PAUTίе
+ JointInfo.PAUT_TrustDate AS PAUTTrustDate, --PAUTί
+ JointInfo.PAUT_States AS PAUTTestResult,--PAUT
+
+ (CASE WHEN (SELECT TOP 1 UnableCheck FROM dbo.HJGL_CH_TrustItem c WHERE c.JOT_ID=JointInfo.JOT_ID )=1
+ THEN '' ELSE '' END) AS UnableCheck,
+ (SELECT TOP 1 UnableCheckReason FROM dbo.HJGL_CH_TrustItem c WHERE c.JOT_ID=JointInfo.JOT_ID ) AS UnableCheckReason,
+
+(CASE WHEN JointInfo.ProessTypes like '%4|5%' Then 'Ӧȴ,ȶ'
+WHEN JointInfo.ProessTypes like '%4%' Then 'Ӧȴ'
+WHEN JointInfo.ProessTypes like '%5%' Then 'ȶ'
+ ELSE '' END) AS ProessTypes,--ȴ
+(case when JointInfo.ProessTypes like '%4%' or JointInfo.ProessTypes like '%5%' then 'Y'
+else 'N' end) as IS_Proess,
+(case when JointInfo.ProessTypes like '%1%' then 'Y'
+else '' end) as IS_Preheating,
+(select top 1 HotProessTrustCode from HJGL_CH_HotProessTrust t left join HJGL_CH_HotProessTrustItem i on t.HotProessTrustId=i.HotProessTrustId where i.JOT_ID=JointInfo.JOT_ID order by TrustDate desc)
+as HotProessTrustCode, --ȴίб
+JointInfo.HotProessTrustDate,--ȴίʱ
+(select top 1 HotStartDate from HJGL_HotProessItem hpi where hpi.JOT_ID=JointInfo.JOT_ID) as HotStartDate, --ȴʼʱ
+JointInfo.HotResultDate,--ȴʱ
+(select top 1 HotHardCode from HJGL_CH_HardTestReport t left join HJGL_CH_HardTestReportItem i on t.HardTestReportId=i.HardTestReportId where i.JOT_ID=JointInfo.JOT_ID order by TestDate desc)
+as HotHardCode, --Ӳίб
+JointInfo.HardTrustDate,--Ӳίʱ
+JointInfo.HardResultDate,--Ӳȷʱ
+(case when JointInfo.HardTestResultOK=1 then 'ϸ' when JointInfo.HardTestResultOK=0 then 'ϸ' else '' end) as HardResult,--Ӳȼ
+BatchDetail.BatchDetailId
+FROM dbo.HJGL_PW_JointInfo AS JointInfo
+LEFT JOIN DBO.HJGL_BO_BatchDetail AS BatchDetail ON JointInfo.JOT_ID = BatchDetail.JOT_ID
+LEFT JOIN DBO.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = JointInfo.ISO_ID
+LEFT JOIN HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID = JointInfo.WME_ID
+LEFT JOIN HJGL_BS_JointType AS JointType ON JointType.JOTY_ID=JointInfo.JOTY_ID
+LEFT JOIN DBO.HJGL_BO_Batch AS Batch ON Batch.BatchId = BatchDetail.BatchId
+LEFT JOIN dbo.Base_Project project ON project.ProjectId=JointInfo.ProjectId
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = JointInfo.STE_ID
+LEFT JOIN DBO.HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder
+LEFT JOIN DBO.HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder
+LEFT JOIN DBO.HJGL_BO_WeldReportMain AS WeldReportMain ON WeldReportMain.DReportID = JointInfo.DReportID
+LEFT JOIN dbo.HJGL_BS_NDTRate AS NDTRate ON NDTRate.NDTR_ID = JointInfo.NDTR_ID
+LEFT JOIN dbo.HJGL_BS_IsoClass AS IsoClass ON IsoClass.ISC_ID =IsoInfo.ISC_ID
+LEFT JOIN dbo.HJGL_BS_Service AS Ser ON Ser.SER_ID = IsoInfo.SER_ID
+LEFT JOIN HJGL_BS_WeldMaterial AS WeldMat ON WeldMat.WMT_ID=JointInfo.JOT_WeldMat
+LEFT JOIN HJGL_BS_WeldMaterial AS WeldSilk ON WeldSilk.WMT_ID=JointInfo.JOT_WeldSilk
+
+WHERE (JointInfo.ProjectId=@projectId OR @projectId IS NULL)
+ AND ((CASE WHEN @ndtType='RT' THEN JointInfo.RT_TrustCode
+ WHEN @ndtType='PT' THEN JointInfo.PT_TrustCode
+ WHEN @ndtType='MT' THEN JointInfo.MT_TrustCode
+ WHEN @ndtType='UT' THEN JointInfo.UT_TrustCode
+ WHEN @ndtType='PAUT' THEN JointInfo.PAUT_TrustCode END) IS NOT NULL OR @ndtType IS NULL)
+ AND ((CASE WHEN @ndtType='RT' AND @ndtResult IS NOT NULL THEN JointInfo.RT_States
+ WHEN @ndtType='PT' AND @ndtResult IS NOT NULL THEN JointInfo.PT_States
+ WHEN @ndtType='MT' AND @ndtResult IS NOT NULL THEN JointInfo.MT_States
+ WHEN @ndtType='UT' AND @ndtResult IS NOT NULL THEN JointInfo.UT_States
+ WHEN @ndtType='PAUT' AND @ndtResult IS NOT NULL THEN JointInfo.PAUT_States END) =@ndtResult OR @ndtResult IS NULL)
+AND ((case when JointInfo.DReportID IS NOT NULL then '1' else '2' end)=@Welded OR @Welded IS NULL)
+AND (IsoInfo.ISO_IsoNo =@iso_isoNo OR @iso_isoNo IS NULL)
+AND (((SELECT TOP 1 TrustDate from dbo.HJGL_CH_HotProessTrustItem a
+ WHERE a.JOT_ID=BatchDetail.JOT_ID and (a.ProessTypes='4' OR a.ProessTypes='5')) IS NOT NULL
+ AND @isHotPress=1) OR @isHotPress IS NULL)
+ORDER BY project.ProjectCode,IsoInfo.ISO_IsoNo,JointInfo.JOT_JointNo
+
+
+
+
+
+GO
+
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HJGLData.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HJGLData.aspx
index 83cf4a7..9676e81 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HJGLData.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HJGLData.aspx
@@ -226,6 +226,10 @@
SortField="HotProessTrustDate" FieldType="Date" Renderer="Date" HeaderTextAlign="Center" RendererArgument="yyyy-MM-dd"
TextAlign="Center" Width="120px">
+
+
From 5dce699ffdbca19155d4dab81d2e05147cd50ae1 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 19 Jan 2026 17:11:58 +0800
Subject: [PATCH 4/4] 1
---
.../FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +-
HJGL_DS/FineUIPro.Web/Global.asax.cs | 238 ++++++++++++++++++
HJGL_DS/FineUIPro.Web/Login.aspx.cs | 7 +-
HJGL_DS/FineUIPro.Web/Web.config | 4 +-
HJGL_DS/WebAPI/WebAPI.csproj.user | 2 +-
5 files changed, 247 insertions(+), 6 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index a1d9585..72b6a27 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
true
- Release|Any CPU
+ Debug|Any CPU
diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs
index 33189ed..21fba8a 100644
--- a/HJGL_DS/FineUIPro.Web/Global.asax.cs
+++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs
@@ -55,6 +55,7 @@
System.Timers.Timer Wtimer = new System.Timers.Timer();
//执行任务的周期 ,20分钟
Wtimer.Interval = 1000 * 60 * 60;
+ //Wtimer.Interval = 1000 * 60;
Wtimer.Enabled = true;
Wtimer.Start();
Wtimer.Elapsed += new System.Timers.ElapsedEventHandler(Wtimer_Elapsed);
@@ -62,6 +63,241 @@
void Wtimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
+ #region 处理未进入批的已焊焊口
+ // 获取未进入批的已焊焊口
+ Model.SGGLDB db2 = Funs.DB;
+
+ var joint2s = from x in db2.HJGL_PW_JointInfo
+ join y in db2.HJGL_BO_BatchDetail on x.JOT_ID equals y.JOT_ID into g
+ from y in g.DefaultIfEmpty()
+ where x.DReportID != null && y.JOT_ID == null
+ select x;
+ var jointList = from x in db2.HJGL_PW_JointInfo select x;
+ var isoList = from x in db2.HJGL_PW_IsoInfo select x;
+ foreach (var newJointInfo in joint2s)
+ {
+ var isoInfo = isoList.FirstOrDefault(x => x.ISO_ID == newJointInfo.ISO_ID);
+ // 获取组批条件
+ var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", newJointInfo.ProjectId);
+ if (batchC != null)
+ {
+ string batchCondition = batchC.SetValue;
+ string[] condition = batchCondition.Split('|');
+
+ bool isPass = true;
+ foreach (string c in condition)
+ {
+ if (c == "1")
+ {
+ if (string.IsNullOrEmpty(newJointInfo.InstallationId))
+ {
+ isPass = false;
+ break;
+
+ }
+ }
+ if (c == "2")
+ {
+ if (string.IsNullOrEmpty(newJointInfo.NDTR_ID))
+ {
+ isPass = false;
+ break;
+ }
+ }
+ if (c == "3")
+ {
+ if (string.IsNullOrEmpty(newJointInfo.JOTY_ID))
+ {
+ isPass = false;
+ break;
+ }
+ }
+ if (c == "4")
+ {
+ if (string.IsNullOrEmpty(isoInfo.ISC_ID))
+ {
+ isPass = false;
+ break;
+ }
+ }
+ if (c == "5")
+ {
+ if (string.IsNullOrEmpty(isoInfo.STE_ID))
+ {
+ isPass = false;
+ break;
+ }
+ }
+ if (c == "6")
+ {
+ if (string.IsNullOrEmpty(isoInfo.ISO_Executive))
+ {
+ isPass = false;
+ break;
+ }
+ }
+ if (c == "9")
+ {
+ if (string.IsNullOrEmpty(newJointInfo.ISO_ID))
+ {
+ isPass = false;
+ break;
+ }
+ }
+ if (c == "10")
+ {
+ if (string.IsNullOrEmpty(isoInfo.SER_ID))
+ {
+ isPass = false;
+ break;
+ }
+ }
+ if (c == "11")
+ {
+ if (string.IsNullOrEmpty(newJointInfo.PressureTestPackageNo))
+ {
+ isPass = false;
+ break;
+ }
+ }
+ }
+
+ if (isPass)
+ {
+ string strSql = @"SELECT BatchId FROM dbo.HJGL_BO_Batch
+ WHERE (BatchIsClosed=0 OR BatchIsClosed IS NULL)
+ AND ProjectId = @ProjectId";
+ List listStr = new List();
+ listStr.Add(new SqlParameter("@ProjectId", newJointInfo.ProjectId));
+ if (condition.Contains("1"))
+ {
+ strSql += " AND InstallationId =@InstallationId";
+ listStr.Add(new SqlParameter("@InstallationId", newJointInfo.InstallationId));
+ }
+ if (condition.Contains("2"))
+ {
+ strSql += " AND NDTR_ID =@NDTR_ID";
+ listStr.Add(new SqlParameter("@NDTR_ID", newJointInfo.NDTR_ID));
+ }
+ if (condition.Contains("3"))
+ {
+ strSql += " AND JOTY_ID =@JOTY_ID";
+ listStr.Add(new SqlParameter("@JOTY_ID", newJointInfo.JOTY_ID));
+ }
+ if (condition.Contains("4"))
+ {
+ strSql += " AND ISC_ID =@ISC_ID";
+ listStr.Add(new SqlParameter("@ISC_ID", isoInfo.ISC_ID));
+ }
+ if (condition.Contains("5"))
+ {
+ strSql += " AND STE_ID =@STE_ID";
+ listStr.Add(new SqlParameter("@STE_ID", isoInfo.STE_ID));
+ }
+ if (condition.Contains("6"))
+ {
+ strSql += " AND ExecStandardId =@ExecStandardId";
+ listStr.Add(new SqlParameter("@ExecStandardId", isoInfo.ISO_Executive));
+ }
+ if (condition.Contains("7"))
+ {
+ strSql += " AND IsSpecial =@IsSpecial";
+ listStr.Add(new SqlParameter("@IsSpecial", newJointInfo.IsSpecial));
+ }
+ if (condition.Contains("8"))
+ {
+ strSql += " AND WED_ID =@WED_ID";
+ listStr.Add(new SqlParameter("@WED_ID", newJointInfo.JOT_CellWelder));
+ }
+ if (condition.Contains("9"))
+ {
+ strSql += " AND ISO_ID =@ISO_ID";
+ listStr.Add(new SqlParameter("@ISO_ID", newJointInfo.ISO_ID));
+ }
+ if (condition.Contains("10"))
+ {
+ strSql += " AND SER_ID =@SER_ID";
+ listStr.Add(new SqlParameter("@SER_ID", isoInfo.SER_ID));
+ }
+ if (condition.Contains("11"))
+ {
+ strSql += " AND TestPackage =@TestPackage";
+ listStr.Add(new SqlParameter("@TestPackage", newJointInfo.PressureTestPackageNo));
+ }
+ if (newJointInfo.IsGold == true) //黄金口单独组批
+ {
+ strSql += " AND IsGold =1";
+ }
+
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable batchInfo = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ //var batchInfo = from x in Funs.DB.HJGL_BO_Batch
+ // where x.ProjectId == this.drpProjectId.SelectedValue
+ // && x.InstallationId == newJointInfo.InstallationId && x.ISC_ID == isoInfo.ISC_ID
+ // && x.STE_ID == isoInfo.STE_ID
+ // && x.ExecStandardId == isoInfo.ISO_Executive && x.JOTY_ID == newJointInfo.JOTY_ID
+ // && x.NDTR_ID == newJointInfo.NDTR_ID && x.IsSpecial == newJointInfo.IsSpecial
+ // && (x.BatchIsClosed == null || x.BatchIsClosed == false)
+ // select x;
+
+ string batchId = string.Empty;
+ if (batchInfo.Rows.Count == 0)
+ {
+ Model.HJGL_BO_Batch batch = new Model.HJGL_BO_Batch();
+ batch.BatchId = SQLHelper.GetNewID(typeof(Model.HJGL_BO_Batch));
+ batchId = batch.BatchId;
+ //string perfix = ins.InstallationCode + "-" + isoC.ISC_IsoCode + "-" + ser.SER_Abbreviate + "-" + execS.ExecStandardName + "-";
+ batch.BatchCode = BLL.SQLHelper.RunProcFlowCode("SpGetFlowCode", "dbo.HJGL_BO_Batch", "BatchCode", newJointInfo.ProjectId);
+
+ batch.ProjectId = newJointInfo.ProjectId;
+ batch.InstallationId = newJointInfo.InstallationId;
+ batch.BatchCondition = batchC.SetValue;
+ batch.NDTR_ID = newJointInfo.NDTR_ID;
+ batch.JOTY_ID = newJointInfo.JOTY_ID;
+ batch.ISC_ID = isoInfo.ISC_ID;
+ batch.STE_ID = isoInfo.STE_ID;
+ batch.ExecStandardId = isoInfo.ISO_Executive;
+ batch.IsSpecial = newJointInfo.IsSpecial;
+ batch.WED_ID = newJointInfo.JOT_CellWelder;
+ batch.ISO_ID = newJointInfo.ISO_ID;
+ batch.SER_ID = isoInfo.SER_ID;
+ batch.TestPackage = newJointInfo.PressureTestPackageNo;
+ batch.BatchStartDate = DateTime.Now.Date;
+ if (newJointInfo.IsGold == true) //黄金口单独组批
+ {
+ batch.IsGold = true;
+ }
+ BLL.HJGL_BO_BatchService.AddBatch(batch);
+ }
+ else
+ {
+ batchId = batchInfo.Rows[0][0].ToString();
+ }
+
+ var bd = BLL.HJGL_BO_BatchDetailService.GetBatchDetailByJotId(newJointInfo.JOT_ID);
+ if (bd == null)
+ {
+ try
+ {
+ Model.HJGL_BO_BatchDetail batchDetail = new Model.HJGL_BO_BatchDetail();
+ batchDetail.BatchDetailId = SQLHelper.GetNewID(typeof(Model.HJGL_BO_BatchDetail));
+ batchDetail.BatchId = batchId;
+ batchDetail.ISO_ID = newJointInfo.ISO_ID;
+ batchDetail.JOT_ID = newJointInfo.JOT_ID;
+ BLL.Funs.DB.HJGL_BO_BatchDetail.InsertOnSubmit(batchDetail);
+ BLL.Funs.DB.SubmitChanges();
+ }
+ catch
+ {
+
+ }
+ }
+ }
+ }
+ }
+ #endregion
+
// 得到 hour minute second 如果等于某个值就开始执行某个程序。
int intHour = e.SignalTime.Hour;
int intMinute = e.SignalTime.Minute;
@@ -749,6 +985,8 @@
}
db1.SubmitChanges();
#endregion
+
+
}
protected void Session_Start(object sender, EventArgs e)
diff --git a/HJGL_DS/FineUIPro.Web/Login.aspx.cs b/HJGL_DS/FineUIPro.Web/Login.aspx.cs
index 624bb35..ccfb8d1 100644
--- a/HJGL_DS/FineUIPro.Web/Login.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/Login.aspx.cs
@@ -8,6 +8,9 @@ using System.Text;
using System.Security.Cryptography;
using CodeName.APPa;
using System.Linq;
+using System.Data.SqlClient;
+using System.Data;
+using System.Collections.Generic;
namespace FineUIPro.Web
{
@@ -49,10 +52,10 @@ namespace FineUIPro.Web
///
protected void btnLogin_Click(object sender, EventArgs e)
{
-
+
string userName = this.tbxUserName.Text;
string password = this.tbxPassword.Text;
- bool rememberMe = this.savemessgae.Checked;
+ bool rememberMe = this.savemessgae.Checked;
bool isLogin = false;
var sysUser = Funs.DB.Sys_User.FirstOrDefault(x => x.Account == userName && x.IsPost == true);
if (sysUser != null)
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 30834b7..0066e09 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 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