lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

焊接修改

This commit is contained in:
李鹏飞 2024-12-10 15:18:31 +08:00
parent f4f7f93835
commit b70dec0803
22 changed files with 266 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_SeDin_New/v17/.wsuo
View File

Binary file not shown.

87
DataBase/版本日志/SGGLDB_V2024-12-06.sql
View File

@ -9,4 +9,89 @@ alter table HJGL_WeldTask
go
alter table Tw_OutputMaster
add AuditMan2 varchar(50),
AuditDate2 datetime
AuditDate2 datetime;
go
alter view dbo.View_HJGL_Pipeline as
SELECT pipeline.PipelineId,
pipeline.ProjectId,
pipeline.UnitId,
pipeline.UnitWorkId,
pipeline.PipelineCode,
pipeline.SingleName,
pipeline.SingleNumber,
pipeline.PipingClassId,
pipeline.MediumId,
pipingClass.PipingClassCode,
pipeline.DetectionRateId,
rate.DetectionRateCode,
pipeline.DetectionType,
pipeline.TestPressure,
pipeline.TestMedium,
pipeline.PressurePipingClassId,
pc.PressurePipingClassCode,
pipeline.PipeLenth,
pipeline.DesignPress,
pipeline.DesignTemperature,
pipeline.Remark,
pipeline.LeakPressure,
pipeline.LeakMedium,
pipeline.VacuumPressure,
pipeline.PCMedium,
pipeline.PCtype,
pipeline.MaterialId,
pipeline.PipeArea,
case pipeline.PipeArea when '1' then '工厂预制' when '2' then '现场施工' else '' end as PipeAreaStr,
pipeline.FlowingSection,
mat.MaterialCode,
dType.DetectionTypeCode,
lea.MediumName AS LeakMediumName,
pur.PurgeMethodName AS PCMediumName,
CAST((SELECT SUM(ISNULL(Size, 0))
FROM dbo.HJGL_WeldJoint
WHERE PipelineId = pipeline.PipelineId) AS DECIMAL(8, 3)) AS TotalDin,
CAST((SELECT ISNULL(SUM(ISNULL(jot.Size, 0)), 0)
FROM dbo.HJGL_WeldJoint jot
WHERE jot.PipelineId = pipeline.PipelineId
AND jot.WeldingDailyId IS NOT NULL) AS DECIMAL(8, 3)) AS FinishSize,
(SELECT COUNT(WeldJointId)
FROM dbo.HJGL_WeldJoint
WHERE PipelineId = pipeline.PipelineId and IsTwoJoint is null) AS JointCount,
(SELECT COUNT(WeldJointId)
FROM dbo.HJGL_WeldJoint
WHERE PipelineId = pipeline.PipelineId
and IsTwoJoint is null
and JointAttribute = '预制口') AS ShopJointCount,
(SELECT COUNT(WeldJointId)
FROM dbo.HJGL_WeldJoint
WHERE PipelineId = pipeline.PipelineId
and IsTwoJoint is null
and WeldingDailyId IS NOT NULL) AS FinishJointCount,
unit.UnitName,
workArea.UnitWorkCode,
medium.MediumCode,
medium.MediumName AS MediumName,
testMedium.MediumCode AS TestMediumCode,
pipeline.ActEndDate AS FinishedDate,
pipeline.IsFinished
FROM dbo.HJGL_Pipeline AS pipeline
LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId = pipeline.PipingClassId
LEFT JOIN dbo.Base_Unit AS unit ON unit.UnitId = pipeline.UnitId
LEFT JOIN WBS_UnitWork AS workArea ON workArea.UnitWorkId = pipeline.UnitWorkId
LEFT JOIN Base_Medium AS medium ON medium.MediumId = pipeline.MediumId
LEFT JOIN dbo.Base_TestMedium AS testMedium ON testMedium.TestMediumId = pipeline.TestMedium
LEFT JOIN dbo.Base_DetectionRate rate ON rate.DetectionRateId = pipeline.DetectionRateId
LEFT JOIN dbo.Base_PressurePipingClass pc ON pc.PressurePipingClassId = pipeline.PressurePipingClassId
LEFT JOIN dbo.Base_TestMedium AS lea ON lea.TestMediumId = pipeline.LeakMedium
LEFT JOIN dbo.Base_PurgeMethod AS pur ON pur.PurgeMethodId = pipeline.PCMedium
LEFT JOIN dbo.Base_Material AS mat ON mat.MaterialId = pipeline.MaterialId
LEFT JOIN dbo.Base_DetectionType dType on dType.DetectionTypeId = pipeline.DetectionType
go
create index HJGL_WeldTask_UnitWorkId_index
on dbo.HJGL_WeldTask (UnitWorkId)
go
create index HJGL_WeldTask_TaskDate_index
on dbo.HJGL_WeldTask (TaskDate)
go

173
SGGL/BLL/API/HJGL/APIPreWeldingDailyService.cs
View File

@ -274,8 +274,8 @@ namespace BLL
{
res = "焊口不存在";
return res;
}
var weldingDaily = db.HJGL_WeldingDaily.FirstOrDefault(x => x.WeldingDate.Value.Date == Convert.ToDateTime(time).Date);
}
var weldingDaily = db.HJGL_WeldingDaily.FirstOrDefault(x => x.WeldingDate.Value.Date == Convert.ToDateTime(time).Date && x.UnitWorkId == joint.UnitWorkId);
var weldTask=db.HJGL_WeldTask.FirstOrDefault(x=>x.WeldJointId==joint.WeldJointId);
if (weldingDaily == null)
{
@ -461,17 +461,11 @@ namespace BLL
/// <returns></returns>
private static string InsertWeldingDailyItem(string weldJointId, string coverWelderId, string backingWelderId, string jointAttribute, DateTime? weldingDate, string batchCondition, bool isSave, string weldingDailyId, string projectId)
{
string errlog = string.Empty;
string[] condition = batchCondition.Split('|');
var project = BLL.ProjectService.GetProjectByProjectId(projectId);
string errlog = string.Empty;
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
var pipeline = BLL.PipelineService.GetPipelineByPipelineId(newWeldJoint.PipelineId);
var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(pipeline.UnitWorkId);
var unit = BLL.UnitService.GetUnitByUnitId(pipeline.UnitId);
var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(newWeldJoint.DetectionTypeId);
var ndtr = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(pipeline.DetectionRateId);
var pipeline = BLL.PipelineService.GetPipelineByPipelineId(newWeldJoint.PipelineId);
var weldingDaily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(weldingDailyId);
if (newWeldJoint != null && string.IsNullOrEmpty(newWeldJoint.WeldingDailyId))
if (newWeldJoint != null /*&& string.IsNullOrEmpty(newWeldJoint.WeldingDailyId)*/)
{
if (!string.IsNullOrEmpty(coverWelderId) && !string.IsNullOrEmpty(backingWelderId))
{
@ -481,6 +475,8 @@ namespace BLL
newWeldJoint.WeldingDailyCode = weldingDaily.WeldingDailyCode;
newWeldJoint.CoverWelderId = coverWelderId;
newWeldJoint.BackingWelderId = backingWelderId;
newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(pipeline.ProjectId, coverWelderId).TeamGroupId;
newWeldJoint.BackingWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(pipeline.ProjectId, backingWelderId).TeamGroupId;
//if (item.WeldingLocationId != Const._Null)
//{
// newWeldJoint.WeldingLocationId = item.WeldingLocationId;
@ -493,163 +489,12 @@ namespace BLL
// 进批
//BLL.Batch_PointBatchItemService.InsertPointBatch(this.ProjectId, this.drpUnit.SelectedValue, this.drpUnitWork.SelectedValue, item.CoverWelderId, item.WeldJointId, weldingDate);
bool isPass = true;
foreach (string c in condition)
if (isSave)
{
if (c == "1")
{
if (string.IsNullOrEmpty(pipeline.UnitWorkId))
{
isPass = false;
break;
}
}
if (c == "2")
{
if (string.IsNullOrEmpty(pipeline.UnitId))
{
isPass = false;
break;
}
}
if (c == "3")
{
if (string.IsNullOrEmpty(newWeldJoint.DetectionTypeId))
{
isPass = false;
break;
}
}
if (c == "4")
{
if (string.IsNullOrEmpty(pipeline.DetectionRateId))
{
isPass = false;
break;
}
}
if (c == "5")
{
if (string.IsNullOrEmpty(pipeline.PipingClassId))
{
isPass = false;
break;
}
}
// 6是管线，7是焊工都不可能为空，这里就不判断了
errlog = PointBatchService.AddBatchByWeldJointId(weldJointId, weldingDate, batchCondition);//自动组批
}
if (isPass)
{
string strSql = @"SELECT PointBatchId FROM dbo.HJGL_Batch_PointBatch
WHERE (EndDate IS NULL OR EndDate ='')
AND ProjectId = @ProjectId
AND UnitWorkId = @UnitWorkId AND UnitId =@UnitId
AND DetectionTypeId =@DetectionTypeId
AND DetectionRateId =@DetectionRateId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", projectId));
listStr.Add(new SqlParameter("@UnitWorkId", pipeline.UnitWorkId));
listStr.Add(new SqlParameter("@UnitId", pipeline.UnitId));
listStr.Add(new SqlParameter("@DetectionTypeId", newWeldJoint.DetectionTypeId));
listStr.Add(new SqlParameter("@DetectionRateId", pipeline.DetectionRateId));
// 5,6,7项为可选项
if (condition.Contains("5"))
{
strSql += " AND PipingClassId =@PipingClassId";
listStr.Add(new SqlParameter("@PipingClassId", pipeline.PipingClassId));
}
if (condition.Contains("6"))
{
strSql += " AND PipelineId =@PipelineId";
listStr.Add(new SqlParameter("@PipelineId", newWeldJoint.PipelineId));
}
if (condition.Contains("7"))
{
strSql += " AND WelderId =@WelderId";
listStr.Add(new SqlParameter("@WelderId", newWeldJoint.CoverWelderId));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable batchInfo = SQLHelper.GetDataTableRunText(strSql, parameter);
string batchId = string.Empty;
if (batchInfo.Rows.Count == 0)
{
Model.HJGL_Batch_PointBatch batch = new Model.HJGL_Batch_PointBatch();
batch.PointBatchId = SQLHelper.GetNewID(typeof(Model.HJGL_Batch_PointBatch));
batchId = batch.PointBatchId;
string perfix = project.ProjectCode + "-" + unitWork.UnitWorkCode + "-GD-DK-" + ndt.DetectionTypeCode + "-" + ndtr.DetectionRateValue.ToString() + "%-";
batch.PointBatchCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_Batch_PointBatch", "PointBatchCode", projectId, perfix);
batch.ProjectId = projectId;
batch.UnitWorkId = pipeline.UnitWorkId;
batch.BatchCondition = batchCondition;
batch.UnitId = pipeline.UnitId;
batch.DetectionTypeId = newWeldJoint.DetectionTypeId;
batch.DetectionRateId = pipeline.DetectionRateId;
if (condition.Contains("5"))
{
batch.PipingClassId = pipeline.PipingClassId;
}
if (condition.Contains("6"))
{
batch.PipelineId = newWeldJoint.PipelineId;
}
if (condition.Contains("7"))
{
batch.WelderId = newWeldJoint.CoverWelderId;
}
batch.StartDate = DateTime.Now;
BLL.PointBatchService.AddPointBatch(batch);
}
else
{
batchId = batchInfo.Rows[0][0].ToString();
}
var b = BLL.PointBatchDetailService.GetBatchDetailByJotId(weldJointId);
if (b == null)
{
try
{
Model.HJGL_Batch_PointBatchItem batchDetail = new Model.HJGL_Batch_PointBatchItem();
string pointBatchItemId = SQLHelper.GetNewID(typeof(Model.HJGL_Batch_PointBatchItem));
batchDetail.PointBatchItemId = pointBatchItemId;
batchDetail.PointBatchId = batchId;
batchDetail.WeldJointId = weldJointId;
batchDetail.WeldingDate = weldingDate;
batchDetail.CreatDate = DateTime.Now;
BLL.Funs.DB.HJGL_Batch_PointBatchItem.InsertOnSubmit(batchDetail);
BLL.Funs.DB.SubmitChanges();
// 焊工首道口RT必点
var joints = from x in Funs.DB.HJGL_Batch_PointBatchItem
join y in Funs.DB.HJGL_Batch_PointBatch on x.PointBatchId equals y.PointBatchId
join z in Funs.DB.Base_DetectionType on y.DetectionTypeId equals z.DetectionTypeId
join j in Funs.DB.HJGL_WeldJoint on x.WeldJointId equals j.WeldJointId
where z.DetectionTypeCode == "RT"
&& j.CoverWelderId == newWeldJoint.CoverWelderId
select x;
if (joints.Count() <= 1)
{
BLL.PointBatchDetailService.UpdatePointBatchDetail(pointBatchItemId, "1", System.DateTime.Now);
BLL.PointBatchDetailService.UpdateWelderFirst(pointBatchItemId, true);
}
}
catch
{
}
}
}
else
{
errlog += "焊口【" + newWeldJoint.WeldJointCode + "】组批条件不能为空。";
}
}

24
SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs
View File

@ -203,5 +203,29 @@ namespace BLL
TwInoutplandetailRelationService.AddList(twinoutplandetailRelationList, inOutPlanMasterId);
}
public static IEnumerable GetPrintListByOutputMasterIds(List<string> outputMasterIds)
{
var q = from x in Funs.DB.Tw_InOutPlanDetail_Relation
join y in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
join plan in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals plan.Id
join master in Funs.DB.Tw_OutputMaster on plan.Id equals master.InOutPlanMasterId
join pipe in Funs.DB.HJGL_Pipeline on x.PipelineId equals pipe.PipelineId
where outputMasterIds.Contains(master.Id)
orderby master.CusBillCode
select new
{
出库单编号 = master.CusBillCode,
管线号=pipe.PipelineCode,
预制组件号= x.PrefabricatedComponents,
材料编码 = x.MaterialCode,
材料名称 = y.MaterialName,
材料描述 = y.MaterialDef,
单位=y.MaterialUnit,
所需量 = x.Number,
};
return q;
}
}
}

19
SGGL/BLL/CLGL/TwOutputdetailService..cs
View File

@ -129,5 +129,24 @@ namespace BLL
}
public static IEnumerable GetPrintListByOutputMasterIds(List<string> outputMasterIds)
{
var q= from x in Funs.DB.Tw_OutputDetail
join y in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
join master in Funs.DB.Tw_OutputMaster on x.OutputMasterId equals master.Id
where outputMasterIds.Contains(x.OutputMasterId)
orderby master.CusBillCode
select new
{
出库单编号 = master.CusBillCode,
材料编码 = x.MaterialCode,
材料名称 = y.MaterialName,
材料描述 = y.MaterialDef,
计划数量 = x.PlanNum,
实际数量 = x.ActNum,
};
return q;
}
}
}

1
SGGL/BLL/CLGL/TwOutputmasterService.cs
View File

@ -52,6 +52,7 @@ namespace BLL
(table.TypeInt == null || x.TypeInt == table.TypeInt) &&
(table.Category == null || x.Category == table.Category) &&
(table.State == null || x.State == table.State)
orderby x.CreateDate descending
select new Model.Tw_InOutMasterOutput
{
Id = x.Id,

2
SGGL/BLL/HJGL/PointTrust/PointBatchService.cs
View File

@ -158,7 +158,7 @@ namespace BLL
}
if (c == "2")
{
if (string.IsNullOrEmpty(pipeline.UnitId))
if (string.IsNullOrEmpty(WeldingDaily.UnitId))
{
isPass = false;
break;

3
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx
View File

@ -77,6 +77,9 @@
<f:DropDownList ID="drpStates" runat="server" Label="状态"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:DropDownList ID="drpCategory" runat="server" Label="类别"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" Text="查询" OnClick="btnSearch_Click">

10
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs
View File

@ -53,6 +53,11 @@ namespace FineUIPro.Web.CLGL
drpStates.DataSource = BLL.TwConst.StateMap;
drpStates.DataBind();
Funs.FineUIPleaseSelect(this.drpStates);
drpCategory.DataTextField = "Key";
drpCategory.DataValueField = "Value";
drpCategory.DataSource = BLL.TwConst.CategoryMap;
drpCategory.DataBind();
Funs.FineUIPleaseSelect(this.drpCategory);
}
#region 数据绑定
@ -72,6 +77,10 @@ namespace FineUIPro.Web.CLGL
{
table.State = Convert.ToInt32(drpStates.SelectedValue);
}
if (drpCategory.SelectedValue != Const._Null)
{
table.Category = Convert.ToInt32(drpCategory.SelectedValue);
}
if (drpWarehouse.SelectedValue != Const._Null)
{
table.WarehouseCode = drpWarehouse.SelectedValue;
@ -284,6 +293,7 @@ namespace FineUIPro.Web.CLGL
ReqUnitName = result.ReqUnitName,
CusBillCode = result.CusBillCode,
CreateDate = result.CreateDate.Value.ToString("yyyy-MM-dd"),
CreateManName = !string.IsNullOrEmpty(result.CreateMan) ? BLL.Person_PersonsService.getSignatureUrl(result.CreateMan) : "",
ProjectName = ProjectService.GetProjectNameByProjectId(result.ProjectId),
CategoryString = result.CategoryString,
BillName = TwConst.PlanPrintMap.Where(x => x.Value == result.TypeInt).Select(x => x.Key).FirstOrDefault(),

9
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.designer.cs generated
View File

@ -149,6 +149,15 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.DropDownList drpStates;
/// <summary>
/// drpCategory 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCategory;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>

6
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx
View File

@ -76,6 +76,9 @@
<f:DropDownList ID="drpStates" runat="server" Label="状态"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:DropDownList ID="drpCategory" runat="server" Label="类别"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" Text="查询" OnClick="btnSearch_Click">
@ -84,6 +87,9 @@
</f:Button>
<f:Button ID="btnGenOutPlanMaster" Text="生成补料申请单" Icon="ArrowRefresh" runat="server" OnClick="btnGenOutPlanMaster_Click" Hidden="true">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>

41
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs
View File

@ -10,6 +10,8 @@ using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using MiniExcelLibs;
using NPOI.SS.Formula.Functions;
namespace FineUIPro.Web.CLGL
{
@ -47,6 +49,11 @@ namespace FineUIPro.Web.CLGL
drpStates.DataSource = BLL.TwConst.StateMap;
drpStates.DataBind();
Funs.FineUIPleaseSelect(this.drpStates);
drpCategory.DataTextField = "Key";
drpCategory.DataValueField = "Value";
drpCategory.DataSource = BLL.TwConst.CategoryMap;
drpCategory.DataBind();
Funs.FineUIPleaseSelect(this.drpCategory);
}
#region 数据绑定
@ -66,6 +73,10 @@ namespace FineUIPro.Web.CLGL
{
table.State = Convert.ToInt32(drpStates.SelectedValue);
}
if (drpCategory.SelectedValue != Const._Null)
{
table.Category = Convert.ToInt32(drpCategory.SelectedValue);
}
if (drpWarehouse.SelectedValue != Const._Null)
{
table.WarehouseCode = drpWarehouse.SelectedValue;
@ -558,10 +569,11 @@ namespace FineUIPro.Web.CLGL
List<Model.Tw_PrintDetail> tw_PrintDetails = new List<Model.Tw_PrintDetail>();
Model.Tw_PrintMaster printMaster = new Model.Tw_PrintMaster
{
ReqUnitName = result.ReqUnitName,
CusBillCode = result.CusBillCode,
CreateDate = result.CreateDate.Value.ToString("yyyy-MM-dd"),
CreateManName = !string.IsNullOrEmpty(result.CreateMan) ? BLL.Person_PersonsService.getSignatureUrl(result.CreateMan) : "",
ProjectName = ProjectService.GetProjectNameByProjectId(result.ProjectId),
CategoryString = result.CategoryString,
BillName = TwConst.PrintMap.Where(x => x.Value == result.TypeInt).Select(x => x.Key).FirstOrDefault(),
@ -650,5 +662,32 @@ namespace FineUIPro.Web.CLGL
#endregion
protected void btnOut_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIDArray.Length > 0)
{
var sheets = new Dictionary<string, object>
{
["出库明细"] = TwOutputdetailService.GetPrintListByOutputMasterIds(Grid1.SelectedRowIDArray.ToList()),
["管线材料明细"] = TwInoutplandetailRelationService.GetPrintListByOutputMasterIds(Grid1.SelectedRowIDArray.ToList())
};
string path = Funs.RootPath + @"File\Excel\Temp\OutputDetail.xlsx";
path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
MiniExcel.SaveAs(path, sheets);
string fileName = "出库明细表.xlsx";
FileInfo info = new FileInfo(path);
long fileSize = info.Length;
System.Web.HttpContext.Current.Response.Clear();
System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
System.Web.HttpContext.Current.Response.Flush();
System.Web.HttpContext.Current.Response.Close();
File.Delete(path);
}
}
}
}

18
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.designer.cs generated
View File

@ -149,6 +149,15 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.DropDownList drpStates;
/// <summary>
/// drpCategory 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCategory;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -185,6 +194,15 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.Button btnGenOutPlanMaster;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// Grid1 控件。
/// </summary>

4
SGGL/FineUIPro.Web/File/Fastreport/材料出库单.frx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/06/2024 16:42:47" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/09/2024 11:08:35" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -84,7 +84,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHshEgxIYkQfIgXTSl13gnL"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREeev+wYP8jmJdmNNn3pXJz"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
<Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>

4
SGGL/FineUIPro.Web/File/Fastreport/材料出库计划单.frx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/06/2024 16:18:48" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/10/2024 09:45:15" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -84,7 +84,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFu0uC3jDjSILbln3ANWj4s"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFS86uT57ZjSzo9HhTkpIww"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
<Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>

28
SGGL/FineUIPro.Web/File/Fastreport/管道焊接任务单.frx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/06/2024 17:43:24" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/10/2024 09:49:49" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -59,7 +59,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREMrQAWDh0fqtKcXNzfqqqi"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHWPVF4cawdM/E/6wxiBHsP"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
<Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
@ -174,33 +174,25 @@ namespace FastReport
</TableRow>
</TableObject>
<DataFooterBand Name="DataFooter1" Top="246.22" Width="1047.06" Height="175.72">
<TableObject Name="Table6" Left="9.45" Width="1030.03" Height="175.72" Border.Lines="Top" ManualBuildEvent="Table6_ManualBuild">
<TableColumn Name="Column65" Width="83.78"/>
<TableColumn Name="Column66" Width="178.33"/>
<TableColumn Name="Column67" Width="178.27"/>
<TableColumn Name="Column85" Width="187.1"/>
<TableColumn Name="Column87" Width="130.4"/>
<TableColumn Name="Column88" Width="272.15"/>
<TableObject Name="Table6" Left="9.45" Width="1030.05" Height="175.72" Border.Lines="Top" ManualBuildEvent="Table6_ManualBuild">
<TableColumn Name="Column65" Width="86.9"/>
<TableColumn Name="Column66" Width="358.73"/>
<TableColumn Name="Column67" Width="188.57"/>
<TableColumn Name="Column85" Width="395.85"/>
<TableRow Name="Row33" Height="74.62">
<TableCell Name="Cell271" Border.Lines="All" Text="备注" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell272" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt" ColSpan="5"/>
<TableCell Name="Cell272" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt" ColSpan="3"/>
<TableCell Name="Cell273" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell331" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell335" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell336" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
</TableRow>
<TableRow Name="Row34" Height="101.1">
<TableCell Name="Cell281" Text="分包制单：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell282" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt">
<PictureObject Name="Picture1" Left="9.45" Top="9.45" Width="151.2" Height="75.6" DataColumn="Table1.CreateManName"/>
<PictureObject Name="Picture1" Left="9.45" Top="9.45" Width="170.1" Height="85.05" DataColumn="Table1.CreateManName"/>
</TableCell>
<TableCell Name="Cell283" Text="专工审核：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell332" HorzAlign="Center" VertAlign="Center">
<PictureObject Name="Picture2" Left="9.45" Top="9.45" Width="160.65" Height="75.6" DataColumn="Table1.AuditManName"/>
</TableCell>
<TableCell Name="Cell337" Text="材控审核：" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell338" HorzAlign="Center" VertAlign="Center">
<PictureObject Name="Picture3" Left="18.9" Top="9.45" Width="198.45" Height="75.6" DataColumn="Table1.AuditManName２"/>
<PictureObject Name="Picture2" Left="9.45" Top="9.45" Width="160.65" Height="85.05" DataColumn="Table1.AuditManName"/>
</TableCell>
</TableRow>
</TableObject>

4
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
View File

@ -130,6 +130,10 @@
HeaderText="总焊口量" HeaderTextAlign="Center"
TextAlign="Right">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ShopJointCount" DataField="ShopJointCount" FieldType="Int"
HeaderText="预制口量" HeaderTextAlign="Center"
TextAlign="Right">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="PipeAreaStr" DataField="PipeAreaStr" SortField="PipeAreaStr"
FieldType="String" HeaderText="管线划分" HeaderTextAlign="Center"
TextAlign="Center">

1
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
View File

@ -317,6 +317,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
完成焊口=x.FinishJointCount,
总达因数 =x.TotalDin,
总焊口量=x.JointCount,
预制口量=x.ShopJointCount,
管线划分 = x.PipeAreaStr,
无损检测类型=x.DetectionTypeCode,
探伤比例 =x.DetectionRateCode,

4
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
View File

@ -87,9 +87,7 @@
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="预制组件打印" ToolTip="预制组件打印" OnClick="btnPrint_Click"></f:Button>
<f:Button ID="btnPassMaster" Text="专工审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster_OnClick" >
</f:Button>
<f:Button ID="btnPassMaster2" Text="材控审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster2_OnClick" >
</f:Button>
</f:Button>
<f:Button ID="btnPrintTask" runat="server" Icon="Printer" EnableAjax="false" Text="焊接任务单打印" ToolTip="焊接任务单打印" OnClick="btnPrintTask_Click"></f:Button>
<f:DatePicker ID="txtTaskDate" Label="计划焊接日期" runat="server"
DateFormatString="yyyy-MM-dd" LabelAlign="Left" LabelWidth="110px" Hidden="true">

5
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
View File

@ -1362,15 +1362,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
where x.ProjectId == this.CurrUser.LoginProjectId &&
x.UnitWorkId == tvControlItem.SelectedNodeID.Split('|')[0] &&
x.UnitId == tvControlItem.SelectedNodeID.Split('|')[1]
&& x.TaskDate.Value.Date == time.Date && x.AuditMan != null && x.AuditMan2 != null &&
&& x.TaskDate.Value.Date == time.Date && x.AuditMan != null &&
x.Tabler != null
select x).FirstOrDefault();
Model.Tw_PrintMaster printMaster = new Model.Tw_PrintMaster
{
CreateManName = !string.IsNullOrEmpty(weldTask_CreateName?.Tabler) ? BLL.Person_PersonsService.getSignatureUrl(weldTask_CreateName.Tabler) : "",
AuditManName = !string.IsNullOrEmpty(weldTask?.AuditMan) ? BLL.Person_PersonsService.getSignatureUrl(weldTask.AuditMan) : "",
AuditManName2 = !string.IsNullOrEmpty(weldTask?.AuditMan2) ? BLL.Person_PersonsService.getSignatureUrl(weldTask.AuditMan2) : "",
AuditManName = !string.IsNullOrEmpty(weldTask?.AuditMan) ? BLL.Person_PersonsService.getSignatureUrl(weldTask.AuditMan) : "",
};
tw_PrintMasters.Add(printMaster);
DataTable Table1 = LINQToDataTable(tw_PrintMasters);

9
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.designer.cs generated
View File

@ -230,15 +230,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Button btnPassMaster;
/// <summary>
/// btnPassMaster2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPassMaster2;
/// <summary>
/// btnPrintTask 控件。
/// </summary>

18
SGGL/Model/Model.cs
View File

@ -280630,6 +280630,8 @@ namespace Model
private System.Nullable<int> _JointCount;
private System.Nullable<int> _ShopJointCount;
private System.Nullable<int> _FinishJointCount;
private string _UnitName;
@ -281242,6 +281244,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ShopJointCount", DbType="Int")]
public System.Nullable<int> ShopJointCount
{
get
{
return this._ShopJointCount;
}
set
{
if ((this._ShopJointCount != value))
{
this._ShopJointCount = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FinishJointCount", DbType="Int")]
public System.Nullable<int> FinishJointCount
{