diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 1cf2f498..8015da45 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -405,7 +405,7 @@ - + diff --git a/SGGL/BLL/HJGL/PreDesign/PackagingmanagedetailService.cs b/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs similarity index 61% rename from SGGL/BLL/HJGL/PreDesign/PackagingmanagedetailService.cs rename to SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs index 57ccb6d5..dcfbca42 100644 --- a/SGGL/BLL/HJGL/PreDesign/PackagingmanagedetailService.cs +++ b/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs @@ -1,4 +1,5 @@ using FineUIPro; +using Model; using System; using System.Collections; using System.Collections.Generic; @@ -9,11 +10,8 @@ using System.Text; namespace BLL { - public static class PackagingmanagedetailService - { - - - + public static class HJGLPackagingmanagedetailService + { #region 获取列表 /// /// 记录数 @@ -122,32 +120,71 @@ namespace BLL { return Funs.DB.HJGL_PackagingManageDetail.FirstOrDefault(x => x.Id == Id); } - public static IEnumerable GetPackagingData(string PackagingManageId) + public static IEnumerable GetPackagingData(string PackagingManageId) { - var q = from detail in Funs.DB.HJGL_PackagingManageDetail - join lib in Funs.DB.HJGL_MaterialCodeLib on detail.MaterialCode equals lib.MaterialCode into libJoin - from libItem in libJoin.DefaultIfEmpty() - join line in Funs.DB.HJGL_Pipeline on detail.PipelineId equals line.PipelineId into lineJoin - from lineItem in lineJoin.DefaultIfEmpty() - where detail.PackagingManageId == PackagingManageId - select new - { - detail.Id, - libItem.MaterialCode, - libItem.MaterialName, - libItem.MaterialUnit, - libItem.MaterialSpec, - libItem.MaterialMade, - libItem.MaterialDef, - detail.Number, - lineItem.PipelineId, - lineItem.PipelineCode, + if (string.IsNullOrEmpty(PackagingManageId)) + { + return null; + } + var pack = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId); + if (pack == null) + { + return null; + } + var result = new List(); + if (pack.TypeInt == (int)HJGL_PackagingmanageService.TypeInt.预制散件) + { + var q = from detail in Funs.DB.HJGL_PackagingManageDetail + join lib in Funs.DB.HJGL_MaterialCodeLib on detail.MaterialCode equals lib.MaterialCode into libJoin + from libItem in libJoin.DefaultIfEmpty() + join line in Funs.DB.HJGL_Pipeline on detail.PipelineId equals line.PipelineId into lineJoin + from lineItem in lineJoin.DefaultIfEmpty() + where detail.PackagingManageId == PackagingManageId /*&& (detail.PipelineId != null || detail.PipelineId != "") && (detail.PipelineComponentId == null || detail.PipelineComponentId == "")*/ + select new PipelinePrefabricatedComponentsItem + { + Id = detail.Id, + MaterialCode = libItem.MaterialCode, + MaterialName = libItem.MaterialName, + MaterialUnit = libItem.MaterialUnit, + MaterialSpec = libItem.MaterialSpec, + MaterialMade = libItem.MaterialMade, + MaterialDef = libItem.MaterialDef, + Number = detail.Number, + PipelineId = lineItem.PipelineId, + PipelineCode = lineItem.PipelineCode, + UnitWorkId=lineItem.UnitWorkId, - }; - return q; + }; + result= q.ToList(); + } + else if(pack.TypeInt == (int)HJGL_PackagingmanageService.TypeInt.其他材料) + { + var q = from detail in Funs.DB.HJGL_PackagingManageDetail + join lib in Funs.DB.HJGL_MaterialCodeLib on detail.MaterialCode equals lib.MaterialCode into libJoin + from libItem in libJoin.DefaultIfEmpty() + join line in Funs.DB.HJGL_Pipeline on detail.PipelineId equals line.PipelineId into lineJoin + from lineItem in lineJoin.DefaultIfEmpty() + where detail.PackagingManageId == PackagingManageId /*&& (detail.PipelineId == null || detail.PipelineId == "")*/ + select new PipelinePrefabricatedComponentsItem + { + Id = detail.Id, + MaterialCode = libItem.MaterialCode, + MaterialName = libItem.MaterialName, + MaterialUnit = libItem.MaterialUnit, + MaterialSpec = libItem.MaterialSpec, + MaterialMade = libItem.MaterialMade, + MaterialDef = libItem.MaterialDef, + Number = detail.Number, + PipelineId = lineItem.PipelineId, + PipelineCode = lineItem.PipelineCode, + + }; + result = q.ToList(); + + } + return result; } - public static void Add(Model.HJGL_PackagingManageDetail newtable) { @@ -165,8 +202,6 @@ namespace BLL Funs.DB.HJGL_PackagingManageDetail.InsertOnSubmit(table); Funs.DB.SubmitChanges(); } - - public static void Update(Model.HJGL_PackagingManageDetail newtable) { diff --git a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs index 63a82ecb..c6062033 100644 --- a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs +++ b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs @@ -8,11 +8,11 @@ using System.Data.SqlClient; using System.Linq; using System.Text; - namespace BLL { - - + /// + /// 包装管理服务类 + /// public static class HJGL_PackagingmanageService { public class PackagingManageItem @@ -28,6 +28,8 @@ namespace BLL public string ContactPhone { get; set; } public string StackingPosition { get; set; } public int? State { get; set; } + public int? TypeInt { get; set; } + public string TypeString { get; set; } public string ReceiveMan { get; set; } public string ReceiveDate { get; set; } @@ -36,22 +38,23 @@ namespace BLL public string Code { get; set; } public string TrainNumber { get; set; } public string TrainNumberOld { get; set; } - - } /// /// 未到场 /// public static int state_0 = 0; + /// /// 已发货 /// public static int state_1 = 1; + /// /// 已到场 /// public static int state_2 = 2; + public static ListItem[] GetState() { ListItem[] list = new ListItem[3]; @@ -67,12 +70,19 @@ namespace BLL 预制散件 = 20, 其他材料 = 30, } + public static Dictionary TypeIntMap = new Dictionary { { "预制组件" ,(int)TypeInt.预制组件}, { "预制散件" ,(int)TypeInt.预制散件}, { "其他材料" ,(int)TypeInt.其他材料}, }; + + public static string GetTypeString(int? TypeInt) + { + return TypeIntMap.FirstOrDefault(c => c.Value == TypeInt).Key; + } + public static Model.HJGL_PackagingManage GetHJGL_PackagingManageById(string PackagingManageId) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) @@ -80,6 +90,7 @@ namespace BLL return db.HJGL_PackagingManage.FirstOrDefault(x => x.PackagingManageId == PackagingManageId); } } + public static string GetMinPlanStartDate(string PackagingManageId) { string PlanStartDate = ""; @@ -95,39 +106,40 @@ namespace BLL } return PlanStartDate; } + public static (List Data, int Total) GetPackagingManageList(string projectId, string PackagingCode, int pageIndex = 0, int pageSize = 20) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - var baseQuery = (from x in db.HJGL_PackagingManage - join n in db.Base_Project on x.ProjectId equals n.ProjectId - join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt - from t in tt.DefaultIfEmpty() + join n in db.Base_Project on x.ProjectId equals n.ProjectId + join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt + from t in tt.DefaultIfEmpty() join train in db.HJGL_TrainNumberManage on x.TrainNumberId equals train.Id into trains from train in trains.DefaultIfEmpty() where x.ProjectId == projectId && (string.IsNullOrEmpty(PackagingCode) || x.PackagingCode.Contains(PackagingCode)) - select new PackagingManageItem - { - PackagingManageId = x.PackagingManageId, - PackagingCode = x.PackagingCode, - ProjectName = n.ProjectName, - ContactName = train.ContactName, - ContactPhone = train.ContactPhone, - DriverName = train.DriverName, - DriverPhone = train.DriverPhone, - LicensePlateNumber = train.LicensePlateNumber, - StackingPosition = x.StackingPosition, - State = x.State, - ReceiveMan = t.PersonName, - ReceiveDate = x.ReceiveDate.HasValue ? string.Format("{0:g}", x.ReceiveDate) : "", - PlanStartDate = GetMinPlanStartDate(x.PackagingManageId), - TrainNumberOld = x.TrainNumber, - TrainNumber = train.TrainNumber, - Code = x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).Substring(x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).LastIndexOf("-") + 1), - - }).Distinct(); + select new PackagingManageItem + { + PackagingManageId = x.PackagingManageId, + PackagingCode = x.PackagingCode, + ProjectName = n.ProjectName, + ContactName = train.ContactName, + ContactPhone = train.ContactPhone, + DriverName = train.DriverName, + DriverPhone = train.DriverPhone, + LicensePlateNumber = train.LicensePlateNumber, + StackingPosition = x.StackingPosition, + State = x.State, + TypeInt = x.TypeInt, + TypeString = GetTypeString(x.TypeInt), + ReceiveMan = t.PersonName, + ReceiveDate = x.ReceiveDate.HasValue ? string.Format("{0:g}", x.ReceiveDate) : "", + PlanStartDate = GetMinPlanStartDate(x.PackagingManageId), + TrainNumberOld = x.TrainNumber, + TrainNumber = train.TrainNumber, + Code = x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).Substring(x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).LastIndexOf("-") + 1), + }).Distinct(); var pagedData = baseQuery .OrderByDescending(x => x.Code) @@ -136,11 +148,11 @@ namespace BLL .ToList(); // 获取总记录数（延迟计数优化） - var totalCount = baseQuery.Count(); - return (pagedData, totalCount); - + var totalCount = baseQuery.Count(); + return (pagedData, totalCount); } - } + } + /// /// 形成出库单 /// @@ -153,8 +165,8 @@ namespace BLL model.State = state_1; UpdateHJGL_PackagingManage(model); } - } + /// /// 根据主键获取装箱明细 /// @@ -168,7 +180,7 @@ namespace BLL { var PipelineComponentIds = model.PipelineComponentId.Split(','); string strSql = @"select com.PipelineComponentId, com.PipelineComponentCode,isnull(pipe.PlanStartDate,getdate()) as PlanStartDate,unitwork.UnitWorkName,'1' as num ,'个' as CU - from HJGL_Pipeline_Component com + from HJGL_Pipeline_Component com left join HJGL_Pipeline pipe on com.PipelineId=pipe.PipelineId left join WBS_UnitWork unitwork on pipe.UnitWorkId=unitwork.UnitWorkId "; @@ -179,7 +191,6 @@ namespace BLL tb = SQLHelper.GetDataTableRunText(strSql, parameter); } return tb; - } /// @@ -195,13 +206,36 @@ namespace BLL select x.PackagingCode).Distinct().ToList(); return q; } + public static List GetPackagingManage(string trainNumberId) + { + Model.SGGLDB db = Funs.DB; + var q = (from x in db.HJGL_PackagingManage + where x.TrainNumberId==trainNumberId + select x).Distinct().ToList(); + return q; + } + public static string GetNewPackagingCode(string projectid) + { + string code = ProjectService.GetProjectCodeByProjectId(projectid) + "-" + string.Format("{0:yyyyMMdd}", DateTime.Now) + "-"; + + var q = GetPackagingManageList(projectid, code); + if (q.Total > 0) + { + code = code + (q.Total + 1).ToString().PadLeft(3, '0'); + } + else + { + code = code + "001"; + } + return code; + } + /// /// 新增实体 /// /// public static void AddHJGL_PackagingManage(Model.HJGL_PackagingManage newtable) { - Model.HJGL_PackagingManage table = new Model.HJGL_PackagingManage { PackagingManageId = newtable.PackagingManageId, @@ -224,7 +258,6 @@ namespace BLL db1.SubmitChanges(); } - public static void UpdateHJGL_PackagingManage(Model.HJGL_PackagingManage newtable) { var db1 = Funs.DB; @@ -247,8 +280,8 @@ namespace BLL table.TypeInt = newtable.TypeInt; db1.SubmitChanges(); } - } + public static void DeleteHJGL_PackagingManageById(string PackagingManageId) { var db1 = Funs.DB; @@ -258,10 +291,8 @@ namespace BLL db1.HJGL_PackagingManage.DeleteOnSubmit(table); db1.SubmitChanges(); } - } - /// /// 管线下拉框 /// @@ -278,6 +309,5 @@ namespace BLL Funs.FineUIPleaseSelect(dropName); } } - } } \ No newline at end of file diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs index 7cba2ab3..f2046f18 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs @@ -85,6 +85,95 @@ namespace BLL return Funs.DB.HJGL_Pipeline_Component.FirstOrDefault(e => e.PipeLineMatId == pipeLineMatId); } + /// + /// 获取预制散件 + /// + /// 单位工程Id + /// 管线Id + /// + public static IEnumerable GetPipelinePrefabricatedComponent(string unitworkId, string pipelineId) + { + var query = from pipe in Funs.DB.HJGL_PipeLineMat + join lib in Funs.DB.HJGL_MaterialCodeLib on pipe.MaterialCode equals lib.MaterialCode into libJoin + from libItem in libJoin.DefaultIfEmpty() + join line in Funs.DB.HJGL_Pipeline on pipe.PipelineId equals line.PipelineId into lineJoin + from lineItem in lineJoin.DefaultIfEmpty() + where lineItem != null && lineItem.UnitWorkId == unitworkId && lineItem.PipeArea == "1" + && (pipe.PrefabricatedComponents == null || pipe.PrefabricatedComponents == "") + select new PipelinePrefabricatedComponentsItem + { + Id = pipe.PipeLineMatId, + MaterialCode = libItem.MaterialCode, + MaterialName = libItem.MaterialName, + MaterialUnit = libItem.MaterialUnit, + MaterialSpec = libItem.MaterialSpec, + MaterialMade = libItem.MaterialMade, + MaterialDef = libItem.MaterialDef, + Number = pipe.Number, + PrefabricatedComponents = pipe.PrefabricatedComponents, + PipelineId = lineItem.PipelineId, + }; + + if (!string.IsNullOrEmpty(pipelineId)) + { + query = query.Where(x => x.PipelineId == pipelineId); + } + + query = query.OrderBy(x => x.PrefabricatedComponents); + + + return query.ToList(); + } + /// + /// 获取预制散件 + /// + /// 管线Id + /// + public static IEnumerable GetPipelinePrefabricatedComponent(string pipelineId) + { + var query = from pipe in Funs.DB.HJGL_PipeLineMat + join lib in Funs.DB.HJGL_MaterialCodeLib on pipe.MaterialCode equals lib.MaterialCode into libJoin + from libItem in libJoin.DefaultIfEmpty() + join line in Funs.DB.HJGL_Pipeline on pipe.PipelineId equals line.PipelineId into lineJoin + from lineItem in lineJoin.DefaultIfEmpty() + where lineItem != null && lineItem.PipeArea == "1" + && (pipe.PrefabricatedComponents == null || pipe.PrefabricatedComponents == "") + select new PipelinePrefabricatedComponentsItem + { + Id = pipe.PipeLineMatId, + MaterialCode = libItem.MaterialCode, + MaterialName = libItem.MaterialName, + MaterialUnit = libItem.MaterialUnit, + MaterialSpec = libItem.MaterialSpec, + MaterialMade = libItem.MaterialMade, + MaterialDef = libItem.MaterialDef, + Number = pipe.Number, + PrefabricatedComponents = pipe.PrefabricatedComponents, + PipelineId = lineItem.PipelineId, + }; + + if (!string.IsNullOrEmpty(pipelineId)) + { + query = query.Where(x => x.PipelineId == pipelineId); + } + + query = query.OrderBy(x => x.PrefabricatedComponents); + + var inoutplandetail = (from x in Funs.DB.HJGL_PackagingManageDetail + where x.PipelineId == pipelineId + && (x.PipelineComponentId == null || x.PipelineComponentId == "") + select x).ToList(); + var queryList = query.ToList(); + // 优化 Linq 过滤条件 + var result = (from x in queryList + join y in inoutplandetail on x.MaterialCode equals y.MaterialCode into yy + from y in yy.DefaultIfEmpty() + where y == null + select x).ToList(); + return result; + + } + /// /// 获取打印实体 /// @@ -92,8 +181,7 @@ namespace BLL /// /// /// - public static IEnumerable GetPrintModelByPipelineComponentIds( - string[] PipelineComponentId, string[] PipelineId, bool IsCheckPrint) + public static IEnumerable GetPrintModelByPipelineComponentIds(string[] PipelineComponentId, string[] PipelineId, bool IsCheckPrint) { var db = Funs.DB; var query = @@ -154,9 +242,6 @@ namespace BLL return result; } - - - /// /// 判断管线组件Code是否存在 /// @@ -226,7 +311,7 @@ namespace BLL } /// - /// 添加作业管线 + /// 添加管线预制组件 /// /// public static void AddPipelineComponent(Model.HJGL_Pipeline_Component pipeline) @@ -258,7 +343,7 @@ namespace BLL } /// - /// 修改作业管线 + /// 修改管线预制组件 /// /// public static void UpdatePipelineComponent(Model.HJGL_Pipeline_Component pipeline) @@ -289,7 +374,7 @@ namespace BLL } } /// - /// 修改出库状态 + /// 修改组件出库状态 /// /// /// @@ -306,7 +391,7 @@ namespace BLL } /// - /// 修改打印状态 + /// 修改组件打印状态 /// /// public static void UpdateIsPrint(string[] PipelineComponentId) @@ -324,7 +409,7 @@ namespace BLL } /// - /// 修改生产状态 + /// 修改组件生产状态 /// /// /// @@ -358,7 +443,7 @@ namespace BLL } /// - /// 根据作业管线Id删除一个作业管线信息 + /// 根据管线组件Id删除一个管线组件信息 /// /// public static void DeletePipelineComponent(string pipelineComponentId) @@ -372,7 +457,7 @@ namespace BLL } } /// - /// 根据管线材料id删除对应组件 + /// 根据管线组件id删除对应组件 /// /// public static void DeletePipelineComponentByMatId(string pipeLineMatId) @@ -387,7 +472,7 @@ namespace BLL } /// - /// 根据管线id删除组件 + /// 根据管线组件id删除组件 /// /// public static void DeletePipelineComponentBypipelineId(string pipelineId) @@ -473,25 +558,4 @@ namespace BLL } } - public class PipelineComponentPrintDto - - { - public string PipelineComponentId { get; set; } - public string PipelineComponentCode { get; set; } - public string BoxNumber { get; set; } - public string UnitWorkName { get; set; } - public string PipelineId { get; set; } - public string PreUnit { get; set; } - public string AssembleUnit { get; set; } - public string PrefabricatedComponents { get; set; } - public string QRCode { get; set; } - public int? State { get; set; } - public string PlanStartDate { get; set; } - public string PipelineCode { get; set; } - public string FlowingSection { get; set; } - public string QRCode2 { get; set; } - public string MaterialCode { get; set; } - public bool? IsPrint { get; set; } - } - } diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 41f14550..b58cc7c9 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1559,6 +1559,7 @@ + @@ -10590,6 +10591,13 @@ TrainNumberManageEdit.aspx + + TrainNumberManagerView.aspx + ASPXCodeBehind + + + TrainNumberManagerView.aspx + YardPlanning.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx index 7c753271..e0c6536d 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx @@ -43,7 +43,9 @@ - + + <%-- --%> diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs index 171f7ac5..af9cc677 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Linq; @@ -34,27 +35,26 @@ namespace FineUIPro.Web.HJGL.PreDesign drpTypeInt.DataBind(); - BindGrid(); btnClose.OnClientClick = ActiveWindow.GetHideReference(); if (!string.IsNullOrEmpty(PackagingManageId)) { var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId); + drpTypeInt.Enabled = false; txtPackagingCode.Text = model.PackagingCode; dropPipelineComponentCode.Values = model.PipelineComponentId?.Split(','); txtStackingPosition.Text = model.StackingPosition; drpTrainNumber.SelectedValue = model.TrainNumberId; drpTypeInt.SelectedValue = model.TypeInt.ToString(); - BindGrid2(this.PackagingManageId); if (model.State== HJGL_PackagingmanageService.state_0) { btnSave.Hidden = false; } } else - { + { + drpTypeInt.Enabled = true; btnSave.Hidden = false; - txtPackagingCode.Text = ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId)+"-"+ string.Format("{0:yyyyMMdd}", DateTime.Now)+"-"; - + txtPackagingCode.Text = HJGL_PackagingmanageService.GetNewPackagingCode(this.CurrUser.LoginProjectId); } drpTypeInt_SelectedIndexChanged(null, null); } @@ -70,25 +70,9 @@ namespace FineUIPro.Web.HJGL.PreDesign private void BindGrid2(string PackagingManageId) { - Grid2.DataSource = PackagingmanagedetailService.GetPackagingData(PackagingManageId); + Grid2.DataSource = HJGLPackagingmanagedetailService.GetPackagingData(PackagingManageId); Grid2.DataBind(); - } - - //protected void drpPipelineComponentCode_SelectedIndexChanged(object sender, EventArgs e) - //{ - // if (!string .IsNullOrEmpty(drpPipelineComponentCode.SelectedValue)) - // { - // var model_Component = BLL.HJGL_PipelineComponentService.GetPipelineComponentById(drpPipelineComponentCode.SelectedValue); - // var model_pipe=BLL.PipelineService.GetPipelineByPipelineId(model_Component.PipelineId); - // txtPlanStartDate.Text= model_Component.PlanStartDate.ToString(); - // } - // else - // { - // txtPlanStartDate.Text =String.Empty; - - // } - - //} + } protected void btnSave_Click(object sender, EventArgs e) { @@ -112,7 +96,7 @@ namespace FineUIPro.Web.HJGL.PreDesign //table.ContactPhone = txtContactPhone.Text; table.TrainNumberId = drpTrainNumber.SelectedValue; table.TypeInt = int.Parse(drpTypeInt.SelectedValue); - if (drpTypeInt.SelectedValue == HJGL_PackagingmanageService.TypeInt.预制组件.ToString()) + if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.预制组件).ToString()) { table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values); @@ -134,7 +118,7 @@ namespace FineUIPro.Web.HJGL.PreDesign //table.ContactPhone =txtContactPhone.Text; table.TrainNumberId = drpTrainNumber.SelectedValue; table.TypeInt = int.Parse(drpTypeInt.SelectedValue); - if (drpTypeInt.SelectedValue == HJGL_PackagingmanageService.TypeInt.预制组件.ToString()) + if (drpTypeInt.SelectedValue ==((int)HJGL_PackagingmanageService.TypeInt.预制组件).ToString()) { table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values); @@ -142,6 +126,29 @@ namespace FineUIPro.Web.HJGL.PreDesign } BLL.HJGL_PackagingmanageService.UpdateHJGL_PackagingManage(table); } + SaveDetail(); + } + + private void SaveDetail() + { + + //根据列表中的明细项添加 + List detailLists = new List(); + JArray teamGroupData = Grid2.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + string id = teamGroupRow.Value("id"); + + var mdoel = HJGLPackagingmanagedetailService.GetModelById(id); + if (mdoel != null) + { + mdoel.Number = values.Value("Number"); + } + HJGLPackagingmanagedetailService.Update(mdoel); + } + } protected void btnFind_Click1(object sender, EventArgs e) @@ -175,25 +182,34 @@ namespace FineUIPro.Web.HJGL.PreDesign { dropPipelineComponentCode.Hidden=false; Grid2.Hidden=true; + BindGrid(); } else if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.预制散件).ToString()) { dropPipelineComponentCode.Hidden = true; Grid2.Hidden = false; + btnSelect.Hidden = false; + btnSelectStock.Hidden = true; + BindGrid2(this.PackagingManageId); + } else if (drpTypeInt.SelectedValue == ((int)HJGL_PackagingmanageService.TypeInt.其他材料).ToString()) { dropPipelineComponentCode.Hidden = true; Grid2.Hidden = false; + btnSelect.Hidden = true; + btnSelectStock.Hidden = false; + BindGrid2(this.PackagingManageId); + } - + } protected void Grid2_RowCommand(object sender, GridCommandEventArgs e) { if (e.CommandName == "delete") { string id = e.RowID; - PackagingmanagedetailService.DeleteById(id); + HJGLPackagingmanagedetailService.DeleteById(id); BindGrid2(this.PackagingManageId); } } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelect.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelect.aspx index 1f33b8aa..0fdf4afe 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelect.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelect.aspx @@ -65,8 +65,8 @@ diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelect.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelect.aspx.cs index 73206c13..834a34b0 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelect.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelect.aspx.cs @@ -1,7 +1,9 @@ using BLL; using FastReport.DevComponents.DotNetBar; using FineUIPro.Web.HJGL.WeldingManage; +using Model; using System; +using System.Collections; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -287,50 +289,21 @@ namespace FineUIPro.Web.HJGL.PreDesign #region 数据绑定 - private void BindGrid(string pipelineId, string unitworkid) + private void BindGrid(string pipelineId, string unitworkid) { - var query = from pipe in Funs.DB.HJGL_PipeLineMat - join lib in Funs.DB.HJGL_MaterialCodeLib on pipe.MaterialCode equals lib.MaterialCode into libJoin - from libItem in libJoin.DefaultIfEmpty() - join line in Funs.DB.HJGL_Pipeline on pipe.PipelineId equals line.PipelineId into lineJoin - from lineItem in lineJoin.DefaultIfEmpty() - where lineItem != null && lineItem.UnitWorkId == unitworkid && lineItem.PipeArea == "1" - && (pipe.PrefabricatedComponents == null || pipe.PrefabricatedComponents == "") - select new - { - pipe.PipeLineMatId, - libItem.MaterialCode, - libItem.MaterialName, - libItem.MaterialUnit, - libItem.MaterialSpec, - libItem.MaterialMade, - libItem.MaterialDef, - pipe.Number, - pipe.PrefabricatedComponents, - lineItem.PipelineId, - }; - - if (!string.IsNullOrEmpty(pipelineId)) - { - query = query.Where(x => x.PipelineId == pipelineId); - } - - query = query.OrderBy(x => x.PrefabricatedComponents); - + var Prelist = HJGL_PipelineComponentService.GetPipelinePrefabricatedComponent(unitworkid, pipelineId); + var inoutplandetail = (from x in Funs.DB.HJGL_PackagingManageDetail - //where x.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID - where x.PipelineId == pipelineId - && (x.PipelineComponentId == null || x.PipelineComponentId == "") - select x).ToList(); - var queryList=query.ToList(); - // 优化 Linq 过滤条件 - var result = (from x in queryList - join y in inoutplandetail on x.MaterialCode equals y.MaterialCode into yy - from y in yy.DefaultIfEmpty() - where y == null - select x).ToList(); - - // 2.获取当前分页数据 + where x.PipelineId == pipelineId + && (x.PipelineComponentId == null || x.PipelineComponentId == "") + select x).ToList(); + var queryList = Prelist; + // 优化 Linq 过滤条件,过滤已经进入包装的预制散件 + var result = (from x in queryList + join y in inoutplandetail on x.MaterialCode equals y.MaterialCode into yy + from y in yy.DefaultIfEmpty() + where y == null + select x).ToList(); Grid1.DataSource = result; Grid1.DataBind(); } @@ -388,7 +361,7 @@ namespace FineUIPro.Web.HJGL.PreDesign CreateTime = DateTime.Now, CreateUser = this.CurrUser.PersonId, }; - PackagingmanagedetailService.Add(model); + HJGLPackagingmanagedetailService.Add(model); } } } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelectStock.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelectStock.aspx index e851c5f9..26564c52 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelectStock.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelectStock.aspx @@ -78,9 +78,9 @@ - - + --%> <%-- diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelectStock.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelectStock.aspx.cs index 42a7502b..184d358f 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelectStock.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageSelectStock.aspx.cs @@ -1,31 +1,33 @@ using BLL; +using Model; using System; using System.Collections.Generic; using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; namespace FineUIPro.Web.HJGL.PreDesign { public partial class PackagingManageSelectStock : PageBase { - public string Id + public string PackagingManageId { get { - return (string)ViewState["Id"]; + return (string)ViewState["PackagingManageId"]; } set { - ViewState["Id"] = value; + ViewState["PackagingManageId"] = value; } } protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) { - Id = Request.QueryString["Id"]; + PackagingManageId = Request.QueryString["PackagingManageId"]; // 绑定表格 this.BindGrid(); } @@ -36,33 +38,25 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 绑定数据 /// private void BindGrid() - { - - var inoutplanmaster = TwInOutplanmasterService.GetById(Id); - if (inoutplanmaster == null) - { - return; - } - + { Model.Tw_MaterialStockOutput table = new Model.Tw_MaterialStockOutput(); table.PipeLineMatCode = txtMatCode.Text.Trim(); - table.WarehouseCode = inoutplanmaster.WarehouseCode; - table.ProjectId = this.CurrUser.LoginProjectId; - if (inoutplanmaster.Category == (int)TwConst.Category.管段) - { - table.MaterialUnit = "米"; + table.WarehouseCode = "工厂预制"; + table.ProjectId = this.CurrUser.LoginProjectId; + var tb = BLL.TwMaterialstockService.GetTw_MaterialStockByModle(table); - } - else if (inoutplanmaster.Category == (int)TwConst.Category.管件) - { - table.MaterialUnit = "个"; - - } - - var tb = BLL.TwMaterialstockService.GetListData(table, Grid1); - Grid1.RecordCount = TwMaterialstockService.Count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); - Grid1.DataSource = tb; + var inoutplandetail = (from x in Funs.DB.HJGL_PackagingManageDetail + where x.PackagingManageId == PackagingManageId + select x).ToList(); + var queryList = tb; + // 优化 Linq 过滤条件,过滤已经进入包装的预制散件 + var result = (from x in queryList + join y in inoutplandetail on x.PipeLineMatCode equals y.MaterialCode into yy + from y in yy.DefaultIfEmpty() + where y == null + select x).ToList(); + Grid1.RecordCount = result.Count; + Grid1.DataSource = result; Grid1.DataBind(); } #endregion @@ -90,28 +84,21 @@ namespace FineUIPro.Web.HJGL.PreDesign { foreach (var id in List_Id) { - var StockModel = TwMaterialstockService.GetTw_MaterialStockById(id); - var querydetail = new Model.Tw_InOutDetailOutput() + var StockModel = TwMaterialstockService.GetTw_MaterialStockById(id); + var model = new Model.HJGL_PackagingManageDetail() { - InOutPlanMasterId = Id, + Id = SQLHelper.GetNewID(), + PackagingManageId = this.PackagingManageId, MaterialCode = StockModel.PipeLineMatCode, + Number = 0, + CreateTime = DateTime.Now, + CreateUser = this.CurrUser.PersonId, }; - var detail = TwInOutplandetailService.GetByModle(querydetail).FirstOrDefault(); - if (detail == null) - { - var tw_InOutPlanDetail = new Model.Tw_InOutPlanDetail - { - Id = Guid.NewGuid().ToString(), - InOutPlanMasterId = Id, - MaterialCode = StockModel.PipeLineMatCode, - PlanNum = 0, - }; - TwInOutplandetailService.Add(tw_InOutPlanDetail); - } + HJGLPackagingmanagedetailService.Add(model); } } - } + #endregion #region GV 数据操作 diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs index 5b96f5cb..bab5b46e 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx.cs @@ -1,9 +1,11 @@ using BLL; +using Model; using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.IO; +using System.Linq; using System.Text; using AspNet = System.Web.UI.WebControls; namespace FineUIPro.Web.HJGL.PreDesign @@ -43,14 +45,36 @@ namespace FineUIPro.Web.HJGL.PreDesign /// private void BindGrid() { - - DataTable tb = BLL.HJGL_PackagingmanageService.GetPackagingDetailById(PackagingManageId); + var pack = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId); + if (pack == null) return; + if (pack.TypeInt == (int)HJGL_PackagingmanageService.TypeInt.预制组件) + { + DataTable tb = BLL.HJGL_PackagingmanageService.GetPackagingDetailById(PackagingManageId); - Grid1.RecordCount = tb.Rows.Count; - tb = GetFilteredTable(Grid1.FilteredData, tb); - var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = table; - Grid1.DataBind(); + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + else + { + var result = HJGLPackagingmanagedetailService.GetPackagingData(PackagingManageId).ToList(); + var detailList = from x in result + select new + { + PipelineComponentId = x.Id, + PipelineComponentCode = x.MaterialCode, + num = x.Number, + CU = x.MaterialUnit, + UnitWorkName = x.UnitWorkId == null ? "" : UnitWorkService.GetNameById(x.UnitWorkId) + }; + Grid1.RecordCount = detailList.Count(); + Grid1.DataSource = detailList; + Grid1.DataBind(); + } + + } #endregion diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx index 71529c18..63716924 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx @@ -5,114 +5,119 @@ - + 车次管理表
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManagerView.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManagerView.aspx.cs new file mode 100644 index 00000000..01684c8a --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManagerView.aspx.cs @@ -0,0 +1,104 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.HJGL.PreDesign +{ + public partial class TrainNumberManagerView : PageBase + { + public string TrainNumberId + { + get + { + return (string)ViewState["TrainNumberId"]; + } + set + { + ViewState["TrainNumberId"] = value; + } + } + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + TrainNumberId = Request.Params["TrainNumberId"]; + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格 + BindGrid(); + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + + var result = HJGL_PackagingmanageService.GetPackagingManage(TrainNumberId); + Grid1.RecordCount = result.Count(); + Grid1.DataSource = result; + Grid1.DataBind(); + + + } + #endregion + + + #region 表头过滤 + protected void Grid1_FilterChange(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + #endregion + + #region 排序 + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + #endregion + + #region 分页选择下拉改变事件 + /// + /// 分页选择下拉改变事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManagerView.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManagerView.aspx.designer.cs new file mode 100644 index 00000000..aea7f066 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManagerView.aspx.designer.cs @@ -0,0 +1,89 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.PreDesign +{ + + + public partial class TrainNumberManagerView + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/Model/HJGL/PipelineComponentPrintDto.cs b/SGGL/Model/HJGL/PipelineComponentPrintDto.cs new file mode 100644 index 00000000..bca1a27c --- /dev/null +++ b/SGGL/Model/HJGL/PipelineComponentPrintDto.cs @@ -0,0 +1,23 @@ +namespace Model +{ + public class PipelineComponentPrintDto + { + public string PipelineComponentId { get; set; } + public string PipelineComponentCode { get; set; } + public string BoxNumber { get; set; } + public string UnitWorkName { get; set; } + public string PipelineId { get; set; } + public string PreUnit { get; set; } + public string AssembleUnit { get; set; } + public string PrefabricatedComponents { get; set; } + public string QRCode { get; set; } + public int? State { get; set; } + public string PlanStartDate { get; set; } + public string PipelineCode { get; set; } + public string FlowingSection { get; set; } + public string QRCode2 { get; set; } + public string MaterialCode { get; set; } + public bool? IsPrint { get; set; } + } + +} diff --git a/SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs b/SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs new file mode 100644 index 00000000..788eb820 --- /dev/null +++ b/SGGL/Model/HJGL/PipelinePrefabricatedComponentsItem.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + /// + /// 管线预制散件 + /// + public class PipelinePrefabricatedComponentsItem + { + public string Id { get; set; } + public string MaterialCode { get; set; } + public string MaterialName { get; set; } + public string MaterialUnit { get; set; } + public string MaterialSpec { get; set; } + public string MaterialMade { get; set; } + public string MaterialDef { get; set; } + public decimal? Number { get; set; } + public string PrefabricatedComponents { get; set; } + public string PipelineId { get; set; } + public string PipelineCode { get; set; } + public string UnitWorkId { get; set; } + public string ProjectId { get; set; } + } +} diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index 0a35e1d5..472a096b 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -225,7 +225,9 @@ + +