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

1

Browse Source
This commit is contained in:
高飞
2026-05-25 15:03:59 +08:00
parent 950fc49cf8
commit 9992a3a6d3
11 changed files with 105 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2026-05-25-gf.sql
+3
View File
@@ -0,0 +1,3 @@
alter table HJGL_MaterialCodeLib add BatchNo nvarchar(50) null
alter table Tw_InOutPlanDetail add BatchNo nvarchar(50) null
GO
SGGL/BLL/CLGL/TwInOutplandetailService.cs
+3 -1
View File
@@ -44,6 +44,7 @@ namespace BLL
PipelineComponentId = x.PipelineComponentId,
MaterialCode = x.MaterialCode,
HeatNo = x.HeatNo,
BatchNo = x.BatchNo,
PlanNum = x.PlanNum,
ActNum = x.ActNum,
PipelineComponentCode = y.PipelineComponentCode,
@@ -121,7 +122,8 @@ namespace BLL
PlanNum = item.PlanNum,
ActNum = item.ActNum,
SortIndex = sortIndex,
HeatNo = item.HeatNo
HeatNo = item.HeatNo,
BatchNo = item.BatchNo
};
sortIndex++;
details.Add(table);
SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs
+5 -1
View File
@@ -30,6 +30,7 @@
{
MaterialCode = codeLib.MaterialCode,
HeatNo = codeLib.HeatNo,
BatchNo = codeLib.BatchNo,
MaterialName = codeLib.MaterialName,
MaterialSpec = codeLib.MaterialSpec,
MaterialMade = codeLib.MaterialMade,
@@ -58,6 +59,7 @@
if (newCodeLib != null)
{
newCodeLib.HeatNo = codeLib.HeatNo;
newCodeLib.BatchNo = codeLib.BatchNo;
newCodeLib.MaterialName = codeLib.MaterialName;
newCodeLib.MaterialSpec = codeLib.MaterialSpec;
newCodeLib.MaterialMade = codeLib.MaterialMade;
@@ -103,9 +105,11 @@
{
MaterialCode = item.MaterialCode,
HeatNo = item.HeatNo,
BatchNo = item.BatchNo,
MaterialName = item.MaterialName,
MaterialSpec = item.MaterialSpec,
MaterialUnit = item.MaterialUnit
MaterialUnit = item.MaterialUnit,
MaterialDef = item.MaterialDef,
};
details.Add(table);
}
SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx
+7 -4
View File
@@ -140,7 +140,7 @@
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="入库申请明细表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
SortDirection="DESC" EnableColumnLines="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10000" EnableTextSelection="True" >
@@ -162,14 +162,17 @@
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉批号" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<%--<f:RenderField Width="300px" ColumnID="MaterialDef" DataField="MaterialDef" SortField="MaterialDef"
<f:RenderField Width="300px" ColumnID="MaterialDef" DataField="MaterialDef" SortField="MaterialDef"
FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" ExpandUnusedSpace="True">
</f:RenderField>--%>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
FieldType="String" HeaderText="数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx
+6 -2
View File
@@ -49,9 +49,13 @@
TextAlign="Left" SortField="MaterialCode">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="HeatNo" DataField="HeatNo"
FieldType="String" HeaderText="炉批号" HeaderTextAlign="Center"
FieldType="String" HeaderText="炉号" HeaderTextAlign="Center"
TextAlign="Left" SortField="HeatNo">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="BatchNo" DataField="BatchNo"
FieldType="String" HeaderText="批号" HeaderTextAlign="Center"
TextAlign="Left" SortField="BatchNo">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="MaterialName" DataField="MaterialName"
FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
TextAlign="Left" SortField="MaterialName">
@@ -93,7 +97,7 @@
</f:Panel>
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close"
IsModal="true" Width="700px" Height="400px">
IsModal="true" Width="700px" Height="450px">
</f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx
+8 -1
View File
@@ -22,7 +22,14 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtHeatNo" runat="server" Label="炉批号"
<f:TextBox ID="txtHeatNo" runat="server" Label="炉号"
Required="true" MaxLength="50" ShowRedStar="true" LabelWidth="100px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtBatchNo" runat="server" Label="批号"
Required="true" MaxLength="50" ShowRedStar="true" LabelWidth="100px">
</f:TextBox>
</Items>
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.cs
+2
View File
@@ -26,6 +26,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
this.txtMaterialCode.Text = materialCode;
this.txtMaterialMade.Text = lib.MaterialMade;
this.txtHeatNo.Text = lib.HeatNo;
this.txtBatchNo.Text = lib.BatchNo;
this.txtMaterialName.Text = lib.MaterialName;
txtMaterialSpec.Text = lib.MaterialSpec;
txtMaterialDef.Text = lib.MaterialDef;
@@ -64,6 +65,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
{
MaterialCode = this.txtMaterialCode.Text.Trim(),
HeatNo = this.txtHeatNo.Text.Trim(),
BatchNo = this.txtBatchNo.Text.Trim(),
MaterialName = this.txtMaterialName.Text.Trim(),
MaterialSpec = this.txtMaterialSpec.Text.Trim(),
MaterialMade = this.txtMaterialMade.Text.Trim(),
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.designer.cs
Generated
+9
View File
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.HJGL.BaseInfo {
/// </remarks>
protected global::FineUIPro.TextBox txtHeatNo;
/// <summary>
/// txtBatchNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBatchNo;
/// <summary>
/// txtMaterialName 控件。
/// </summary>
SGGL/Model/CLGL/Tw_InputDataIn.cs
+14 -6
View File
@@ -17,29 +17,37 @@ namespace Model
/// </summary>
[ExcelColumnIndex("B")] public string MaterialCode { get; set; }
/// <summary>
/// 炉批号
/// 炉号
/// </summary>
[ExcelColumnIndex("C")] public string HeatNo { get; set; }
/// <summary>
/// 批号
/// </summary>
[ExcelColumnIndex("D")] public string BatchNo { get; set; }
/// <summary>
/// 类型
/// </summary>
[ExcelColumnIndex("D")] public string MaterialName { get; set; }
[ExcelColumnIndex("E")] public string MaterialName { get; set; }
/// <summary>
/// 规格
/// </summary>
[ExcelColumnIndex("E")] public string MaterialSpec { get; set; }
[ExcelColumnIndex("F")] public string MaterialSpec { get; set; }
/// <summary>
/// 材料描述
/// </summary>
[ExcelColumnIndex("G")] public string MaterialDef { get; set; }
/// <summary>
/// 单位
/// </summary>
[ExcelColumnIndex("F")] public string MaterialUnit { get; set; }
[ExcelColumnIndex("H")] public string MaterialUnit { get; set; }
/// <summary>
/// 数量
/// </summary>
[ExcelColumnIndex("G")] public string PlanNum { get; set; }
[ExcelColumnIndex("I")] public string PlanNum { get; set; }
/// <summary>
/// 类型
/// </summary>
[ExcelColumnIndex("H")] public string TypeString { get; set; }
[ExcelColumnIndex("J")] public string TypeString { get; set; }
}
}
SGGL/Model/Model.cs
+48
View File
@@ -100586,6 +100586,8 @@ namespace Model
private string _HeatNo;
private string _BatchNo;
private EntityRef<Base_Project> _Base_Project;
private EntitySet<HJGL_PipeLineMat> _HJGL_PipeLineMat;
@@ -100612,6 +100614,8 @@ namespace Model
partial void OnMaterialUnitChanged();
partial void OnHeatNoChanging(string value);
partial void OnHeatNoChanged();
partial void OnBatchNoChanging(string value);
partial void OnBatchNoChanged();
#endregion
public HJGL_MaterialCodeLib()
@@ -100805,6 +100809,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BatchNo", DbType="NVarChar(50)")]
public string BatchNo
{
get
{
return this._BatchNo;
}
set
{
if ((this._BatchNo != value))
{
this.OnBatchNoChanging(value);
this.SendPropertyChanging();
this._BatchNo = value;
this.SendPropertyChanged("BatchNo");
this.OnBatchNoChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_MaterialCodeLib_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@@ -275610,6 +275634,8 @@ namespace Model
private string _HeatNo;
private string _BatchNo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -275630,6 +275656,8 @@ namespace Model
partial void OnSortIndexChanged();
partial void OnHeatNoChanging(string value);
partial void OnHeatNoChanged();
partial void OnBatchNoChanging(string value);
partial void OnBatchNoChanged();
#endregion
public Tw_InOutPlanDetail()
@@ -275797,6 +275825,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BatchNo", DbType="NVarChar(50)")]
public string BatchNo
{
get
{
return this._BatchNo;
}
set
{
if ((this._BatchNo != value))
{
this.OnBatchNoChanging(value);
this.SendPropertyChanging();
this._BatchNo = value;
this.SendPropertyChanged("BatchNo");
this.OnBatchNoChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;