shecs
/
Basf_TCC11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

This commit is contained in:
佘春生 2024-07-08 11:08:50 +08:00
parent 10ba0f997b
commit 594f0e295b
5 changed files with 54 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

9
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs
View File

@ -534,9 +534,13 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
Model.Repair_RepairRecord repairRecord = BLL.RepairRecordService.GetRepairRecordById(repairRecordId);
var pipe = BLL.Pipeline_WeldJointService.GetViewWeldJointById(repairRecord.WeldJointId);
string pipelineId = string.Empty;
string weldingMethodId = string.Empty;
string grooveTypeId = string.Empty;
if (pipe != null)
{
pipelineId = pipe.PipelineId;
weldingMethodId= pipe.WeldingMethodId;
grooveTypeId = pipe.GrooveTypeId;
}
var t = from x in Funs.DB.Batch_BatchTrustItem where x.RepairRecordId == repairRecordId select x;
if (t.Count() == 0)
@ -557,6 +561,8 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
newRepairTrust.WorkAreaId = repairRecord.WorkAreaId;
newRepairTrust.DetectionTypeId = repairRecord.DetectionTypeId;
newRepairTrust.PipelineId = pipelineId;
newRepairTrust.WeldingMethodId = weldingMethodId;
newRepairTrust.GrooveTypeId= grooveTypeId;
BLL.Batch_BatchTrustService.AddBatchTrust(newRepairTrust); // 新增返修委托单
Model.Batch_BatchTrustItem newRepairTrustItem = new Model.Batch_BatchTrustItem();
@ -572,6 +578,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
var exp = BLL.RepairRecordService.GetExportItem(repairRecordId);
if (exp != null)
{
var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(exp.First().WeldJointId);
string exportTrustCode = string.Empty;
if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 4) == "K1R2")
{
@ -600,6 +607,8 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
newExportTrust.WorkAreaId = repairRecord.WorkAreaId;
newExportTrust.DetectionTypeId = repairRecord.DetectionTypeId;
newExportTrust.PipelineId = pipelineId;
newExportTrust.WeldingMethodId = jot.WeldingMethodId;
newExportTrust.GrooveTypeId = jot.GrooveTypeId;
BLL.Batch_BatchTrustService.AddBatchTrust(newExportTrust); // 新增扩透委托单
foreach (var q in exp)

4
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/NDTByWelder.aspx
View File

@ -13,8 +13,8 @@
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="<%$ Resources:Lan,NDTByWelder %>"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WelderCode"
AllowCellEditing="true" ClicksToEdit="2" DataIDField="WelderCode" AllowSorting="true"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true"
AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
SortField="WeldTypeName,WelderCode" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True">

55
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/NDTByWelder.aspx.designer.cs generated
View File

@ -2,15 +2,17 @@
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.WeldingReport {
namespace FineUIPro.Web.WeldingProcess.WeldingReport
{
public partial class NDTByWelder {
public partial class NDTByWelder
{
/// <summary>
/// form1 控件。
@ -57,15 +59,6 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpProjectId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectId;
/// <summary>
/// drpUnitId 控件。
/// </summary>
@ -84,6 +77,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport {
/// </remarks>
protected global::FineUIPro.DropDownList drpInstallationId;
/// <summary>
/// drpWorkAreaId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkAreaId;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -111,33 +113,6 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport {
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpWorkAreaId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkAreaId;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// labNumber 控件。
/// </summary>

2
HJGL/WebApi/WebApi.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>