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

重构包装管理服务，优化数据结构与接口

Browse Source 
移除 APIPackagingManageService，功能迁移至 HJGLPackagingmanageService 并进行重构，新增方法支持包装与组件关联管理、分页查询、状态描述等功能。
更新 PackagingManageController，替换旧服务调用，新增接口方法。
调整数据库结构，新增子表 HJGL_PackagingManageDetail，优化包装与组件的关联存储。
更新前端页面逻辑，适配新数据结构，新增 StackingPosition 字段显示。
优化 Model 层字段定义，调整长度限制，提升性能与一致性。
更新报表模板与项目文件，移除冗余代码，提升代码可维护性。
This commit is contained in:
李鹏飞
2025-10-29 17:00:27 +08:00
parent 98663b00f7
commit d35ff80f3e
19 changed files with 912 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/Model/Model.cs
+177 -159
View File
@@ -12267,7 +12267,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
public string ApproveIdea
{
get
@@ -97820,10 +97820,10 @@ namespace Model
private string _TrainNumber;
private System.Nullable<int> _TypeInt;
private string _TrainNumberId;
private System.Nullable<int> _TypeInt;
private string _CompileMan;
private System.Nullable<System.DateTime> _CompileDate;
@@ -97858,10 +97858,10 @@ namespace Model
partial void OnReceiveDateChanged();
partial void OnTrainNumberChanging(string value);
partial void OnTrainNumberChanged();
partial void OnTypeIntChanging(System.Nullable<int> value);
partial void OnTypeIntChanged();
partial void OnTrainNumberIdChanging(string value);
partial void OnTrainNumberIdChanged();
partial void OnTypeIntChanging(System.Nullable<int> value);
partial void OnTypeIntChanged();
partial void OnCompileManChanging(string value);
partial void OnCompileManChanged();
partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
@@ -98115,26 +98115,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")]
public System.Nullable<int> TypeInt
{
get
{
return this._TypeInt;
}
set
{
if ((this._TypeInt != value))
{
this.OnTypeIntChanging(value);
this.SendPropertyChanging();
this._TypeInt = value;
this.SendPropertyChanged("TypeInt");
this.OnTypeIntChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")]
public string TrainNumberId
{
@@ -98155,6 +98135,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")]
public System.Nullable<int> TypeInt
{
get
{
return this._TypeInt;
}
set
{
if ((this._TypeInt != value))
{
this.OnTypeIntChanging(value);
this.SendPropertyChanging();
this._TypeInt = value;
this.SendPropertyChanged("TypeInt");
this.OnTypeIntChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
public string CompileMan
{
@@ -109402,7 +109402,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(50)")]
public string Rectification
{
get
@@ -109528,7 +109528,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(50)")]
public string Measures
{
get
@@ -162243,7 +162243,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
public string AttentPerson
{
get
@@ -193226,7 +193226,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
public string ProjectDescription
{
get
@@ -193346,7 +193346,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
public string CalculationRule
{
get
@@ -193406,7 +193406,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
public string ConstructionSubcontractor
{
get
@@ -193790,7 +193790,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WorkPackageEstimate
{
get
@@ -194095,16 +194095,6 @@ namespace Model
private string _ProjectId;
private string _ContractId;
private string _OrderCode;
private System.Nullable<System.DateTime> _OrderInDate;
private System.Nullable<System.DateTime> _OrderOutDate;
private string _MaterialRequisitionUnit;
private System.Nullable<int> _State;
private string _InvoiceCode;
@@ -194133,6 +194123,16 @@ namespace Model
private string _CreateUser;
private string _ContractId;
private System.Nullable<System.DateTime> _OrderInDate;
private string _OrderCode;
private System.Nullable<System.DateTime> _OrderOutDate;
private string _MaterialRequisitionUnit;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -194141,16 +194141,6 @@ namespace Model
partial void OnInvoiceIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnContractIdChanging(string value);
partial void OnContractIdChanged();
partial void OnOrderCodeChanging(string value);
partial void OnOrderCodeChanged();
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderInDateChanged();
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderOutDateChanged();
partial void OnMaterialRequisitionUnitChanging(string value);
partial void OnMaterialRequisitionUnitChanged();
partial void OnStateChanging(System.Nullable<int> value);
partial void OnStateChanged();
partial void OnInvoiceCodeChanging(string value);
@@ -194179,6 +194169,16 @@ namespace Model
partial void OnCreateDateChanged();
partial void OnCreateUserChanging(string value);
partial void OnCreateUserChanged();
partial void OnContractIdChanging(string value);
partial void OnContractIdChanged();
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderInDateChanged();
partial void OnOrderCodeChanging(string value);
partial void OnOrderCodeChanged();
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderOutDateChanged();
partial void OnMaterialRequisitionUnitChanging(string value);
partial void OnMaterialRequisitionUnitChanged();
#endregion
public PHTGL_Invoice()
@@ -194226,106 +194226,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
public string OrderCode
{
get
{
return this._OrderCode;
}
set
{
if ((this._OrderCode != value))
{
this.OnOrderCodeChanging(value);
this.SendPropertyChanging();
this._OrderCode = value;
this.SendPropertyChanged("OrderCode");
this.OnOrderCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderInDate
{
get
{
return this._OrderInDate;
}
set
{
if ((this._OrderInDate != value))
{
this.OnOrderInDateChanging(value);
this.SendPropertyChanging();
this._OrderInDate = value;
this.SendPropertyChanged("OrderInDate");
this.OnOrderInDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderOutDate
{
get
{
return this._OrderOutDate;
}
set
{
if ((this._OrderOutDate != value))
{
this.OnOrderOutDateChanging(value);
this.SendPropertyChanging();
this._OrderOutDate = value;
this.SendPropertyChanged("OrderOutDate");
this.OnOrderOutDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
public string MaterialRequisitionUnit
{
get
{
return this._MaterialRequisitionUnit;
}
set
{
if ((this._MaterialRequisitionUnit != value))
{
this.OnMaterialRequisitionUnitChanging(value);
this.SendPropertyChanging();
this._MaterialRequisitionUnit = value;
this.SendPropertyChanged("MaterialRequisitionUnit");
this.OnMaterialRequisitionUnitChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
public System.Nullable<int> State
{
@@ -194606,6 +194506,106 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderInDate
{
get
{
return this._OrderInDate;
}
set
{
if ((this._OrderInDate != value))
{
this.OnOrderInDateChanging(value);
this.SendPropertyChanging();
this._OrderInDate = value;
this.SendPropertyChanged("OrderInDate");
this.OnOrderInDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
public string OrderCode
{
get
{
return this._OrderCode;
}
set
{
if ((this._OrderCode != value))
{
this.OnOrderCodeChanging(value);
this.SendPropertyChanging();
this._OrderCode = value;
this.SendPropertyChanged("OrderCode");
this.OnOrderCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderOutDate
{
get
{
return this._OrderOutDate;
}
set
{
if ((this._OrderOutDate != value))
{
this.OnOrderOutDateChanging(value);
this.SendPropertyChanging();
this._OrderOutDate = value;
this.SendPropertyChanged("OrderOutDate");
this.OnOrderOutDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
public string MaterialRequisitionUnit
{
get
{
return this._MaterialRequisitionUnit;
}
set
{
if ((this._MaterialRequisitionUnit != value))
{
this.OnMaterialRequisitionUnitChanging(value);
this.SendPropertyChanging();
this._MaterialRequisitionUnit = value;
this.SendPropertyChanged("MaterialRequisitionUnit");
this.OnMaterialRequisitionUnitChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -290638,6 +290638,8 @@ namespace Model
private string _ProjectId;
private string _StackingPosition;
public View_HJGL_InstallData()
{
}
@@ -290817,6 +290819,22 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StackingPosition", DbType="NVarChar(50)")]
public string StackingPosition
{
get
{
return this._StackingPosition;
}
set
{
if ((this._StackingPosition != value))
{
this._StackingPosition = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_JointInfoQuery")]
@@ -314162,7 +314180,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
public string Name
{
get
@@ -314739,7 +314757,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -314930,7 +314948,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -320269,7 +320287,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -321741,7 +321759,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -331292,7 +331310,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")]
public string ContractNo
{
get
@@ -331312,7 +331330,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")]
public string UnitWorks
{
get