From 883493e02e8722703ba9276b206fd9141fb89b10 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Tue, 26 May 2026 21:33:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(hjgl):=E9=A2=84=E5=88=B6=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=9D=90=E6=96=99=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=82=89=E5=8F=B7=E6=89=B9=E5=8F=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../File/Excel/DataIn/PipelineMat.xlsx | Bin 8784 -> 8986 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- .../HJGL/WeldingManage/PipelineMatIn.aspx.cs | 229 ++---------------- 3 files changed, 25 insertions(+), 206 deletions(-) diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/PipelineMat.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/PipelineMat.xlsx index 736e3a0f290fea6351a9bdbcf89602ec4d91a9ca..d21e1b9b26b67131f1ba5a4d3aadc30a8e7adb28 100644 GIT binary patch literal 8986 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 eZ_@t7{Pzs0tBHYJT>t - + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs index c97666d8..719ec24c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs @@ -133,207 +133,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage } #endregion #region 将Dataset的数据导入数据库 - /// - /// 将Dataset的数据导入数据库 - /// - /// 数据集 - /// 数据集行数 - /// - private Model.ResponeData AddDatasetToSQL(DataTable pds, int Cols) - { - Model.ResponeData responeData = new Model.ResponeData(); - List result = new List(); - - int ic, ir; - ic = pds.Columns.Count; - ir = pds.Rows.Count; - if (ic < Cols) - { - responeData.code = 0; - responeData.message = "导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列"; - return responeData; - } - // DataRow[] dv = pds.Select("主项编号 <>'' and 管线号 <>'' and 材料编码 <>'' and 数量 <>''and 管线划分<>'' "); - DataRow[] dv = pds.Select(" 管线号 <>'' and 材料编码 <>'' and 数量 <>'' "); - - //导入数据库 - if (dv.Length > 0) - { - for (int i = 0; i < dv.Length; i++) - { - HJGL_PipeLineMat item = new HJGL_PipeLineMat(); - - #region 数据验证和赋值 - - - string unitworkId = string.Empty; - unitworkId = Request.Params["UnitWorkId"]; - string PipeArea = string.Empty;//管线划分 1工厂预制 2现场施工 - - if (dv[i]["管线号"] != null && !string.IsNullOrEmpty(dv[i]["管线号"].ToString())) - { - var pipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == unitworkId && x.PipelineCode == dv[i]["管线号"].ToString().Trim() select x; - if (pipeline.Count() > 0) - { - item.PipelineId = pipeline.First().PipelineId; - PipeArea = pipeline.First().PipeArea; - } - else - { - // errorInfos += (i + 2) + "Line,"+ dv[i]["管线号"].ToString() + " [管线号] 不存在
"; - result.Add("不存在此管线号-" + dv[i]["管线号"].ToString()); - - - } - - } - else - { - //errorInfos += (i + 2) + "Line, [管线号] 不能为空
"; - result.Add((i + 2) + "Line, [管线号] 不能为空
"); - } - //if (dv[i]["管线划分"] != null && !string.IsNullOrEmpty(dv[i]["管线划分"].ToString())) - //{ - // string txtPipeArea = ""; - // switch (PipeArea) - // { - // case "1": - // txtPipeArea = "工厂预制"; - // break; - // case "2": - // txtPipeArea = "现场施工"; - // break; - // default: - // txtPipeArea = "无"; - // break; - // } - // if (!Equals(txtPipeArea, dv[i]["管线划分"].ToString().Trim())) - // { - // errorInfos += (i + 2) + "Line, [管线划分] 不匹配
"; - - // } - //} - //else - //{ - // errorInfos += (i + 2) + "Line, [管线划分] 不能为空
"; - - //} - - - if (dv[i]["材料编码"] != null && !string.IsNullOrEmpty(dv[i]["材料编码"].ToString())) - { - var lib = from x in Funs.DB.HJGL_MaterialCodeLib where x.MaterialCode == dv[i]["材料编码"].ToString() select x; - if (lib.Count() > 0) - { - item.MaterialCode = dv[i]["材料编码"].ToString(); - } - else - { - //errorInfos += (i + 2) + "Line," + dv[i]["材料编码"].ToString() + " [材料编码] 不存在
"; - result.Add("不存在此材料编码-" + dv[i]["材料编码"].ToString()); - - } - - } - else - { - //errorInfos += (i + 2) + "Line, [材料编码] 不能为空
"; - result.Add((i + 2) + "Line, [材料编码] 不能为空
"); - } - - if (dv[i]["数量"] != null && !string.IsNullOrEmpty(dv[i]["数量"].ToString())) - { - try - { - var number = Funs.GetNewDecimal(dv[i]["数量"].ToString()); - item.Number = number; - } - catch (Exception) - { - //errorInfos += "第" + (i + 2).ToString() + "行," + "数量格式输入有误
"; - result.Add("第" + (i + 2).ToString() + "行," + "数量格式输入有误
"); - } - - } - else - { - //errorInfos += (i + 2) + "Line, [数量] 不能为空
"; - result.Add((i + 2) + "Line, [数量] 不能为空
"); - } - - if (PipeArea == "1") - { - if (dv[i]["预制组件"] != null && !string.IsNullOrEmpty(dv[i]["预制组件"].ToString())) - { - item.PrefabricatedComponents = dv[i]["预制组件"].ToString(); - - } - else - { - result.Add((i + 2) + "Line, [预制组件] 不能为空
"); - } - } - var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode && x.PrefabricatedComponents == item.PrefabricatedComponents); - if (model.Count() == 0) - { - matList.Add(item); - - } - //if (PipeArea == "1")//工厂预制 - //{ - - // var model= matList.Where(x => x.PrefabricatedComponents == item.PrefabricatedComponents && x.MaterialCode == item.MaterialCode); - // if (model.Count()==0) - // { - // matList.Add(item); - - // } - - //} else if (PipeArea == "2")//现场施工 - //{ - // var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode); - // if (model.Count() == 0) - // { - // matList.Add(item); - - // } - //} - //item.PipeLineMatId= SQLHelper.GetNewID(typeof(Model.HJGL_PipeLineMat)); - //if (!matList.Select(x => x.MaterialCode).Contains(item.MaterialCode)) - //{ - // matList.Add(item); - //} - - #endregion - } - - } - else - { - responeData.code = 0; - responeData.message = "没有数据"; - - } - if (result.Count > 0) - { - // result = result.Substring(0, result.LastIndexOf("|")); - errorInfos = string.Join("|", result.Distinct()); - //Alert alert = new Alert(); - //alert.Message = result; - //alert.Target = Target.Self; - //alert.Show(); - responeData.code = 0; - responeData.message = errorInfos; - } - - return responeData; - } private Model.ResponeData AddDatasetToSQL(List pds, int count) { Model.ResponeData responeData = new Model.ResponeData(); List result = new List(); - if (count < 4) + if (count < 6) { responeData.code = 0; responeData.message = "导入Excel格式错误！Excel只有" + count.ToString().Trim() + "列"; @@ -377,16 +182,30 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (pds[i].C != null && !string.IsNullOrEmpty(pds[i].C.ToString())) { - string materialCode = pds[i].C.ToString(); - var lib = from x in Funs.DB.HJGL_MaterialCodeLib where x.MaterialCode == materialCode select x; - if (lib.Count() > 0) + string materialCode = pds[i].C.ToString().Trim(); + string furnaceNo = pds[i].D == null ? string.Empty : pds[i].D.ToString().Trim(); + string batchNo = pds[i].E == null ? string.Empty : pds[i].E.ToString().Trim(); + if (pds[i].D == null || string.IsNullOrEmpty(pds[i].D.ToString())) { - item.MaterialCode = pds[i].C.ToString(); + result.Add((i + 2) + "Line, [炉号] 不能为空
"); } - else + if (pds[i].E == null || string.IsNullOrEmpty(pds[i].E.ToString())) { - result.Add("不存在此材料编码-" + pds[i].C.ToString()); + result.Add((i + 2) + "Line, [批号] 不能为空
"); + } + if (!string.IsNullOrEmpty(materialCode) && !string.IsNullOrEmpty(furnaceNo) && !string.IsNullOrEmpty(batchNo)) + { + string fullMaterialCode = materialCode + "-" + furnaceNo + "-" + batchNo; + var lib = from x in Funs.DB.HJGL_MaterialCodeLib where x.MaterialCode == fullMaterialCode select x; + if (lib.Count() > 0) + { + item.MaterialCode = fullMaterialCode; + } + else + { + result.Add("不存在此材料:" + fullMaterialCode); + } } } @@ -395,11 +214,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage result.Add((i + 2) + "Line, [材料编码] 不能为空
"); } - if (pds[i].D != null && !string.IsNullOrEmpty(pds[i].D.ToString())) + if (pds[i].F != null && !string.IsNullOrEmpty(pds[i].F.ToString())) { try { - var number = Funs.GetNewDecimal(pds[i].D.ToString()); + var number = Funs.GetNewDecimal(pds[i].F.ToString()); item.Number = number; } catch (Exception) @@ -674,4 +493,4 @@ namespace FineUIPro.Web.HJGL.WeldingManage } } } -} \ No newline at end of file +}