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

新增管道颜色标识导入功能及API控制器

Browse Source 
更新了多个服务和页面，增加了导入管道颜色标识数据的功能，并实现了包装管理、车次管理、管道组件和焊口信息的API控制器。修正了文件路径错误，优化了分页和排序逻辑，删除了不再使用的API方法。
This commit is contained in:
李鹏飞
2025-10-24 10:04:03 +08:00
parent 55b798135c
commit c23d113eae
55 changed files with 1502 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/Model/HJGL/BaseInfo/BaseMaterialcolorDataIn.cs
+37
View File
@@ -0,0 +1,37 @@
using MiniExcelLibs.Attributes;
namespace Model
{
/// <summary>
/// 管道材质颜色导入实体
/// </summary>
public class BaseMaterialcolorDataIn
{
/// <summary>
/// 材质
/// </summary>
[ExcelColumnIndex("A")]
public string MaterialCode { get; set; }
/// <summary>
/// 颜色名称
/// </summary>
[ExcelColumnIndex("B")]
public string ColorName { get; set; }
/// <summary>
/// 色卡号
/// </summary>
[ExcelColumnIndex("C")]
public string ColorCardNo { get; set; }
/// <summary>
/// RGB
/// </summary>
[ExcelColumnIndex("D")]
public string RGB { get; set; }
/// <summary>
/// 备注
/// </summary>
[ExcelColumnIndex("E")]
public string Remark { get; set; }
}
}
SGGL/Model/HJGL/BaseMaterialcolorOutput.cs → SGGL/Model/HJGL/BaseInfo/BaseMaterialcolorOutput.cs
View File
SGGL/Model/HJGL/MaterialStockItem.cs → SGGL/Model/HJGL/PreDesign/Material/MaterialStockItem.cs
View File
SGGL/Model/HJGL/PreDesign/PackagingManage/PackagingManageInput.cs
+59
View File
@@ -0,0 +1,59 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Model
{
/// <summary>
/// 包装管理输入参数
/// </summary>
public class PackagingManageInput
{
/// <summary>
/// 主键
/// </summary>
public string PackagingManageId { get; set; }
/// <summary>
/// 包装编号
/// </summary>
public string PackagingCode { get; set; }
/// <summary>
/// 项目id
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 项目名称
/// </summary>
public string ProjectName { get; set; }
/// <summary>
/// 联系人姓名
/// </summary>
public string ContactName { get; set; }
/// <summary>
/// 联系人电话
/// </summary>
public string ContactPhone { get; set; }
/// <summary>
/// 预制工作包
/// </summary>
public string StackingPosition { get; set; }
/// <summary>
/// 状态
/// </summary>
public int? State { get; set; }
/// <summary>
/// 接收人
/// </summary>
public string ReceiveMan { get; set; }
/// <summary>
/// 接收时间
/// </summary>
public string ReceiveDate { get; set; }
/// <summary>
/// 车次id
/// </summary>
public string TrainNumberId { get; set; }
}
}
SGGL/Model/HJGL/PackagingManagePrintOutput.cs → SGGL/Model/HJGL/PreDesign/PackagingManage/PackagingManagePrintOutput.cs
View File
SGGL/Model/HJGL/PipelineComponentPrintDto.cs → SGGL/Model/HJGL/PreDesign/PipelineComponent/PipelineComponentPrintDto.cs
View File
SGGL/Model/HJGL/Pipeline_ComponentQRCodeItem.cs → SGGL/Model/HJGL/PreDesign/PipelineComponent/Pipeline_ComponentQRCodeItem.cs
View File
SGGL/Model/Model.cs
+239
View File
@@ -6921,6 +6921,14 @@ namespace Model
}
}
public System.Data.Linq.Table<View_HJGL_InstallData> View_HJGL_InstallData
{
get
{
return this.GetTable<View_HJGL_InstallData>();
}
}
public System.Data.Linq.Table<View_HJGL_JointInfoQuery> View_HJGL_JointInfoQuery
{
get
@@ -97820,6 +97828,8 @@ namespace Model
private System.Nullable<System.DateTime> _CompileDate;
private System.Nullable<int> _CategoryInt;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -97856,6 +97866,8 @@ namespace Model
partial void OnCompileManChanged();
partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
partial void OnCompileDateChanged();
partial void OnCategoryIntChanging(System.Nullable<int> value);
partial void OnCategoryIntChanged();
#endregion
public HJGL_PackagingManage()
@@ -98183,6 +98195,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CategoryInt", DbType="Int")]
public System.Nullable<int> CategoryInt
{
get
{
return this._CategoryInt;
}
set
{
if ((this._CategoryInt != value))
{
this.OnCategoryIntChanging(value);
this.SendPropertyChanging();
this._CategoryInt = value;
this.SendPropertyChanged("CategoryInt");
this.OnCategoryIntChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -290556,6 +290588,213 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_InstallData")]
public partial class View_HJGL_InstallData
{
private string _Id;
private string _PipelineCode;
private string _Code;
private string _TypeStr;
private string _Matdef;
private System.Nullable<decimal> _Number;
private string _PackagingCode;
private string _TrainNumber;
private string _FlowingSection;
private string _UnitWorkId;
private string _ProjectId;
public View_HJGL_InstallData()
{
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string Id
{
get
{
return this._Id;
}
set
{
if ((this._Id != value))
{
this._Id = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
public string PipelineCode
{
get
{
return this._PipelineCode;
}
set
{
if ((this._PipelineCode != value))
{
this._PipelineCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="NVarChar(50)")]
public string Code
{
get
{
return this._Code;
}
set
{
if ((this._Code != value))
{
this._Code = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeStr", DbType="VarChar(8) NOT NULL", CanBeNull=false)]
public string TypeStr
{
get
{
return this._TypeStr;
}
set
{
if ((this._TypeStr != value))
{
this._TypeStr = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Matdef", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string Matdef
{
get
{
return this._Matdef;
}
set
{
if ((this._Matdef != value))
{
this._Matdef = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Number", DbType="Decimal(18,2)")]
public System.Nullable<decimal> Number
{
get
{
return this._Number;
}
set
{
if ((this._Number != value))
{
this._Number = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackagingCode", DbType="NVarChar(50)")]
public string PackagingCode
{
get
{
return this._PackagingCode;
}
set
{
if ((this._PackagingCode != value))
{
this._PackagingCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumber", DbType="NVarChar(50)")]
public string TrainNumber
{
get
{
return this._TrainNumber;
}
set
{
if ((this._TrainNumber != value))
{
this._TrainNumber = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FlowingSection", DbType="NVarChar(200)")]
public string FlowingSection
{
get
{
return this._FlowingSection;
}
set
{
if ((this._FlowingSection != value))
{
this._FlowingSection = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(50)")]
public string UnitWorkId
{
get
{
return this._UnitWorkId;
}
set
{
if ((this._UnitWorkId != value))
{
this._UnitWorkId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this._ProjectId = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_JointInfoQuery")]
public partial class View_HJGL_JointInfoQuery
{
SGGL/Model/Model.csproj
+9 -6
View File
@@ -212,11 +212,11 @@
<Compile Include="Chart\DataSourcePoint.cs" />
<Compile Include="Chart\DataSourceTeam.cs" />
<Compile Include="CLGL\Tw_ArrivalStatisticsOutPut.cs" />
<Compile Include="CLGL\Tw_InputDataIn.cs" />
<Compile Include="CLGL\Tw_PipeMatMatchOutput.cs" />
<Compile Include="CLGL\Tw_PrintModel.cs" />
<Compile Include="CLGL\Tw_InOutDetailOutput.cs" />
<Compile Include="CLGL\Tw_InOutMasterOutput.cs" />
<Compile Include="CLGL\Tw_InputDataIn.cs" />
<Compile Include="CLGL\Tw_MaterialStockOutput.cs" />
<Compile Include="CLGL\Tw_PipeLineMat.cs" />
<Compile Include="ConstructionLogCQMS.cs" />
@@ -233,14 +233,16 @@
<Compile Include="FastReportItem.cs" />
<Compile Include="HandleStep.cs" />
<Compile Include="HJGL\3DParameter.cs" />
<Compile Include="HJGL\BaseMaterialcolorOutput.cs" />
<Compile Include="HJGL\MaterialStockItem.cs" />
<Compile Include="HJGL\BaseInfo\BaseMaterialcolorDataIn.cs" />
<Compile Include="HJGL\BaseInfo\BaseMaterialcolorOutput.cs" />
<Compile Include="HJGL\PreDesign\Material\MaterialStockItem.cs" />
<Compile Include="APIItem\HJGL\PackagingManageItem.cs" />
<Compile Include="HJGL\PackagingManagePrintOutput.cs" />
<Compile Include="HJGL\PipelineComponentPrintDto.cs" />
<Compile Include="HJGL\PreDesign\PackagingManage\PackagingManageInput.cs" />
<Compile Include="HJGL\PreDesign\PackagingManage\PackagingManagePrintOutput.cs" />
<Compile Include="HJGL\PreDesign\PipelineComponent\PipelineComponentPrintDto.cs" />
<Compile Include="HJGL\PipeLineIdCodeItem.cs" />
<Compile Include="HJGL\PipelinePrefabricatedComponentsItem.cs" />
<Compile Include="HJGL\Pipeline_ComponentQRCodeItem.cs" />
<Compile Include="HJGL\PreDesign\PipelineComponent\Pipeline_ComponentQRCodeItem.cs" />
<Compile Include="HJGL\PointBatch.cs" />
<Compile Include="HJGL\PointBatchItem.cs" />
<Compile Include="HJGL\PrePipelineItem.cs" />
@@ -299,6 +301,7 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.