feat(HJGL): 新增材料仓库管理并优化管线划分页面

**新增功能:**
   - 添加材料仓库管理模块(增删改查)
   - 管线划分页面支持按流水段和管线划分筛选
   - 管线划分页面支持批量设置仓库

   **技术改进:**
   - 新增 Base_Warehouse 表和模型
   - 扩展 HJGL_Pipeline 模型添加 WarehouseId 字段
   - 优化管线查询支持多条件组合
This commit is contained in:
2026-03-05 19:26:36 +08:00
parent 5b89af7fa0
commit b9f4db1a04
18 changed files with 1533 additions and 13 deletions
+265
View File
@@ -266,6 +266,9 @@ namespace Model
partial void InsertBase_UnitType(Base_UnitType instance);
partial void UpdateBase_UnitType(Base_UnitType instance);
partial void DeleteBase_UnitType(Base_UnitType instance);
partial void InsertBase_Warehouse(Base_Warehouse instance);
partial void UpdateBase_Warehouse(Base_Warehouse instance);
partial void DeleteBase_Warehouse(Base_Warehouse instance);
partial void InsertBase_WeldingLocation(Base_WeldingLocation instance);
partial void UpdateBase_WeldingLocation(Base_WeldingLocation instance);
partial void DeleteBase_WeldingLocation(Base_WeldingLocation instance);
@@ -2571,6 +2574,14 @@ namespace Model
}
}
public System.Data.Linq.Table<Base_Warehouse> Base_Warehouse
{
get
{
return this.GetTable<Base_Warehouse>();
}
}
public System.Data.Linq.Table<Base_WeldingLocation> Base_WeldingLocation
{
get
@@ -38761,6 +38772,236 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_Warehouse")]
public partial class Base_Warehouse : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private string _WarehouseId;
private string _WarehouseName;
private string _Remark;
private string _ProjectId;
private string _CreateUserId;
private System.Nullable<System.DateTime> _CreateTime;
private string _ModifyUserId;
private System.Nullable<System.DateTime> _ModifyTime;
#region
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnWarehouseIdChanging(string value);
partial void OnWarehouseIdChanged();
partial void OnWarehouseNameChanging(string value);
partial void OnWarehouseNameChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnCreateUserIdChanging(string value);
partial void OnCreateUserIdChanged();
partial void OnCreateTimeChanging(System.Nullable<System.DateTime> value);
partial void OnCreateTimeChanged();
partial void OnModifyUserIdChanging(string value);
partial void OnModifyUserIdChanged();
partial void OnModifyTimeChanging(System.Nullable<System.DateTime> value);
partial void OnModifyTimeChanged();
#endregion
public Base_Warehouse()
{
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
public string WarehouseId
{
get
{
return this._WarehouseId;
}
set
{
if ((this._WarehouseId != value))
{
this.OnWarehouseIdChanging(value);
this.SendPropertyChanging();
this._WarehouseId = value;
this.SendPropertyChanged("WarehouseId");
this.OnWarehouseIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseName", DbType="NVarChar(200) NOT NULL", CanBeNull=false)]
public string WarehouseName
{
get
{
return this._WarehouseName;
}
set
{
if ((this._WarehouseName != value))
{
this.OnWarehouseNameChanging(value);
this.SendPropertyChanging();
this._WarehouseName = value;
this.SendPropertyChanged("WarehouseName");
this.OnWarehouseNameChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
public string Remark
{
get
{
return this._Remark;
}
set
{
if ((this._Remark != value))
{
this.OnRemarkChanging(value);
this.SendPropertyChanging();
this._Remark = value;
this.SendPropertyChanged("Remark");
this.OnRemarkChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this.OnProjectIdChanging(value);
this.SendPropertyChanging();
this._ProjectId = value;
this.SendPropertyChanged("ProjectId");
this.OnProjectIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateUserId", DbType="NVarChar(50)")]
public string CreateUserId
{
get
{
return this._CreateUserId;
}
set
{
if ((this._CreateUserId != value))
{
this.OnCreateUserIdChanging(value);
this.SendPropertyChanging();
this._CreateUserId = value;
this.SendPropertyChanged("CreateUserId");
this.OnCreateUserIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateTime", DbType="DateTime")]
public System.Nullable<System.DateTime> CreateTime
{
get
{
return this._CreateTime;
}
set
{
if ((this._CreateTime != value))
{
this.OnCreateTimeChanging(value);
this.SendPropertyChanging();
this._CreateTime = value;
this.SendPropertyChanged("CreateTime");
this.OnCreateTimeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ModifyUserId", DbType="NVarChar(50)")]
public string ModifyUserId
{
get
{
return this._ModifyUserId;
}
set
{
if ((this._ModifyUserId != value))
{
this.OnModifyUserIdChanging(value);
this.SendPropertyChanging();
this._ModifyUserId = value;
this.SendPropertyChanged("ModifyUserId");
this.OnModifyUserIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ModifyTime", DbType="DateTime")]
public System.Nullable<System.DateTime> ModifyTime
{
get
{
return this._ModifyTime;
}
set
{
if ((this._ModifyTime != value))
{
this.OnModifyTimeChanging(value);
this.SendPropertyChanging();
this._ModifyTime = value;
this.SendPropertyChanged("ModifyTime");
this.OnModifyTimeChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void SendPropertyChanging()
{
if ((this.PropertyChanging != null))
{
this.PropertyChanging(this, emptyChangingEventArgs);
}
}
protected virtual void SendPropertyChanged(String propertyName)
{
if ((this.PropertyChanged != null))
{
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_WeldingLocation")]
public partial class Base_WeldingLocation : INotifyPropertyChanging, INotifyPropertyChanged
{
@@ -102234,6 +102475,8 @@ namespace Model
private string _FlowingSection;
private string _WarehouseId;
private EntityRef<Base_TestMedium> _Base_TestMedium;
private EntitySet<HJGL_Batch_PointBatch> _HJGL_Batch_PointBatch;
@@ -102338,6 +102581,8 @@ namespace Model
partial void OnStateChanged();
partial void OnFlowingSectionChanging(string value);
partial void OnFlowingSectionChanged();
partial void OnWarehouseIdChanging(string value);
partial void OnWarehouseIdChanged();
#endregion
public HJGL_Pipeline()
@@ -103054,6 +103299,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseId", DbType="NVarChar(50)")]
public string WarehouseId
{
get
{
return this._WarehouseId;
}
set
{
if ((this._WarehouseId != value))
{
this.OnWarehouseIdChanging(value);
this.SendPropertyChanging();
this._WarehouseId = value;
this.SendPropertyChanged("WarehouseId");
this.OnWarehouseIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_[HJGL_Pipeline_Base_TestMedium1", Storage="_Base_TestMedium", ThisKey="LeakMedium", OtherKey="TestMediumId", IsForeignKey=true)]
public Base_TestMedium Base_TestMedium
{