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

补充材料编码和批次信息展示

Browse Source
This commit is contained in:
李鹏飞
2026-05-27 17:57:11 +08:00
parent 33394e09ab
commit 729cf24338
30 changed files with 276 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
+9
View File
@@ -70,6 +70,9 @@ namespace BLL
StockNum = m == null ? 0 : (decimal)m.StockNum,
NeedNum = x == null ? 0 : x.NeedNum,
RealNum = y == null ? 0 : y.RealNum,
Code = z == null ? null : z.Code,
HeatNo = z == null ? null : z.HeatNo,
BatchNo = z == null ? null : z.BatchNo,
MaterialName = z == null ? null : z.MaterialName,
MaterialSpec = z == null ? null : z.MaterialSpec,
MaterialUnit = z == null ? null : z.MaterialUnit,
@@ -213,6 +216,9 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc
PipelineCode = z.PipelineCode,
PrefabricatedComponents = x.PrefabricatedComponents,
MaterialCode = x.MaterialCode,
Code = y.Code,
HeatNo = y.HeatNo,
BatchNo = y.BatchNo,
MaterialName = y.MaterialName,
MaterialSpec = y.MaterialSpec,
MaterialUnit = y.MaterialUnit,
@@ -261,6 +267,9 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc
UnitWorkName = m.UnitWorkName,
PrefabricatedComponents = x.PrefabricatedComponents,
MaterialCode = x.MaterialCode,
Code = y.Code,
HeatNo = y.HeatNo,
BatchNo = y.BatchNo,
MaterialName = y.MaterialName,
MaterialSpec = y.MaterialSpec,
MaterialUnit = y.MaterialUnit,
SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs
+8 -2
View File
@@ -66,6 +66,9 @@ namespace BLL
y.PipelineCode,
x.InOutPlanMasterId,
x.MaterialCode,
Code = mat.Code,
mat.HeatNo,
mat.BatchNo,
x.PrefabricatedComponents,
x.Number,
mat.MaterialName,
@@ -219,7 +222,10 @@ namespace BLL
出库单编号 = master.CusBillCode,
管线号 = pipe.PipelineCode,
预制组件号 = x.PrefabricatedComponents,
材料编码 = x.MaterialCode,
材料主编码 = x.MaterialCode,
材料编码 = y.Code,
炉号 = y.HeatNo,
批号 = y.BatchNo,
材料名称 = y.MaterialName,
材料描述 = y.MaterialDef,
单位 = y.MaterialUnit,
@@ -228,4 +234,4 @@ namespace BLL
return q;
}
}
}
}
SGGL/BLL/CLGL/TwInOutplandetailService.cs
+3 -2
View File
@@ -42,7 +42,8 @@ namespace BLL
Id = x.Id,
InOutPlanMasterId = x.InOutPlanMasterId,
PipelineComponentId = x.PipelineComponentId,
MaterialCode = mat.Code,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = x.HeatNo,
BatchNo = x.BatchNo,
PlanNum = x.PlanNum,
@@ -200,4 +201,4 @@ namespace BLL
}
}
}
}
SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs
+3
View File
@@ -45,6 +45,9 @@ namespace BLL
InputMasterId = x.InputMasterId,
CusBillCode = master.CusBillCode,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
MaterialName = mat.MaterialName,
MaterialDef = mat.MaterialDef,
BarCode = x.BarCode
SGGL/BLL/CLGL/TwInputdetailService.cs
+7 -1
View File
@@ -40,6 +40,9 @@ namespace BLL
InputMasterId = x.InputMasterId,
PipelineComponentId = x.PipelineComponentId,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
PlanNum = x.PlanNum,
ActNum = x.ActNum,
PipelineComponentCode = y.PipelineComponentCode,
@@ -135,7 +138,10 @@ namespace BLL
select new
{
入库单编号 = y.CusBillCode,
材料编码 = x.MaterialCode,
材料主编码 = x.MaterialCode,
材料编码 = mat.Code,
炉号 = mat.HeatNo,
批号 = mat.BatchNo,
材料名称 = mat.MaterialName,
材料描述 = mat.MaterialDef,
计划数量 = x.PlanNum,
SGGL/BLL/CLGL/TwMaterialstockService.cs
+4 -1
View File
@@ -42,6 +42,9 @@ namespace BLL
PipeLineMatCode = x.PipeLineMatCode,
StockNum = x.StockNum,
ProjectId = x.ProjectId,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
MaterialName = mat.MaterialName,
MaterialSpec = mat.MaterialSpec,
MaterialUnit = mat.MaterialUnit,
@@ -158,4 +161,4 @@ namespace BLL
}
}
}
}
}
SGGL/BLL/CLGL/TwOutputdetailService..cs
+8 -2
View File
@@ -44,6 +44,9 @@ namespace BLL
TypeInt = master.TypeInt,
PipelineComponentId = x.PipelineComponentId,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
PlanNum = x.PlanNum,
ActNum = x.ActNum,
PipelineComponentCode = y.PipelineComponentCode,
@@ -155,7 +158,10 @@ namespace BLL
select new
{
出库单编号 = master.CusBillCode,
材料编码 = x.MaterialCode,
材料主编码 = x.MaterialCode,
材料编码 = y.Code,
炉号 = y.HeatNo,
批号 = y.BatchNo,
材料名称 = y.MaterialName,
材料描述 = y.MaterialDef,
计划数量 = x.PlanNum,
@@ -165,4 +171,4 @@ namespace BLL
}
}
}
}
SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs
+8 -2
View File
@@ -108,6 +108,9 @@ namespace BLL
public static DataTable GetSHOPStockDt(string projectid)
{
string strSql = @" SELECT mat.MaterialCode,
lib.Code,
lib.HeatNo,
lib.BatchNo,
lib.MaterialName,
lib.MaterialSpec,
lib.MaterialUnit,
@@ -157,7 +160,7 @@ namespace BLL
GROUP BY stockused.MaterialCode,stockused.MaterialName,stockused.MaterialUnit,stockused.MaterialSpec,stockused.MaterialMade ) AS aa
ON mat.MaterialCode=aa.MaterialCode
WHERE mat.projectid=@projectid
GROUP BY mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num
GROUP BY mat.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num
";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -171,6 +174,9 @@ namespace BLL
{
string strSql = @"
SELECT mat.MaterialCode,
lib.Code,
lib.HeatNo,
lib.BatchNo,
lib.MaterialName,
lib.MaterialSpec,
lib.MaterialUnit,
@@ -223,7 +229,7 @@ namespace BLL
ON mat.MaterialCode=aa.MaterialCode
WHERE mat.projectid=@Projectid
AND Ins.State=@State
GROUP BY mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num ";
GROUP BY mat.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@Projectid", projectid));
listStr.Add(new SqlParameter("@PipeArea", BLL.PipelineService.PipeArea_SHOP));