From 9992a3a6d3df8ce2623a77492be7b9f118db8fa0 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 25 May 2026 15:03:59 +0800 Subject: [PATCH] 1 --- DataBase/版本日志/SGGLDB_V2026-05-25-gf.sql | 3 ++ SGGL/BLL/CLGL/TwInOutplandetailService.cs | 4 +- .../HJGL/BaseInfo/MaterialCodeLibService.cs | 6 ++- SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx | 11 ++-- .../File/Excel/DataIn/材料入库导入模板.xlsx | Bin 9391 -> 9413 bytes .../HJGL/BaseInfo/MaterialCodeLib.aspx | 8 ++- .../HJGL/BaseInfo/MaterialCodeLibEdit.aspx | 9 +++- .../HJGL/BaseInfo/MaterialCodeLibEdit.aspx.cs | 2 + .../MaterialCodeLibEdit.aspx.designer.cs | 9 ++++ SGGL/Model/CLGL/Tw_InputDataIn.cs | 20 +++++--- SGGL/Model/Model.cs | 48 ++++++++++++++++++ 11 files changed, 105 insertions(+), 15 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2026-05-25-gf.sql 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/SGGL/BLL/CLGL/TwInOutplandetailService.cs b/SGGL/BLL/CLGL/TwInOutplandetailService.cs index 077be9c0..0b88df79 100644 --- a/SGGL/BLL/CLGL/TwInOutplandetailService.cs +++ b/SGGL/BLL/CLGL/TwInOutplandetailService.cs @@ -44,6 +44,7 @@ namespace BLL PipelineComponentId = x.PipelineComponentId, MaterialCode = x.MaterialCode, HeatNo = x.HeatNo, + BatchNo = x.BatchNo, PlanNum = x.PlanNum, ActNum = x.ActNum, PipelineComponentCode = y.PipelineComponentCode, @@ -121,7 +122,8 @@ namespace BLL PlanNum = item.PlanNum, ActNum = item.ActNum, SortIndex = sortIndex, - HeatNo = item.HeatNo + HeatNo = item.HeatNo, + BatchNo = item.BatchNo }; sortIndex++; details.Add(table); diff --git a/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs b/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs index bc61976a..129ee9cf 100644 --- a/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs @@ -30,6 +30,7 @@ { MaterialCode = codeLib.MaterialCode, HeatNo = codeLib.HeatNo, + BatchNo = codeLib.BatchNo, MaterialName = codeLib.MaterialName, MaterialSpec = codeLib.MaterialSpec, MaterialMade = codeLib.MaterialMade, @@ -58,6 +59,7 @@ if (newCodeLib != null) { newCodeLib.HeatNo = codeLib.HeatNo; + newCodeLib.BatchNo = codeLib.BatchNo; newCodeLib.MaterialName = codeLib.MaterialName; newCodeLib.MaterialSpec = codeLib.MaterialSpec; newCodeLib.MaterialMade = codeLib.MaterialMade; @@ -103,9 +105,11 @@ { MaterialCode = item.MaterialCode, HeatNo = item.HeatNo, + BatchNo = item.BatchNo, MaterialName = item.MaterialName, MaterialSpec = item.MaterialSpec, - MaterialUnit = item.MaterialUnit + MaterialUnit = item.MaterialUnit, + MaterialDef = item.MaterialDef, }; details.Add(table); } diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx index faac25eb..8912c95a 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"> @@ -162,14 +162,17 @@ FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center" > + FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center"> + + - <%-- - --%> + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx index d8da1ea35fd3602c299aaa40491c08df25ead655..e8b790c00f49d428104b300d46de55608dac085d 100644 GIT binary patch delta 2397 zcmV-j38MC|NySO9;s$?rs02Vj0{{TP2LJ#M0001ZY%h0ja%*C5Z)+}iZEU1f-EPw` z6uw8|9U|XniPNTQqorv52^4LpTK98PX>t>Hv6k4uan?)|Z@?``NZj%aNFd&ZUGNqh zCv8V5LS;m)o#W$t`OZ1taSoo9X=2<^nKQwCg!gP@P#%hi@hg8Hot*||8yUGGJR*tU z)JL~8N6)%XpByZNyq*bhZ2$nzeH1H|d6t!jF-=LnCo;;xGZ!)?3QT!r<(Z@;%414Z znplo)x2%*fj%ox??t&raa~9Hp2#b_*Rf9;H5C!z}m}U72Ee&^pONqQLGBXru1`sor zFm+pjA|nmG(G`CelFSkayTq>yfNlYpm7-7`Fc#4TH2Qt$2{UN20lFZVu`m%vnOuYv~#! z%U+RGS1Lh9LUJ{Xn4*!7_Q4bj`mo?4Ll#-DUMdei&QpT2+lIQ{YA z-TmA5_g}wEC(oZBT~1!StZt?O5_rDVG${z0cC z)M>IHH8p?z`u_JcK@`$kX>qKi0r#W95!7QsZlF4#foR#hBS=4PT=GzQ`0}pNv-|sp zhi$Wmn~vFZ9NX*#xMw!{jiA|gTi6czZy*@i@xRDUHg@T#_ft`sAwGb)Q9 z3d2cI5-w29Fjtpw$SmWOttH)+OqiNPv4R+gU+28iEn7)1p(}}c+*MapmK9KJc)`ud zks`08^ZTukifjtl_Ysc>^^OX@5&YuTjawghDmhhB%gp$|9Mmxnw?7MJ0ihk!aQ_$4 z;8CF1p4$SRsehukg@nf)S9B(e-$*v;$ZWdQe8CEQP?R9l$aYYWSY5 zSWzVCAsT_i|2QXh4laVu$J2T1@6Jj3tMXEokzHX{vVZu^Qnr>8a36l4qG__1|FWdW@4^h$2q4^&5vb^J9Wj{O-Pg_CHEJi60HmW?Zyip~&< zQjmrXF7e0B0+(ip{4|M~OW;$*2IwILdk;%4Gb036|u)5o?Avc zX*XBv#w|Rn2M~g#xV0P(1v=3n+x;?J1ba{-Z4e)Z2;4`khKTDvVm(Am`-qQ2#Hf$B z8zRPi#HS%*)<=9EA|`#r{SXoL5pXWpjDh&Oj9A4TB7n-YU0j!{%Hbw6oI(d@QW$$W zSkqGl$Gng$DVpohHfTk*>-d2OVD4sG9Zxa=4d z)b=`flBRvJCro#JF8{N14_65Z7@4ocJplj!*^|^5D}QSbB9f$sg5b@AK0rveO(2<# z*^StvVhKe`gwlWqrI+GKs33}_;>+Y;-@?_1px(@JzF~ed-^?iO6W2k<)aNz>6>m10 z7*Q~oX+uxNhX=bG+Zb`7gQ+_VsEYfPZCqHr#dtOc%OO9*d=5N=r1)p>(?6lA8$ zd{-AT^nZJVdp^}oZc!>+hqRi_E#m4nU}UfWgzPKZ24EirwDT=!3b!>yXlXLeUd9R$ znnFI5O3kk?^Z2S*#KrXVPi`__hS6`exKFa1i?wAKmJfH?U?!m?8$6~-Tm|c&1)e2s z3ftKCQI~<(GgaKeNc27F9ax9K*RC-6F-`@qLqaHT&-3Y`4j~&&($`TPLOy)XqNiGW zI2+a^REN!@sC=9MZxSM3Q+o#h0RR6308mQ<1QY-U00;m803iS=_nov>vojhq0R)}W zs#ue18yKaB%(c1iX*aqHAM%I0z&~MXlH*hjVS){IxwaEv!PQ4&QiH;?RVP8 z9kQk9#iM&;)zR2AP1KCK7(PG6PmA08Zq-of_ErK=mPo;b0q!c3EkOl^O7Ni6p0D86 zE&QdI3gp!`+kJinyRY{I|CT(g%ia?~20jhzvmcbl(e+I}M_EkhI3$yhjB`3=^pX+s z+)g1r>2K5Zg>patUt-+i!g!pM3A-3EN(aOPAnS6U{)p@wv#1=p1qFAg1VBKOXChJo zL6f>7EgKan3!B^m004sr000;O000000000000000bdv%jMFEDBNFzW2dXtGGAR8E& zuf#n8007wn000yK000000000000000$dkk)Cj}|@owQby@FNugHy00000=>ty- delta 2408 zcmY+GdpHw{8^^cICBsIIu{CTillyc??u1OW8B5xs+$OhnP#I$El*>47b18Q2#o0H93} z0Du4h0J@)MFfGv6jYjj;p!@rA$n96Ajze3dCK*t=qr&qHH*iY)WaS0T)Q$%uZ`|Yx z6i=YhDMu~4gjsv-F2PX;S~d{E)sw9+ksF%Vu`ka$YYOYZ{76p=^IreiTzEEbB7{0^ z=Y(tLyP4$YK}5wfZmwnnS{h>iMB(t3baPz0cjRa9xI9Qi*!4<@wd?YoWk5i)2=So< zk8)1>{xRjn6f9P7fb=W}tF`zCSu!=1b6SNQLe;PRqa}~Q1yIwU@cgEhA?;|D*M$Y~YZy?5GFLZ0$(>QE({$uFI+U61!rG0kxbTJ9( zJj8!qIydRVZR&b57ROtsIp8-a^U7E8Zn;VfFll6%w$e&CbW(oz56Sy@ncqwf4iunt z0tLr_q6#0Da!t1bma}?>dnQ&+v^;l{tr0=BXnV@QnN+hcPa;AnDM8T$rZEJ+r7jEC%sO)=ve0qs4xfgR}>o@&w z1cbwWsrf#8Sse>HHeIYXzO-Pl1z~H;9Ihe=>l`?ko$o#L;s5|($c`70XG|q#YeB;+ zMj4NPJc*Rg6u4DdYg5+*Nq^{)f5e?x6It?U+Tq)*fo`T>=TU@zn$}#7zRrUF@5^;D zm8J&e)yZULoYbXGRV8~ne~BOKJ-aUi6RHczc(BtdNVcK7E`D=mDXb*#YJY=S8}S`z zxqFnm;+wIa>O&ZBW-@Rk47|^ro&ODI)wA}?4w4aY(4kh&-40QU(sEw1lM?)*O|5!} zr;J1w*hh|$8-F3#Pq8Vwob%qBGOOh@ZpxLsrDbi+vg@7iIim=3mLhIOC15QC`DdXK zc2eDC5Og|IrNonJcxfX$CuVWr#~p&xz_HT(qcXTP*zCcnwnJpbR&Cm|`ek8)#}J}d z$>`3E28?EzHP>pk(*U&nsCeADaet53We6K|rNBsrwqK6K$qH>q1>MiT$XxkW73T4F z+d%WU4$=*pP--|qGIpB7sPVTwIMRkAQ9BbgL+li`{+-f!yST7JpJwAm-#nooTO3(o>$>Ki`@Yn1!{tbPdmkzJdvqVPICy!H zUMW)eHfe2hZ(ryn1nQp>fkx%D$+*! z`6G~jX&JUVnpSX0={K>(PI3vDI%8iE(6t4o@S((U?fmDJZhO`Px5wKNcYPWm|5J2-vn9W?lvWb>i0&GBci&re(_LmLuS3r2G^y}C7KiX0_6$24Xb5%iskP56EWvh>Ak zaWlGx=%-5A^q#ldN|b`DCp)+VC1YtXURtyc{#lR?`a7r9W&*}~`hyX7PhdHwD&f~* z?A@WRNIHn)|9M0~J&*XvrQ#t0VtS*q?O<{MV|lw diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx index 6fe9ff9b..e64b6888 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx @@ -49,9 +49,13 @@ TextAlign="Left" SortField="MaterialCode"> + + @@ -93,7 +97,7 @@