diff --git a/DataBase/版本日志/SGGLDB_V2026-05-19-gf.sql b/DataBase/版本日志/SGGLDB_V2026-05-19-gf.sql index 087bc6ba..2e89698a 100644 --- a/DataBase/版本日志/SGGLDB_V2026-05-19-gf.sql +++ b/DataBase/版本日志/SGGLDB_V2026-05-19-gf.sql @@ -4,4 +4,13 @@ GO insert into Sys_Menu values('2F027233-22EC-4063-A04F-FB9FE6A91588','ϲֿ',null,'HJGL/BaseInfo/Warehouse.aspx',30,'60F4B988-4D1D-48D6-A959-2EA4BD2978A1','Menu_HJGL',0,1,1) -GO \ No newline at end of file +GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('CFDC5365-2050-49F2-B1E5-8E5B7DA2D5DC','2F027233-22EC-4063-A04F-FB9FE6A91588','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('E6303B08-335C-47B5-B1F9-AD2E70068838','2F027233-22EC-4063-A04F-FB9FE6A91588','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('F7D6FE99-01C2-465E-8029-CF83BCB1362E','2F027233-22EC-4063-A04F-FB9FE6A91588','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('DE51285D-5F2C-4122-BD80-C8CC2A68D027','2F027233-22EC-4063-A04F-FB9FE6A91588','',4) + GO \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2026-05-25-gf-002.sql b/DataBase/版本日志/SGGLDB_V2026-05-25-gf-002.sql new file mode 100644 index 00000000..37c51ebd --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-05-25-gf-002.sql @@ -0,0 +1,2 @@ +alter table Tw_InOutPlanDetail add DeliveryDate datetime null +GO \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2026-05-25-gf.sql b/DataBase/版本日志/SGGLDB_V2026-05-25-gf.sql new file mode 100644 index 00000000..75d4c4f1 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-05-25-gf.sql @@ -0,0 +1,3 @@ +alter table HJGL_MaterialCodeLib add BatchNo nvarchar(50) null +alter table Tw_InOutPlanDetail add BatchNo nvarchar(50) null +GO \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2026-05-25-lpf.sql b/DataBase/版本日志/SGGLDB_V2026-05-25-lpf.sql new file mode 100644 index 00000000..d91b7bf3 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-05-25-lpf.sql @@ -0,0 +1 @@ +UPDATE Sys_Menu set SuperMenu ='0' , SortIndex ='14' where MenuId ='1C6F9CA9-FDAC-4CE5-A19C-5536538851E1'; \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2026-05-26-gf.sql b/DataBase/版本日志/SGGLDB_V2026-05-26-gf.sql new file mode 100644 index 00000000..88e1dc90 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-05-26-gf.sql @@ -0,0 +1,2 @@ +alter table [dbo].[HJGL_MaterialCodeLib] add Code nvarchar(50) null +GO \ No newline at end of file diff --git a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs index d0831ae5..896701d7 100644 --- a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs +++ b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs @@ -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, @@ -240,7 +246,7 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc /// /// /// - public static List GetPipeMatMatch(string projectId, List pipelineIds, string warehouseCode) + public static List GetPipeMatMatch(string projectId, List pipelineIds, string warehouseCode, Dictionary> priorityComponents = null) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { @@ -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, @@ -271,7 +280,20 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc var newRequiredMaterials = new List(); foreach (string id in pipelineIds) { - newRequiredMaterials.AddRange(requiredMaterials.Where(x => x.PipelineId == id)); + var pipelineMaterials = requiredMaterials.Where(x => x.PipelineId == id).ToList(); + if (priorityComponents != null && priorityComponents.ContainsKey(id) && priorityComponents[id] != null && priorityComponents[id].Any()) + { + var components = priorityComponents[id]; + newRequiredMaterials.AddRange(pipelineMaterials + .Where(x => components.Contains(x.PrefabricatedComponents)) + .OrderBy(x => components.IndexOf(x.PrefabricatedComponents))); + newRequiredMaterials.AddRange(pipelineMaterials + .Where(x => !components.Contains(x.PrefabricatedComponents))); + } + else + { + newRequiredMaterials.AddRange(pipelineMaterials); + } } results = GetMatMatchOutput(newRequiredMaterials, warehouseCode, projectId); return results; diff --git a/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs b/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs index f8f618b1..ea011d04 100644 --- a/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs +++ b/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs @@ -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; } } -} \ No newline at end of file +} diff --git a/SGGL/BLL/CLGL/TwInOutplandetailService.cs b/SGGL/BLL/CLGL/TwInOutplandetailService.cs index 077be9c0..aec9d136 100644 --- a/SGGL/BLL/CLGL/TwInOutplandetailService.cs +++ b/SGGL/BLL/CLGL/TwInOutplandetailService.cs @@ -43,13 +43,16 @@ namespace BLL InOutPlanMasterId = x.InOutPlanMasterId, PipelineComponentId = x.PipelineComponentId, MaterialCode = x.MaterialCode, + Code = mat.Code, HeatNo = x.HeatNo, + BatchNo = x.BatchNo, PlanNum = x.PlanNum, ActNum = x.ActNum, PipelineComponentCode = y.PipelineComponentCode, MaterialName = mat.MaterialName, MaterialDef = mat.MaterialDef, StockNum = stock.StockNum ?? 0, + DeliveryDate = x.DeliveryDate, } ; @@ -117,11 +120,13 @@ namespace BLL Id = SQLHelper.GetNewID(), InOutPlanMasterId = inoutPlanMasterId, PipelineComponentId = item.PipelineComponentId, - MaterialCode = item.MaterialCode, + MaterialCode = item.MaterialCode + "-" + item.HeatNo + "-" + item.BatchNo, PlanNum = item.PlanNum, ActNum = item.ActNum, SortIndex = sortIndex, - HeatNo = item.HeatNo + HeatNo = item.HeatNo, + BatchNo = item.BatchNo, + DeliveryDate = item.DeliveryDate }; sortIndex++; details.Add(table); @@ -196,4 +201,4 @@ namespace BLL } } -} \ No newline at end of file +} diff --git a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs index 679af536..c7a4032d 100644 --- a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs +++ b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs @@ -275,9 +275,9 @@ namespace BLL { //if (temeplateDtoIns.Count == 0) //{ - responeData.code = 0; - responeData.message = errorWarehouseCode + "仓库不存在！"; - return responeData; + responeData.code = 0; + responeData.message = errorWarehouseCode + "仓库不存在！"; + return responeData; //} } var typeString = temeplateDtoIns.Select(x => x.TypeString).Distinct().ToList(); //获取导入文件的类型 @@ -293,7 +293,20 @@ namespace BLL responeData.message = errorWarehouseCode + "每次只能导入一种类型！"; return responeData; } - + var dateTypeString = temeplateDtoIns.Select(x => x.DeliveryDate).Distinct().ToList(); //获取导入文件的类型 + foreach (var item in dateTypeString) + { + try + { + DateTime date = Convert.ToDateTime(item); + } + catch (Exception) + { + responeData.code = 0; + responeData.message = errorWarehouseCode + "到货时间[" + item + "]格式错误！"; + return responeData; + } + } //var materialCodeList = temeplateDtoIns.Select(x => x.MaterialCode).Distinct().ToList(); //获取导入文件的材料编码 //var IsExitMaterialCode = @@ -707,18 +720,41 @@ namespace BLL return; } var pipelineList = db.View_HJGL_WeldingTask.Where(e => e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date && e.SerialNumber == serialNumber).OrderBy(x => x.PipeLineSortIndex).Select(x => x.PipelineId).Distinct().ToList(); + var taskWeldJointIds = db.View_HJGL_WeldingTask + .Where(e => e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date && e.SerialNumber == serialNumber && e.WeldJointId != null) + .Select(e => e.WeldJointId) + .Distinct() + .ToList(); + var taskComponents = (from relation in db.HJGL_Pipeline_ComponentJoint + join component in db.HJGL_Pipeline_Component on relation.PipelineComponentId equals component.PipelineComponentId into componentJoin + from componentItem in componentJoin.DefaultIfEmpty() + join weldJointItem in db.HJGL_WeldJoint on relation.WeldJointId equals weldJointItem.WeldJointId + where taskWeldJointIds.Contains(relation.WeldJointId) + && weldJointItem.PipelineId != null + && (relation.PipelineComponentCode != null || (componentItem != null && componentItem.PipelineComponentCode != null)) + select new + { + PipelineId = weldJointItem.PipelineId, + PipelineComponentCode = componentItem != null && componentItem.PipelineComponentCode != null ? componentItem.PipelineComponentCode : relation.PipelineComponentCode + }).Distinct().ToList(); //领料出库需要排除散件材料 - var MaterDatial = from x in db.HJGL_PipeLineMat - join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode - where pipelineList.Contains(x.PipelineId) && x.PrefabricatedComponents != null - select new - { - x.PipelineId, - x.PrefabricatedComponents, - x.MaterialCode, - x.Number, - y.MaterialUnit, - }; + var allMaterDatial = (from x in db.HJGL_PipeLineMat + join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode + where pipelineList.Contains(x.PipelineId) && x.PrefabricatedComponents != null + select new + { + x.PipelineId, + x.PrefabricatedComponents, + x.MaterialCode, + x.Number, + y.MaterialUnit, + }).ToList(); + var componentPipelineIds = taskComponents.Select(x => x.PipelineId).Distinct().ToList(); + var MaterDatial = taskComponents.Any() + ? allMaterDatial.Where(mat => !componentPipelineIds.Contains(mat.PipelineId) + || taskComponents.Any(component => component.PipelineId == mat.PipelineId + && component.PipelineComponentCode == mat.PrefabricatedComponents)).ToList() + : allMaterDatial; //var outMateriaList = from x in db.HJGL_PipeLineMat // join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode // where pipelineList.Contains(x.PipelineId) @@ -774,7 +810,7 @@ namespace BLL }; TwInOutplandetailService.Add(detail); } - var twinoutplandetailRelationList = MaterDatial.ToList().Select(x => new Tw_InOutPlanDetail_Relation + var twinoutplandetailRelationList = MaterDatial.Select(x => new Tw_InOutPlanDetail_Relation { PipelineId = x.PipelineId, MaterialCode = x.MaterialCode, @@ -813,7 +849,7 @@ namespace BLL }; TwInOutplandetailService.Add(detail); } - var twinoutplandetailRelationList = MaterDatial.ToList().Select(x => new Tw_InOutPlanDetail_Relation + var twinoutplandetailRelationList = MaterDatial.Select(x => new Tw_InOutPlanDetail_Relation { PipelineId = x.PipelineId, MaterialCode = x.MaterialCode, @@ -828,4 +864,4 @@ namespace BLL } -} \ No newline at end of file +} diff --git a/SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs b/SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs index 39b92a64..cec3453e 100644 --- a/SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs +++ b/SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs @@ -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 diff --git a/SGGL/BLL/CLGL/TwInputdetailService.cs b/SGGL/BLL/CLGL/TwInputdetailService.cs index 4ac4a4e3..188ec6cf 100644 --- a/SGGL/BLL/CLGL/TwInputdetailService.cs +++ b/SGGL/BLL/CLGL/TwInputdetailService.cs @@ -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, diff --git a/SGGL/BLL/CLGL/TwMaterialstockService.cs b/SGGL/BLL/CLGL/TwMaterialstockService.cs index 6d3bcc3e..ac078e0b 100644 --- a/SGGL/BLL/CLGL/TwMaterialstockService.cs +++ b/SGGL/BLL/CLGL/TwMaterialstockService.cs @@ -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 } } } -} \ No newline at end of file +} diff --git a/SGGL/BLL/CLGL/TwOutputdetailService..cs b/SGGL/BLL/CLGL/TwOutputdetailService..cs index 2c082dd1..bbd6db54 100644 --- a/SGGL/BLL/CLGL/TwOutputdetailService..cs +++ b/SGGL/BLL/CLGL/TwOutputdetailService..cs @@ -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 } } -} \ No newline at end of file +} diff --git a/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs b/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs index bc61976a..c2ab5c3e 100644 --- a/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs @@ -30,13 +30,15 @@ { MaterialCode = codeLib.MaterialCode, HeatNo = codeLib.HeatNo, + BatchNo = codeLib.BatchNo, MaterialName = codeLib.MaterialName, MaterialSpec = codeLib.MaterialSpec, MaterialMade = codeLib.MaterialMade, MaterialDef = codeLib.MaterialDef, PipeGrade = codeLib.PipeGrade, MaterialUnit = codeLib.MaterialUnit, - ProjectId = codeLib.ProjectId + ProjectId = codeLib.ProjectId, + Code = codeLib.Code }; db.HJGL_MaterialCodeLib.InsertOnSubmit(newCodeLib); db.SubmitChanges(); @@ -58,12 +60,14 @@ if (newCodeLib != null) { newCodeLib.HeatNo = codeLib.HeatNo; + newCodeLib.BatchNo = codeLib.BatchNo; newCodeLib.MaterialName = codeLib.MaterialName; newCodeLib.MaterialSpec = codeLib.MaterialSpec; newCodeLib.MaterialMade = codeLib.MaterialMade; newCodeLib.MaterialDef = codeLib.MaterialDef; newCodeLib.PipeGrade = codeLib.PipeGrade; newCodeLib.MaterialUnit = codeLib.MaterialUnit; + newCodeLib.Code = codeLib.Code; db.SubmitChanges(); } } @@ -94,20 +98,28 @@ { var materialCodes = from x in db.HJGL_MaterialCodeLib select x.MaterialCode; var ls = from x in list - where !materialCodes.Contains(x.MaterialCode) + where !materialCodes.Contains(x.MaterialCode + "-" + x.HeatNo + "-" + x.BatchNo) select x; + List codes = new List(); List details = new List(); foreach (var item in ls) { - Model.HJGL_MaterialCodeLib table = new Model.HJGL_MaterialCodeLib + if (!codes.Contains(item.MaterialCode + "-" + item.HeatNo + "-" + item.BatchNo)) { - MaterialCode = item.MaterialCode, - HeatNo = item.HeatNo, - MaterialName = item.MaterialName, - MaterialSpec = item.MaterialSpec, - MaterialUnit = item.MaterialUnit - }; - details.Add(table); + Model.HJGL_MaterialCodeLib table = new Model.HJGL_MaterialCodeLib + { + MaterialCode = item.MaterialCode + "-" + item.HeatNo + "-" + item.BatchNo, + HeatNo = item.HeatNo, + BatchNo = item.BatchNo, + MaterialName = item.MaterialName, + MaterialSpec = item.MaterialSpec, + MaterialUnit = item.MaterialUnit, + MaterialDef = item.MaterialDef, + Code = item.MaterialCode + }; + details.Add(table); + codes.Add(table.MaterialCode); + } } db.HJGL_MaterialCodeLib.InsertAllOnSubmit(details); diff --git a/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs b/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs index 784ed5f9..f46f48e7 100644 --- a/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs +++ b/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs @@ -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 listStr = new List(); @@ -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 listStr = new List(); listStr.Add(new SqlParameter("@Projectid", projectid)); listStr.Add(new SqlParameter("@PipeArea", BLL.PipelineService.PipeArea_SHOP)); diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx index ef42c711..3e1f0ab4 100644 --- a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx +++ b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx @@ -61,8 +61,17 @@ + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx index faac25eb..27081c7f 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx @@ -140,7 +140,7 @@ ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> @@ -158,21 +158,30 @@ - + + + + FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center"> + + - <%-- - --%> + + + diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx index 5959a00d..8a8f7a58 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx @@ -66,8 +66,17 @@ + + + + + + @@ -81,6 +90,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx index 8a0923cd..6d157b9a 100644 --- a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx @@ -144,8 +144,17 @@ + + + + + + @@ -179,8 +188,17 @@ FieldType="String" HeaderText="入库单编号" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx b/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx index ec77b46a..ecc6a8e7 100644 --- a/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx +++ b/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx @@ -65,8 +65,17 @@ FieldType="String" HeaderText="仓库编码" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx index 3fc1bf06..6e34cb4e 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx @@ -178,8 +178,17 @@ + + + + + + @@ -211,10 +220,22 @@ FieldType="String" HeaderText="预制组件号" HeaderTextAlign="Center" TextAlign="Left"> - + + + + + + @@ -262,10 +283,22 @@ FieldType="String" HeaderText="预制组件号" HeaderTextAlign="Center" TextAlign="Left"> - + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx index 1df44192..f3b0c768 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx @@ -81,8 +81,17 @@ FieldType="String" HeaderText="管线号" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + @@ -118,8 +127,17 @@ FieldType="String" HeaderText="管线号" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx index e066e76b..75914890 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx @@ -61,8 +61,17 @@ FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx index fee957db..0d2499e0 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx @@ -87,8 +87,17 @@ + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs index af52b468..a8e0e2b4 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs @@ -233,6 +233,9 @@ namespace FineUIPro.Web.CLGL x.PipeLineMatId, x.PipelineId, x.MaterialCode, + lib.Code, + lib.HeatNo, + lib.BatchNo, lib.MaterialName, lib.MaterialSpec, lib.MaterialUnit, @@ -358,4 +361,4 @@ namespace FineUIPro.Web.CLGL #endregion } -} \ No newline at end of file +} diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx index 68676741..2bdd6a00 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx @@ -64,8 +64,17 @@ FieldType="String" HeaderText="仓库编码" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx index bc301bee..8640e859 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx @@ -177,8 +177,17 @@ FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center"> --%> + + + + + + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/PipelineMat.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/PipelineMat.xlsx index 736e3a0f..d21e1b9b 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/PipelineMat.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/PipelineMat.xlsx differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx index d8da1ea3..cb9dff80 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx b/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx index d18c601f..4b64d246 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -84,7 +84,7 @@ namespace FastReport } - + @@ -137,7 +137,7 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx index 6892e540..8bdea399 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -99,7 +99,7 @@ namespace FastReport } - + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index f626f6b8..d4f3e8a1 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1637,6 +1637,7 @@ + @@ -10975,6 +10976,13 @@ PrePipelineQRCodeIn.aspx + + PrePipelineComponentJointIn.aspx + ASPXCodeBehind + + + PrePipelineComponentJointIn.aspx + ProductionSchedulingPlan.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx index 6fe9ff9b..4c64fc73 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx @@ -22,7 +22,7 @@ - @@ -44,14 +44,18 @@ - + TextAlign="Left" SortField="Code"> + + @@ -93,7 +97,7 @@