From 0ff22e78763f81ab62ec6f9a179128e6a1ec18bd Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Thu, 23 Jan 2025 15:52:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=A4=9F=E5=AE=9E=E7=8E=B0=E5=A4=9A?= =?UTF-8?q?=E4=BA=BA=E6=89=AB=E7=A0=81=E5=87=BA=E5=BA=93=EF=BC=8C=E6=9D=90?= =?UTF-8?q?=E6=96=99=E5=8C=B9=E9=85=8D=E7=94=9F=E6=88=90=E7=9A=84=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8D=95=EF=BC=8C=E6=8E=92=E5=BA=8F=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4=EF=BC=8C=E9=80=80=E8=B4=A7=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=8C=B9=E9=85=8D=E7=AE=A1=E7=BA=BF?= =?UTF-8?q?=E6=AD=A3=E5=9C=A8=E5=87=BA=E5=BA=93=E4=B8=AD=E7=AE=A1=E7=BA=BF?= =?UTF-8?q?=E4=B8=8D=E7=BB=9F=E8=AE=A1=E6=95=A3=E4=BB=B6=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BLL/API/HJGL/APIPackagingManageService.cs | 23 ++++- SGGL/BLL/CLGL/TwArrivalStatisticsService.cs | 10 ++- .../CLGL/TwInOutplandetailRelationService.cs | 4 +- SGGL/BLL/CLGL/TwInOutplanmasterService.cs | 84 +++++++++++++----- SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx | 4 +- .../CLGL/OutPlanMasterEdit.aspx.cs | 2 +- .../File/Excel/DataIn/材料入库导入模板.xlsx | Bin 8769 -> 8935 bytes .../HJGL/WeldingManage/WeldMatMatch.aspx.cs | 12 +-- .../HJGL/WeldingManage/WeldTask.aspx | 7 +- .../HJGL/WeldingManage/WeldTask.aspx.cs | 9 +- SGGL/Model/CLGL/Tw_InOutMasterOutput.cs | 2 + SGGL/Model/CLGL/Tw_InputDataIn.cs | 5 ++ SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs | 2 + 13 files changed, 124 insertions(+), 40 deletions(-) diff --git a/SGGL/BLL/API/HJGL/APIPackagingManageService.cs b/SGGL/BLL/API/HJGL/APIPackagingManageService.cs index ee61a943..95f4e477 100644 --- a/SGGL/BLL/API/HJGL/APIPackagingManageService.cs +++ b/SGGL/BLL/API/HJGL/APIPackagingManageService.cs @@ -110,8 +110,27 @@ namespace BLL { var table = db.HJGL_PackagingManage.FirstOrDefault(x => x.PackagingManageId == packagingManageId); if (table != null) - { - table.PipelineComponentId = PipelineComponentIds; + { + if (string.IsNullOrEmpty(table.PipelineComponentId)) + { + table.PipelineComponentId = PipelineComponentIds; + } + else + { + HashSet set = new HashSet(); + string[] oldIds = table.PipelineComponentId.Split(','); + foreach (var id in oldIds) + { + set.Add(id); + } + string[] newIds = PipelineComponentIds.Split(','); + foreach (var id in newIds) + { + set.Add(id); + } + table.PipelineComponentId = string.Join(",", set); + + } } BLL.HJGL_PackagingmanageService.UpdateHJGL_PackagingManage(table); diff --git a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs index 4c719325..d411049a 100644 --- a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs +++ b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs @@ -114,8 +114,8 @@ namespace BLL if (stock != null) { stock.StockNum -= material.MatchNum; - } - } + } + } var results = requiredMaterials; return results; @@ -177,7 +177,8 @@ namespace BLL var requiredMaterials = (from x in db.Tw_InOutPlanDetail_Relation join master in db.Tw_InOutPlanMaster on x.InOutPlanMasterId equals master.Id join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode - join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId + join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId + join t in db.HJGL_WeldTask on master.WeldTaskId equals t.WeldTaskId where x.InOutPlanMasterId == outPlanMasterId select new Tw_PipeMatMatchOutput { @@ -191,9 +192,10 @@ namespace BLL MaterialUnit = y.MaterialUnit, MaterialDef = y.MaterialDef, NeedNum = x.Number, + PipeLineSortIndex=t.PipeLineSortIndex } ).ToList(); - var masterModle = db.Tw_InOutPlanMaster.FirstOrDefault(x => x.Id == outPlanMasterId); + var masterModle = db.Tw_InOutPlanMaster.FirstOrDefault(x => x.Id == outPlanMasterId); results = GetMatMatchOutput(requiredMaterials.OrderBy(x=>x.PipelineId).ThenBy(x=>x.MaterialCode).ToList(), masterModle.WarehouseCode, masterModle.ProjectId); return results; } diff --git a/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs b/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs index a9ada9c2..485ef651 100644 --- a/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs +++ b/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs @@ -4,6 +4,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using System.Runtime.CompilerServices; using System.Text; @@ -82,9 +83,10 @@ namespace BLL public static Model.Tw_InOutPlanDetail_Relation GetByPipelineId(string pipelineId,string WarehouseCode) { + int typeInt = (int)TwConst.TypeInt.散件出库; var q= from x in Funs.DB.Tw_InOutPlanDetail_Relation join y in Funs.DB .Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id - where x.PipelineId == pipelineId && y.WarehouseCode == WarehouseCode + where x.PipelineId == pipelineId && y.WarehouseCode == WarehouseCode && y.TypeInt!= typeInt select x; return q.FirstOrDefault(); } diff --git a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs index f08c9d5a..115f2f1b 100644 --- a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs +++ b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs @@ -87,7 +87,9 @@ namespace BLL AuditDate2 = x.AuditDate2, WarehouseMan = x.WarehouseMan, WarehouseDate = x.WarehouseDate, - WarehouseManName= warehouseperson.PersonName + WarehouseManName= warehouseperson.PersonName, + PipeLineSortIndex=y.PipeLineSortIndex + } ; @@ -145,7 +147,8 @@ namespace BLL AuditDate2 = x.AuditDate2, WarehouseMan = x.WarehouseMan, WarehouseDate = x.WarehouseDate, - WarehouseManName= x.WarehouseManName + WarehouseManName= x.WarehouseManName, + PipeLineSortIndex = x.PipeLineSortIndex, }).ToList(); } @@ -281,6 +284,15 @@ namespace BLL return responeData; } } + var typeString = temeplateDtoIns.Select(x => x.TypeString).Distinct().ToList(); //获取导入文件的材料编码 + if (typeString.Contains("采购入库") && typeString.Contains("退料入库")) + { + responeData.code = 0; + responeData.message = errorWarehouseCode + "每次只能导入一种类型！"; + return responeData; + } + + var materialCodeList = temeplateDtoIns.Select(x => x.MaterialCode).Distinct().ToList(); //获取导入文件的材料编码 var IsExitMaterialCode= from x in Funs.DB.HJGL_MaterialCodeLib @@ -296,7 +308,7 @@ namespace BLL return responeData; } } - string cusbilcode = GetDataInCusBillCode(projectid,UnitService.GetUnitCodeByUnitId(Person_PersonsService.GetPerson_PersonsById(creatUserId).UnitId)); + string cusbilcode = GetDataInCusBillCode(projectid,UnitService.GetUnitCodeByUnitId(Person_PersonsService.GetPerson_PersonsById(creatUserId).UnitId), temeplateDtoIns.FirstOrDefault().TypeString); foreach (var item in temeplateDtoIns) { item.CusBillCode = cusbilcode; @@ -320,7 +332,7 @@ namespace BLL foreach (var CusBillCode in CusBillCodeList) { var CusBillCodeDtoIns = temeplateDtoIns.Where(x => x.CusBillCode == CusBillCode).ToList(); - + var FirstCusBillCodeDtoIns = temeplateDtoIns.FirstOrDefault(x => x.CusBillCode == CusBillCode); var mapper = ObjectMapperManager.DefaultInstance.GetMapper, List>(); var mapperDetail = @@ -332,7 +344,21 @@ namespace BLL twInOutPlanMaster.Id = SQLHelper.GetNewID(); twInOutPlanMaster.InOutType= (int)TwConst.InOutType.入库; twInOutPlanMaster.State = (int)TwConst.State.待审核; - twInOutPlanMaster.TypeInt= (int)TwConst.TypeInt.采购入库; + + if ("采购入库".Equals(FirstCusBillCodeDtoIns.TypeString)) + { + twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.采购入库; + + } + else if ("退料入库".Equals(FirstCusBillCodeDtoIns.TypeString)) + { + twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.退料入库; + } + else + { + twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.其他入库; + } + twInOutPlanMaster.Category= (int)TwConst.Category.全部; twInOutPlanMaster.ProjectId = projectid; twInOutPlanMaster.CreateMan = creatUserId; @@ -514,7 +540,11 @@ namespace BLL planMasterModel.InOutType= (int)TwConst.InOutType.出库; break; case TwConst.TypeInt.退料入库: - planMasterModel.CusBillCode = GetCusBillCodeByTaskCode(outMaster.WeldTaskCode, TwConst.TypeInt.退料入库, (BLL.TwConst.Category)planMasterModel.Category); + string pre = ""; + pre += DateTime.Now.ToString("yyyyMMdd"); + pre += UnitService.GetUnitCodeByUnitId(outMaster.ReqUnitId); + pre += "-"+ UnitWorkService.getUnitWorkByUnitWorkId(outMaster.UnitWorkId)?.UnitWorkCode; + planMasterModel.CusBillCode = GetCusBillCodeByTaskCode(pre , TwConst.TypeInt.退料入库, (BLL.TwConst.Category)planMasterModel.Category); planMasterModel.TypeInt = (int)TwConst.TypeInt.退料入库; planMasterModel.InOutType = (int)TwConst.InOutType.入库; ; @@ -556,11 +586,11 @@ namespace BLL case TwConst.TypeInt.退料入库: if (category == TwConst.Category.管段) { - cusBillCode = taskCode + "-GI-P01-RE01"; + cusBillCode = taskCode + "-GI-P01-RE01-GR01"; } else if (category == TwConst.Category.管件) { - cusBillCode = taskCode + "-GI-PF01-RE01"; + cusBillCode = taskCode + "-GI-PF01-RE01-GR01"; } break; @@ -569,20 +599,34 @@ namespace BLL } - public static string GetDataInCusBillCode(string projectid, string unitcode) + public static string GetDataInCusBillCode(string projectid, string unitcode,string typeString) { - - //生成规则是20240919-unitcode-AP-GR01 - string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + "-"+unitcode + "-AP-GR"; - var queryAll = new Tw_InOutMasterOutput() + if (typeString == TwConst.TypeInt.退料入库.ToString()) { - ProjectId = projectid, - CusBillCode=cusBillCode, - }; - var queryAllresult = GetModle(queryAll).Count(); - cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0'); - return cusBillCode; - + //生成规则是20240919-unitcode-AP-GR01 + string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + "-" + unitcode + "-AP-GR"; + var queryAll = new Tw_InOutMasterOutput() + { + ProjectId = projectid, + CusBillCode = cusBillCode, + }; + var queryAllresult = GetModle(queryAll).Count(); + cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0'); + return cusBillCode; + } + else + { + //生成规则是20240919-unitcode-AP-GR01 + string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + "-" + unitcode + "-AP-GR"; + var queryAll = new Tw_InOutMasterOutput() + { + ProjectId = projectid, + CusBillCode = cusBillCode, + }; + var queryAllresult = GetModle(queryAll).Count(); + cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0'); + return cusBillCode; + } } /// diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx index 19ee4bf6..3fc1bf06 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx @@ -101,7 +101,7 @@ =>a3fd?4Ql{PQKlYo)AE7DBb zt^K<|;?GJFmioFmy)ThEc@J0T=q?B>d2{uSR_$qT$3&M@R(&Qvm4}2+HwUUb?#m3| zYGeKU=ddQaZK8wp_v_PB9&De>hdoK&?xlQbXG#VfkuV6mD|8Hjj-ff@rD zv64+RsKC)jFmQo+VN$ zEoypC>ve)#RTCYc8<|JPD(1e1KP#hAU8I8=>SJzAruKv0%AF|hC9_9a!BmWzkJSeS z(U}MIZ(?UQ&g=WfO7Q6uvX?HMtVu@C07_nxL~hXrV(YS9EMGsWp?PRByA+E0Kb2h0 zrhr&x?r_7bWk|NQIW?Uy>Rn$qUc&wfFA<&vf+Q4P9Von*e}~r$_-u`*;zWZ1!wGrty!zJvF zMggi6b|B?=e!Tnv%1O0OFDefISnaB2L7vz%M{6BJqqQ!!32l$+=m$Hv4Rmqu&AM=` z4_ZwK1gpYcHB*-$J{tVL48!*xx=QkA3l)oQ^~|F)}&aW(<^(~p=tyL5N!`=j&)4B zp_wfc>XjAm*J2U!A;YD7-&1NLJSCTzLx%7Na}e@r3o>DFT$7vI`_yYWOm3@APe(&Y zx9av9UUTIX0`M@SsCu57)dqLtKi2nnS@46gdg2;r!GFm9RAIk!RlG>_5_KUir8U(`Z+**JO>~ zTp0k3BRDkI9_;RbM}KgA2(zjfKrT-#9<@m+OcG;Oq}cIQ_PhDK=#$&yX^5|%PUL(E z8zWM_*sfRCN2-sojLh(fr6l=$B#`|n!}vT+aR8Buyczd-L#_8Z5o*gr>Wa_QN(X7{ z)y1kNCQJDyLux3W37kFwuINm~onnug<#`+c-YkoS&$Sm#-%1KuQ8=s&zD^x^yE3V! z4N=^}HsN}iXJEx|_3folZ3EV&N)=aqm>D>z3yrouQT{SDZXW~V!cV|{j@BN6rFyQK ziA&dPwLJ4|BYM$sY|EBV;L!Ywt&VKD>5P|Y-td-L-Dh*0y$44M5<8>QJ>M4G0pvnB zd<;o0RPQ*~#~+9m(C@v6%T-_P`hZ<7UYhApO&>Fnvs|cGfXZ{pXM}!JX9CP-qR(A@ zwl*X4BPFELS)e3nFT+MOVE#F2P&!Sbp8W6xqfR$IUx0*+a?n!~oS~Hr>n|gGG_OSa z;q%RTl-9p2T+FLeN;G=K=224lew;j-J3E;(_qu73?-zhSxFFd~gqQT|g_M^p*Ow?B zNH)zp!2_ce?Y(N%)t$s@d6>p!sOs}fnF++j+tS?n#WZvQo8-(1-pqnTSEbBlQ28_M z1eJ&(RkcFTB@uh0)N<}AMYLftRiMe|ZtWf+qPDQg`F)GM@IWkno51Mms#}viCG2wT zk*p)W{qDD2?T?L3Z2~n}qmQ}~``NPXgQ_xyj_T_!QUCjLzWYK#m$Qqtg}ueSFQh;U zD*E)@A|?D4Q2rA8Dg1Md?&&CihIMo74|q* zSn#PWp4A(A(*wwvz39jF(4_-l_DWN4GT`kmsRUNvY86WLqF=<}Rk0fG^LEE_c7p~^ zTd!EvLq{XxlB^bTUzFgHCxi&)>&&BN$Asl9pv7tMy<~$BZXu#l23;ZLyl_T8C<`ux z5AdZucjA>z8aj7(Gk@5vz4(=XaCsr=B@Uwp&XF?pA;N{ymr;j`=~+4U5!j@!IP)T} zlx<|kwVNM3P8mgdM9N8XDmKs~+e{l1(kWBZBr_1Q%N{VwzJti7(!<)fT7-hpt=9R{ z0l+ERIojDu(qcr!UfVleP5dh7<6Ew9%VtYuOqDls#L<=ouG-&uVTyU2g3fZetu=2R z!Guwizh5@J0+PDMT#jJb1w@Jpw_WYs7%p_`-JJ9Ak@1{X2Jz;0`I*6qJ~<62_XmJJM2?*_or4Lcm#447g3AKyVEuTl(oLN zY|KHxxV~!;tMj8P)3wv@Pe{PYkngBrJ9L;}X<<%LSv4e&K7PTK zE@FQqFBZlwh$r6FQ+zP-IXncsG%uXVk4!oYj#J(Se^CgR{Knp$-o-u`E^$ecgSn!! z0G7{c$esW=4wj$@mux;%2g&xitl)ec+6*p^OAU!7FPx1S`NHYalMb5lb>62m(KBAB z5TzYPhOlQdW?t&YI1TOk=a?p6$j0DNzITEvC7)zBd4fhsSv0mD?|-T*=LfU>Rpp9M zuaHHJPT<>jq2A270g;?jtju+h-Ehl@=pXu{xl-(2!^!9``W8s?b12aH=3ebvCGl;w z=|9X4bev7nLdahl4tbi|A1rt(sQZqdR>neXhNMy1#;w#1pL4$0)|+oB#_)68qBip3%j@TvRU;9C z3tr3FYJD=codcy@Ru0I*Pl>v6>o`-D)C@X~;cq?(64E+4R(13tBEM}bWFVyB3;X6J zJg#i2(-cE9)EMlYPk44Y?ZKlm=Akjqx#Q|v!qg*aT1!;PUFOt4^%{1;wsK!N*}I#E z$9%|6KhKdx75&bhWZ;1XDf4>GQy{2GZ~!+Ws2@xGZh~u%NXVNP}1FGwb#}Y z*y7oR6>0e>EnK%J%ElWU-U^l_37ojl4QXq0&AKo3uM{^THoMvzr&r)GN#ZZ$*3JYc zAUiFh6+0S*iB3MTeYV}rWXbMxf|5+fbFGv_gRgd4r5Nc?JVF17yeRTvkM%6t$#EIi zyJ73_uUbn8;upq)u3}muT+VSWyo2TfG zLzf9Oy~?ch0YkF+y`T@p!cM}Rj_txMf8I70#v#Lt?6=+_p~k9uO6!2hC|(O~J2(FA zvzRql);zalT9eWjc3W=D4w|ut%1A-H+tB0jBI zoHVEbY`H;x5B|(6k?nza5a?He5Sm-w9iO0|0kE}+vxT|3i?fY`75FY!si~?Q7*VBD zU}hK{9;?yh_{0fNlO0hQRT&&ssMkb6bDFFLsL`>=4J*hE4~{9+YQ9lq)~c?DtX0#q zu&Bapk1*D04$;xmzxz1Dsyr$?qQo@)fmL<{Zm4h#e~mT;rcrw9vKK+RG=jdDu(Xt> zk^fQ#5z+FpF(Tbl9%b-*kta=^Jgq!Rk!N~HQRygKTb7bjah6iVLgGSV&i*T4fsv_I z0XkMdxJZWJ*DvqW$IcbK+j21_9kxSL_kL{VkMZum5UA9HSa@H(WVXwxV?iK#b6cJF zz#1jEAYwch{p1zN&y4W*>G4EaTKxkQkR@n3i2gf?GX;U{e&%lKf6Lvn2xP6{P&D%3 zE7a6AZBiUm5|L=N5s1H77QQ-LvXa~k6HpQ|Sb~6K4^p2$FKL2p506W#!4TjihVA0W zR(E^!b;j40nIaCQ=E?KScnlG2f8CeVDNcc*&gG#x9z`u=XV>+KoKiLFN=;5Ep4l=e?h%(O$xb`4?7yz&n|zXcJj7CIDdGg~8|eLeWB*LODWULn0*INfz* z<msmy%itKKLm2me=so>Phz?9Uhsb>ZGFMAS(9OE|}8a zi-pJ#-p2GmGj@0~KuwI%@yecMtb!Y}Cd2EGBv@FviM&qLcy29xqc-&qx0byY>ON{p zAUu8}pQP1)6rh(&?j{mQ!DSE_uI2^T?F4q@Px!U_hmbgEA;|K2;Cxp=Z;Ii~U z&OOs{8SzJG`F@hc;8uN5%-jL@D%pIsysHk8lv}%*xA>CHfYqp2TifjjXcsM?bF9&G zmoFZk=`twP=ZW;w=12}}GQl?C&&bM|BKlj1d7x*9oV)ZviQ`p*a8j$@kywsIogC>@3VH(A{D_2s&t+-a*RqT@83sl9%on+D$m!HupG4 zd_3CCKN-uV*sZB1SqWFl%iAmb%Z`P^`)Lrya#e4-*3 z&UQYfjmp4#ZMOEY zu}40uQC4|XO(I8&GNnm9yE-;|xxuJiWJ%WS)ooPuXK&>5^s=g~^qCF1f}V+mr5!|H zB6Fo6x&qEC?;zeH!8)V`DQQewBtr~&%v_TEsIe3KB?@MioEGozy9f@hz%aN?>R5B2#YGL%YIMk3rVa2aY=A3f~si*kXD7xW@M2LIVaf$^4M$x^2dBs1`h^mzaG2{hTE1{MC?L&WfwMA@UP z7{L>D$fOCE6X7vrNUCt5M~oAxyN)kuH3oHzJNEqouVgArLG%im& zH2S2^(U2H=hlc~6-`a~PB04d$;(petJNOC8h^ocr5EDrmt_$I{fDeIGrxX@UbnG?KrXv1C<{o3M+7 zWZ3Jit2cn&TM%_K$1zV5Sbmd;e$eyH@xxl^)CwLhhbjwQOsMU&HWC&{JTtA7@^!Xe zFZZK&X+8*oXp0nD$LMQSRRRtRmjc1BOUTPW zqv|@+7+B{|ipsf*1-Z+%#fw=YBNfx(>}{+!o+hquZ&(2@jTwkH^#C;KD~OkP>T+nF z+;2N_LE_2gZx9&V^m1ve^#RQ3{sn>c2)fR2@BlyMV&GeDG#e(C#ua^S=0;lsI%XYx zyt>18TWZX}wXcpk^B=piAntFHR(WnP(9A===3! zv&$@QWhdvSN4dpENr1#HT%DI;>mJp;^X{6B$)^x5iR_~CrL1(N$kuU$LM3?0~erD3@*i7t_$QKn^%|xbFo9Ba)o&xmFSO( zPi^G$NhO0&=!-f9bFHjzd~dgdHX!F@G|m8>0MrfnyiF>#p>Um91$J=(5mKusjN#KM_Arj7q{0fVD<%%{+%;b|PrI@;6 zj~TpWENobh)HoOI%GW#;2p+chWLkJXlIL5?zSA*Lf(4a{00%`*2mgo|u}0*$Oi_iR z!*G9{u<+Ftl~jCmbu3bBHUx~gDA88I8%V)K&{E9)60zU4wEPE%1U6!%*o#oSu{rA& zE|VP6TZoU(xhT}_5vH=iX+*-89QI>YXi5(wCN}VGyh+hsVW2&C_dA`Md`gcTi=Y%9 zGJ!uv>(`D%KqlzY;m0EUZBTy$AEZ8 zaZ?&vEIr*GEDtRB1p<~aQFx=A(^MK3Y zTVqWGF*Vw9*ys%bX5>9q#n0)8No$%gYVIC;tZqxJT6%?4e~q_$7|+-t|4PS|wB}I0 zFtroKqT39QCmZ>*`On9wddvvGJ4+9E-{tWHe^Fh=4M#5J-5dct`uvE(lCw(U%V8RK zaN5WTRFP^1gOYcWF$wJ=j9WfjKj1lxY1MOo+z(>mUlc0=JVKU?62rf&>S6v8jGaf3 zVaXcq7#ERXrSHy&n5+_BE`zx2<>4>Lv+|gGT?=3Pz)6WZoQ8To4QG29su*kZY%I2e z4}onzQ>GGq*$Mq3B{Xj?&hN$N@^qxI6sqx3(HkJOftD-y-goU8Y zxm&XTUU)-lsTv=FP+lUaYmwQ-IxLHb0Si7gF)SdJjKbP2zx z8C4KZs{_Dc=vbyNhZLYB)Vs(K?%j;=?9Rzx_GrBCCULZNf$p}3+WVr(4aHE2J z3O=`EoJu1i@{c*YihMY5mk%qiuw+J))(=TjkDOoAZ+Bu!@7Gr*i=@dN`7Sm&xzW`b zKcV;jgRDR>P5#a;HAjEXYKo@_w~?&#F>{&wf5-A)Ma+MKa{&0oc^3*}6BJG&=oNZ; z{Uvr+pa1u9?O*6B*>*|~)=zHnB>Pe_%y4DuM8O7B_^aD2Eb-BrlLYwNuplHw}LzAFQP>Og$f zqp1U@@ltL_g&pkuR`i2>Pq=X@^2f4x3RS@=rHQH;LHl>;sumX^eX`0n1>qL9`oc^o zvOm2&AepV>y}%mY2+wAfl3lSGfD4x?d92f!!@@x|@ZspZtWPj&ybU}wXQ0OPVaAxp zuFLTSl~9FginB!K*n7tu z=}CedTr3=1j5ItQEx-nM2il6H56ZCYIHBjXZQX@>oa&AyQ6|P;ElR0Z;69yoaGj)N z2Ogef(;LHz2SjDa3G97uzrAjKB*SPINh9@XajM+tRQrLlSJ6VbC0SzXaW-yRuzHsV z61N^)^~B+&Et?KfN8lTh>2f)GA;*~N2aNBIA3PaR^nFh`!8YoF;ml&$0rGAYWNB4c zR!i4K<9Q;~sllYkkp29`8$ul@t|jDvS6BWj0wXGgGG4vSW!qoP0U1|wo%{2qKd*Vv zQ9-cVx_d|6esq3>t~fg$dn<|pPs6eE6JIgq&^PUxF`rK+OH;&%P!%vW#_P((k^`tI zXwgKoZ_O3RzB*s96x3asuD~YNr*fhbrRc0HUJN+`rQlDqDYImE75g#7>3}c^+*8?S z`>&t8Y(0&iM!Z=N!xI))b}9AW0JVc*bk^YyKlFbuIsZ2LuKPXx=@81^=<)`$#H{a| zt;N%}__}tcmT#Tk%y_O50SXUbaeh`=ev#DoJp*+P%mWy5XwO0NkAC_!z&{gHcM<1T zyW_hvpu6GU8|F`=_ao4q&M%|wf9d?(G5^ch-In~-?u^~Fzwz*Y+Plxh-wFS+_w?^- z|KjEELv){L{;eGfUDAIU{WtA=U;RF7`dj@18ZmyW|HYyHua~~#27k4?msW@W8E*cU z!k;K@5dSSc-Jj_FKz3*67fO$x{7vmY!rJ|D?w9j^j{|@fH2$f$cYlQYHIUyU7(ie9 zZiK%oBLDw)r$qXx`fncU&lPf?iTZ6(?(b^9d8zwTzF)5UJ%9z2u7ytd@38%^N#BvX xzuKLLU4D7^532XincpXS?{t58E%!fke^b8z1%#iQ6%+c`2_&f85b2%X{{cGUIIREx literal 8769 zcmeHsge*hUhjI>SxZX|1(g_p4!{He0CWKJ-E7;3NB}@0DgZzP zz(h8Yb8+^xa`rUU^K-TGfO7jfInw5%BD3ZKkP-L)H~xoLpdxihqlXu$aH@PIx5lNq zSSyVwxD(b#$gVBfpwO z_P>KXq!i|P-?z=wd51jN-PmX^mzYwTkKEKW!TKd2-L0`l2Q0rTqgp{>OF}9c@;Q5< zPam`bYsM`zF1gna@A{~rzYG!?ES&;=o*mtBManZ-pIsu{H4(q^wtjHyXs(y+S1sgGGkbx14n1TgMi1KtWV>P zv@TkNNNi2HOmd_{>B1)G09p=lb)=R2&SQbSQX~cUhxWT^moAxBiKu#4C@ouZo+Vmp zkkLDFek|uN5k7SAiB2q?5fRk+(qgAOf4PX9m>D#B)SgZ z(#Y!9p$8M5@sBC>G36cy8`pskhO+&7g|T|d`}YUJ;%G{i5eoHBk`SV*4Kbkr0J{hZ z5g=B^*OAA^#ofW&#l_(_-Kv0$Xuzd`9R^!shW^4QqEAx{$>d#S8MKK(LEK5>u;q^= zCsnP>iL|{neJ3AuSMqiW)5`KSb>&y`-)h_sdB8fY>MbF5vhHHtkquqRvMP1cujMS2gwy@}XZ6C>qx7=0ujY zrS{SITn|RihRvt%0B{;ndDHvM3Fk8gTYBZ!k9NvcOq=(n1luf_+HGpT?^d@lku{jc zN6Hu%>IWz<3ruYJEK=3gNLsT=WU9^5`gJJrLraOt+1T`0tYcwF_91LVp3MO50hQ&P zYT`DHf-m5tdN-E!4pbET&gbmx_q07tT+wt)w1P`3RJV8JL!uJ`FPys>Bid02!(1OR zCTS`vyejEU?*~igNwu9H?R@P?TiuzZ=?re~Z11?c9CUlNzTUU`$j0W>Qd$nCd9qOl zj)KBA&ED|5U*Mw-eLiVsLptF}MyT*Oz*n=@(ku8X+*akahqX-3*P7uynsr>+|R;kbXR z6vf#XWlAlYX(jtwG?7s>yukj|Q}}Cu$_NT_M{a*?J*2(<;Lg7>DpWEx?GVAF7KH3j z05FjdjQU-9{>rOARR{@@6e4)}zdb5+)YW=v1kZ%N-19fb0 zW;%hOqZLZ_7O3F|H69d~NWZ<2KJQaO{7)!E$6XvHv4p6Pi5&OD&|F3iM^G@$cPj6O zDWMS&Zf|`n-@(Dp^dM@MOz!8*Ar|?1#>zwnBUv3tkwNS z9l8oGaKBKMtKBUVln99Qq>buVq6ub8_V|*Y(F)mH^_0CFWb1@~=NvlPvtAqMn^{5Z z^gn~JY4nZkIKo}r(EtE4#2tSGVGmm?D^CxeA1A)wqH$IV{OL?=m$&$0=F{nS(5gf!ecWEPpWqwT!?gx}~v28ARIPEluojp}#Rh(`; z%VOjf0N|;S(H2n^E2*Qv5+N*Tp~1UUql#39fY|FMZM%vO#51(%O=v340~bV^37#6h zSO%?M+Xa&r+7T9Ck!V)P?8O{zWXSWx)=19X{_uq#hg!B#Wpyq$6;749w`_wv2CTIZ zemxylZslPP^xBH}P{(RzcRM$gpemCfZD(^V!`$w1M!tFW!bzrjk$Zv!tk$_U6_z$B zxcprpOH@M=tu``NV{4m71*Xz&?34;{GU$;k91*o z^8!)FO|dSK^g)}2o9|OF@;ZTVC&KCMY9r#?W%e~87kmLZ6<~w7=9YdmlvESL{e*2> z#Wk|c&>>Pw7@tYL13kg0%zxiL=cF|!>ub8PP-?J0y-zrKj(SW__r+9F1B+o#1H3)& zG&9}l3gPSjWP!R=27I@lPIa%@iIQ}5Ow$YdiT!^@XVD6T7W7oKW zX&!%zxWSRdA*I1~5np0b$f+hzUhZ`Yg+eIQhnzQ;(wn>*j^7i447W?W7UpW$eKyCy zWMX+=_&N!BX`Bp`am)W1&5HlUncS?4xJHRbq=1Iuf}6vv_-xna6Ll5Qy{1#89@QbQ zCh1LL?H8Y(wstSJ*W8}l%ueJ)yM<9#Yo6cTYN`Rowc9_}%q2f?a17P;6|yi2LtV5! z+ycw3e-zG}X<3h$K~0+W(n$@0i@hb!cx1x}ZMk$OPvoD{3AdlVvd5Xc^4ep*x{RY(Bq7e zzLy$-Qu{r-uuf#HngmKP#wzXNnJxgF@lM%;yJakQcK0|Oxjgi{THIdH+m#Y>-;rR8 zI1k}ODU>(T&B4JqQdEjS1;q6|$?D$MM$ZC%TrPGCw>z)6Q23(7vZ-h`jz0tnHCW9M~ysQZIhP~bSzWz=CdfBgE(M4?yaQ*FecK==qOc?`bIKqy$9u6W`WkD zhb>s!&{WBztl#Y7wWD99Ntr@RqjM$V!43mB>HC$;1AVJ0@tpE~?N|??c;8(&sdzyt zDih`I=7v=Ho>eAo7w7O`MB06R+4$+jE`OxN$ijL}!$pN^T{ z++4jUSh+eL5{Nr>j)aK@$P*4{!_O9*`v}Q0Bc$%yxY+Q;g7`SKa67oFFn}V|zWxy< zc(Xm$m^7BTJVGD4z9)4ZGmgFpGkn}Z!h*h^&bMHZAqZ%+G&O#rH00^LCvLLU zfALhyp3%4ZK}a>>%OO@6`baBrA@Yb@Yy`ur8r^uV0)ORb(5waj0GW-zsyL$t0mwmF z(bADv$IerkuzzS!5vb$T`}Hhz%3@k*OHxuGY2TREo=&QJ8uK%fF?Qc)MQzMeN>`+e9E-uME@BVox6LVCzV)wHkezCZuhXjti88RuD3EHy9HK{ z@ANp-O4tM@Z)+y+-0U&=&$b2}%R=o1`n{Va4a$!#*UbYJStURmvCo=}-*}`a70KD^ zQDW7f1GvLeViqR12e09lR3joX1ZVL zjXSiKu6`(CU&(x0(Cq8VIOxqYSJ!hRyS7nnwA(7QJEP%Ub<*d6JbB`zY@40INI^BRO>cu$SU-d)*-ks01^hURS^b<3&v{MR+A^*MV@vWxNS9{lHlo6~sgW_NM0N=I; z*B;mv`Jkn2kpR9$d7-6dIIC5OMX@NQr7cieF3{#Zf2ktN(L<*0rk#CZHURnB0xg=( zWs$21qEw|A`4H7#Pn?9aAgv2!v)#(_S*!-V^P5BE65Yi;xp2+k%=K=1uthH#h4MD0 z|NEUAXsT6`+k}$%C`y$)i$VAk%&dE02t|I=%oZ&s4Og>J|6rdYezG$& z`IxmY{ZX9*7yslr7i&Nj$%o>>tEH~VWG=cTmV={3@+m8C0+|@Jkxbl=sjed5OTSEH z5sLIIVj39*-(fD2^*)x9hsgPf<;Rhc2*h%Kz4styBl2kryjQxF1BQ#Vgum*`%`$hI zh=arwBz)k-DtS=(`v;}P@ACYR>OMtFvB+-kk#^M)EB3iLP4mX zCZbYSm`ENJ5_Sk#Vv+`)&%1F`?#GIgzNY|HWmzeT?h^5ATxd%~vp?h@)4Ph?gBZ&+ zYHy;;6bND3KkPIJ#wLo3PBBglwk7Wd5kpB{ndn`9U`ewK9Q1bTPG;AArB@c)bg`yW zzIU_s2?)$)F$WJ}LzjgBH+i}&(b_06Qsa;KcXwv$3?Ox>Wa^Ia>oPQH7SPlt0IpY0!1OouT z`(3m=JpCN4Jbug9UPIKJ;k>}5I~&xPyCi{*%?)&H(VsCf6Oqx9k(VY3t%z2YayRre zCZNI+Dh5j!OGjXZ$MN_~^ZJQ(Dk%x-_)#v)!=K~xdyHK@6};Z3#@7UYG?TX~a%WEC z3kpsWwTNezv(#ux2E!?r3I&jhMPg5@_=zT4o-Dh)O!IfK5?@8FMOEEd9BBVA zCQs3l`H+u;Mk8NVMK|w$Wns(#AbNrDK2PBVtFAvPw$DQqJ!k<(ch@Hi;TZn+&lS;M zhYt#ps-QYaI3wO=uMegklgRUS*j0uKg3W!L!(=uqC+fk*{Fl5${@=;I=H}JXw}jcu z)KcQUBDFD_Z{sbriEyc{q=mxHt4>0>1jv#x@0R8n7gftFU6||2CNUl9npDE}KzoJE zlv0@fcNUo+5pt!D<^?yFnS`3?61o|avBp^sJ--$%d$JP2kG||n_$8k6IpZRGL;D05 zZFanSkhA}loEt_fcjALMz4R$@7%x}F2RIYsB$r8>x5dGwEtfaJ2hwl1X4=s0{abG_ zKoCL7!jj@^&U2V|RN(2(ZuHwi;yOVl(7f}6s+~7pRf7w^NHMSeBVURa$DBedEgQ*^ zVE_6y-2te2qEj5%ZA55-)mQxG*i_6N-@aG=Z%@%u8qf9KsU1X3#r6bzfYwr)+MnNm$f(iHAMFVY((fSY{V&^Xi!{q1%R`%pV-ZPzANb=>tD6k_;xv&pg0n1 zFk{ia9#Z0hmh|ZI8RKFl;qHxC*44k(puF6`Oq&SqI3j)}{)0odX6{y&x}NTK&NjbO zDUnYVRR*Zw(Ip0c-YUT!t*q%%O`A@>fs~oCkR7?X)ljauINq;i=GG;>j|tmy^St9y z!?lG5z6!Yc49PfvY|JoOpCsAOQA2VQGv^*>&bS77w|QX3zSsVCp={VgMGo`!AL5N; zH~B;%n&kOfP?#FMuOK~9RUqM>2piuRxH!J*3%<7Oo71u_X^eF&JtB-`iW3>UH6HY= zD{F^26NZy(uY-eHUgHWCC?9Yo%UUpjk;Ul%jpm|*E*q2=!4>cL~-;%@av zW9h#d0%GX`lC{-(c!?uc&~D`h{9hI=!AKYI^-k8LtMkuDlUupwis)jzFHehh^f`!V zJjR+=Bu15s7zD+b6Nh|CNVI=dkmgRrt^J5vHw=;xMwR_8-^MOER6C^`4Rbtnb^q>65X@hZ!Ocn;Hvyo=?TBa3rG(E^WWq zI>LqQrz9iCH22{r2hFB}sb#Gs7hU2lVmlOh!7j`J3DAlvm}QIKsqRhiAbt1Dx>& zX0@y;_ieD$4TwIWX<43a$r1m1WkM8s1j$NC!V-1LUMV0H4_B|6pjDRHUK)e5dmsVrtL z{pfv0aeIPX?Yn1_BldSN4P)bg6%*KYs^>Es8!2yiFWY7wq0z*JZM?|cE9lA|Mx!Y< zFMS?yk9b?$p#T6r_7Cv? zr^fuNonK3hKP}1N{=Yx*kHX`xR(>tj{IsHkXd)q|@@wJdR|CJM%|8uXk^C_5Gl~8c z`fIlE6Dm#qJM`Dw;a3ZP7uBD50Kf!MdisaN{tEwlO#CYxPW2b~9}!YZ4Gpoo001`P N6M|6ja+=@1{U7z^03`qb diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs index 44b244f8..cdd0972b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs @@ -392,12 +392,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage Grid3.DataBind(); for (int i = 0; i < Grid3.Rows.Count; i++) { - var model = Grid3.Rows[i].DataItem ; - var model2= JsonConvert.DeserializeObject>(JsonConvert.SerializeObject(model)); - string pipeid= model2.First().Value; - - var relationModle=TwInoutplandetailRelationService.GetByPipelineId(pipeid,WarehouseCode); - if (relationModle!= null) + var model = Grid3.Rows[i].DataItem; + var model2 = JsonConvert.DeserializeObject>(JsonConvert.SerializeObject(model)); + string pipeid = model2.First().Value; + + var relationModle = TwInoutplandetailRelationService.GetByPipelineId(pipeid, WarehouseCode); + if (relationModle != null) { Grid3.Rows[i].RowCssClass = "yellow"; } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx index 0bf00fb3..b7f94daa 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx @@ -61,7 +61,7 @@ @@ -141,7 +141,10 @@ DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="70px"> - + [ExcelColumnIndex("C")] public string PlanNum { get; set; } + /// + /// 类型 + /// + [ExcelColumnIndex("D")] public string TypeString { get; set; } + } } \ No newline at end of file diff --git a/SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs b/SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs index aa6c0d8f..72534643 100644 --- a/SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs +++ b/SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs @@ -25,6 +25,8 @@ namespace Model public decimal? MatchNum { get; set; } public decimal? MatchRate { get; set; } public string MatchRateString { get; set; } + public int? PipeLineSortIndex { get; set; } + } public class Tw_PipeMatchOutput {