gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260702

Browse Source
This commit is contained in:
毕文静
2026-07-02 09:38:34 +08:00
parent 2db8b24921
commit 7a8450c65e
11 changed files with 278 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/HJGLDB_DS_2026-07-02_bwj.sql
+75
View File
@@ -0,0 +1,75 @@
ALTER PROCEDURE [dbo].[HJGL_sp_WeldInspectionCheckRecord]
(
@ProjectId NVARCHAR(50)=null,
@ISO_ID VARCHAR(1000)=NULL,
@VICheckDate DATETIME=NULL,
@NDTR_ID VARCHAR(50)=NULL,
@JOTY_Group NCHAR(1)=NULL,
@WeldingDate datetime =null
)
AS
--밗돛뚤쌈보쌈쌈庫괩쇱/쇱꿴션쩌
SELECT ROW_NUMBER() OVER(ORDER BY IsoInfo.ISO_IsoNo,joint.JOT_JointNo)%18 AS Num,NEWID() as New_ID,
Project.ProjectId,Project.ProjectCode,Project.ProjectName,batchDetail.JOT_ID,
joint.JOT_JointNo,joint.JOT_JointDesc,joint.ISO_ID,batch.NDTR_ID,
IsoInfo.ISO_IsoNo,batchDetail.VICheckDate,
(CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code, --보묏뵀
(CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Name+'/'+CellWelder.WED_Name ELSE FloorWelder.WED_Name END) AS WED_Name, --보묏檎츰
(CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL and Steel.STE_Code!=Steel2.STE_Code
THEN Steel.STE_Code + '/' + Steel2.STE_Code
WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code
ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code, --꼼醴
(CASE batchDetail.IsVI WHEN 1 THEN '￡' ELSE NULL END) AS PassVI,
(CASE batchDetail.IsVI WHEN 0 THEN '￡' ELSE NULL END) AS NoPassVI,
(CASE WHEN v.CH_TrustItemID IS NOT NULL THEN '￡' ELSE NULL END) AS IsTrust,
(CASE v.States WHEN '2' THEN '￡' ELSE NULL END ) AS TrustState,
(SELECT TOP 1 ReportCode FROM dbo.HJGL_CH_TestingReportPrint report
WHERE report.BatchId=batchDetail.BatchId
AND report.ISO_ID=batchDetail.ISO_ID AND report.NDT_ID=v.NDT_ID
AND report.Specifications=joint.JOT_JointDesc) AS ReportCode,
joint.JOT_Location --보쌈貫零
,WeldMethod.WME_Name --보쌈렘랬
,CASE WHEN WeldMat.WeldName IS NULL THEN ISNULL(WeldSilk.WeldName,'')
ELSE (CASE WHEN WeldSilk.WeldName IS NULL
THEN ISNULL(WeldMat.WeldName,'')
ELSE (ISNULL(WeldSilk.WeldName,'') +'/'+ ISNULL(WeldMat.WeldName,'')) END) END AS WMT_MatName --보꼼탬뵀
,joint.JOT_PrepareTemp --渡훑侊똑
,batchDetail.Remark
,jointType.JOTY_Group,joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
,weldReport.JOT_WeldDate
FROM dbo.HJGL_BO_BatchDetail batchDetail
LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = joint.ISO_ID
LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=joint.JOT_CellWelder
LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=joint.JOT_FloorWelder
LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = joint.STE_ID
LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=joint.STE_ID2
LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
LEFT JOIN (SELECT top 1 trustItem.CH_TrustItemID,trust.CH_NDTMethod AS NDT_ID, trustItem.JOT_ID, trustItem.States
FROM dbo.HJGL_CH_TrustItem trustItem
LEFT JOIN dbo.HJGL_CH_Trust trust ON trust.CH_TrustID = trustItem.CH_TrustID
LEFT JOIN dbo.HJGL_BS_NDTType ndtType on ndtType.NDT_ID=trust.CH_NDTMethod
WHERE ndtType.NDT_Code LIKE '%RT%') v ON v.JOT_ID=batchDetail.JOT_ID
LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=joint.WME_ID
LEFT JOIN View_WeldInfoDropDownLists as WeldMat on WeldMat.WeldId = joint.JOT_WeldMat and WeldMat.WeldTypeName like '%보係%'
LEFT JOIN View_WeldInfoDropDownLists as WeldSilk on WeldSilk.WeldId = joint.JOT_WeldSilk and WeldSilk.WeldTypeName like '%보介%'
left join HJGL_BO_WeldReportMain as weldReport on weldReport.DReportID = joint.DReportID
WHERE (jointType.JOTY_Group=@JOTY_Group OR @JOTY_Group IS NULL) AND
(joint.ProjectId=@projectId OR @projectId IS NULL) AND
(joint.ISO_ID=@ISO_ID or @ISO_ID is null)
AND (batchDetail.VICheckDate=@VICheckDate OR @VICheckDate IS NULL)
AND (batch.NDTR_ID=@NDTR_ID OR @NDTR_ID IS NULL)
AND joint.DReportID is not null
--AND batchDetail.VICheckDate IS NOT NULL
and(weldReport.JOT_WeldDate=@WeldingDate or @WeldingDate is null)
order by joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
GO
HJGL_DS/BLL/Funs.cs
+60 -61
View File
@@ -7,17 +7,17 @@ namespace BLL
using System.Text.RegularExpressions;
/// <summary>
/// ͨ�÷����ࡣ
/// 通用方法类。
/// </summary>
public static class Funs
{
/// <summary>
/// ά��һ��DB����
/// 维护一个DB集合
/// </summary>
private static Dictionary<int, Model.SGGLDB> dataBaseLinkList = new System.Collections.Generic.Dictionary<int, Model.SGGLDB>();
/// <summary>
/// ά��һ��DB����
/// 维护一个DB集合
/// </summary>
public static System.Collections.Generic.Dictionary<int, Model.SGGLDB> DBList
{
@@ -28,7 +28,7 @@ namespace BLL
}
/// <summary>
/// ���ݿ������ַ���
/// 数据库连接字符串
/// </summary>
private static string connString;
@@ -38,7 +38,7 @@ namespace BLL
public static string usingMatId;
/// <summary>
/// ���ݿ������ַ�����
/// 数据库连结字符串。
/// </summary>
public static string ConnString
{
@@ -46,7 +46,7 @@ namespace BLL
{
if (connString == null)
{
throw new NotSupportedException("�����������ַ�����");
throw new NotSupportedException("请设置连接字符串！");
}
return connString;
@@ -56,7 +56,7 @@ namespace BLL
{
if (connString != null)
{
throw new NotSupportedException("���������ã�");
throw new NotSupportedException("连接已设置！");
}
connString = value;
@@ -70,7 +70,7 @@ namespace BLL
}
/// <summary>
/// �����
/// 单位设置
/// </summary>
public static string UnitSet
{
@@ -79,7 +79,7 @@ namespace BLL
}
/// <summary>
/// ·��
/// 路径
/// </summary>
public static string RootPath
{
@@ -88,7 +88,7 @@ namespace BLL
}
/// <summary>
/// ϵͳ��
/// 系统名
/// </summary>
public static string SystemName
{
@@ -96,7 +96,7 @@ namespace BLL
set;
}
/// <summary>
/// AD����
/// AD域名
/// </summary>
public static string ADomainUrl
{
@@ -104,7 +104,7 @@ namespace BLL
set;
}
/// <summary>
/// APP���ص�ַ
/// APP下载地址
/// </summary>
public static string APPUrl
{
@@ -122,7 +122,7 @@ namespace BLL
/// <summary>
/// ÿҳ����
/// 每页数量
/// </summary>
public static int PageSize
{
@@ -131,7 +131,7 @@ namespace BLL
} = 15;
/// <summary>
/// ���ݿ������ġ�
/// 数据库上下文。
/// </summary>
public static Model.SGGLDB DB
{
@@ -147,50 +147,50 @@ namespace BLL
}
/// <summary>
/// ΪĿ����������� "��ѡ��" ��
/// 为目标下拉框加上 "请选择" 项
/// </summary>
/// <param name="DLL">Ŀ��������</param>
/// <param name="DLL">目标下拉框</param>
public static void PleaseSelect(System.Web.UI.WebControls.DropDownList DDL)
{
DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("- ��ѡ�� -", "0"));
DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("- 请选择 -", "0"));
return;
}
/// <summary>
/// ΪĿ����������� "��ѡ��" ��
/// 为目标下拉框加上 "请选择" 项
/// </summary>
/// <param name="DLL">Ŀ��������</param>
/// <param name="DLL">目标下拉框</param>
public static void FineUIPleaseSelect(FineUIPro.DropDownList DDL)
{
DDL.Items.Insert(0, new FineUIPro.ListItem("- ��ѡ�� -", BLL.Const._Null));
DDL.Items.Insert(0, new FineUIPro.ListItem("- 请选择 -", BLL.Const._Null));
return;
}
/// <summary>
/// ΪĿ����������� "���±���" ��
/// 为目标下拉框加上 "重新编制" 项
/// </summary>
/// <param name="DLL">Ŀ��������</param>
/// <param name="DLL">目标下拉框</param>
public static void ReCompileSelect(System.Web.UI.WebControls.DropDownList DDL)
{
DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("���±���", "0"));
DDL.Items.Insert(0, new System.Web.UI.WebControls.ListItem("重新编制", "0"));
return;
}
/// <summary>
/// ΪĿ����������� "���±���" ��
/// 为目标下拉框加上 "重新编制" 项
/// </summary>
/// <param name="DLL">Ŀ��������</param>
/// <param name="DLL">目标下拉框</param>
public static void FineUIReCompileSelect(FineUIPro.DropDownList DDL)
{
DDL.Items.Insert(0, new FineUIPro.ListItem("���±���", "0"));
DDL.Items.Insert(0, new FineUIPro.ListItem("重新编制", "0"));
return;
}
/// <summary>
/// �ַ����Ƿ�Ϊ������
/// 字符串是否为浮点数
/// </summary>
/// <param name="decimalStr">Ҫ�����ַ���</param>
/// <returns>�����ǻ��</returns>
/// <param name="decimalStr">要检查的字符串</param>
/// <returns>返回是或否</returns>
public static bool IsDecimal(string decimalStr)
{
if (String.IsNullOrEmpty(decimalStr))
@@ -211,10 +211,10 @@ namespace BLL
}
/// <summary>
/// �ж�һ���ַ����Ƿ�������
/// 判断一个字符串是否是整数
/// </summary>
/// <param name="integerStr">Ҫ�����ַ���</param>
/// <returns>�����ǻ��</returns>
/// <param name="integerStr">要检查的字符串</param>
/// <returns>返回是或否</returns>
public static bool IsInteger(string integerStr)
{
if (String.IsNullOrEmpty(integerStr))
@@ -235,10 +235,10 @@ namespace BLL
}
/// <summary>
/// ��ȡ�µ�����
/// 获取新的数字
/// </summary>
/// <param name="number">Ҫת��������</param>
/// <returns>�µ�����</returns>
/// <param name="number">要转换的数字</param>
/// <returns>新的数字</returns>
public static string InterceptDecimal(object number)
{
if (number == null)
@@ -285,11 +285,11 @@ namespace BLL
}
/// <summary>
/// �ж��ַ����ӵ�nλ��ʼ�Ժ��Ƿ�Ϊ0
/// 判断字符串从第n位开始以后是否都为0
/// </summary>
/// <param name="number">Ҫ�жϵ��ַ���</param>
/// <param name="n">��ʼ��λ��</param>
/// <returns>false����Ϊ0��true��Ϊ0</returns>
/// <param name="number">要判断的字符串</param>
/// <param name="n">开始的位数</param>
/// <returns>false不都为0，true都为0</returns>
public static bool GetStr(string number, int n)
{
for (int i = n; i < number.Length; i++)
@@ -303,11 +303,11 @@ namespace BLL
}
/// <summary>
/// ��ȡ�ַ�������
/// 截取字符串长度
/// </summary>
/// <param name="str">Ҫ��ȡ���ַ���</param>
/// <param name="n">����</param>
/// <returns>��ȡ���ַ���</returns>
/// <param name="str">要截取的字符串</param>
/// <param name="n">长度</param>
/// <returns>截取后字符串</returns>
public static string GetSubStr(object str, object n)
{
if (str != null)
@@ -326,7 +326,7 @@ namespace BLL
/// <summary>
/// �����ı�ת��ʱ������
/// 输入文本转换时间类型
/// </summary>
/// <returns></returns>
public static DateTime? GetNewDateTime(string time)
@@ -350,7 +350,7 @@ namespace BLL
}
/// <summary>
/// �����ı�ת������
/// 输入文本转换数字
/// </summary>
/// <returns></returns>
public static decimal? GetNewDecimal(string value)
@@ -374,7 +374,7 @@ namespace BLL
}
/// <summary>
/// �����ı�ת������
/// 输入文本转换数字
/// </summary>
/// <returns></returns>
public static decimal GetNewDecimalOrZero(string value)
@@ -388,7 +388,7 @@ namespace BLL
}
catch (Exception)
{
// 如果直接解析失败（如带单位 "10M", "5KM", "3KG"），取前面的数字部分
// 如果直接解析失败（如带单位 "10M", "5KM", "3KG"），取前面的数字部分
try
{
Match match = Regex.Match(value, @"\d+\.?\d*");
@@ -408,7 +408,7 @@ namespace BLL
}
/// <summary>
/// 从qty字符串中提取单位（如 "10M" → "M", "5KG" → "KG", "33.4 mm" → "mm", "10" → ""）
/// 从qty字符串中提取单位（如 "10M" → "M", "5KG" → "KG", "33.4 mm" → "mm", "10" → ""）
/// </summary>
public static string GetUnitFromQty(string value)
{
@@ -419,9 +419,8 @@ namespace BLL
return "";
}
/// <summary>
/// �����ı�ת����������
/// 输入文本转换数字类型
/// </summary>
/// <returns></returns>
public static int? GetNewInt(string value)
@@ -445,7 +444,7 @@ namespace BLL
}
/// <summary>
/// �����ı�ת����������
/// 输入文本转换数字类型
/// </summary>
/// <returns></returns>
public static int GetNewIntOrZero(string value)
@@ -467,7 +466,7 @@ namespace BLL
}
/// <summary>
/// ָ���ϴ��ļ�������
/// 指定上传文件的名称
/// </summary>
/// <returns></returns>
public static string GetNewFileName()
@@ -477,7 +476,7 @@ namespace BLL
}
/// <summary>
/// ���ݱ�ʶ�����ַ���list
/// 根据标识返回字符串list
/// </summary>
/// <param name="str"></param>
/// <param name="n"></param>
@@ -494,24 +493,24 @@ namespace BLL
}
/// <summary>
/// ���ݵ�һҳ�͵ڶ�ҳ�������ܼ�¼����ȷ����Ҫ��ӡ��ҳ
/// 根据第一页和第二页行数及总记录数，确定需要打印几页
/// </summary>
/// <param name="pageSize1">��һҳ����</param>
/// <param name="pageSize2">�ڶ�ҳ����</param>
/// <param name="count">�ܼ�¼��</param>
/// <param name="pageSize1">第一页行数</param>
/// <param name="pageSize2">第二页行数</param>
/// <param name="count">总记录数</param>
/// <returns></returns>
public static int GetPagesCountByPageSize(int pageSize1, int pageSize2, int count)
{
int pagesCount = 0;
if (pageSize1 >= count) //�ܼ�¼��С�ڵ��ڵ�һҳ����
if (pageSize1 >= count) //总记录数小于等于第一页行数
{
pagesCount = 1;
}
else if (count > pageSize1 && count <= (pageSize1 + pageSize2)) //�ܼ�¼�����ڵ�һҳ������С�ڵ��ڵ�һҳ�ӵڶ�ҳ������
else if (count > pageSize1 && count <= (pageSize1 + pageSize2)) //总记录数大于第一页行数且小于等于第一页加第二页总行数
{
pagesCount = 2;
}
else //�ܼ�¼�����ڵ�һҳ�ӵڶ�ҳ������
else //总记录数大于第一页加第二页总行数
{
int lastCount = count - pageSize1;
decimal c = Convert.ToDecimal(Math.Round(Convert.ToDecimal(lastCount) / Convert.ToDecimal(pageSize2), 2));
@@ -530,7 +529,7 @@ namespace BLL
}
/// <summary>
/// ��ȡ�ϴη������
/// 获取上次返修情况
/// </summary>
/// <returns></returns>
public static string GetRepariMark(string repairMark)
HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
+6 -1
View File
@@ -22,11 +22,16 @@ namespace FineUIPro.Web.ContinuousPrint
{
if (!IsPostBack)
{
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
this.txtProjectCode.Text = BLL.Base_ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectCode;
}
BindGrid();
this.Grid1.SelectedRowID = this.CurrUser.LoginProjectId;
BindGrid1(this.CurrUser.LoginProjectId);
}
}
#region 绑定Grid1
/// <summary>
/// 绑定Grid1
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx
+3
View File
@@ -208,6 +208,9 @@
<f:MenuButton ID="btnMenuExtend" OnClick="btnMenuExtend_Click" EnablePostBack="true"
runat="server" Text="扩拍" Icon="TableEdit">
</f:MenuButton>
<f:MenuButton ID="btnIncision" OnClick="btnIncision_Click" EnablePostBack="true"
runat="server" Text="割口" Icon="CdrCross">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.cs
+25
View File
@@ -726,5 +726,30 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
this.InitTreeMenu();
}
/// <summary>
/// 割口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnIncision_Click(object sender, EventArgs e)
{
string repairItemRecordId = Grid1.DataKeys[Grid1.SelectedRowIndex][0].ToString();
var r = BLL.HJGL_CH_RepairItemRecordService.GetRepairItemRecordById(repairItemRecordId);
if (r != null)
{
if (r.RepairMark != "CE")
{
r.RepairMark = "CE";
Funs.DB.SubmitChanges();
ShowNotify("割口成功", MessageBoxIcon.Success);
BindGrid();
}
else
{
ShowNotify("已是割口，无需重复割口！");
}
}
}
}
}
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.designer.cs
Generated
+43 -32
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage {
public partial class RepairItemRecordTrust {
namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class RepairItemRecordTrust
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpIsProjectClosed 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsProjectClosed;
/// <summary>
/// drpProjectId 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectId;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// rblIsTrust 控件。
/// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsTrust;
/// <summary>
/// lbDef 控件。
/// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbDef;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSave2 控件。
/// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave2;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// lbExtendedNum 控件。
/// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbExtendedNum;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// txtCheckPlace 控件。
/// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckPlace;
/// <summary>
/// txtTrustRemark 控件。
/// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTrustRemark;
/// <summary>
/// txtCheckPerson 控件。
/// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckPerson;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuExtend 控件。
/// </summary>
@@ -263,5 +265,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuExtend;
/// <summary>
/// btnIncision 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnIncision;
}
}
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
+6 -2
View File
@@ -22,6 +22,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport
this.drpProjectId.DataSource = BLL.Base_ProjectService.GetProjectListByUserId(this.CurrUser.UserId, "1");
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(drpProjectId);
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
}
this.drpJointType.DataTextField = "Text";
this.drpJointType.DataValueField = "Value";
@@ -81,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
left join HJGL_PW_IsoInfo as isoInfo on isoInfo.ISO_ID= jointInfo.ISO_ID
left join HJGL_BS_JointType as jointType on jointType.JOTY_ID= jointInfo.JOTY_ID
left join Base_Project as project on project.ProjectId = batch.ProjectId
LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where BatchDetail.VICheckDate IS NOT NULL ";
LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where jointInfo.DReportID IS NOT NULL ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
{
@@ -113,7 +117,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(Grid1.FilteredData, tb);
//tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx
+1 -1
View File
@@ -56,7 +56,7 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道对接焊接接头报检/检查记录" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="JOT_ID,New_ID" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="New_ID" AllowSorting="true" SortField="JOT_WeldDate,ISO_IsoNo,JOT_JointNo"
ClicksToEdit="2" DataIDField="New_ID" AllowSorting="true" SortField="ISO_IsoNo,Sort1,Sort2,Sort3,Sort4,Sort5"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
<Columns>
HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx
+49 -33
View File
@@ -133,39 +133,55 @@
</f:Panel>
<f:Panel ID="Panel8" BoxFlex="1" runat="server" ShowBorder="true" ShowHeader="true" Title="焊口返修超期未处理预警" AutoScroll="true">
<Items>
<f:Grid ID="GridRepair" ShowBorder="false" ShowHeader="false" EnableCollapse="true"
ShowGridHeader="true" runat="server" BoxFlex="0" DataKeyNames="RepairItemRecordId"
AllowSorting="true" SortField="FeedbackDate" SortDirection="ASC" OnSort="GridRepair_Sort"
EnableColumnLines="false" EnableRowLines="false" DataIDField="RepairItemRecordId">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DropDownList ID="drpPro" runat="server" Label="项目号" LabelAlign="Right" EnableEdit="true"
Width="250px" LabelWidth="70px" AutoPostBack="true" OnSelectedIndexChanged="drpPro_SelectedIndexChanged">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill3" runat="server">
</f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
HeaderText="施工号" HeaderTextAlign="Center" TextAlign="left" Width="130px">
</f:RenderField>
<f:RenderField ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" FieldType="String"
HeaderText="管线号" HeaderTextAlign="Center" TextAlign="left" Width="180px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField ColumnID="JOT_JointNo" DataField="JOT_JointNo" FieldType="String"
HeaderText="焊口号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="FilmNum" DataField="FilmNum" FieldType="String"
HeaderText="底片编号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="FeedbackDate" DataField="FeedbackDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="反馈日期" HeaderTextAlign="Center" TextAlign="left" Width="120px">
</f:RenderField>
</Columns>
</f:Grid>
<f:TabStrip ID="TabStrip1" ShowBorder="true" TabPosition="Top"
EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server" Height="285">
<Tabs>
<f:Tab Title="焊口返修超期未焊接" BodyPadding="0px" Layout="Fit" runat="server">
<Items>
<f:Grid ID="GridRepair" ShowBorder="false" ShowHeader="false" EnableCollapse="true"
ShowGridHeader="true" runat="server" BoxFlex="0" DataKeyNames="RepairItemRecordId"
AllowSorting="true" SortField="FeedbackDate" SortDirection="ASC" OnSort="GridRepair_Sort"
EnableColumnLines="false" EnableRowLines="false" DataIDField="RepairItemRecordId">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DropDownList ID="drpPro" runat="server" Label="项目号" LabelAlign="Right" EnableEdit="true"
Width="250px" LabelWidth="70px" AutoPostBack="true" OnSelectedIndexChanged="drpPro_SelectedIndexChanged">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill3" runat="server">
</f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String"
HeaderText="施工号" HeaderTextAlign="Center" TextAlign="left" Width="130px">
</f:RenderField>
<f:RenderField ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" FieldType="String"
HeaderText="管线号" HeaderTextAlign="Center" TextAlign="left" Width="180px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField ColumnID="JOT_JointNo" DataField="JOT_JointNo" FieldType="String"
HeaderText="焊口号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="FilmNum" DataField="FilmNum" FieldType="String"
HeaderText="底片编号" HeaderTextAlign="Center" TextAlign="left" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="FeedbackDate" DataField="FeedbackDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="反馈日期" HeaderTextAlign="Center" TextAlign="left" Width="120px">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Tab>
<f:Tab Title="焊口返修超期未委托" BodyPadding="10px"
runat="server">
<Items>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
</f:Panel>
</Items>
HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs
+1 -1
View File
@@ -426,7 +426,7 @@ namespace FineUIPro.Web.common
{
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
}
strSql += " AND DateDiff(d, repairItemRecord.FeedbackDate, GETDATE()) > 7 order by repairItemRecord.FeedbackDate asc";
strSql += " AND DateDiff(d, repairItemRecord.FeedbackDate, GETDATE()) > 3 and repairItemRecord.IsWeld is null order by repairItemRecord.FeedbackDate,repairItemRecord.FilmNum asc";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
this.GridRepair.DataSource = tb;
HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.designer.cs
Generated
+9
View File
@@ -248,6 +248,15 @@ namespace FineUIPro.Web.common
/// </remarks>
protected global::FineUIPro.Panel Panel8;
/// <summary>
/// TabStrip1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// GridRepair 控件。
/// </summary>