From f7fdb435ab81ec45ba9349f9c79f62a19b487079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=87=AF=20=E7=8E=8B?= <648428741@qq.com> Date: Fri, 2 Jul 2021 17:35:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8D=95=E3=80=81?= =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WinformGeneralDeveloperFrame/v16/.suo | Bin 574976 -> 587264 bytes DB/script.sql | Bin 7475294 -> 7494116 bytes .../Encrypt/Base64Util.cs | 292 ++++ .../Encrypt/EncodeHelper.cs | 620 ++++++++ .../{ => Encrypt}/MD5Utils.cs | 0 .../Encrypt/QQEncryptUtil.cs | 44 + .../Encrypt/RSASecurityHelper.cs | 239 ++++ .../GetDataTableUtils.cs | 17 +- ...informGeneralDeveloperFrame.Commons.csproj | 6 +- WinformGeneralDeveloperFrame.Start/App.config | 3 +- WinformGeneralDeveloperFrame.Start/Program.cs | 2 +- WinformGeneralDeveloperFrame/DB.cs | 4 +- WinformGeneralDeveloperFrame/DB/MESDB.cs | 12 +- .../Entity/productBOMInfo.cs | 2 +- .../Entity/productionBOMInfo.cs | 61 + .../Entity/productionRequisitionDetailInfo.cs | 61 + .../Entity/productionRequisitionInfo.cs | 58 + .../Entity/workorderInfo.cs | 6 +- .../Form/Frmbuyer.designer.cs | 82 +- .../Form/Frmbuyerreturn.designer.cs | 106 +- .../Form/FrmproductBOM.cs | 16 +- .../Form/FrmproductBOM.designer.cs | 146 +- .../Form/FrmproductionBOM.cs | 218 +++ .../Form/FrmproductionBOM.designer.cs | 864 ++++++++++++ .../Form/FrmproductionBOM.resx | 120 ++ .../Form/FrmproductionRequisition.cs | 385 +++++ .../Form/FrmproductionRequisition.designer.cs | 1218 ++++++++++++++++ .../Form/FrmproductionRequisition.resx | 123 ++ .../Form/Frmquotation.designer.cs | 8 +- .../Form/Frmreturnsale.designer.cs | 28 +- .../Form/Frmsale.designer.cs | 28 +- .../Form/Frmworkorder.cs | 187 ++- .../Form/Frmworkorder.designer.cs | 1243 +++++++++++------ .../Form/Frmworkorder.resx | 3 + WinformGeneralDeveloperFrame/FrmBaseForm.cs | 7 + .../MainForm.Designer.cs | 111 +- WinformGeneralDeveloperFrame/MainForm.resx | 516 ++++++- .../MainForm.zh-CN.resx | 219 +++ .../WinformGeneralDeveloperFrame.csproj | 24 + 39 files changed, 6334 insertions(+), 745 deletions(-) create mode 100644 WinformGeneralDeveloperFrame.Commons/Encrypt/Base64Util.cs create mode 100644 WinformGeneralDeveloperFrame.Commons/Encrypt/EncodeHelper.cs rename WinformGeneralDeveloperFrame.Commons/{ => Encrypt}/MD5Utils.cs (100%) create mode 100644 WinformGeneralDeveloperFrame.Commons/Encrypt/QQEncryptUtil.cs create mode 100644 WinformGeneralDeveloperFrame.Commons/Encrypt/RSASecurityHelper.cs create mode 100644 WinformGeneralDeveloperFrame/Entity/productionBOMInfo.cs create mode 100644 WinformGeneralDeveloperFrame/Entity/productionRequisitionDetailInfo.cs create mode 100644 WinformGeneralDeveloperFrame/Entity/productionRequisitionInfo.cs create mode 100644 WinformGeneralDeveloperFrame/Form/FrmproductionBOM.cs create mode 100644 WinformGeneralDeveloperFrame/Form/FrmproductionBOM.designer.cs create mode 100644 WinformGeneralDeveloperFrame/Form/FrmproductionBOM.resx create mode 100644 WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.cs create mode 100644 WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.designer.cs create mode 100644 WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.resx create mode 100644 WinformGeneralDeveloperFrame/MainForm.zh-CN.resx diff --git a/.vs/WinformGeneralDeveloperFrame/v16/.suo b/.vs/WinformGeneralDeveloperFrame/v16/.suo index c321281ca7614374ba9ff47adf48ec344278dd59..892651193f1f787ae7c66361bd19636501d09bc2 100644 GIT binary patch delta 35701 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 T7Ui%0->u&-84>@f|6u!n_ohnB delta 34064 zcmeHw3tUxI_CNc)K_mo3M8hj05&~WxBEByV3C$EAnH3@+_zD3LO-<$Mlw)RwT!+<^ z5u%})89w5gy{=}Cl{w_}a7>My9#&@PXb&s>fA=}}!qv3b%y0g``Tsk77H6M*_St)% zwbx#2?X}iE*Ltd(bw#%d^B@n`;p^cMz&t$K;`-vHOP6>yE(e2KFU&fnnt zE#QpD)}l+S?SV~^=IQUUF1X{Uw9OahvthRLLb?1Dilp1-iFddAgW%y|oyDv3@bClt zKySX!ItmSM!*;V?`a_JB_cgu zGJ2nlG_o&sb)NaFm;t*0odE#=Z=S|;%RD@SJ(6%y1&9GG02~EW16J7Hlsd>ipsFuy zUr1fbLy(sVFyU>c;G7D05|9AsjJ$N5{{)x^XaWoX%JM3n0hC!*;*i@%mSgo&Z<~7>8#T<2)b0aqVZ@?b*fmbEKvM zW&r*Qur}!rCZMqlf!7c!Lvv3wFk*IUGDeuV_^CS z-Exh=R-}Uf<$!oV5unn$EUByF;n4+P0&x6>;@k}o28aZN19|`=05<@5nG~FDo4vET zrXrCB7y?KK+z7}33kQEp+RKU0eEBk-3n|(dMqC1gPj_)EOS+Fs;H3zx37=LVpWq_Dy1G~gK5cRmTY@jh*fr?e3(iX zCPQNE^*76$@CMMlDeNZgIwXTJVtS|Aa^f%n__5m6K-~7KsOfEN)zQOG*U9x*6y zv%VZfWrb{{Co|(R&Q%4SLmqFG%4V@>NJ1cZ~m!;(8F^c>r@h_nKRoMz^#H_fI&>bi+9e&>avC=)pYbkuagH z7KIC5HPwd+2Zrb1Di@Fkm;@*Qyo@TR;LJ-+#d#WFI^a$~Az%ie2v7oe31v%h)@$6~ zUFb|rim3T5K-NOQB0xF7%4~~*BDY5jJIuBP9$-P|fVA^~uK-^Iu2+nyXZx^&Wqa6& zqiREx__B^@nX?Lw<~6Zi+atyw7Rfq^Mc51LuZnmk>i>s z{HA;Q>+L_>CHhuofHcktCMNO5bFX+NB7GsYX z#?~;Y4RUx*ZTKr7%@5i-NzL7!Q&po@9bjury8Ojmetr_SIl_3FvjI+#^gK$@_|I7c zS>IsR+8RHv#b}5Z$(LO$m| zyk`XN{nzmx{~z-n4`Q)$0X5E2eYThGS$Tckd?v7cHkSL?_L>tp?Wyt$X0clY!NF=T z_*4b35*?pZc0`D>*95Q##$xEz_N7k zlDY$LI(^v7;)E5fDwxZ)DUcO&MGub#FPb0BhH3sN6z(dhJPQ5cs74nK3nL^?S1y%x zVwqYxNW#~ZrQF7^6x#(02riHv7H!t)p!wD8FsodRL}zwbtqf1~)Mp;&KL(wK;;GVh zw)x@n$#H^7OtO6&KFm{J>F@#83)#wgSle>)ZU*qX$u#Gf3AG!b(4my|5tV%KNTo7n}0h_N*MjGoo+naIzcAs(V zEUV1I^O$~@xLT+`PmXn>WSg5cT;th%>0@MDHzNC+tOe|8+w2MDN?Y7mF4-^K#uTCM zC=>pzSO|SeE+cb^8fx?1m0*7@hb8KQH~CtE_X2p_cYyB!9Gz_-k30biAXN46;M$g_ zhnL3&>eW?tRj{6y%BUI-4r{j09?wQF zdU-O7ZOdy$Mf!1oFbTJk`3LY^pExbhesC&_6R)8IhW-K_P%(5s`-K@mC?)Tby3%(y zDs3qtM5y&FEhw8^S~M%S&^BsU6lH}7J5#wd?|#dyg3`>=;>ptr3%X||mz1RCmgQy* zFP@ZJm^G}RETuGeTG6bmF;jC(3-Yt(Bp1!gN-LODJfj4~OH*?v)s-?~;?#ny{FcnD zls>6_(^3;sqZ1Po`$i|kn-imx6XSYE59!-CIVCkcB`Gm|NLFlOR({^3yaaP>Le}Vl zlHys@%8E zr~C9ZC#R&RCq^g5rl&?H#0}{aoor4>iS9cjAz?^bT5@b~LPBg-LR?nwq{QBR?o>4SzTESh;{w2ltjY^0$`uF0$yMIIaB=+tTpWHV(J~lQXIw3VNJ~}BeAt^dO zE;TN8NL+k+P-1%Dti*(@0&`q`ZtP@p*4To%WiIS>s++^4sv|7S9_B5CF=-f=v3w~* zWo?BOws+!u>^`3{g?0V-^o5we4Bi+#VbGa`-Mh>k27j>NdiIn#<|(%9PZu9~yr%~g zdCK^l?W_tCBvQT;bI5nT9B7}vh%FTrDa(_R%cT(JFu3P}xw4o2VxS|qKb3C^zy6$d_hIdAC%^D!uh|w)9UN$mHoF}Q7sSRT_Ku3D9$kgG>a2OQ zZZ0UA&4(+20=ft@J!j4?F3T;OR$QbHVMu(RsNV6$06vbsr1i_naYF(wwliask)mGXg^fJVp!c0CQwb5yp&A0 zszLVZJuHt^-i$@m@B_^Ie!TW+RLqa6I&CqD--&}O4@Xj?Sy@3Z`U}3abc0q+O-Zs3 z?K;mw?3oX>_r2bw6s+fE9vMyA%DmyRKytzKlY-srvdK+iU9`zp8;-1nM#~r z08BvIf%8P1a{!x=es|T(yW58SRz7zVUy;BT6;>lLkkO- z2xI2iJ4)AC7e4U}X};3euRi-XYTPTQ*}WF2QLJtS6B??(X@yN5G>6!tHe5*$0N|kH zPnA0<$+iTT^s< zdUg!E5w8(SIcMa~WUW(U?1ekoYF2fKg>4TTbd=GdOL790^icim>CdxWa+SsksjyB9 zAgjg(7}}FVV>Rp|<#rc3(A=#oiRwLB=6{GS@B5uC|LF8+rbw{-sXhKefyf@6XF-9RZ;mLvtQv8vy;DGpM_f z=I0K$4gz!plp=4KGk-eHU7Tfyc+jHbESr_Bn%PMnjLcq0P|*7@O5L?;W*0V*cE8WM zu|=z9_Msi`Gjpf;DD$ziBHjo;%8|DQj9~G*YJAms=0%PGIozK24y$IAzMl0XYdZ6# zVc$!M{~;7j9bD(fggRe{hPWop^q)mhXO5y%S4WYDF2UQxC7NAoENwLjoqsII|2-mz zud>`l&_5x9D&Ghrt4R)|k|05`TRw&!K#m0AHcGui>-KYkfDUyMf+%Q*Hr4mX;-ZE{ z(SmVo7}a+dWNLGR(3>4goY|n(OaVDcU5cp0mn|C*8@_Vj5`@ zdU+@Gj*9K;)Dn295@{@S0^_k=JYx!3u!Ie|xj4U|FlAa%erj=1S!r=$a#>mFw7l76 zF8$k+_I5!Nylj^-GqGkUol{WCn;AQ=q+o2Z{~r?RbV0&+Rw~>j*yoIAH#;@g8}PhSeV)MLo(UIV{tquxeq>^xZx0CH$+|&-=4G*7 zc9{4NGqPrJZAnkgtd!>Q`vsi}Q6U<{fX2igVIj z9ZgJOUA%v(W{TB)*-tI!**Ne&eI+f;4X61sHzVckebg#o7tFoE7 z?E@&g67V2kwJo>C-@6JaKHh{gWo5Gi((61GHIa>_`kqYk7um#!0_^Sy;}Vg)pN87pV`be^Aj(d>7HOTW#` z#G7a_GkFD7_oUgcv-`<9fv@$#5pdwixb=+NWStZXKaQK>*Y>i1?9Z5d|M(m1 zT&v0VAd_1EMR1Fr7l3z!(-sFGq&dEMx*g7b0LnPXa>86C_<|!i;k)APx`@paTb) z!|Yyi3Ua3crUAGXaVMY2wQFj>27R)3en9-bkHd+dAxvksB*5lH!j}7%?+)+5#b>Ew}40D-&z&>h^ zI07DUP3`CdltVXvt#;JGllv2XfriwPi~qX;e1Xdw;)kvw(GLYI-P5BT&~OztFjC^n zU>za4OY$W?{~>^g0Z)FkD;~(ZX%CXcQh*INol5 zG1OaHcKf=-xRij<`KIJLl#h2 zJ*e^iCkN;G@LVzlHXj{IowQ|)e?u)-U)@fP_pE;26V zolISDv`447lqqjNvn2MutvQvw;!-|-{tqX6H+?>mr&C8B8(m?_Y|qo=_>eVc z&i?i*-v`&X>s59lHs#QozkE03=Jc^V{paEWZNsbY4k$%>`a9i*ZtpLyh(8vqzt5rM zGYun=o_E)_l9%((*YouDuj1Ec`h1c^)|1Rij*pn7Y8iOI41=!~8hot}&AyM_-*Ad) zOj%n0soxX%cAqcUMJBA-WcL{&E>XzrFG%*K!^Qcc&3Cp!IbX40yGarb!R{l}5RCYe z&Zg`e1E4)S&G~dzgKOw}KOsP0uiKB@E{4lw4iYpn-+@KCcaU&SuA43jG~f>AL#A^~ zvj;{BpQ)5NP^csG0>MaaL;7))( zt?SPSX43*(@k(6>Uv}K@mPbwg;$}+fB}Cf4pDRSR*QeuaAW%9qR|vLSRtg`p20yl! z_2+fY!joly*?>6!o;TNdegJ1ai+GC*oq2o~Sp^Rol@1Niv``4AoRvC$6e?UO1lUhi z2mx)#@|ZB!KDS!f0zdBcTn}jC?Kh4U;^?@)7+^1~6?Pe(IbYo~XG@KY;~u#`2qxIy zUu8=-)VCLfs@Fgvy$w0w4^nQG0||y4h&SXw?KB|^qbPpE?DIDYn;BU73Y`pW6;?Aj z4zPz>ylgcI?mU`L5pJI6FYOMTM{~aox32Jf8hemM81m10kR^rnLcTkvc7Ha}^~_Ol z?#@?oYWI?~^RLX*!lgeExRkP=JIuUAT5^XlzF~t@Cy~`EZld~PF^CrB2)_2OCQ4>S z=P2bSj0B(GQGo8BES;5+bL@|N2IdSo_GE8Ayw>@xg_pgKFQhcZV^9gfLYX_dL?7_SW zAD;Mp0y?y0a&2_>shsP1=lZT(-QK_5lmMPidZm2dEr&99Jf)z1+8?DfZlIZXJ_Og>+-x9s1~miA!& z{uA2HwvUA!^EVC~=%jUw6GZC>o6`Rn<#wTH}8VaYb)jncJFrLMZtb{xaf1a%*mFoEmH_GC78~p3(LuL zlMqVHHX+l#V4WZ_dh0Pcf_xPSA03^|{=9=hLW8)$x?T|EQbc`Dr8heXUG2lCiaW&1 zWs)D<5xEdMjykwJf#l;pDRugLV6Al^n%ZMZjYq3 zj- zgeY2eKPZd$pE7gABV@W+sHKt&;4vpv2(=$c7lw-zIv40NEf7Crly@VSX2XP!MSI>l zAxI{#8RGXiG7OYxxH5GLtp<{e6^KSX;iJ4OpD9K{`Ad8 zA;&)bJK=&vg9@A++YXMsQKVJ1;sl!Th`6q1FKpmE+?OLVj?*@${9-W zbeKB&(e4;2%qO(p-JxTOXO~VY;I2cmY!t`R^`EkCp2c$tLia6d{u^sAjr&FR<=dB22!n$}Toj*e1~z zaoM__Nl)9wj$~>OO)A!eI{W!xqu7_MJ4Gv1J|L_njFvtZLU}5fG8cf>91mld`6RJp zlK6svovK4UqlqVAvV8t!QL_gp%aa*p>=Auv<;$WUjV=*PGH=w2UU^yUU$sxPkafRk zVGYFoB0f##m&HtS><2s9!ZRMTH|-N^nB6*3E@FHU)^be4#JG!QjuxJ zaWB0p4j}8>VgQYORg5CbVX>i24BRsX9%TsbK1J;BVmW(@8<~Hk(;VhK`MWrhdDuH1 z5kFznbVN)e=@@9@{(Skyw!GK8;~cio`^cio!}20pbW}{Ck|Sa$l}whC{9_O#UgnVt zn{k;(mR>lGtTs6foL9Vsif@r&(ESAOyAz!#w>wTCNtV-MAZ;BZN0Rll=pgG1*}p=~aW|9VwORWOCaCDWd zcI$N6A&@0ha?t2(A%f~}!}MhxU!NX~Ye_1C|pSXBp0zT+!CIIS|zjv1b(UPY*xbT`QE4e~E=gN*#uDEDl6 zqReH0t;xD;TG8a<(ixxfP^)LFCTKo(?UFQCpxAQs`G7u6wyhF(*_+yk8CY&Xo+{L? zzvNFfJtf7fwMH6slXN{L9|MPUY?3wdd06$MIf6Wl)|N;adg<2oY3ooaLW)gHh@({_ zqz>Ut&LKw_rbFVh3rE_6LRvpF{_ajsO-)Nqk59H+McE41>uUMH6?8*6CnU)&Z_!Z2 z-F1G&W$r(u^mb0?D;f%NaBD(udUcp`4`pwF2Py9Y)?b_Ighr;zB`EUy&YDMGdR9 zXThtnM0e=&&JKC!$tZV>9BMmyDwqc3Df=j(w;We>RvAWvWOS-Ux;4~_%Nf1q6lG&= zW@ulCgo3LW|1Q63&8L8kqM7z?1iKv_1$G73+SI}17Y%px(OZ=;@*S@_$Zx9%=JSMT zh0Y3LWrwg@DN@`l!LMp3#8ki+ENKH|47-f^>o2mWJ@9neOFl%mXDi`s4<$FUXDBOH z@v%!aYyjI}%|-}Oi`y@#q@XmtG9I77V=~ z6w`LoSx}X~Y!PJOB~ac-zJc;+7D8K}lpi%{Z>l6G!bvfMM)i@Oad{e}U^mx`j1QC7 zQ{`i7wJoG1jJ9->y(wUV7DuK~%xCL;2=Uk%ijabon;^ki zz^osIN6MU<)O5-jq50C5?y?UXM{CEZLnvxCIxvi9oS@{{>Q)-?6$_-!NwSI6(W)P$ z{aoxXG6vPEO=OV-G`;P_OgAYfh{jLQBfjNUEPH%(qpq3BbL3C^lMt zgWej3*c>pOB@`14EC4qT(V1~@UB39980oHl*xpf$&i zTBz`d7|zwC0iG_LO#Ty7{N+60Xa;$HA`T?Wm(YMp`pH3vMQIl(_oWei!BZ@=)opY- zNe<`lvEFuk7PQg%vKKo*Z3E?a`aVq#W!q@f7Wq+I_IZwke)QmDYBZHBR@Q^N=r@j^ z3aZLL7x$#g%V@{nK<*{|)F5j7o^f~MqXwnIx$DaVY6B?yHrX5XcYRjePQLz7m@3BO zVbK2)HiBk`qGu5|$-&?#TbHV{Xv;7#`@CIhA~hzf=@c^+ zC?-dqO%0}IQHdjKe?%aK3`G^&h$U(3Xj2ASUHt+InXP0QT&wwV`3f!^a8Rd^}uDbq{wa z8ga^Od6OF}2&B9Xz^b`B@Ov;o36Wy3?6y0KWs5|PFv*t$5uBv*2gzb6UTvmhe-77R zqdfj(D4ivx#rd-*mE{#va*PzEEJ%j}RH5JUYKcKDAg+)y&FlfaG>_Mt!Q=Jx zqLn|&Gqd}6UZpZi=MD6tP1(tsY1K6KFSZeH``M0c<`X%Za?6#qWN8cKU}X*_8d$Iq zsz*&;%tSS3Wr?kzt=rYdbn^~n&ck#leFs$1)Ekmyz)}!RUZXs`>Jua^qd{HU?#09d zo%ZAS%%HIEG1xj4;?hi}-WngIi5t{Z^5q$OZvvLh&&zXcId?}Pz^)r;b<{Xt zj=@3^_c?pvp_H9lhHeQZ_mfiTXu8syt>iEIww{)CeA3!f#Oqw@h4Jvskmk}0J(W0C zO{RG16g?KM#Ip@XI(UgZfL$5l^XnDu$9ZjEw0Ndx7@lc;T-NIi`INTABFyHo2>PuC z{g!E#E4CpYu?=O2Z73_A!9yclmwI8E5hH!kQP0mq$iyTgWFprYGT|hb-umqs#Et@)z#B1uJ7~8}dCXSx1?Pnx)XpLICg1MrAaZbeNvM=hQ0XB#n3~oq zW9eM50+r-GIi1GV8(h(s8YKat@MYKmcpvze&gkp^DlfIwKN*f1RT?!))oYBS1#9F8 zOi=LZ8>nWw>P;)|P`&8;M>IV0N|rDEJM@b^EYB1tqW=$==i`Qa? zYQig)^(Yx5N3Zt-#hC4SQ}+7Ra$9B;9cODU4FZ$<)`RM+8Y zpz9|X>P9}X7^wr*JS%CEs|GVBGspIoO*uzlHPt@`=DwgkjFg$xpsQ`ewSHAw4{BFXU-?$tku{F#YLhUeuRn|Jb<+j5W3WhXuoq?@WX%O~l>O&B-uEeEAN ztu%4!t>v=Hn_~W=MPM8o-6n*k9%JXQDI00Q8QDuXua9~S-=7k}ZZpQaX(yDg&|ca} ziZ~91r+z1&5r>fn^-G~ecG*Ow4f0fWkTds}Xl=ZdNA-z{=jEL=U(OUa85IAP=iIW= zT)qg8HHgz~)Gxy#AK@!3BtIe0qG5W7HRySF`*f!U8Uw>U4>sV{9H3R1>N+ZU29)W$ zLw??k%^#0uTryP~3Xy5MY_^-X%EK8geNo=anT1pQ2G^^hRP-V=wL)6;l{|!wynw+? z8w$14F;?}nnYZ}T$`^p4gq`XdDj5b{%kj9zb*%}MyiSg$%;)3=L*6;YLpiP21cgk` z;Q^_gQfI5#=}U!v0#^?{p?3RG-tu>O4Sf&CF(~s(yu(U5^LKeB)xV1=Si2jF6c{kq z#k_YzPDuw0u@^uq?*pR)5AvaV92o1`xsYc$532W&cQEMC$AJd(ilDV-AJi70v48N! zKIMJTXX=`&{dfozRn2Kap`}f@PrjYD^j zB9AvDvA%#>y%#b$Ar<(E$<~HZ;9gAR+CB0L-q(AK4mTxeiM+4Abm4WVx2xS%ub0En zyWaG{CZK}H@{{8=s8UW`L6z)?xAEN#KRWifGBP))No0Ogp31d@hxh`bzG{mafu$1^ zf{A`#^?sXz}avNZR=>s0K>P zILdezGsz{4u%+M~If>$)QFT4Wn=D-C0ag=1N*KY$x8+C(6|PQ^X`p6;uB2;H`r2c} zQD{=YYC4511=(5Nlf$u`z;d!b?LUHH!s1F-FMTNQ2wSq*lW=vz&H(EN@}8oRIG(YmA278XsfL=AawrAtmm{k_#6;#RFqf6b42o%>-Oci=d;y20{X4<*Vl!H|eu+IFd7pr& z8<%6PX897zK1k8fBAfq-7E@01W{2_x-WQm5d4V9-ia0rir1M}IAHEAxHs6lBgEp!P zTTByoseO%s!P7BVsxN+2ew_}?(pkwiKHu$pSrtX0Th)Ek?u69o3bneYpKp5Uj8+XC zdspVus@J6%(A}In!wOpR+@IwJy+9EZYaDS7S1L{CkC_xv3_kVo*I);Fudx>Mrgy%A zBm)&BQqu*z$%Q?j)(L5E#HEnfnavQMC&Wh!Mg_N#HtVT77dF@i>fSz%8|TQ zzLSDfC4#e=0Wge2(O0t4z*&HE^onG~gw|L6Q=UO@Nr(wuPBY)eLn#uBb|z72V29`f zO?iqICCK42|L{NpZ|W1m9^2vQQ30);puRwkd-Z{xXY`L7wp3$czuTf2rc<>KtUkI? z2m4^KIC%<`;zc*NRc7-EhSlml;9m)CmCkHY3!e+LHD8j@PA|TUjOOc-dI%j8W71S}>8X8mChZHVIH^fP$4G=gk=3PzqWHy|mFE z99>sEA$aE4YEE!f;1qR<$NCHN2sTRW!eLpw;bUwEpR!NdPF>RIqOYRMFz3c6$Rzl> zd=)PW=nGb|=mb_<4ZV~QKE!ck?xl>tK#W={7t@IDszxVbl+JXvt2&o2xEJw4R_Mk0 z=K}E63_lA%IN2*~5C^t)fg&sCT{efjJl1c`u4a}e)-7fg22o^+96O`b~nY%an zW?^KGyB4g0sJ$cPT_DIB#tt9K91n^CUs~QG`9@PjDqa?|OxF-Xs3rxMxGX53F?e*nTy-OdE!c@ zUBws?6nI(PEiY!(-#VbRk(N6~^X{!#c(>iw`XTySzXK{x$(>ce?I`GV%kvAU>v?IG zXUjF2&P!W)4OdlLO?q8?be!6L%E+7DYtu((w(k|W`mhvhx{o&K7AT^*gSF zb7sDt+nz%}#=7Yk7DPY#Y^MTGDmN%D>ZgX&iC*eSTG3av&|5>*My{;FIb(x(e7+}! z6zbI)%CX9C*uU(lq%*GsCz8`ztr>&aT<-sx;eB&jZ@$xE7W%E{45F^L$bnVgLEe5A z2^loDkGzetzl92hE_7xWXk?leO-(;Q`MX%EMhZEMRvnXiRFzAb=BkUoQctSBUg;Eg zziWIw++>`aA;muF1|^#X8vX%ZHpaoj-DE(TZtHjxvu`eSovG&1vJu!Y1+J7%7jA}* z;l(d6Gfl=oFt|+m-nRPtgDIxJsu*Tq-PUZFS)br~Bg`*v%Tcz2W4OrLNbM$Qy`lLA z(8puc#LIZ$J!3GLvC!vAI*fY?of{1lW5zmlI+(Be@%ijWXX2$!zsxezz1z=hPT^WZ z1?6^Dio$+zNz>1jY#kP#T#jn}h;YEvvN%-k!+Wflp{uOR(di131?ZthsSTMD4bCH#)p9B8mz#%krnol7}!m~zlY22k}KsvqsW zUA@PC&uyxOvB`!bE&DcbJ5bn3IUrM2_AV7RssHo$Ml<(r03S2-udBEM_ox0rIBn~YipK5$2iq95Q00iyUf zfYPosyn1_~-(&es_(?Fu@H8Zj~)4MbiuQrrYUF|0uhSTQ<$SUWt}sqZmqFYA_VpuYv-I;9v2z*UU69ohqnH|iGP7&nBK>v;6P){VB8-M9jmfqFEp z{#J30F*pz9Z}ekhvyXRc)01Y+(OdL#R_wY~jB9aXxXhL3;n&f(sa2|J0Wlk-}5;JHg1f0%d}jg>vHX{dXE+lRf;@YZt-`} z$KprU@xTBeLMIRRsu$@9@%vH!Y(3v;TzA#^WBa;)J5<_g!!APAck54*b+;rt)#}SL zUFLaxmio8M`XEO<(!)5i-7KY7+Q)-~+!`}1;m!$i5697DeS&oS1!dY_wT#<@3F8!? zA3=^jI7b4~R<~O2-R$!LetKn>bw|gmF<oAE!B51&p!R|H5V1h#w+ z#=TYNtiS3#W7fCa(q}ziAALssW288G{ZqIFa~4Yj^awpl2~z&*6@=!Kc^9tX$2{jhu z#v0t)wFU<&uCgjm4}8gmOm{=YRpWqvLp*1T+JdF=4QNO-;yI_s%T-qd)!LRUt!s(l zoUVUk&>8qTQkgGMf+)jB{s7ZmKY?_y2xfsi6YR4&f}BHxis3;=Fy|6yFsgZ?QpTe; z5-*SN%(O4NML`s8V>fwxWvE4u1FcQf=G%9AAwY&lG`{E--if&X9Jm~ox0TDNxkxwr z?x)!PsW$mzlm^oF86qpA+`h+$J#u_YWSKWm8f&(+O z>l7pQkU~D<5sWeLCxJ1Lh^y9e1BmWbze%rVo&Zp{b-B0-e!o$i` z1Tp@~_`Sq`TMS;?2Hl>K9w6gGMIXt&Y)flQgspz3#6OqiLp6EuAS6V?>{y?x zMi}AAdc3veI&3-l{tnUQL_W=(%+cHfznltZz;n_P;A$;IREr*qP=BXdLQ)J5mx+S{ zwwZ_6mE4KQ!?#kfL8orIYNpYb&}T#~R@1Hu7GTSH8~vD$F6^DE9-tFb)DwD81ck^_ zFjSpkj6!CrMJ$bnGWH^6Cc^okXJPNm^XdTFQi2|TIMErU#y{K}VMo-EiSasKG=l&1 zux`s&2rqzV*O&6jVE;El9rftizwi$v_rboxDO?m^Cobn+pMwapRbzPAcS_ZK)eJ39 zZ~ftUY8bv~q3_H%H&>m5*iqdZyCpEvS00HKbdK>_Wq(9F^-I+) zR8fXlkcy>1V4-21MqrB`_MJeB?p1F$BC_`1qb}i*5qf;`J#-qeHfa4;N*<^^LuyZ_YzijxgBW7q1e+gLs!1%uK%yQNl=Xm`jyNG5tEcW)m)YZ%!y#pa zdsN&m*Kl5l1~$19?=kE@{{&xl!0!>X1Q;Q7#-`5ao+{`57=#LqW>qailw=SV!l(TR z8(K9ye40i*2a<+-E^FPraLx!mXqh(h514h^jKCp;&`EUs5(WZZdwr{dGhXZX!-(Q) z;BC#O1XUY{-LgP8Hq`k1sz@~qfI=rmV~3CL!-z_8Mfk$4IZ)GVnO06iUF=&)RT0Sb zu)2~eNQJ+j@9k-NP7cLZbi4IYHI8x8bp`|uJAk;g$&YeZ;s!YK5bcskhsI&b=z9VY zrQ|~u6JN;3Jr1X=0W z2-br5wAO7Q`mP&^I&b7Wc!OHP;Kkn|ul00=Yko(umGYZ3qEYshH(<6pcT{D6!UN?M z1e-pi=FyzZY7m>FuiZ%5492C4C|68d5G)X`(A6cj%@=t*6B%;8WH2^l9eD!mMGv|) z_M$wU05$Fov{gjAC#qxU_7@?xurTrFJ$Js{mZxDCaR%ClJ`E`y*8l-mu|@4?N0=cv zd)at|eCeXG{#hsli0#;Kc;tO{0;P=&Y7Kv++AV@9umS7~L8o(}!pv-=JkBG)@Q$D9 zVc~UrkCvD1^nM;2&wtRa!HA;fzgt0@wyRzU8w1|f(S_}@ANEA(aiNfs%Z;ExpXXt^ z(Z@#L+VOR#WVVJ`ZA)&>tKX>P`%K z_d?VLw4WGS(iQQGdd%Cu9+-LZ_b|!d!z6zXll=cFOtSJ9M=qNGP2qITFlT4T^iF*@ z`cFi~$=m_=UlFy|x>r8#UyA+Wn~C(e;(s}kXB(Z$;p@EqD&L9{K>wmM!F|^VRs;Af zKmbCa7yO{_pPp;T@~fJ1>EvXD8U1cf_}!fFyE);1sX0O44T#V71pRNa1n?ln)*T$i z-ooG4OuB9K_chaRUNfzCZ3X-+S_|e|w5A(|QS8p}q0TSB&Z}?bgxR-<9W?e0xPAkz zbIUI8aTJoM1sN+h-Gf)rThq4yWm4no5Z^WT$bP~h4{9DF*Kxae6yMm=fRr4@*7BXT z&rz0yPc0h12OB`KTVVkR(Xg`3>Zip)R_a?@Gy7^`d~dY=?H9iNI)pZM)_0^`;w$nE zq?^yPHGywsI?7ckXBI5#_+ZI(deN_2V)TcTWuPY6t^Kt*Fqk^ObP`JGeRUJ=Kly%y z_l+;O=pU=Xr>+v&?c6Y@@9f9E+*Fv><5IL*cF0)x!loBw`~DC&n)Wv~Z0Wlh+_$jh z@vqTrr;;&@Z~m#GGlR5O43o7^!i|IQhG_$}Beb^}wv8riIE3**-^cdNId0b+3JX7s zh*=aDgI+r~asEDX`j0;TSB%^m8bJu4S)PH-P%XB6+m=VTDSxb?G;-g9t^Qb`X6zxn zk5S1xuukb8IGH;VKUxJVNj~3a%>S=#-n05m!DclQ%-Df`3yc}+XgTt_=6V{gUlC^Zdy zKQ#aLKJ;7uH7eKsTiq6=QS&VbT7VrUhv1p=rIcH=1h!BA_6F7bMdY8#_>z)`YWTp* zO0;!qj24WkHEfpQ@&{)dp-k<-NJmv+F}~{_V*#W zVGLV&Qu)WY%-p9kr)o3Idd;_^|N3TA?9NT+#zE&6)#JATKlt#6?!~L*s=JqM-!aaB z_|HIZp;6oA4PGvL-%4g*IRQUJ4RfBpQ?YOYW+}X1@6gy$SW6_r>xBK+-n4fjHeNsE zwo$00HUc#!qQ)J@_c0<*<1_0yQ-EIBF8A|2Lb%@v_g5HuB&!SXDKUNLWK+I2f*s)> zDe6L}Cut5C_AX-s8Wk>LK6tt}%$fW6CzE!Qc@lowvV}kL-PykM(39{pC|hBR^lPOq zD#=ApJt+4)ye7J#wSF?Jt-tPv+<5UmbeF$8)Nb924$=o_G>hH34_}L~nyM|P-Fvl{ z$ohnak0+H&-aKY1!Itw+6E*GEQf)_{zMkzT{r6hIuf6Gn21gq{IdFos>GuO%;KX9PtNKz>88K02>ERJl;SV+A4^O*p$)P{ zOvN7g*AOg*-?SUb4jV0Cw{{PD?;qMnH0mQQgEIDMN%+>Aa3iU&YJJJEK^{h5eu$sI zoA{dc0X08^ueSNVp_Nd{O_EH#Vp%(CKBG-+b7$+vCL1CI3qDC0f*8U1d44GfkdePG-v{9_7vA5&!@I diff --git a/DB/script.sql b/DB/script.sql index 69843453eab9ae4faeade5695ff217a7203436f8..32f4e33238ef3f357efe23cdd21915d761f8c75f 100644 GIT binary patch delta 13259 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 + /// 基于Base64的加密编码辅助类， + /// 可以设置不同的密码表来获取不同的编码与解码 + /// + public class Base64Util + { + /// + /// 构造函数，初始化编码表 + /// + public Base64Util() + { + this.InitDict(); + } + + protected static Base64Util s_b64 = new Base64Util(); + + /// + /// 使用默认的密码表加密字符串 + /// + /// 待加密字符串 + /// + public static string Encrypt(string input) + { + return s_b64.Encode(input); + } + /// + /// 使用默认的密码表解密字符串 + /// + /// 待解密字符串 + /// + public static string Decrypt(string input) + { + return s_b64.Decode(input); + } + + /// + /// 获取具有标准的Base64密码表的加密类 + /// + /// + public static Base64Util GetStandardBase64() + { + Base64Util b64 = new Base64Util(); + b64.Pad = "="; + b64.CodeTable = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + return b64; + } + + protected string m_codeTable = @"ABCDEFGHIJKLMNOPQRSTUVWXYZbacdefghijklmnopqrstu_wxyz0123456789*-"; + protected string m_pad = "v"; + protected Dictionary m_t1 = new Dictionary(); + protected Dictionary m_t2 = new Dictionary(); + + /// + /// 密码表 + /// + public string CodeTable + { + get { return m_codeTable; } + set + { + if (value == null) + { + throw new Exception("密码表不能为null"); + } + else if (value.Length < 64) + { + throw new Exception("密码表长度必须至少为64"); + } + else + { + this.ValidateRepeat(value); + this.ValidateEqualPad(value, m_pad); + m_codeTable = value; + this.InitDict(); + } + } + } + + /// + /// 补码 + /// + public string Pad + { + get { return m_pad; } + set + { + if (value == null) + { + throw new Exception("密码表的补码不能为null"); + } + else if (value.Length != 1) + { + throw new Exception("密码表的补码长度必须为1"); + } + else + { + this.ValidateEqualPad(m_codeTable, value); + m_pad = value; + this.InitDict(); + } + } + } + + /// + /// 返回编码后的字符串 + /// + /// 原字符串 + /// + public string Encode(string source) + { + if (source == null || source == "") + { + return ""; + } + else + { + StringBuilder sb = new StringBuilder(); + byte[] tmp = System.Text.UTF8Encoding.UTF8.GetBytes(source); + int remain = tmp.Length % 3; + int patch = 3 - remain; + if (remain != 0) + { + Array.Resize(ref tmp, tmp.Length + patch); + } + int cnt = (int)Math.Ceiling(tmp.Length * 1.0 / 3); + for (int i = 0; i < cnt; i++) + { + sb.Append(this.EncodeUnit(tmp[i * 3], tmp[i * 3 + 1], tmp[i * 3 + 2])); + } + if (remain != 0) + { + sb.Remove(sb.Length - patch, patch); + for (int i = 0; i < patch; i++) + { + sb.Append(m_pad); + } + } + return sb.ToString(); + } + + } + + protected string EncodeUnit(params byte[] unit) + { + int[] obj = new int[4]; + obj[0] = (unit[0] & 0xfc) >> 2; + obj[1] = ((unit[0] & 0x03) << 4) + ((unit[1] & 0xf0) >> 4); + obj[2] = ((unit[1] & 0x0f) << 2) + ((unit[2] & 0xc0) >> 6); + obj[3] = unit[2] & 0x3f; + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < obj.Length; i++) + { + sb.Append(this.GetEC((int)obj[i])); + } + return sb.ToString(); + } + + protected char GetEC(int code) + { + return m_t1[code];//m_codeTable[code]; + } + + /// + /// 获得解码字符串 + /// + /// 原字符串 + /// + public string Decode(string source) + { + if (source == null || source == "") + { + return ""; + } + else + { + List list = new List(); + char[] tmp = source.ToCharArray(); + int remain = tmp.Length % 4; + if (remain != 0) + { + Array.Resize(ref tmp, tmp.Length - remain); + } + int patch = source.IndexOf(m_pad); + if (patch != -1) + { + patch = source.Length - patch; + } + int cnt = tmp.Length / 4; + for (int i = 0; i < cnt; i++) + { + this.DecodeUnit(list, tmp[i * 4], tmp[i * 4 + 1], tmp[i * 4 + 2], tmp[i * 4 + 3]); + } + for (int i = 0; i < patch; i++) + { + list.RemoveAt(list.Count - 1); + } + return System.Text.Encoding.UTF8.GetString(list.ToArray()); + } + } + + protected void DecodeUnit(List byteArr, params char[] chArray) + { + int[] res = new int[3]; + byte[] unit = new byte[chArray.Length]; + for (int i = 0; i < chArray.Length; i++) + { + unit[i] = this.FindChar(chArray[i]); + } + res[0] = (unit[0] << 2) + ((unit[1] & 0x30) >> 4); + res[1] = ((unit[1] & 0xf) << 4) + ((unit[2] & 0x3c) >> 2); + res[2] = ((unit[2] & 0x3) << 6) + unit[3]; + for (int i = 0; i < res.Length; i++) + { + byteArr.Add((byte)res[i]); + } + } + + protected byte FindChar(char ch) + { + int pos = m_t2[ch];//m_codeTable.IndexOf(ch); + return (byte)pos; + } + + /// + /// 初始化双向哈希字典 + /// + protected void InitDict() + { + m_t1.Clear(); + m_t2.Clear(); + m_t2.Add(m_pad[0], -1); + for (int i = 0; i < m_codeTable.Length; i++) + { + m_t1.Add(i, m_codeTable[i]); + m_t2.Add(m_codeTable[i], i); + } + } + + /// + /// 检查字符串中的字符是否有重复 + /// + /// 待检查字符串 + /// + protected void ValidateRepeat(string input) + { + for (int i = 0; i < input.Length; i++) + { + if (input.LastIndexOf(input[i]) > i) + { + throw new Exception("密码表中含有重复字符：" + input[i]); + } + } + } + + /// + /// 检查字符串是否包含补码字符 + /// + /// 待检查字符串 + /// + protected void ValidateEqualPad(string input, string pad) + { + if (input.IndexOf(pad) > -1) + { + throw new Exception("密码表中包含了补码字符：" + pad); + } + } + + /// + /// 测试 + /// + protected void Test() + { + //m_codeTable = @"STUVWXYZbacdefghivklABCDEFGHIJKLMNOPQRmnopqrstu!wxyz0123456789+/"; + //m_pad = "j"; + + this.InitDict(); + + string test = "abc ABC 你好！◎＃￥％……!@#$%^"; + string encode = this.Encode("false"); + string decode = this.Decode(encode); + Console.WriteLine(encode); + Console.WriteLine(test == decode); + } + } +} + diff --git a/WinformGeneralDeveloperFrame.Commons/Encrypt/EncodeHelper.cs b/WinformGeneralDeveloperFrame.Commons/Encrypt/EncodeHelper.cs new file mode 100644 index 0000000..64e30cd --- /dev/null +++ b/WinformGeneralDeveloperFrame.Commons/Encrypt/EncodeHelper.cs @@ -0,0 +1,620 @@ +using System; +using System.Text; +using System.IO; +using System.Security.Cryptography; + +namespace WinformGeneralDeveloperFrame.Commons +{ + /// + /// DESԳƼӽܡAES RijndaelManagedӽܡBase64ܽܡMD5ܵȲ + /// + public sealed class EncodeHelper + { + #region DESԳƼܽ + + /// + /// עDEFAULT_ENCRYPT_KEYijΪ8λ(Ҫӻ߼key,IVijȾ) + /// + public const string DEFAULT_ENCRYPT_KEY = "12345678"; + + /// + /// ʹĬϼ + /// + /// + /// + public static string DesEncrypt(string strText) + { + try + { + return DesEncrypt(strText, DEFAULT_ENCRYPT_KEY); + } + catch + { + return ""; + } + } + + /// + /// ʹĬϽ + /// + /// ַ + /// + public static string DesDecrypt(string strText) + { + try + { + return DesDecrypt(strText, DEFAULT_ENCRYPT_KEY); + } + catch + { + return ""; + } + } + + /// + /// ַ,עstrEncrKeyijΪ8λ + /// + /// ַ + /// ܼ + /// + public static string DesEncrypt(string strText, string strEncrKey) + { + byte[] byKey = null; + byte[] IV = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF }; + + byKey = Encoding.UTF8.GetBytes(strEncrKey.Substring(0, 8)); + DESCryptoServiceProvider des = new DESCryptoServiceProvider(); + byte[] inputByteArray = Encoding.UTF8.GetBytes(strText); + MemoryStream ms = new MemoryStream(); + CryptoStream cs = new CryptoStream(ms, des.CreateEncryptor(byKey, IV), CryptoStreamMode.Write); + cs.Write(inputByteArray, 0, inputByteArray.Length); + cs.FlushFinalBlock(); + return Convert.ToBase64String(ms.ToArray()); + } + + /// + /// ַ,עstrEncrKeyijΪ8λ + /// + /// ַܵ + /// ܼ + /// ַܺ + public static string DesDecrypt(string strText, string sDecrKey) + { + byte[] byKey = null; + byte[] IV = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF }; + byte[] inputByteArray = new Byte[strText.Length]; + + byKey = Encoding.UTF8.GetBytes(sDecrKey.Substring(0, 8)); + DESCryptoServiceProvider des = new DESCryptoServiceProvider(); + inputByteArray = Convert.FromBase64String(strText); + MemoryStream ms = new MemoryStream(); + CryptoStream cs = new CryptoStream(ms, des.CreateDecryptor(byKey, IV), CryptoStreamMode.Write); + cs.Write(inputByteArray, 0, inputByteArray.Length); + cs.FlushFinalBlock(); + Encoding encoding = new UTF8Encoding(); + return encoding.GetString(ms.ToArray()); + } + + /// + /// ļ,עstrEncrKeyijΪ8λ + /// + /// ܵļ· + /// ļ· + /// ܼ + public static void DesEncrypt(string m_InFilePath, string m_OutFilePath, string strEncrKey) + { + byte[] byKey = null; + byte[] IV = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF }; + + byKey = Encoding.UTF8.GetBytes(strEncrKey.Substring(0, 8)); + FileStream fin = new FileStream(m_InFilePath, FileMode.Open, FileAccess.Read); + FileStream fout = new FileStream(m_OutFilePath, FileMode.OpenOrCreate, FileAccess.Write); + fout.SetLength(0); + //Create variables to help with read and write. + byte[] bin = new byte[100]; //This is intermediate storage for the encryption. + long rdlen = 0; //This is the total number of bytes written. + long totlen = fin.Length; //This is the total length of the input file. + int len; //This is the number of bytes to be written at a time. + + DES des = new DESCryptoServiceProvider(); + CryptoStream encStream = new CryptoStream(fout, des.CreateEncryptor(byKey, IV), CryptoStreamMode.Write); + + //Read from the input file, then encrypt and write to the output file. + while (rdlen < totlen) + { + len = fin.Read(bin, 0, 100); + encStream.Write(bin, 0, len); + rdlen = rdlen + len; + } + encStream.Close(); + fout.Close(); + fin.Close(); + } + + /// + /// ļ,עstrEncrKeyijΪ8λ + /// + /// ܵļ· + /// · + /// ܼ + public static void DesDecrypt(string m_InFilePath, string m_OutFilePath, string sDecrKey) + { + byte[] byKey = null; + byte[] IV = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF }; + + byKey = Encoding.UTF8.GetBytes(sDecrKey.Substring(0, 8)); + FileStream fin = new FileStream(m_InFilePath, FileMode.Open, FileAccess.Read); + FileStream fout = new FileStream(m_OutFilePath, FileMode.OpenOrCreate, FileAccess.Write); + fout.SetLength(0); + //Create variables to help with read and write. + byte[] bin = new byte[100]; //This is intermediate storage for the encryption. + long rdlen = 0; //This is the total number of bytes written. + long totlen = fin.Length; //This is the total length of the input file. + int len; //This is the number of bytes to be written at a time. + + DES des = new DESCryptoServiceProvider(); + CryptoStream encStream = new CryptoStream(fout, des.CreateDecryptor(byKey, IV), CryptoStreamMode.Write); + + //Read from the input file, then encrypt and write to the output file. + while (rdlen < totlen) + { + len = fin.Read(bin, 0, 100); + encStream.Write(bin, 0, len); + rdlen = rdlen + len; + } + encStream.Close(); + fout.Close(); + fin.Close(); + } + #endregion + + #region ԳƼ㷨AES RijndaelManagedܽ + private static readonly string Default_AES_Key = "@#kim123"; + private static byte[] Keys = { 0x41, 0x72, 0x65, 0x79, 0x6F, 0x75, 0x6D, 0x79, + 0x53,0x6E, 0x6F, 0x77, 0x6D, 0x61, 0x6E, 0x3F }; + + /// + /// ԳƼ㷨AES RijndaelManaged(RijndaelManagedAES㷨ǿʽ㷨) + /// + /// ַ + /// ַܽ + public static string AES_Encrypt(string encryptString) + { + return AES_Encrypt(encryptString, Default_AES_Key); + } + + /// + /// ԳƼ㷨AES RijndaelManaged(RijndaelManagedAES㷨ǿʽ㷨) + /// + /// ַ + /// Կַ + /// ַܽ + public static string AES_Encrypt(string encryptString, string encryptKey) + { + encryptKey = GetSubString(encryptKey, 32, ""); + encryptKey = encryptKey.PadRight(32, ' '); + + RijndaelManaged rijndaelProvider = new RijndaelManaged(); + rijndaelProvider.Key = Encoding.UTF8.GetBytes(encryptKey.Substring(0, 32)); + rijndaelProvider.IV = Keys; + ICryptoTransform rijndaelEncrypt = rijndaelProvider.CreateEncryptor(); + + byte[] inputData = Encoding.UTF8.GetBytes(encryptString); + byte[] encryptedData = rijndaelEncrypt.TransformFinalBlock(inputData, 0, inputData.Length); + + return Convert.ToBase64String(encryptedData); + } + + /// + /// ԳƼ㷨AES RijndaelManagedַ + /// + /// ַܵ + /// ܳɹؽַܺ,ʧܷԴ + public static string AES_Decrypt(string decryptString) + { + return AES_Decrypt(decryptString, Default_AES_Key); + } + + /// + /// ԳƼ㷨AES RijndaelManagedַ + /// + /// ַܵ + /// Կ,ͼԿͬ + /// ܳɹؽַܺ,ʧܷؿ + public static string AES_Decrypt(string decryptString, string decryptKey) + { + try + { + decryptKey = GetSubString(decryptKey, 32, ""); + decryptKey = decryptKey.PadRight(32, ' '); + + RijndaelManaged rijndaelProvider = new RijndaelManaged(); + rijndaelProvider.Key = Encoding.UTF8.GetBytes(decryptKey); + rijndaelProvider.IV = Keys; + ICryptoTransform rijndaelDecrypt = rijndaelProvider.CreateDecryptor(); + + byte[] inputData = Convert.FromBase64String(decryptString); + byte[] decryptedData = rijndaelDecrypt.TransformFinalBlock(inputData, 0, inputData.Length); + + return Encoding.UTF8.GetString(decryptedData); + } + catch + { + return string.Empty; + } + } + + /// + /// ֽڳ(ֽ,һΪ2ֽ)ȡijַһ + /// + /// Դַ + /// ȡַֽڳ + /// ַ(ַʱβӵַһΪ"...") + /// ijַһ + private static string GetSubString(string sourceString, int length, string tailString) + { + return GetSubString(sourceString, 0, length, tailString); + } + + /// + /// ֽڳ(ֽ,һΪ2ֽ)ȡijַһ + /// + /// Դַ + /// λã0ʼ + /// ȡַֽڳ + /// ַ(ַʱβӵַһΪ"...") + /// ijַһ + private static string GetSubString(string sourceString, int startIndex, int length, string tailString) + { + string myResult = sourceString; + + //Ļʱ(ע:ĵķΧ:\u4e00 - \u9fa5, \u0800 - \u4e00, Ϊ\xAC00-\xD7A3) + if (System.Text.RegularExpressions.Regex.IsMatch(sourceString, "[\u0800-\u4e00]+") || + System.Text.RegularExpressions.Regex.IsMatch(sourceString, "[\xAC00-\xD7A3]+")) + { + //ȡʼλóֶδʱ + if (startIndex >= sourceString.Length) + { + return string.Empty; + } + else + { + return sourceString.Substring(startIndex, + ((length + startIndex) > sourceString.Length) ? (sourceString.Length - startIndex) : length); + } + } + + //ַ"йabcd123" + if (length <= 0) + { + return string.Empty; + } + byte[] bytesSource = Encoding.Default.GetBytes(sourceString); + + //ַȴʼλ + if (bytesSource.Length > startIndex) + { + int endIndex = bytesSource.Length; + + //ҪȡijַЧȷΧ + if (bytesSource.Length > (startIndex + length)) + { + endIndex = length + startIndex; + } + else + { //ЧΧʱ,ֻȡַĽβ + length = bytesSource.Length - startIndex; + tailString = ""; + } + + int[] anResultFlag = new int[length]; + int nFlag = 0; + //ֽڴ127Ϊ˫ַֽ + for (int i = startIndex; i < endIndex; i++) + { + if (bytesSource[i] > 127) + { + nFlag++; + if (nFlag == 3) + { + nFlag = 1; + } + } + else + { + nFlag = 0; + } + anResultFlag[i] = nFlag; + } + //һֽΪ˫ַֽһ + if ((bytesSource[endIndex - 1] > 127) && (anResultFlag[length - 1] == 1)) + { + length = length + 1; + } + + byte[] bsResult = new byte[length]; + Array.Copy(bytesSource, startIndex, bsResult, 0, length); + myResult = Encoding.Default.GetString(bsResult); + myResult = myResult + tailString; + + return myResult; + } + + return string.Empty; + + } + + /// + /// ļ + /// + /// ļ + /// ܼ + /// + public static CryptoStream AES_EncryptStrream(FileStream fs, string encryptKey) + { + encryptKey = GetSubString(encryptKey, 32, ""); + encryptKey = encryptKey.PadRight(32, ' '); + + RijndaelManaged rijndaelProvider = new RijndaelManaged(); + rijndaelProvider.Key = Encoding.UTF8.GetBytes(encryptKey); + rijndaelProvider.IV = Keys; + + ICryptoTransform encrypto = rijndaelProvider.CreateEncryptor(); + CryptoStream cytptostreamEncr = new CryptoStream(fs, encrypto, CryptoStreamMode.Write); + return cytptostreamEncr; + } + + /// + /// ļ + /// + /// ļ + /// ܼ + /// + public static CryptoStream AES_DecryptStream(FileStream fs, string decryptKey) + { + decryptKey = GetSubString(decryptKey, 32, ""); + decryptKey = decryptKey.PadRight(32, ' '); + + RijndaelManaged rijndaelProvider = new RijndaelManaged(); + rijndaelProvider.Key = Encoding.UTF8.GetBytes(decryptKey); + rijndaelProvider.IV = Keys; + ICryptoTransform Decrypto = rijndaelProvider.CreateDecryptor(); + CryptoStream cytptostreamDecr = new CryptoStream(fs, Decrypto, CryptoStreamMode.Read); + return cytptostreamDecr; + } + + /// + /// ָļ + /// + /// ļ + /// ļ + /// + public static bool AES_EncryptFile(string InputFile, string OutputFile) + { + try + { + string decryptKey = "www.iqidi.com"; + + FileStream fr = new FileStream(InputFile, FileMode.Open); + FileStream fren = new FileStream(OutputFile, FileMode.Create); + CryptoStream Enfr = AES_EncryptStrream(fren, decryptKey); + byte[] bytearrayinput = new byte[fr.Length]; + fr.Read(bytearrayinput, 0, bytearrayinput.Length); + Enfr.Write(bytearrayinput, 0, bytearrayinput.Length); + Enfr.Close(); + fr.Close(); + fren.Close(); + } + catch + { + //ļ쳣 + return false; + } + return true; + } + + /// + /// ָļѹ + /// + /// ļ + /// ļ + /// + public static bool AES_DecryptFile(string InputFile, string OutputFile) + { + try + { + string decryptKey = "www.iqidi.com"; + FileStream fr = new FileStream(InputFile, FileMode.Open); + FileStream frde = new FileStream(OutputFile, FileMode.Create); + CryptoStream Defr = AES_DecryptStream(fr, decryptKey); + byte[] bytearrayoutput = new byte[1024]; + int m_count = 0; + + do + { + m_count = Defr.Read(bytearrayoutput, 0, bytearrayoutput.Length); + frde.Write(bytearrayoutput, 0, m_count); + if (m_count < bytearrayoutput.Length) + break; + } while (true); + + Defr.Close(); + fr.Close(); + frde.Close(); + } + catch + { + //ļ쳣 + return false; + } + return true; + } + + #endregion + + #region Base64ܽ + /// + /// Base64һNʹ64λӋʹ2ηHӡASCII Ԫ + /// @ʹÁ]ĂݔaBase64е׃ʹԪA-Za-z0-9 + /// @ӹ62ԪÁ_ʼ64֣ɂÁ锵ֵķ̖ڲͬ + /// ϵyжͬ + /// Base64 + /// + /// Base64ʽַ + /// + public static string Base64Encrypt(string str) + { + byte[] encbuff = System.Text.Encoding.UTF8.GetBytes(str); + return Convert.ToBase64String(encbuff); + } + + /// + /// Base64ַ + /// + /// ַܵ + /// + public static string Base64Decrypt(string str) + { + byte[] decbuff = Convert.FromBase64String(str); + return System.Text.Encoding.UTF8.GetString(decbuff); + } + #endregion + + #region MD5 + + /// + /// ʹMD5ַ + /// + /// ַܵ + /// MD5ַܺ + public static string MD5Encrypt(string strText) + { + MD5 md5 = new MD5CryptoServiceProvider(); + byte[] result = md5.ComputeHash(Encoding.Default.GetBytes(strText)); + return Encoding.Default.GetString(result); + } + + /// + /// ʹMD5ܵHash + /// + /// ַ + /// + public static string MD5EncryptHash(String input) + { + MD5 md5 = new MD5CryptoServiceProvider(); + //the GetBytes method returns byte array equavalent of a string + byte[] res = md5.ComputeHash(Encoding.Default.GetBytes(input), 0, input.Length); + char[] temp = new char[res.Length]; + //copy to a char array which can be passed to a String constructor + Array.Copy(res, temp, res.Length); + //return the result as a string + return new String(temp); + } + + /// + /// ʹMd5Ϊ16ַ + /// + /// ַ + /// + public static string MD5EncryptHashHex(String input) + { + MD5 md5 = new MD5CryptoServiceProvider(); + //the GetBytes method returns byte array equavalent of a string + byte[] res = md5.ComputeHash(Encoding.Default.GetBytes(input), 0, input.Length); + + String returnThis = string.Empty; + + for (int i = 0; i < res.Length; i++) + { + returnThis += Uri.HexEscape((char)res[i]); + } + returnThis = returnThis.Replace("%", ""); + returnThis = returnThis.ToLower(); + + return returnThis; + } + + /// + /// MD5 μ㷨.: (QQʹ) + /// 1. ֤תΪд + /// 2. ʹμܺ,֤е + /// 3. Ȼ󽫵ӺٴMD5һ,õֵ֤ + /// + /// ַ + /// + public static string EncyptMD5_3_16(string s) + { + MD5 md5 = MD5CryptoServiceProvider.Create(); + byte[] bytes = System.Text.Encoding.ASCII.GetBytes(s); + byte[] bytes1 = md5.ComputeHash(bytes); + byte[] bytes2 = md5.ComputeHash(bytes1); + byte[] bytes3 = md5.ComputeHash(bytes2); + + StringBuilder sb = new StringBuilder(); + foreach (var item in bytes3) + { + sb.Append(item.ToString("x").PadLeft(2, '0')); + } + return sb.ToString().ToUpper(); + } + #endregion + + /// + /// SHA256 + /// + /// ԭʼַ + /// SHA256(سΪ44ֽڵַ) + public static string SHA256(string str) + { + byte[] SHA256Data = Encoding.UTF8.GetBytes(str); + SHA256Managed Sha256 = new SHA256Managed(); + byte[] Result = Sha256.ComputeHash(SHA256Data); + return Convert.ToBase64String(Result); //سΪ44ֽڵַ + } + + /// + /// ַ + /// + /// ַܵ + /// + public static string EncryptString(string input) + { + return MD5Utils.AddMD5Profix(Base64Util.Encrypt(MD5Utils.AddMD5Profix(input))); + //return Base64.Encrypt(MD5.AddMD5Profix(Base64.Encrypt(input))); + } + + /// + /// ܼӹַܵ + /// + /// ַܵ + /// ʧǷ쳣 + /// + public static string DecryptString(string input, bool throwException) + { + string res = ""; + try + { + res = input;// Base64.Decrypt(input); + if (MD5Utils.ValidateValue(res)) + { + return MD5Utils.RemoveMD5Profix(Base64Util.Decrypt(MD5Utils.RemoveMD5Profix(res))); + } + else + { + throw new Exception("ַ޷תɹ"); + } + } + catch + { + if (throwException) + { + throw; + } + else + { + return ""; + } + } + } + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame.Commons/MD5Utils.cs b/WinformGeneralDeveloperFrame.Commons/Encrypt/MD5Utils.cs similarity index 100% rename from WinformGeneralDeveloperFrame.Commons/MD5Utils.cs rename to WinformGeneralDeveloperFrame.Commons/Encrypt/MD5Utils.cs diff --git a/WinformGeneralDeveloperFrame.Commons/Encrypt/QQEncryptUtil.cs b/WinformGeneralDeveloperFrame.Commons/Encrypt/QQEncryptUtil.cs new file mode 100644 index 0000000..b793561 --- /dev/null +++ b/WinformGeneralDeveloperFrame.Commons/Encrypt/QQEncryptUtil.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WinformGeneralDeveloperFrame.Commons +{ + /// + /// QQ密码加密操作辅助类 + /// + public class QQEncryptUtil + { + /// + /// QQ根据密码及验证码对数据进行加密 + /// + /// 原始密码 + /// 验证码 + /// + public static string EncodePasswordWithVerifyCode(string password, string verifyCode) + { + return MD5(MD5_3(password) + verifyCode.ToUpper()); + } + + static string MD5_3(string arg) + { + System.Security.Cryptography.MD5 md5 = System.Security.Cryptography.MD5.Create(); + + byte[] buffer = System.Text.Encoding.ASCII.GetBytes(arg); + buffer = md5.ComputeHash(buffer); + buffer = md5.ComputeHash(buffer); + buffer = md5.ComputeHash(buffer); + + return BitConverter.ToString(buffer).Replace("-", "").ToUpper(); + } + static string MD5(string arg) + { + System.Security.Cryptography.MD5 md5 = System.Security.Cryptography.MD5.Create(); + + byte[] buffer = System.Text.Encoding.ASCII.GetBytes(arg); + buffer = md5.ComputeHash(buffer); + + return BitConverter.ToString(buffer).Replace("-", "").ToUpper(); + } + } +} diff --git a/WinformGeneralDeveloperFrame.Commons/Encrypt/RSASecurityHelper.cs b/WinformGeneralDeveloperFrame.Commons/Encrypt/RSASecurityHelper.cs new file mode 100644 index 0000000..55f2c41 --- /dev/null +++ b/WinformGeneralDeveloperFrame.Commons/Encrypt/RSASecurityHelper.cs @@ -0,0 +1,239 @@ +using System; +using System.Security.Cryptography; +using System.Text; +using System.IO; + +namespace WinformGeneralDeveloperFrame.Commons +{ + /// + /// ǶԳƼܡܡ֤ + /// + public class RSASecurityHelper + { + /// + /// ǶԳƼɵ˽Կ͹Կ + /// + /// ˽Կ + /// Կ + public static void GenerateRSAKey(out string privateKey, out string publicKey) + { + RSACryptoServiceProvider rsa = new RSACryptoServiceProvider(); + privateKey = rsa.ToXmlString(true); + publicKey = rsa.ToXmlString(false); + } + + #region ǶԳݼܣԿܣ + + /// + /// ǶԳƼַݣؼܺ + /// + /// Կ + /// ַܵ + /// ܺ + public static string RSAEncrypt(string publicKey, string originalString) + { + byte[] PlainTextBArray; + byte[] CypherTextBArray; + string Result; + RSACryptoServiceProvider rsa = new RSACryptoServiceProvider(); + rsa.FromXmlString(publicKey); + PlainTextBArray = (new UnicodeEncoding()).GetBytes(originalString); + CypherTextBArray = rsa.Encrypt(PlainTextBArray, false); + Result = Convert.ToBase64String(CypherTextBArray); + return Result; + } + + /// + /// ǶԳƼֽ飬ؼܺ + /// + /// Կ + /// ֽܵ + /// ؼܺ + public static string RSAEncrypt(string publicKey, byte[] originalBytes) + { + byte[] CypherTextBArray; + string Result; + RSACryptoServiceProvider rsa = new RSACryptoServiceProvider(); + rsa.FromXmlString(publicKey); + CypherTextBArray = rsa.Encrypt(originalBytes, false); + Result = Convert.ToBase64String(CypherTextBArray); + return Result; + } + + #endregion + + #region ǶԳƽܣ˽Կܣ + + /// + /// ǶԳƽַؽܺ + /// + /// ˽Կ + /// + /// ؽܺ + public static string RSADecrypt(string privateKey, string encryptedString) + { + byte[] PlainTextBArray; + byte[] DypherTextBArray; + string Result; + System.Security.Cryptography.RSACryptoServiceProvider rsa = new RSACryptoServiceProvider(); + rsa.FromXmlString(privateKey); + PlainTextBArray = Convert.FromBase64String(encryptedString); + DypherTextBArray = rsa.Decrypt(PlainTextBArray, false); + Result = (new UnicodeEncoding()).GetString(DypherTextBArray); + return Result; + } + + /// + /// ǶԳƽֽ飬ؽܺ + /// + /// ˽Կ + /// + /// + public static string RSADecrypt(string privateKey, byte[] encryptedBytes) + { + byte[] DypherTextBArray; + string Result; + System.Security.Cryptography.RSACryptoServiceProvider rsa = new RSACryptoServiceProvider(); + rsa.FromXmlString(privateKey); + DypherTextBArray = rsa.Decrypt(encryptedBytes, false); + Result = (new UnicodeEncoding()).GetString(DypherTextBArray); + return Result; + } + #endregion + + #region ǶԳƼǩ֤ + + /// + /// ʹ÷ǶԳƼǩ + /// + /// ˽Կ + /// ַܵ + /// ܺ + public static string RSAEncrypSignature(string privateKey, string originalString) + { + string signature; + using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider()) + { + rsa.FromXmlString(privateKey); //˽Կ + // ܶ + RSAPKCS1SignatureFormatter f = new RSAPKCS1SignatureFormatter(rsa); + f.SetHashAlgorithm("SHA1"); + byte[] source = ASCIIEncoding.ASCII.GetBytes(originalString); + SHA1Managed sha = new SHA1Managed(); + byte[] result = sha.ComputeHash(source); + byte[] b = f.CreateSignature(result); + signature = Convert.ToBase64String(b); + } + return signature; + } + + /// + /// ˽ԿǩַʹùԿ֤ + /// + /// δܵı + /// ܺıעк + /// ֤ɹTrueΪFalse + //public static bool Validate(string originalString, string encrytedString) + //{ + // return Validate(originalString, encrytedString, UIConstants.PublicKey); + //} + + /// + /// ˽ԿַܵʹùԿ֤ + /// + /// δܵı + /// ܺıעк + /// ǶԳƼܵĹԿ + /// ֤ɹTrueΪFalse + public static bool Validate(string originalString, string encrytedString, string publicKey) + { + bool bPassed = false; + using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider()) + { + try + { + rsa.FromXmlString(publicKey); //Կ + RSAPKCS1SignatureDeformatter formatter = new RSAPKCS1SignatureDeformatter(rsa); + formatter.SetHashAlgorithm("SHA1"); + + byte[] key = Convert.FromBase64String(encrytedString); //֤ + SHA1Managed sha = new SHA1Managed(); + byte[] name = sha.ComputeHash(ASCIIEncoding.ASCII.GetBytes(originalString)); + if (formatter.VerifySignature(name, key)) + { + bPassed = true; + } + } + catch + { + } + } + return bPassed; + } + + #endregion + + #region Hash + + /// Hash + /// + /// + public static int HashEncrypt(string str2Hash) + { + const int salt = 100716; // ֵ + str2Hash += "Commons"; // һַ + + int len = str2Hash.Length; + int result = (str2Hash[len - 1] - 31) * 95 + salt; + for (int i = 0; i < len - 1; i++) + { + result = (result * 95) + (str2Hash[i] - 32); + } + + return result; + } + + /// + /// MD5 + /// + /// ִ + /// ִܺ + public static string ComputeMD5(string str) + { + byte[] hashValue = ComputeMD5Data(str); + return BitConverter.ToString(hashValue).Replace("-", ""); + } + + /// + /// MD5 + /// + /// ִ + /// ִܺ + public static byte[] ComputeMD5Data(string input) + { + byte[] buffer = Encoding.UTF8.GetBytes(input); + return MD5.Create().ComputeHash(buffer); + } + + /// + /// MD5 + /// + /// + /// ִܺ + public static byte[] ComputeMD5Data(byte[] data) + { + return MD5.Create().ComputeHash(data); + } + + /// + /// MD5 + /// + /// + /// ִܺ + public static byte[] ComputeMD5Data(Stream stream) + { + return MD5.Create().ComputeHash(stream); + } + #endregion + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame.Commons/GetDataTableUtils.cs b/WinformGeneralDeveloperFrame.Commons/GetDataTableUtils.cs index 20c1a94..fdbec5d 100644 --- a/WinformGeneralDeveloperFrame.Commons/GetDataTableUtils.cs +++ b/WinformGeneralDeveloperFrame.Commons/GetDataTableUtils.cs @@ -17,7 +17,7 @@ namespace WinformGeneralDeveloperFrame.Commons public static DataTable SqlTable(string name) { - string connstring = ConfigurationManager.ConnectionStrings["DB"].ConnectionString; + string connstring = EncodeHelper.AES_Decrypt(ConfigurationManager.ConnectionStrings["DB"].ConnectionString); string sql = ""; string url = ""; DataTable dt1 = new DataTable(); @@ -45,5 +45,20 @@ namespace WinformGeneralDeveloperFrame.Commons } return dt; } + + public static DataTable SqlTableBySql(string sql) + { + string connstring = EncodeHelper.AES_Decrypt(ConfigurationManager.ConnectionStrings["DB"].ConnectionString); + DataTable dt = new DataTable(); + using (var con = new SqlConnection(connstring)) + { + con.Open(); + SqlCommand cmd = new SqlCommand(sql, con); + cmd.CommandType = CommandType.Text; + SqlDataAdapter sqlda = new SqlDataAdapter(cmd); + sqlda.Fill(dt); + } + return dt; + } } } diff --git a/WinformGeneralDeveloperFrame.Commons/WinformGeneralDeveloperFrame.Commons.csproj b/WinformGeneralDeveloperFrame.Commons/WinformGeneralDeveloperFrame.Commons.csproj index 71d1d2a..f129f5c 100644 --- a/WinformGeneralDeveloperFrame.Commons/WinformGeneralDeveloperFrame.Commons.csproj +++ b/WinformGeneralDeveloperFrame.Commons/WinformGeneralDeveloperFrame.Commons.csproj @@ -57,11 +57,15 @@ + + + + - + diff --git a/WinformGeneralDeveloperFrame.Start/App.config b/WinformGeneralDeveloperFrame.Start/App.config index 76fe7b1..a1a350d 100644 --- a/WinformGeneralDeveloperFrame.Start/App.config +++ b/WinformGeneralDeveloperFrame.Start/App.config @@ -51,8 +51,7 @@ - - + diff --git a/WinformGeneralDeveloperFrame.Start/Program.cs b/WinformGeneralDeveloperFrame.Start/Program.cs index b1f79fc..9662b73 100644 --- a/WinformGeneralDeveloperFrame.Start/Program.cs +++ b/WinformGeneralDeveloperFrame.Start/Program.cs @@ -19,7 +19,7 @@ namespace WinformGeneralDeveloperFrame.Start static void Main() { DevExpress.Skins.SkinManager.EnableFormSkins(); - UserLookAndFeel.Default.SetSkinStyle("Office 2010 Blue"); + UserLookAndFeel.Default.SetSkinStyle("Office 2007 Silver"); BonusSkins.Register(); Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); diff --git a/WinformGeneralDeveloperFrame/DB.cs b/WinformGeneralDeveloperFrame/DB.cs index ebf2718..9d0ac89 100644 --- a/WinformGeneralDeveloperFrame/DB.cs +++ b/WinformGeneralDeveloperFrame/DB.cs @@ -1,8 +1,10 @@ using System; using System.ComponentModel.DataAnnotations.Schema; +using System.Configuration; using System.Data.Entity; using System.Linq; using MES.Entity; +using WinformGeneralDeveloperFrame.Commons; //using MES.Entity; @@ -11,7 +13,7 @@ namespace WinformGeneralDeveloperFrame public partial class DB : DbContext { public DB() - : base("name=DB") + : base(EncodeHelper.AES_Decrypt(ConfigurationManager.ConnectionStrings["DB"].ConnectionString)) { } diff --git a/WinformGeneralDeveloperFrame/DB/MESDB.cs b/WinformGeneralDeveloperFrame/DB/MESDB.cs index 9ee768a..4b224ee 100644 --- a/WinformGeneralDeveloperFrame/DB/MESDB.cs +++ b/WinformGeneralDeveloperFrame/DB/MESDB.cs @@ -1,15 +1,18 @@ using System; using System.ComponentModel.DataAnnotations.Schema; +using System.Configuration; using System.Data.Entity; using System.Linq; using MES.Entity; +using WinformGeneralDeveloperFrame.Commons; namespace MES { public partial class MESDB : DbContext { public MESDB() - : base("name=DB") + //: base("name=DB") + : base(EncodeHelper.AES_Decrypt(ConfigurationManager.ConnectionStrings["DB"].ConnectionString)) { } public virtual DbSet stockDataInfo { get; set; } @@ -67,5 +70,12 @@ namespace MES public virtual DbSet workorderInfo { get; set; } + public virtual DbSet productionBOMInfo { set; get; } + + + public virtual DbSet productionRequisitionInfo { get; set; } + + public virtual DbSet productionRequisitionDetailInfo { set; get; } + } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Entity/productBOMInfo.cs b/WinformGeneralDeveloperFrame/Entity/productBOMInfo.cs index 667569d..24c1450 100644 --- a/WinformGeneralDeveloperFrame/Entity/productBOMInfo.cs +++ b/WinformGeneralDeveloperFrame/Entity/productBOMInfo.cs @@ -37,7 +37,7 @@ namespace MES.Entity public int warehouse{set;get;} ///版本号 [ModelBindControl("txtversion")] - public int version{set;get;} + public string version{set;get;} ///BOM编号 [ModelBindControl("txtproductBOMcode")] public string productBOMcode{set;get;} diff --git a/WinformGeneralDeveloperFrame/Entity/productionBOMInfo.cs b/WinformGeneralDeveloperFrame/Entity/productionBOMInfo.cs new file mode 100644 index 0000000..3ed785b --- /dev/null +++ b/WinformGeneralDeveloperFrame/Entity/productionBOMInfo.cs @@ -0,0 +1,61 @@ +using WinformGeneralDeveloperFrame.Commons; + +namespace MES.Entity +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.ComponentModel.DataAnnotations.Schema; + using System.Data.Entity.Spatial; + + [Table("productionBOM")] + public partial class productionBOMInfo + { + ///id + [ModelBindControl("txtid")] + public int id{set;get;} + ///工程BOM编号 + [ModelBindControl("txtprojectBOMcode")] + public string projectBOMcode{set;get;} + ///生产BOM编号 + [ModelBindControl("txtproductionBOMcode")] + public string productionBOMcode{set;get;} + ///产品生产数量 + [ModelBindControl("txtnumber")] + public decimal number{set;get;} + ///物料编码 + [ModelBindControl("txtmaterialcode")] + public string materialcode{set;get;} + ///物料名称 + [ModelBindControl("txtmaterialid")] + public int materialid{set;get;} + ///规格型号 + [ModelBindControl("txtspec")] + public string spec{set;get;} + ///物料类型 + [ModelBindControl("txtmaterialtype")] + public int materialtype{set;get;} + ///单位用量 + [ModelBindControl("txtuintnumber")] + public decimal uintnumber{set;get;} + ///需求总量 + [ModelBindControl("txtneednumber")] + public decimal neednumber{set;get;} + ///计量单位 + [ModelBindControl("txtunit")] + public int unit{set;get;} + ///单价 + [ModelBindControl("txtunitprice")] + public decimal unitprice{set;get;} + ///总价 + [ModelBindControl("txttotalprice")] + public decimal totalprice{set;get;} + ///仓库 + [ModelBindControl("txtwarehouse")] + public int warehouse{set;get;} + ///备注 + [ModelBindControl("txtremark")] + public string remark{set;get;} + + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Entity/productionRequisitionDetailInfo.cs b/WinformGeneralDeveloperFrame/Entity/productionRequisitionDetailInfo.cs new file mode 100644 index 0000000..97b24b2 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Entity/productionRequisitionDetailInfo.cs @@ -0,0 +1,61 @@ +using WinformGeneralDeveloperFrame.Commons; + +namespace MES.Entity +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.ComponentModel.DataAnnotations.Schema; + using System.Data.Entity.Spatial; + + [Table("productionRequisitionDetail")] + public partial class productionRequisitionDetailInfo + { + ///id + [ModelBindControl("txtid")] + public int id{set;get;} + ///主表ID + [ModelBindControl("txtmasterid")] + public int masterid{set;get;} + ///领料单号 + [ModelBindControl("txtmastercode")] + public string mastercode{set;get;} + ///领料明细单号 + [ModelBindControl("txtdetailcode")] + public string detailcode{set;get;} + ///物料 + [ModelBindControl("txtmaterialid")] + public int materialid{set;get;} + ///物料编码 + [ModelBindControl("txtmaterialcode")] + public string materialcode{set;get;} + ///规格型号 + [ModelBindControl("txtmaterialspec")] + public string materialspec{set;get;} + ///物料类型 + [ModelBindControl("txtmaterialtype")] + public int materialtype{set;get;} + ///单位用量 + [ModelBindControl("txtunitnumber")] + public decimal unitnumber{set;get;} + ///产品生产数量 + [ModelBindControl("txtproductnumber")] + public decimal productnumber{set;get;} + ///领料数量 + [ModelBindControl("txtpicknumber")] + public decimal picknumber{set;get;} + ///计量单位 + [ModelBindControl("txtunit")] + public int unit{set;get;} + ///仓库 + [ModelBindControl("txtwarehouse")] + public int warehouse{set;get;} + ///备注 + [ModelBindControl("txtremark")] + public string remark{set;get;} + ///工单号 + [ModelBindControl("txtwocode")] + public string wocode{set;get;} + + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Entity/productionRequisitionInfo.cs b/WinformGeneralDeveloperFrame/Entity/productionRequisitionInfo.cs new file mode 100644 index 0000000..ddea2be --- /dev/null +++ b/WinformGeneralDeveloperFrame/Entity/productionRequisitionInfo.cs @@ -0,0 +1,58 @@ +using WinformGeneralDeveloperFrame.Commons; + +namespace MES.Entity +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.ComponentModel.DataAnnotations.Schema; + using System.Data.Entity.Spatial; + + [Table("productionRequisition")] + public partial class productionRequisitionInfo + { + ///id + [ModelBindControl("txtid")] + public int id{set;get;} + ///领料单号 + [ModelBindControl("txtcode")] + public string code{set;get;} + ///工单号 + [ModelBindControl("txtwocode")] + public string wocode{set;get;} + ///销售单号 + [ModelBindControl("txtsalecode")] + public string salecode{set;get;} + ///领料日期 + [ModelBindControl("txtpickingtime")] + public DateTime pickingtime{set;get;}=DateTime.Now; + ///产品 + [ModelBindControl("txtproductID")] + public int productID{set;get;} + ///产品编号 + [ModelBindControl("txtproductcode")] + public string productcode{set;get;} + ///规格型号 + [ModelBindControl("txtproductspec")] + public string productspec{set;get;} + ///生产数量 + [ModelBindControl("txtnumber")] + public decimal number{set;get;} + ///计量单位 + [ModelBindControl("txtunit")] + public int unit{set;get;} + ///领料部门 + [ModelBindControl("txtpickingdept")] + public int pickingdept{set;get;} + ///制单人 + [ModelBindControl("txtcreatorId")] + public int creatorId{set;get;} + ///制单日期 + [ModelBindControl("txtcreateTime")] + public DateTime createTime{set;get;}=DateTime.Now; + ///备注 + [ModelBindControl("txtremark")] + public string remark{set;get;} + + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Entity/workorderInfo.cs b/WinformGeneralDeveloperFrame/Entity/workorderInfo.cs index cb92653..7e544cd 100644 --- a/WinformGeneralDeveloperFrame/Entity/workorderInfo.cs +++ b/WinformGeneralDeveloperFrame/Entity/workorderInfo.cs @@ -65,6 +65,10 @@ namespace MES.Entity ///备注 [ModelBindControl("txtremark")] public string remark{set;get;} - + + ///BOM + [ModelBindControl("txtbomid")] + public int bomid { set; get; } + } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/Frmbuyer.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmbuyer.designer.cs index 25f9ec9..07b01df 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmbuyer.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/Frmbuyer.designer.cs @@ -269,7 +269,7 @@ namespace MES.Form this.xtraTabControl1.Location = new System.Drawing.Point(0, 34); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabDataList; - this.xtraTabControl1.Size = new System.Drawing.Size(992, 673); + this.xtraTabControl1.Size = new System.Drawing.Size(1002, 679); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabDataList, @@ -279,7 +279,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(986, 644); + this.tabDataList.Size = new System.Drawing.Size(997, 653); this.tabDataList.Text = "数据列表"; // // grdList @@ -288,7 +288,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(986, 644); + this.grdList.Size = new System.Drawing.Size(997, 653); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -314,7 +314,7 @@ namespace MES.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(986, 644); + this.tabDataDetail.Size = new System.Drawing.Size(997, 653); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -323,7 +323,7 @@ namespace MES.Form this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(986, 644); + this.panelControl2.Size = new System.Drawing.Size(997, 653); this.panelControl2.TabIndex = 0; // // layoutControl1 @@ -342,7 +342,7 @@ namespace MES.Form this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup1; - this.layoutControl1.Size = new System.Drawing.Size(982, 640); + this.layoutControl1.Size = new System.Drawing.Size(993, 649); this.layoutControl1.TabIndex = 6; this.layoutControl1.Text = "layoutControl1"; // @@ -351,7 +351,7 @@ namespace MES.Form this.xtraTabControl2.Location = new System.Drawing.Point(12, 132); this.xtraTabControl2.Name = "xtraTabControl2"; this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl2.Size = new System.Drawing.Size(958, 496); + this.xtraTabControl2.Size = new System.Drawing.Size(969, 505); this.xtraTabControl2.TabIndex = 10; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1}); @@ -360,7 +360,7 @@ namespace MES.Form // this.xtraTabPage1.Controls.Add(this.gridControl1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(952, 467); + this.xtraTabPage1.Size = new System.Drawing.Size(964, 479); this.xtraTabPage1.Text = "采购明细"; // // gridControl1 @@ -378,7 +378,7 @@ namespace MES.Form this.repositoryItemSearchLookUpEditrequisitioncode, this.repositoryItemGridLookUpEditrequisitioncode, this.repositoryItemTextEditrequisitioncode}); - this.gridControl1.Size = new System.Drawing.Size(952, 467); + this.gridControl1.Size = new System.Drawing.Size(964, 479); this.gridControl1.TabIndex = 1; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -390,19 +390,19 @@ namespace MES.Form this.toolStripMenuItemAdd, this.toolStripMenuItemDel}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(181, 70); + this.contextMenuStrip1.Size = new System.Drawing.Size(113, 48); // // toolStripMenuItemAdd // this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd"; - this.toolStripMenuItemAdd.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItemAdd.Size = new System.Drawing.Size(112, 22); this.toolStripMenuItemAdd.Text = "新增行"; this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click); // // toolStripMenuItemDel // this.toolStripMenuItemDel.Name = "toolStripMenuItemDel"; - this.toolStripMenuItemDel.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItemDel.Size = new System.Drawing.Size(112, 22); this.toolStripMenuItemDel.Text = "删除行"; this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click); // @@ -713,15 +713,15 @@ namespace MES.Form // this.txtid.Location = new System.Drawing.Point(75, 12); this.txtid.Name = "txtid"; - this.txtid.Size = new System.Drawing.Size(414, 20); + this.txtid.Size = new System.Drawing.Size(419, 20); this.txtid.StyleController = this.layoutControl1; this.txtid.TabIndex = 1; // // txtbuyercode // - this.txtbuyercode.Location = new System.Drawing.Point(556, 12); + this.txtbuyercode.Location = new System.Drawing.Point(561, 12); this.txtbuyercode.Name = "txtbuyercode"; - this.txtbuyercode.Size = new System.Drawing.Size(414, 20); + this.txtbuyercode.Size = new System.Drawing.Size(420, 20); this.txtbuyercode.StyleController = this.layoutControl1; this.txtbuyercode.TabIndex = 2; // @@ -737,7 +737,7 @@ namespace MES.Form new DevExpress.XtraEditors.Controls.EditorButton()}); this.txtbuyerdate.Properties.DisplayFormat.FormatString = "G"; this.txtbuyerdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txtbuyerdate.Size = new System.Drawing.Size(414, 20); + this.txtbuyerdate.Size = new System.Drawing.Size(419, 20); this.txtbuyerdate.StyleController = this.layoutControl1; this.txtbuyerdate.TabIndex = 3; // @@ -752,15 +752,15 @@ namespace MES.Form this.txtsupplierid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtsupplierid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtsupplierid.Properties.ValueMember = "ID"; - this.txtsupplierid.Size = new System.Drawing.Size(414, 20); + this.txtsupplierid.Size = new System.Drawing.Size(419, 20); this.txtsupplierid.StyleController = this.layoutControl1; this.txtsupplierid.TabIndex = 4; // // txtsuppliercode // - this.txtsuppliercode.Location = new System.Drawing.Point(556, 60); + this.txtsuppliercode.Location = new System.Drawing.Point(561, 60); this.txtsuppliercode.Name = "txtsuppliercode"; - this.txtsuppliercode.Size = new System.Drawing.Size(414, 20); + this.txtsuppliercode.Size = new System.Drawing.Size(420, 20); this.txtsuppliercode.StyleController = this.layoutControl1; this.txtsuppliercode.TabIndex = 5; // @@ -768,7 +768,7 @@ namespace MES.Form // this.txtdeliverdate.EditValue = null; this.txtdeliverdate.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtdeliverdate.Location = new System.Drawing.Point(556, 36); + this.txtdeliverdate.Location = new System.Drawing.Point(561, 36); this.txtdeliverdate.Name = "txtdeliverdate"; this.txtdeliverdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -776,7 +776,7 @@ namespace MES.Form new DevExpress.XtraEditors.Controls.EditorButton()}); this.txtdeliverdate.Properties.DisplayFormat.FormatString = "G"; this.txtdeliverdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txtdeliverdate.Size = new System.Drawing.Size(414, 20); + this.txtdeliverdate.Size = new System.Drawing.Size(420, 20); this.txtdeliverdate.StyleController = this.layoutControl1; this.txtdeliverdate.TabIndex = 6; // @@ -791,15 +791,15 @@ namespace MES.Form this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtcreatorId.Properties.ValueMember = "ID"; - this.txtcreatorId.Size = new System.Drawing.Size(414, 20); + this.txtcreatorId.Size = new System.Drawing.Size(419, 20); this.txtcreatorId.StyleController = this.layoutControl1; this.txtcreatorId.TabIndex = 7; // // txttotalprice // - this.txttotalprice.Location = new System.Drawing.Point(556, 84); + this.txttotalprice.Location = new System.Drawing.Point(561, 84); this.txttotalprice.Name = "txttotalprice"; - this.txttotalprice.Size = new System.Drawing.Size(414, 20); + this.txttotalprice.Size = new System.Drawing.Size(420, 20); this.txttotalprice.StyleController = this.layoutControl1; this.txttotalprice.TabIndex = 8; // @@ -807,7 +807,7 @@ namespace MES.Form // this.txtremark.Location = new System.Drawing.Point(75, 108); this.txtremark.Name = "txtremark"; - this.txtremark.Size = new System.Drawing.Size(895, 20); + this.txtremark.Size = new System.Drawing.Size(906, 20); this.txtremark.StyleController = this.layoutControl1; this.txtremark.TabIndex = 9; // @@ -827,7 +827,7 @@ namespace MES.Form this.layoutControlItem5, this.layoutControlItem8}); this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Size = new System.Drawing.Size(982, 640); + this.layoutControlGroup1.Size = new System.Drawing.Size(993, 649); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem1 @@ -836,7 +836,7 @@ namespace MES.Form this.layoutControlItem1.CustomizationFormText = "id"; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(481, 24); + this.layoutControlItem1.Size = new System.Drawing.Size(486, 24); this.layoutControlItem1.Text = "id"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14); // @@ -846,7 +846,7 @@ namespace MES.Form this.layoutControlItem3.CustomizationFormText = "采购日期"; this.layoutControlItem3.Location = new System.Drawing.Point(0, 24); this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(481, 24); + this.layoutControlItem3.Size = new System.Drawing.Size(486, 24); this.layoutControlItem3.Text = "采购日期"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14); // @@ -856,7 +856,7 @@ namespace MES.Form this.layoutControlItem4.CustomizationFormText = "供应商"; this.layoutControlItem4.Location = new System.Drawing.Point(0, 48); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(481, 24); + this.layoutControlItem4.Size = new System.Drawing.Size(486, 24); this.layoutControlItem4.Text = "供应商"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14); // @@ -866,7 +866,7 @@ namespace MES.Form this.layoutControlItem7.CustomizationFormText = "制单人"; this.layoutControlItem7.Location = new System.Drawing.Point(0, 72); this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(481, 24); + this.layoutControlItem7.Size = new System.Drawing.Size(486, 24); this.layoutControlItem7.Text = "制单人"; this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 14); // @@ -876,7 +876,7 @@ namespace MES.Form this.layoutControlItem9.CustomizationFormText = "备注"; this.layoutControlItem9.Location = new System.Drawing.Point(0, 96); this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(962, 24); + this.layoutControlItem9.Size = new System.Drawing.Size(973, 24); this.layoutControlItem9.Text = "备注"; this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 14); // @@ -885,7 +885,7 @@ namespace MES.Form this.layoutControlItem10.Control = this.xtraTabControl2; this.layoutControlItem10.Location = new System.Drawing.Point(0, 120); this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.Size = new System.Drawing.Size(962, 500); + this.layoutControlItem10.Size = new System.Drawing.Size(973, 509); this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextVisible = false; // @@ -893,9 +893,9 @@ namespace MES.Form // this.layoutControlItem2.Control = this.txtbuyercode; this.layoutControlItem2.CustomizationFormText = "采购单号"; - this.layoutControlItem2.Location = new System.Drawing.Point(481, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(486, 0); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(481, 24); + this.layoutControlItem2.Size = new System.Drawing.Size(487, 24); this.layoutControlItem2.Text = "采购单号"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14); // @@ -903,9 +903,9 @@ namespace MES.Form // this.layoutControlItem6.Control = this.txtdeliverdate; this.layoutControlItem6.CustomizationFormText = "完货日期"; - this.layoutControlItem6.Location = new System.Drawing.Point(481, 24); + this.layoutControlItem6.Location = new System.Drawing.Point(486, 24); this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(481, 24); + this.layoutControlItem6.Size = new System.Drawing.Size(487, 24); this.layoutControlItem6.Text = "完货日期"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 14); // @@ -913,9 +913,9 @@ namespace MES.Form // this.layoutControlItem5.Control = this.txtsuppliercode; this.layoutControlItem5.CustomizationFormText = "供应商编码"; - this.layoutControlItem5.Location = new System.Drawing.Point(481, 48); + this.layoutControlItem5.Location = new System.Drawing.Point(486, 48); this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(481, 24); + this.layoutControlItem5.Size = new System.Drawing.Size(487, 24); this.layoutControlItem5.Text = "供应商编码"; this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14); // @@ -923,9 +923,9 @@ namespace MES.Form // this.layoutControlItem8.Control = this.txttotalprice; this.layoutControlItem8.CustomizationFormText = "金额"; - this.layoutControlItem8.Location = new System.Drawing.Point(481, 72); + this.layoutControlItem8.Location = new System.Drawing.Point(486, 72); this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(481, 24); + this.layoutControlItem8.Size = new System.Drawing.Size(487, 24); this.layoutControlItem8.Text = "金额"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 14); // @@ -933,7 +933,7 @@ namespace MES.Form // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(992, 707); + this.ClientSize = new System.Drawing.Size(1002, 713); this.Controls.Add(this.xtraTabControl1); this.Name = "Frmbuyer"; this.Text = "采购单"; diff --git a/WinformGeneralDeveloperFrame/Form/Frmbuyerreturn.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmbuyerreturn.designer.cs index b74ad8b..562c52d 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmbuyerreturn.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/Frmbuyerreturn.designer.cs @@ -86,14 +86,14 @@ namespace MES.Form this.txtremark = new DevExpress.XtraEditors.TextEdit(); this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtsupplierid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -127,14 +127,14 @@ namespace MES.Form ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); this.SuspendLayout(); // // gridColumn1 @@ -244,7 +244,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1294, 737); + this.tabDataList.Size = new System.Drawing.Size(1295, 740); this.tabDataList.Text = "数据列表"; // // grdList @@ -253,7 +253,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(1294, 737); + this.grdList.Size = new System.Drawing.Size(1295, 740); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -278,7 +278,7 @@ namespace MES.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(1294, 737); + this.tabDataDetail.Size = new System.Drawing.Size(1295, 740); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -287,7 +287,7 @@ namespace MES.Form this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(1294, 737); + this.panelControl2.Size = new System.Drawing.Size(1295, 740); this.panelControl2.TabIndex = 0; // // layoutControl1 @@ -305,7 +305,7 @@ namespace MES.Form this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup1; - this.layoutControl1.Size = new System.Drawing.Size(1290, 733); + this.layoutControl1.Size = new System.Drawing.Size(1291, 736); this.layoutControl1.TabIndex = 6; this.layoutControl1.Text = "layoutControl1"; // @@ -314,7 +314,7 @@ namespace MES.Form this.xtraTabControl2.Location = new System.Drawing.Point(12, 132); this.xtraTabControl2.Name = "xtraTabControl2"; this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl2.Size = new System.Drawing.Size(1266, 589); + this.xtraTabControl2.Size = new System.Drawing.Size(1267, 592); this.xtraTabControl2.TabIndex = 9; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1}); @@ -323,7 +323,7 @@ namespace MES.Form // this.xtraTabPage1.Controls.Add(this.gridControl1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1260, 560); + this.xtraTabPage1.Size = new System.Drawing.Size(1262, 566); this.xtraTabPage1.Text = "明细"; // // gridControl1 @@ -338,7 +338,7 @@ namespace MES.Form this.repositoryItemLookUpEditunit, this.repositoryItemLookUpEditwarehouse, this.repositoryItemTextEditbuyerdetailcode}); - this.gridControl1.Size = new System.Drawing.Size(1260, 560); + this.gridControl1.Size = new System.Drawing.Size(1262, 566); this.gridControl1.TabIndex = 1; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -349,19 +349,19 @@ namespace MES.Form this.toolStripMenuItemAdd, this.toolStripMenuItemDel}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(113, 48); + this.contextMenuStrip1.Size = new System.Drawing.Size(181, 70); // // toolStripMenuItemAdd // this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd"; - this.toolStripMenuItemAdd.Size = new System.Drawing.Size(112, 22); + this.toolStripMenuItemAdd.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItemAdd.Text = "新增行"; this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click); // // toolStripMenuItemDel // this.toolStripMenuItemDel.Name = "toolStripMenuItemDel"; - this.toolStripMenuItemDel.Size = new System.Drawing.Size(112, 22); + this.toolStripMenuItemDel.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItemDel.Text = "删除行"; this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click); // @@ -579,7 +579,7 @@ namespace MES.Form new DevExpress.XtraEditors.Controls.EditorButton()}); this.txtreturndate.Properties.DisplayFormat.FormatString = "G"; this.txtreturndate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txtreturndate.Size = new System.Drawing.Size(556, 20); + this.txtreturndate.Size = new System.Drawing.Size(557, 20); this.txtreturndate.StyleController = this.layoutControl1; this.txtreturndate.TabIndex = 2; // @@ -587,7 +587,7 @@ namespace MES.Form // this.txtsuppliercode.Location = new System.Drawing.Point(722, 36); this.txtsuppliercode.Name = "txtsuppliercode"; - this.txtsuppliercode.Size = new System.Drawing.Size(556, 20); + this.txtsuppliercode.Size = new System.Drawing.Size(557, 20); this.txtsuppliercode.StyleController = this.layoutControl1; this.txtsuppliercode.TabIndex = 3; // @@ -626,7 +626,7 @@ namespace MES.Form // this.txtreturnbuyercode.Location = new System.Drawing.Point(722, 12); this.txtreturnbuyercode.Name = "txtreturnbuyercode"; - this.txtreturnbuyercode.Size = new System.Drawing.Size(556, 20); + this.txtreturnbuyercode.Size = new System.Drawing.Size(557, 20); this.txtreturnbuyercode.StyleController = this.layoutControl1; this.txtreturnbuyercode.TabIndex = 6; // @@ -634,7 +634,7 @@ namespace MES.Form // this.txttotalprice.Location = new System.Drawing.Point(87, 84); this.txttotalprice.Name = "txttotalprice"; - this.txttotalprice.Size = new System.Drawing.Size(1191, 20); + this.txttotalprice.Size = new System.Drawing.Size(1192, 20); this.txttotalprice.StyleController = this.layoutControl1; this.txttotalprice.TabIndex = 7; // @@ -642,7 +642,7 @@ namespace MES.Form // this.txtremark.Location = new System.Drawing.Point(87, 108); this.txtremark.Name = "txtremark"; - this.txtremark.Size = new System.Drawing.Size(1191, 20); + this.txtremark.Size = new System.Drawing.Size(1192, 20); this.txtremark.StyleController = this.layoutControl1; this.txtremark.TabIndex = 8; // @@ -661,7 +661,7 @@ namespace MES.Form this.layoutControlItem4, this.layoutControlItem3}); this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733); + this.layoutControlGroup1.Size = new System.Drawing.Size(1291, 736); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem1 @@ -674,16 +674,6 @@ namespace MES.Form this.layoutControlItem1.Text = "id"; this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14); // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.txtsuppliercode; - this.layoutControlItem3.CustomizationFormText = "供应商编号"; - this.layoutControlItem3.Location = new System.Drawing.Point(635, 24); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(635, 24); - this.layoutControlItem3.Text = "供应商编号"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14); - // // layoutControlItem5 // this.layoutControlItem5.Control = this.txtcreatorId; @@ -700,7 +690,7 @@ namespace MES.Form this.layoutControlItem7.CustomizationFormText = "金额"; this.layoutControlItem7.Location = new System.Drawing.Point(0, 72); this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem7.Size = new System.Drawing.Size(1271, 24); this.layoutControlItem7.Text = "金额"; this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14); // @@ -710,7 +700,7 @@ namespace MES.Form this.layoutControlItem8.CustomizationFormText = "备注"; this.layoutControlItem8.Location = new System.Drawing.Point(0, 96); this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem8.Size = new System.Drawing.Size(1271, 24); this.layoutControlItem8.Text = "备注"; this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14); // @@ -720,10 +710,29 @@ namespace MES.Form this.layoutControlItem6.CustomizationFormText = "采购退货单号"; this.layoutControlItem6.Location = new System.Drawing.Point(635, 0); this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(635, 24); + this.layoutControlItem6.Size = new System.Drawing.Size(636, 24); this.layoutControlItem6.Text = "采购退货单号"; this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14); // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txtreturndate; + this.layoutControlItem2.CustomizationFormText = "退货日期"; + this.layoutControlItem2.Location = new System.Drawing.Point(635, 48); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(636, 24); + this.layoutControlItem2.Text = "退货日期"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.xtraTabControl2; + this.layoutControlItem9.Location = new System.Drawing.Point(0, 120); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.Size = new System.Drawing.Size(1271, 596); + this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem9.TextVisible = false; + // // layoutControlItem4 // this.layoutControlItem4.Control = this.txtsupplierid; @@ -734,24 +743,15 @@ namespace MES.Form this.layoutControlItem4.Text = "供应商名称"; this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14); // - // layoutControlItem2 + // layoutControlItem3 // - this.layoutControlItem2.Control = this.txtreturndate; - this.layoutControlItem2.CustomizationFormText = "退货日期"; - this.layoutControlItem2.Location = new System.Drawing.Point(635, 48); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(635, 24); - this.layoutControlItem2.Text = "退货日期"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.xtraTabControl2; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 120); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(1270, 593); - this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem9.TextVisible = false; + this.layoutControlItem3.Control = this.txtsuppliercode; + this.layoutControlItem3.CustomizationFormText = "供应商编号"; + this.layoutControlItem3.Location = new System.Drawing.Point(635, 24); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.Size = new System.Drawing.Size(636, 24); + this.layoutControlItem3.Text = "供应商编号"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14); // // Frmbuyerreturn // @@ -796,14 +796,14 @@ namespace MES.Form ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); this.ResumeLayout(false); } diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductBOM.cs b/WinformGeneralDeveloperFrame/Form/FrmproductBOM.cs index 25cd097..25e7805 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmproductBOM.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmproductBOM.cs @@ -358,10 +358,18 @@ namespace MES.Form private void treeList1_ValidateNode(object sender, ValidateNodeEventArgs e) { - treeList1.FocusedNode["money"] = decimal.Multiply( - treeList1.FocusedNode["unitprice"].ToDecimal(0), - treeList1.FocusedNode["unitusenumber"].ToDecimal(0)); - + if (e.Node.ParentNode != null) + { + e.Node["money"] = decimal.Multiply( + e.Node["unitprice"].ToDecimal(0), + e.Node["unitusenumber"].ToDecimal(0))* e.Node.ParentNode["unitusenumber"].ToDecimal(1); + } + else + { + e.Node["money"] = decimal.Multiply( + e.Node["unitprice"].ToDecimal(0), + e.Node["unitusenumber"].ToDecimal(0)); + } treeList1.BestFitColumns(); decimal totalprice = 0; foreach (TreeListNode node in treeList1.Nodes) diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductBOM.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmproductBOM.designer.cs index 25bb8ae..c285f3f 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmproductBOM.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmproductBOM.designer.cs @@ -87,6 +87,7 @@ namespace MES.Form this.treeListColumn14 = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.treeListColumn15 = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.treeListColumn16 = new DevExpress.XtraTreeList.Columns.TreeListColumn(); + this.treeListColumn6 = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemAddSon = new System.Windows.Forms.ToolStripMenuItem(); @@ -120,7 +121,6 @@ namespace MES.Form this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.treeListColumn6 = new DevExpress.XtraTreeList.Columns.TreeListColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomerid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproductid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).BeginInit(); @@ -328,7 +328,7 @@ namespace MES.Form this.xtraTabControl1.Location = new System.Drawing.Point(0, 34); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabDataList; - this.xtraTabControl1.Size = new System.Drawing.Size(1027, 710); + this.xtraTabControl1.Size = new System.Drawing.Size(1037, 716); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabDataList, @@ -338,7 +338,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1021, 681); + this.tabDataList.Size = new System.Drawing.Size(1032, 690); this.tabDataList.Text = "数据列表"; // // grdList @@ -350,7 +350,7 @@ namespace MES.Form this.grdList.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemtxtcreatorId, this.repositoryItemtxteditorId}); - this.grdList.Size = new System.Drawing.Size(1021, 681); + this.grdList.Size = new System.Drawing.Size(1032, 690); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -440,7 +440,7 @@ namespace MES.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(1021, 681); + this.tabDataDetail.Size = new System.Drawing.Size(1032, 690); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -449,7 +449,7 @@ namespace MES.Form this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(1021, 681); + this.panelControl2.Size = new System.Drawing.Size(1032, 690); this.panelControl2.TabIndex = 0; // // layoutControl1 @@ -475,14 +475,14 @@ namespace MES.Form this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup1; - this.layoutControl1.Size = new System.Drawing.Size(1017, 677); + this.layoutControl1.Size = new System.Drawing.Size(1028, 686); this.layoutControl1.TabIndex = 6; this.layoutControl1.Text = "layoutControl1"; // // txteditTime // this.txteditTime.EditValue = null; - this.txteditTime.Location = new System.Drawing.Point(562, 156); + this.txteditTime.Location = new System.Drawing.Point(567, 156); this.txteditTime.Name = "txteditTime"; this.txteditTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -492,14 +492,14 @@ namespace MES.Form this.txteditTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; this.txteditTime.Properties.EditFormat.FormatString = "G"; this.txteditTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txteditTime.Size = new System.Drawing.Size(443, 20); + this.txteditTime.Size = new System.Drawing.Size(449, 20); this.txteditTime.StyleController = this.layoutControl1; this.txteditTime.TabIndex = 1; // // txtcreateTime // this.txtcreateTime.EditValue = null; - this.txtcreateTime.Location = new System.Drawing.Point(562, 132); + this.txtcreateTime.Location = new System.Drawing.Point(567, 132); this.txtcreateTime.Name = "txtcreateTime"; this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -509,7 +509,7 @@ namespace MES.Form this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; this.txtcreateTime.Properties.EditFormat.FormatString = "G"; this.txtcreateTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txtcreateTime.Size = new System.Drawing.Size(443, 20); + this.txtcreateTime.Size = new System.Drawing.Size(449, 20); this.txtcreateTime.StyleController = this.layoutControl1; this.txtcreateTime.TabIndex = 1; // @@ -521,7 +521,7 @@ namespace MES.Form new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txteditorId.Properties.DisplayMember = "Name"; this.txteditorId.Properties.ValueMember = "ID"; - this.txteditorId.Size = new System.Drawing.Size(442, 20); + this.txteditorId.Size = new System.Drawing.Size(447, 20); this.txteditorId.StyleController = this.layoutControl1; this.txteditorId.TabIndex = 1; // @@ -533,7 +533,7 @@ namespace MES.Form new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txtcreatorId.Properties.DisplayMember = "Name"; this.txtcreatorId.Properties.ValueMember = "ID"; - this.txtcreatorId.Size = new System.Drawing.Size(442, 20); + this.txtcreatorId.Size = new System.Drawing.Size(447, 20); this.txtcreatorId.StyleController = this.layoutControl1; this.txtcreatorId.TabIndex = 1; // @@ -541,7 +541,7 @@ namespace MES.Form // this.txtunitcost.Location = new System.Drawing.Point(64, 180); this.txtunitcost.Name = "txtunitcost"; - this.txtunitcost.Size = new System.Drawing.Size(442, 20); + this.txtunitcost.Size = new System.Drawing.Size(447, 20); this.txtunitcost.StyleController = this.layoutControl1; this.txtunitcost.TabIndex = 1; // @@ -550,7 +550,7 @@ namespace MES.Form this.xtraTabControl2.Location = new System.Drawing.Point(12, 204); this.xtraTabControl2.Name = "xtraTabControl2"; this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl2.Size = new System.Drawing.Size(993, 461); + this.xtraTabControl2.Size = new System.Drawing.Size(1004, 470); this.xtraTabControl2.TabIndex = 12; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1}); @@ -559,7 +559,7 @@ namespace MES.Form // this.xtraTabPage1.Controls.Add(this.treeList1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(987, 432); + this.xtraTabPage1.Size = new System.Drawing.Size(999, 444); this.xtraTabPage1.Text = "物料清单"; // // treeList1 @@ -590,7 +590,7 @@ namespace MES.Form this.treeList1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemLookUpEditmaterialtype, this.repositoryItemLookUpEditmaterialname}); - this.treeList1.Size = new System.Drawing.Size(987, 432); + this.treeList1.Size = new System.Drawing.Size(999, 444); this.treeList1.TabIndex = 0; this.treeList1.ValidateNode += new DevExpress.XtraTreeList.ValidateNodeEventHandler(this.treeList1_ValidateNode); // @@ -739,6 +739,14 @@ namespace MES.Form this.treeListColumn16.Visible = true; this.treeListColumn16.VisibleIndex = 9; // + // treeListColumn6 + // + this.treeListColumn6.Caption = "明细编号"; + this.treeListColumn6.FieldName = "productBOMdetailcode"; + this.treeListColumn6.Name = "treeListColumn6"; + this.treeListColumn6.Visible = true; + this.treeListColumn6.VisibleIndex = 10; + // // contextMenuStrip1 // this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -746,26 +754,26 @@ namespace MES.Form this.toolStripMenuItemAddSon, this.toolStripMenuItemDel}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(125, 70); + this.contextMenuStrip1.Size = new System.Drawing.Size(181, 92); // // toolStripMenuItemAdd // this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd"; - this.toolStripMenuItemAdd.Size = new System.Drawing.Size(124, 22); + this.toolStripMenuItemAdd.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItemAdd.Text = "新增"; this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click); // // toolStripMenuItemAddSon // this.toolStripMenuItemAddSon.Name = "toolStripMenuItemAddSon"; - this.toolStripMenuItemAddSon.Size = new System.Drawing.Size(124, 22); + this.toolStripMenuItemAddSon.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItemAddSon.Text = "新增子级"; this.toolStripMenuItemAddSon.Click += new System.EventHandler(this.toolStripMenuItemAddSon_Click); // // toolStripMenuItemDel // this.toolStripMenuItemDel.Name = "toolStripMenuItemDel"; - this.toolStripMenuItemDel.Size = new System.Drawing.Size(124, 22); + this.toolStripMenuItemDel.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItemDel.Text = "删除"; this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click); // @@ -773,7 +781,7 @@ namespace MES.Form // this.txtid.Location = new System.Drawing.Point(64, 12); this.txtid.Name = "txtid"; - this.txtid.Size = new System.Drawing.Size(442, 20); + this.txtid.Size = new System.Drawing.Size(447, 20); this.txtid.StyleController = this.layoutControl1; this.txtid.TabIndex = 1; // @@ -788,24 +796,24 @@ namespace MES.Form this.txtcustomerid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtcustomerid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtcustomerid.Properties.ValueMember = "ID"; - this.txtcustomerid.Size = new System.Drawing.Size(442, 20); + this.txtcustomerid.Size = new System.Drawing.Size(447, 20); this.txtcustomerid.StyleController = this.layoutControl1; this.txtcustomerid.TabIndex = 2; this.txtcustomerid.EditValueChanged += new System.EventHandler(this.txtcustomerid_EditValueChanged); // // txtcustomercode // - this.txtcustomercode.Location = new System.Drawing.Point(562, 36); + this.txtcustomercode.Location = new System.Drawing.Point(567, 36); this.txtcustomercode.Name = "txtcustomercode"; - this.txtcustomercode.Size = new System.Drawing.Size(443, 20); + this.txtcustomercode.Size = new System.Drawing.Size(449, 20); this.txtcustomercode.StyleController = this.layoutControl1; this.txtcustomercode.TabIndex = 3; // // txtproductcode // - this.txtproductcode.Location = new System.Drawing.Point(562, 60); + this.txtproductcode.Location = new System.Drawing.Point(567, 60); this.txtproductcode.Name = "txtproductcode"; - this.txtproductcode.Size = new System.Drawing.Size(443, 20); + this.txtproductcode.Size = new System.Drawing.Size(449, 20); this.txtproductcode.StyleController = this.layoutControl1; this.txtproductcode.TabIndex = 4; // @@ -820,7 +828,7 @@ namespace MES.Form this.txtproductid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtproductid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtproductid.Properties.ValueMember = "ID"; - this.txtproductid.Size = new System.Drawing.Size(442, 20); + this.txtproductid.Size = new System.Drawing.Size(447, 20); this.txtproductid.StyleController = this.layoutControl1; this.txtproductid.TabIndex = 5; this.txtproductid.EditValueChanged += new System.EventHandler(this.txtproductid_EditValueChanged); @@ -829,14 +837,14 @@ namespace MES.Form // this.txtspec.Location = new System.Drawing.Point(64, 84); this.txtspec.Name = "txtspec"; - this.txtspec.Size = new System.Drawing.Size(442, 20); + this.txtspec.Size = new System.Drawing.Size(447, 20); this.txtspec.StyleController = this.layoutControl1; this.txtspec.TabIndex = 6; // // txtunit // this.txtunit.EditValue = ""; - this.txtunit.Location = new System.Drawing.Point(562, 84); + this.txtunit.Location = new System.Drawing.Point(567, 84); this.txtunit.Name = "txtunit"; this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -844,7 +852,7 @@ namespace MES.Form this.txtunit.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtunit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtunit.Properties.ValueMember = "ID"; - this.txtunit.Size = new System.Drawing.Size(443, 20); + this.txtunit.Size = new System.Drawing.Size(449, 20); this.txtunit.StyleController = this.layoutControl1; this.txtunit.TabIndex = 7; // @@ -859,31 +867,31 @@ namespace MES.Form this.txtwarehouse.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtwarehouse.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtwarehouse.Properties.ValueMember = "ID"; - this.txtwarehouse.Size = new System.Drawing.Size(442, 20); + this.txtwarehouse.Size = new System.Drawing.Size(447, 20); this.txtwarehouse.StyleController = this.layoutControl1; this.txtwarehouse.TabIndex = 8; // // txtversion // - this.txtversion.Location = new System.Drawing.Point(562, 108); + this.txtversion.Location = new System.Drawing.Point(567, 108); this.txtversion.Name = "txtversion"; - this.txtversion.Size = new System.Drawing.Size(443, 20); + this.txtversion.Size = new System.Drawing.Size(449, 20); this.txtversion.StyleController = this.layoutControl1; this.txtversion.TabIndex = 9; // // txtproductBOMcode // - this.txtproductBOMcode.Location = new System.Drawing.Point(562, 12); + this.txtproductBOMcode.Location = new System.Drawing.Point(567, 12); this.txtproductBOMcode.Name = "txtproductBOMcode"; - this.txtproductBOMcode.Size = new System.Drawing.Size(443, 20); + this.txtproductBOMcode.Size = new System.Drawing.Size(449, 20); this.txtproductBOMcode.StyleController = this.layoutControl1; this.txtproductBOMcode.TabIndex = 10; // // txtremark // - this.txtremark.Location = new System.Drawing.Point(562, 180); + this.txtremark.Location = new System.Drawing.Point(567, 180); this.txtremark.Name = "txtremark"; - this.txtremark.Size = new System.Drawing.Size(443, 20); + this.txtremark.Size = new System.Drawing.Size(449, 20); this.txtremark.StyleController = this.layoutControl1; this.txtremark.TabIndex = 11; // @@ -910,7 +918,7 @@ namespace MES.Form this.layoutControlItem15, this.layoutControlItem16}); this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Size = new System.Drawing.Size(1017, 677); + this.layoutControlGroup1.Size = new System.Drawing.Size(1028, 686); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem1 @@ -919,7 +927,7 @@ namespace MES.Form this.layoutControlItem1.CustomizationFormText = "id"; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(498, 24); + this.layoutControlItem1.Size = new System.Drawing.Size(503, 24); this.layoutControlItem1.Text = "id"; this.layoutControlItem1.TextSize = new System.Drawing.Size(49, 14); // @@ -929,7 +937,7 @@ namespace MES.Form this.layoutControlItem2.CustomizationFormText = "客户"; this.layoutControlItem2.Location = new System.Drawing.Point(0, 24); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(498, 24); + this.layoutControlItem2.Size = new System.Drawing.Size(503, 24); this.layoutControlItem2.Text = "客户"; this.layoutControlItem2.TextSize = new System.Drawing.Size(49, 14); // @@ -939,7 +947,7 @@ namespace MES.Form this.layoutControlItem6.CustomizationFormText = "规格型号"; this.layoutControlItem6.Location = new System.Drawing.Point(0, 72); this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(498, 24); + this.layoutControlItem6.Size = new System.Drawing.Size(503, 24); this.layoutControlItem6.Text = "规格型号"; this.layoutControlItem6.TextSize = new System.Drawing.Size(49, 14); // @@ -949,7 +957,7 @@ namespace MES.Form this.layoutControlItem8.CustomizationFormText = "仓库"; this.layoutControlItem8.Location = new System.Drawing.Point(0, 96); this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(498, 24); + this.layoutControlItem8.Size = new System.Drawing.Size(503, 24); this.layoutControlItem8.Text = "仓库"; this.layoutControlItem8.TextSize = new System.Drawing.Size(49, 14); // @@ -957,9 +965,9 @@ namespace MES.Form // this.layoutControlItem11.Control = this.txtremark; this.layoutControlItem11.CustomizationFormText = "备注"; - this.layoutControlItem11.Location = new System.Drawing.Point(498, 168); + this.layoutControlItem11.Location = new System.Drawing.Point(503, 168); this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.Size = new System.Drawing.Size(499, 24); + this.layoutControlItem11.Size = new System.Drawing.Size(505, 24); this.layoutControlItem11.Text = "备注"; this.layoutControlItem11.TextSize = new System.Drawing.Size(49, 14); // @@ -967,9 +975,9 @@ namespace MES.Form // this.layoutControlItem3.Control = this.txtcustomercode; this.layoutControlItem3.CustomizationFormText = "客户编码"; - this.layoutControlItem3.Location = new System.Drawing.Point(498, 24); + this.layoutControlItem3.Location = new System.Drawing.Point(503, 24); this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(499, 24); + this.layoutControlItem3.Size = new System.Drawing.Size(505, 24); this.layoutControlItem3.Text = "客户编码"; this.layoutControlItem3.TextSize = new System.Drawing.Size(49, 14); // @@ -977,9 +985,9 @@ namespace MES.Form // this.layoutControlItem10.Control = this.txtproductBOMcode; this.layoutControlItem10.CustomizationFormText = "BOM编号"; - this.layoutControlItem10.Location = new System.Drawing.Point(498, 0); + this.layoutControlItem10.Location = new System.Drawing.Point(503, 0); this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.Size = new System.Drawing.Size(499, 24); + this.layoutControlItem10.Size = new System.Drawing.Size(505, 24); this.layoutControlItem10.Text = "BOM编号"; this.layoutControlItem10.TextSize = new System.Drawing.Size(49, 14); // @@ -987,9 +995,9 @@ namespace MES.Form // this.layoutControlItem7.Control = this.txtunit; this.layoutControlItem7.CustomizationFormText = "计量单位"; - this.layoutControlItem7.Location = new System.Drawing.Point(498, 72); + this.layoutControlItem7.Location = new System.Drawing.Point(503, 72); this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(499, 24); + this.layoutControlItem7.Size = new System.Drawing.Size(505, 24); this.layoutControlItem7.Text = "计量单位"; this.layoutControlItem7.TextSize = new System.Drawing.Size(49, 14); // @@ -997,9 +1005,9 @@ namespace MES.Form // this.layoutControlItem9.Control = this.txtversion; this.layoutControlItem9.CustomizationFormText = "版本号"; - this.layoutControlItem9.Location = new System.Drawing.Point(498, 96); + this.layoutControlItem9.Location = new System.Drawing.Point(503, 96); this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(499, 24); + this.layoutControlItem9.Size = new System.Drawing.Size(505, 24); this.layoutControlItem9.Text = "版本号"; this.layoutControlItem9.TextSize = new System.Drawing.Size(49, 14); // @@ -1008,7 +1016,7 @@ namespace MES.Form this.layoutControlItem12.Control = this.xtraTabControl2; this.layoutControlItem12.Location = new System.Drawing.Point(0, 192); this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.Size = new System.Drawing.Size(997, 465); + this.layoutControlItem12.Size = new System.Drawing.Size(1008, 474); this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem12.TextVisible = false; // @@ -1018,7 +1026,7 @@ namespace MES.Form this.layoutControlItem5.CustomizationFormText = "产品"; this.layoutControlItem5.Location = new System.Drawing.Point(0, 48); this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(498, 24); + this.layoutControlItem5.Size = new System.Drawing.Size(503, 24); this.layoutControlItem5.Text = "产品"; this.layoutControlItem5.TextSize = new System.Drawing.Size(49, 14); // @@ -1026,9 +1034,9 @@ namespace MES.Form // this.layoutControlItem4.Control = this.txtproductcode; this.layoutControlItem4.CustomizationFormText = "产品编号"; - this.layoutControlItem4.Location = new System.Drawing.Point(498, 48); + this.layoutControlItem4.Location = new System.Drawing.Point(503, 48); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(499, 24); + this.layoutControlItem4.Size = new System.Drawing.Size(505, 24); this.layoutControlItem4.Text = "产品编号"; this.layoutControlItem4.TextSize = new System.Drawing.Size(49, 14); // @@ -1037,7 +1045,7 @@ namespace MES.Form this.txtunitcost111.Control = this.txtunitcost; this.txtunitcost111.Location = new System.Drawing.Point(0, 168); this.txtunitcost111.Name = "txtunitcost111"; - this.txtunitcost111.Size = new System.Drawing.Size(498, 24); + this.txtunitcost111.Size = new System.Drawing.Size(503, 24); this.txtunitcost111.Text = "单位成本"; this.txtunitcost111.TextSize = new System.Drawing.Size(49, 14); // @@ -1046,7 +1054,7 @@ namespace MES.Form this.layoutControlItem13.Control = this.txtcreatorId; this.layoutControlItem13.Location = new System.Drawing.Point(0, 120); this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.Size = new System.Drawing.Size(498, 24); + this.layoutControlItem13.Size = new System.Drawing.Size(503, 24); this.layoutControlItem13.Text = "创建人"; this.layoutControlItem13.TextSize = new System.Drawing.Size(49, 14); // @@ -1055,41 +1063,33 @@ namespace MES.Form this.layoutControlItem14.Control = this.txteditorId; this.layoutControlItem14.Location = new System.Drawing.Point(0, 144); this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.Size = new System.Drawing.Size(498, 24); + this.layoutControlItem14.Size = new System.Drawing.Size(503, 24); this.layoutControlItem14.Text = "编辑人"; this.layoutControlItem14.TextSize = new System.Drawing.Size(49, 14); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txtcreateTime; - this.layoutControlItem15.Location = new System.Drawing.Point(498, 120); + this.layoutControlItem15.Location = new System.Drawing.Point(503, 120); this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.Size = new System.Drawing.Size(499, 24); + this.layoutControlItem15.Size = new System.Drawing.Size(505, 24); this.layoutControlItem15.Text = "创建时间"; this.layoutControlItem15.TextSize = new System.Drawing.Size(49, 14); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txteditTime; - this.layoutControlItem16.Location = new System.Drawing.Point(498, 144); + this.layoutControlItem16.Location = new System.Drawing.Point(503, 144); this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.Size = new System.Drawing.Size(499, 24); + this.layoutControlItem16.Size = new System.Drawing.Size(505, 24); this.layoutControlItem16.Text = "编辑时间"; this.layoutControlItem16.TextSize = new System.Drawing.Size(49, 14); // - // treeListColumn6 - // - this.treeListColumn6.Caption = "明细编号"; - this.treeListColumn6.FieldName = "productBOMdetailcode"; - this.treeListColumn6.Name = "treeListColumn6"; - this.treeListColumn6.Visible = true; - this.treeListColumn6.VisibleIndex = 10; - // // FrmproductBOM // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1027, 744); + this.ClientSize = new System.Drawing.Size(1037, 750); this.Controls.Add(this.xtraTabControl1); this.Name = "FrmproductBOM"; this.Text = "产品BOM"; diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.cs b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.cs new file mode 100644 index 0000000..7180897 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.cs @@ -0,0 +1,218 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using WinformGeneralDeveloperFrame; +using WinformGeneralDeveloperFrame.Commons; +using DevExpress.XtraLayout; +using MES.Entity; +using System.Data.Entity.Migrations; +using System.Data.Entity; +namespace MES.Form +{ + public partial class FrmproductionBOM : FrmBaseForm + { + private Dictionary fieldDictionary = new Dictionary(); + public FrmproductionBOM() + { + InitializeComponent(); + } + private void FrmproductionBOM_Load(object sender, EventArgs e) + { + InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new productionBOMInfo()); + InitSearchDicData(); + } + /// + /// 数据源初始化 + /// + /// + private void Init() + { + txtmaterialid.Properties.DataSource = GetDataTableUtils.SqlTable("物料"); + repositoryItemtxtmaterialid.DataSource= GetDataTableUtils.SqlTable("物料"); + txtmaterialtype.Properties.DataSource = GetDataTableUtils.SqlTable("物料类别"); + repositoryItemtxtmaterialtype.DataSource= GetDataTableUtils.SqlTable("物料类别"); + txtunit.Properties.DataSource = GetDataTableUtils.SqlTable("计量单位"); + repositoryItemtxtunit.DataSource= GetDataTableUtils.SqlTable("计量单位"); + txtwarehouse.Properties.DataSource = GetDataTableUtils.SqlTable("仓库"); + repositoryItemtxtwarehouse.DataSource= GetDataTableUtils.SqlTable("仓库"); + } + /// + /// 搜索字段 + /// + /// + private void InitSearchDicData() + { + fieldDictionary.Add("工程BOM编号","projectBOMcode"); + fieldDictionary.Add("生产BOM编号","productionBOMcode"); + fieldDictionary.Add("物料编码","materialcode"); + fieldDictionary.Add("物料名称","materialid"); + } + + public override void InitgrdListDataSource() + { + using (var con=new MESDB())/// + { + grdList.DataSource=con.productionBOMInfo.ToList(); + } + Init(); + } + /// + /// 字段为空校验 + /// + /// + public override bool CheckInput() + { + if(string.IsNullOrEmpty(txtprojectBOMcode.EditValue.ToString())) + { + "工程BOM编号不能为空".ShowWarning(); + txtprojectBOMcode.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtproductionBOMcode.EditValue.ToString())) + { + "生产BOM编号不能为空".ShowWarning(); + txtproductionBOMcode.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtnumber.EditValue.ToString())) + { + "产品生产数量不能为空".ShowWarning(); + txtnumber.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtmaterialcode.EditValue.ToString())) + { + "物料编码不能为空".ShowWarning(); + txtmaterialcode.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtmaterialid.EditValue.ToString())) + { + "物料名称不能为空".ShowWarning(); + txtmaterialid.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtspec.EditValue.ToString())) + { + "规格型号不能为空".ShowWarning(); + txtspec.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtmaterialtype.EditValue.ToString())) + { + "物料类型不能为空".ShowWarning(); + txtmaterialtype.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtuintnumber.EditValue.ToString())) + { + "单位用量不能为空".ShowWarning(); + txtuintnumber.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtneednumber.EditValue.ToString())) + { + "需求总量不能为空".ShowWarning(); + txtneednumber.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtunit.EditValue.ToString())) + { + "计量单位不能为空".ShowWarning(); + txtunit.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtunitprice.EditValue.ToString())) + { + "单价不能为空".ShowWarning(); + txtunitprice.Focus(); + return false; + } + if(string.IsNullOrEmpty(txttotalprice.EditValue.ToString())) + { + "总价不能为空".ShowWarning(); + txttotalprice.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtwarehouse.EditValue.ToString())) + { + "仓库不能为空".ShowWarning(); + txtwarehouse.Focus(); + return false; + } + return true; + } + /// + /// 保存 + /// + /// + public override bool SaveFunction() + { + try + { + productionBOMInfo info= (productionBOMInfo)this.ControlDataToModel(new productionBOMInfo()); + using (var db = new MESDB()) + { + db.productionBOMInfo.AddOrUpdate(info); + db.SaveChanges(); + } + } + catch (Exception ex) + { + ex.Message.ShowError(); + return false; + } + return true; + } + /// + /// 删除 + /// + /// + public override bool DelFunction() + { + try + { + productionBOMInfo info = (productionBOMInfo)this.ControlDataToModel(new productionBOMInfo()); + using (var db = new MESDB()) + { + db.Entry(info).State=EntityState.Deleted; + db.SaveChanges(); + } + } + catch (Exception ex) + { + ex.Message.ShowError(); + return false; + } + return true; + } + /// + /// 搜索 + /// + /// + public override void SearchFunction() + { + FrmSearch frm = new FrmSearch(fieldDictionary); + if (frm.ShowDialog()==DialogResult.OK) + { + string sql = frm.sql; + using (var db = new MESDB()) + { + if (string.IsNullOrEmpty(sql)) + { + grdList.DataSource = db.productionBOMInfo.SqlQuery("select * from productionBOM").ToList(); + } + else + { + grdList.DataSource = db.productionBOMInfo.SqlQuery($"select * from productionBOM where {sql}").ToList(); + } + } + } + } + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.designer.cs new file mode 100644 index 0000000..03a79a5 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.designer.cs @@ -0,0 +1,864 @@ + +using DevExpress.XtraEditors; +using DevExpress.XtraLayout; +using DevExpress.XtraTab; + +namespace MES.Form +{ + partial class FrmproductionBOM + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemtxtmaterialid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemtxtmaterialtype = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemtxtunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemtxtwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); + this.tabDataList = new DevExpress.XtraTab.XtraTabPage(); + this.grdList = new DevExpress.XtraGrid.GridControl(); + this.grdListView = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage(); + this.panelControl2 = new DevExpress.XtraEditors.PanelControl(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtid = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtprojectBOMcode = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtproductionBOMcode = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtnumber = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtmaterialcode = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtmaterialid = new DevExpress.XtraEditors.LookUpEdit(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtspec = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtmaterialtype = new DevExpress.XtraEditors.LookUpEdit(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtuintnumber = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtneednumber = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtunit = new DevExpress.XtraEditors.LookUpEdit(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtunitprice = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txttotalprice = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtwarehouse = new DevExpress.XtraEditors.LookUpEdit(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtremark = new DevExpress.XtraEditors.TextEdit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtmaterialid)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtmaterialtype)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtwarehouse)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); + this.xtraTabControl1.SuspendLayout(); + this.tabDataList.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.grdListView)).BeginInit(); + this.tabDataDetail.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit(); + this.panelControl2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtprojectBOMcode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtproductionBOMcode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtnumber.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtmaterialcode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtmaterialid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtspec.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtmaterialtype.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtuintnumber.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtneednumber.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtunitprice.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txttotalprice.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit(); + this.SuspendLayout(); + // + // gridColumn1 + // + this.gridColumn1.Caption = "id"; + this.gridColumn1.FieldName = "id"; + this.gridColumn1.Name = "gridColumn1"; + // + // gridColumn2 + // + this.gridColumn2.Caption = "工程BOM编号"; + this.gridColumn2.FieldName = "projectBOMcode"; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 0; + this.gridColumn2.Width = 201; + // + // gridColumn3 + // + this.gridColumn3.Caption = "生产BOM编号"; + this.gridColumn3.FieldName = "productionBOMcode"; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 1; + this.gridColumn3.Width = 201; + // + // gridColumn4 + // + this.gridColumn4.Caption = "产品生产数量"; + this.gridColumn4.FieldName = "number"; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 2; + this.gridColumn4.Width = 201; + // + // gridColumn5 + // + this.gridColumn5.Caption = "物料编码"; + this.gridColumn5.FieldName = "materialcode"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 3; + this.gridColumn5.Width = 201; + // + // gridColumn6 + // + this.gridColumn6.Caption = "物料名称"; + this.gridColumn6.ColumnEdit = this.repositoryItemtxtmaterialid; + this.gridColumn6.FieldName = "materialid"; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 4; + this.gridColumn6.Width = 201; + // + // repositoryItemtxtmaterialid + // + this.repositoryItemtxtmaterialid.AutoHeight = false; + this.repositoryItemtxtmaterialid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemtxtmaterialid.DisplayMember = "Name"; + this.repositoryItemtxtmaterialid.Name = "repositoryItemtxtmaterialid"; + this.repositoryItemtxtmaterialid.ValueMember = "ID"; + // + // gridColumn7 + // + this.gridColumn7.Caption = "规格型号"; + this.gridColumn7.FieldName = "spec"; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 5; + this.gridColumn7.Width = 201; + // + // gridColumn8 + // + this.gridColumn8.Caption = "物料类型"; + this.gridColumn8.ColumnEdit = this.repositoryItemtxtmaterialtype; + this.gridColumn8.FieldName = "materialtype"; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 6; + this.gridColumn8.Width = 201; + // + // repositoryItemtxtmaterialtype + // + this.repositoryItemtxtmaterialtype.AutoHeight = false; + this.repositoryItemtxtmaterialtype.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemtxtmaterialtype.DisplayMember = "Name"; + this.repositoryItemtxtmaterialtype.Name = "repositoryItemtxtmaterialtype"; + this.repositoryItemtxtmaterialtype.ValueMember = "ID"; + // + // gridColumn9 + // + this.gridColumn9.Caption = "单位用量"; + this.gridColumn9.FieldName = "uintnumber"; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 7; + this.gridColumn9.Width = 201; + // + // gridColumn10 + // + this.gridColumn10.Caption = "需求总量"; + this.gridColumn10.FieldName = "neednumber"; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 8; + this.gridColumn10.Width = 201; + // + // gridColumn11 + // + this.gridColumn11.Caption = "计量单位"; + this.gridColumn11.ColumnEdit = this.repositoryItemtxtunit; + this.gridColumn11.FieldName = "unit"; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 9; + this.gridColumn11.Width = 201; + // + // repositoryItemtxtunit + // + this.repositoryItemtxtunit.AutoHeight = false; + this.repositoryItemtxtunit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemtxtunit.DisplayMember = "Name"; + this.repositoryItemtxtunit.Name = "repositoryItemtxtunit"; + this.repositoryItemtxtunit.ValueMember = "ID"; + // + // gridColumn12 + // + this.gridColumn12.Caption = "单价"; + this.gridColumn12.FieldName = "unitprice"; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 10; + this.gridColumn12.Width = 201; + // + // gridColumn13 + // + this.gridColumn13.Caption = "总价"; + this.gridColumn13.FieldName = "totalprice"; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 11; + this.gridColumn13.Width = 201; + // + // gridColumn14 + // + this.gridColumn14.Caption = "仓库"; + this.gridColumn14.ColumnEdit = this.repositoryItemtxtwarehouse; + this.gridColumn14.FieldName = "warehouse"; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Visible = true; + this.gridColumn14.VisibleIndex = 12; + this.gridColumn14.Width = 201; + // + // repositoryItemtxtwarehouse + // + this.repositoryItemtxtwarehouse.AutoHeight = false; + this.repositoryItemtxtwarehouse.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemtxtwarehouse.DisplayMember = "Name"; + this.repositoryItemtxtwarehouse.Name = "repositoryItemtxtwarehouse"; + this.repositoryItemtxtwarehouse.ValueMember = "ID"; + // + // gridColumn15 + // + this.gridColumn15.Caption = "备注"; + this.gridColumn15.FieldName = "remark"; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.Visible = true; + this.gridColumn15.VisibleIndex = 13; + this.gridColumn15.Width = 201; + // + // xtraTabControl1 + // + this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.xtraTabControl1.Location = new System.Drawing.Point(0, 34); + this.xtraTabControl1.Name = "xtraTabControl1"; + this.xtraTabControl1.SelectedTabPage = this.tabDataList; + this.xtraTabControl1.Size = new System.Drawing.Size(1310, 772); + this.xtraTabControl1.TabIndex = 1; + this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.tabDataList, + this.tabDataDetail}); + // + // tabDataList + // + this.tabDataList.Controls.Add(this.grdList); + this.tabDataList.Name = "tabDataList"; + this.tabDataList.Size = new System.Drawing.Size(1305, 746); + this.tabDataList.Text = "数据列表"; + // + // grdList + // + this.grdList.Dock = System.Windows.Forms.DockStyle.Fill; + this.grdList.Location = new System.Drawing.Point(0, 0); + this.grdList.MainView = this.grdListView; + this.grdList.Name = "grdList"; + this.grdList.Size = new System.Drawing.Size(1305, 746); + this.grdList.TabIndex = 0; + this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.grdListView}); + // + // grdListView + // + this.grdListView.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn1, + this.gridColumn2, + this.gridColumn3, + this.gridColumn4, + this.gridColumn5, + this.gridColumn6, + this.gridColumn7, + this.gridColumn8, + this.gridColumn9, + this.gridColumn10, + this.gridColumn11, + this.gridColumn12, + this.gridColumn13, + this.gridColumn14, + this.gridColumn15}); + this.grdListView.GridControl = this.grdList; + this.grdListView.Name = "grdListView"; + this.grdListView.OptionsBehavior.Editable = false; + this.grdListView.OptionsView.ColumnAutoWidth = false; + // + // tabDataDetail + // + this.tabDataDetail.Controls.Add(this.panelControl2); + this.tabDataDetail.Name = "tabDataDetail"; + this.tabDataDetail.Size = new System.Drawing.Size(1294, 737); + this.tabDataDetail.Text = "数据编辑"; + // + // panelControl2 + // + this.panelControl2.Controls.Add(this.layoutControl1); + this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelControl2.Location = new System.Drawing.Point(0, 0); + this.panelControl2.Name = "panelControl2"; + this.panelControl2.Size = new System.Drawing.Size(1294, 737); + this.panelControl2.TabIndex = 0; + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.txtid); + this.layoutControl1.Controls.Add(this.txtprojectBOMcode); + this.layoutControl1.Controls.Add(this.txtproductionBOMcode); + this.layoutControl1.Controls.Add(this.txtnumber); + this.layoutControl1.Controls.Add(this.txtmaterialcode); + this.layoutControl1.Controls.Add(this.txtmaterialid); + this.layoutControl1.Controls.Add(this.txtspec); + this.layoutControl1.Controls.Add(this.txtmaterialtype); + this.layoutControl1.Controls.Add(this.txtuintnumber); + this.layoutControl1.Controls.Add(this.txtneednumber); + this.layoutControl1.Controls.Add(this.txtunit); + this.layoutControl1.Controls.Add(this.txtunitprice); + this.layoutControl1.Controls.Add(this.txttotalprice); + this.layoutControl1.Controls.Add(this.txtwarehouse); + this.layoutControl1.Controls.Add(this.txtremark); + this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutControl1.Location = new System.Drawing.Point(2, 2); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.layoutControlGroup1; + this.layoutControl1.Size = new System.Drawing.Size(1290, 733); + this.layoutControl1.TabIndex = 6; + this.layoutControl1.Text = "layoutControl1"; + // + // layoutControlGroup1 + // + this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1"; + this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem1, + this.layoutControlItem2, + this.layoutControlItem3, + this.layoutControlItem4, + this.layoutControlItem5, + this.layoutControlItem6, + this.layoutControlItem7, + this.layoutControlItem8, + this.layoutControlItem9, + this.layoutControlItem10, + this.layoutControlItem11, + this.layoutControlItem12, + this.layoutControlItem13, + this.layoutControlItem14, + this.layoutControlItem15}); + this.layoutControlGroup1.Name = "layoutControlGroup1"; + this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733); + this.layoutControlGroup1.TextVisible = false; + // + // layoutControlItem1 + // + this.layoutControlItem1.Control = this.txtid; + this.layoutControlItem1.CustomizationFormText = "id"; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem1.Text = "id"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(73, 14); + // + // txtid + // + this.txtid.Location = new System.Drawing.Point(88, 12); + this.txtid.Name = "txtid"; + this.txtid.Size = new System.Drawing.Size(1190, 20); + this.txtid.StyleController = this.layoutControl1; + this.txtid.TabIndex = 1; + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txtprojectBOMcode; + this.layoutControlItem2.CustomizationFormText = "工程BOM编号"; + this.layoutControlItem2.Location = new System.Drawing.Point(0, 24); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem2.Text = "工程BOM编号"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(73, 14); + // + // txtprojectBOMcode + // + this.txtprojectBOMcode.Location = new System.Drawing.Point(88, 36); + this.txtprojectBOMcode.Name = "txtprojectBOMcode"; + this.txtprojectBOMcode.Size = new System.Drawing.Size(1190, 20); + this.txtprojectBOMcode.StyleController = this.layoutControl1; + this.txtprojectBOMcode.TabIndex = 2; + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txtproductionBOMcode; + this.layoutControlItem3.CustomizationFormText = "生产BOM编号"; + this.layoutControlItem3.Location = new System.Drawing.Point(0, 48); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem3.Text = "生产BOM编号"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(73, 14); + // + // txtproductionBOMcode + // + this.txtproductionBOMcode.Location = new System.Drawing.Point(88, 60); + this.txtproductionBOMcode.Name = "txtproductionBOMcode"; + this.txtproductionBOMcode.Size = new System.Drawing.Size(1190, 20); + this.txtproductionBOMcode.StyleController = this.layoutControl1; + this.txtproductionBOMcode.TabIndex = 3; + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txtnumber; + this.layoutControlItem4.CustomizationFormText = "产品生产数量"; + this.layoutControlItem4.Location = new System.Drawing.Point(0, 72); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem4.Text = "产品生产数量"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(73, 14); + // + // txtnumber + // + this.txtnumber.Location = new System.Drawing.Point(88, 84); + this.txtnumber.Name = "txtnumber"; + this.txtnumber.Size = new System.Drawing.Size(1190, 20); + this.txtnumber.StyleController = this.layoutControl1; + this.txtnumber.TabIndex = 4; + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txtmaterialcode; + this.layoutControlItem5.CustomizationFormText = "物料编码"; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 96); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem5.Text = "物料编码"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(73, 14); + // + // txtmaterialcode + // + this.txtmaterialcode.Location = new System.Drawing.Point(88, 108); + this.txtmaterialcode.Name = "txtmaterialcode"; + this.txtmaterialcode.Size = new System.Drawing.Size(1190, 20); + this.txtmaterialcode.StyleController = this.layoutControl1; + this.txtmaterialcode.TabIndex = 5; + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txtmaterialid; + this.layoutControlItem6.CustomizationFormText = "物料名称"; + this.layoutControlItem6.Location = new System.Drawing.Point(0, 120); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem6.Text = "物料名称"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(73, 14); + // + // txtmaterialid + // + this.txtmaterialid.EditValue = ""; + this.txtmaterialid.Location = new System.Drawing.Point(88, 132); + this.txtmaterialid.Name = "txtmaterialid"; + this.txtmaterialid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtmaterialid.Properties.DisplayMember = "Name"; + this.txtmaterialid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtmaterialid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtmaterialid.Properties.ValueMember = "ID"; + this.txtmaterialid.Size = new System.Drawing.Size(1190, 20); + this.txtmaterialid.StyleController = this.layoutControl1; + this.txtmaterialid.TabIndex = 6; + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txtspec; + this.layoutControlItem7.CustomizationFormText = "规格型号"; + this.layoutControlItem7.Location = new System.Drawing.Point(0, 144); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem7.Text = "规格型号"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(73, 14); + // + // txtspec + // + this.txtspec.Location = new System.Drawing.Point(88, 156); + this.txtspec.Name = "txtspec"; + this.txtspec.Size = new System.Drawing.Size(1190, 20); + this.txtspec.StyleController = this.layoutControl1; + this.txtspec.TabIndex = 7; + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.txtmaterialtype; + this.layoutControlItem8.CustomizationFormText = "物料类型"; + this.layoutControlItem8.Location = new System.Drawing.Point(0, 168); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem8.Text = "物料类型"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(73, 14); + // + // txtmaterialtype + // + this.txtmaterialtype.EditValue = ""; + this.txtmaterialtype.Location = new System.Drawing.Point(88, 180); + this.txtmaterialtype.Name = "txtmaterialtype"; + this.txtmaterialtype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtmaterialtype.Properties.DisplayMember = "Name"; + this.txtmaterialtype.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtmaterialtype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtmaterialtype.Properties.ValueMember = "ID"; + this.txtmaterialtype.Size = new System.Drawing.Size(1190, 20); + this.txtmaterialtype.StyleController = this.layoutControl1; + this.txtmaterialtype.TabIndex = 8; + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txtuintnumber; + this.layoutControlItem9.CustomizationFormText = "单位用量"; + this.layoutControlItem9.Location = new System.Drawing.Point(0, 192); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem9.Text = "单位用量"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(73, 14); + // + // txtuintnumber + // + this.txtuintnumber.Location = new System.Drawing.Point(88, 204); + this.txtuintnumber.Name = "txtuintnumber"; + this.txtuintnumber.Size = new System.Drawing.Size(1190, 20); + this.txtuintnumber.StyleController = this.layoutControl1; + this.txtuintnumber.TabIndex = 9; + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txtneednumber; + this.layoutControlItem10.CustomizationFormText = "需求总量"; + this.layoutControlItem10.Location = new System.Drawing.Point(0, 216); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem10.Text = "需求总量"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(73, 14); + // + // txtneednumber + // + this.txtneednumber.Location = new System.Drawing.Point(88, 228); + this.txtneednumber.Name = "txtneednumber"; + this.txtneednumber.Size = new System.Drawing.Size(1190, 20); + this.txtneednumber.StyleController = this.layoutControl1; + this.txtneednumber.TabIndex = 10; + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txtunit; + this.layoutControlItem11.CustomizationFormText = "计量单位"; + this.layoutControlItem11.Location = new System.Drawing.Point(0, 240); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem11.Text = "计量单位"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(73, 14); + // + // txtunit + // + this.txtunit.EditValue = ""; + this.txtunit.Location = new System.Drawing.Point(88, 252); + this.txtunit.Name = "txtunit"; + this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtunit.Properties.DisplayMember = "Name"; + this.txtunit.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtunit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtunit.Properties.ValueMember = "ID"; + this.txtunit.Size = new System.Drawing.Size(1190, 20); + this.txtunit.StyleController = this.layoutControl1; + this.txtunit.TabIndex = 11; + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txtunitprice; + this.layoutControlItem12.CustomizationFormText = "单价"; + this.layoutControlItem12.Location = new System.Drawing.Point(0, 264); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem12.Text = "单价"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(73, 14); + // + // txtunitprice + // + this.txtunitprice.Location = new System.Drawing.Point(88, 276); + this.txtunitprice.Name = "txtunitprice"; + this.txtunitprice.Size = new System.Drawing.Size(1190, 20); + this.txtunitprice.StyleController = this.layoutControl1; + this.txtunitprice.TabIndex = 12; + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txttotalprice; + this.layoutControlItem13.CustomizationFormText = "总价"; + this.layoutControlItem13.Location = new System.Drawing.Point(0, 288); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem13.Text = "总价"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(73, 14); + // + // txttotalprice + // + this.txttotalprice.Location = new System.Drawing.Point(88, 300); + this.txttotalprice.Name = "txttotalprice"; + this.txttotalprice.Size = new System.Drawing.Size(1190, 20); + this.txttotalprice.StyleController = this.layoutControl1; + this.txttotalprice.TabIndex = 13; + // + // layoutControlItem14 + // + this.layoutControlItem14.Control = this.txtwarehouse; + this.layoutControlItem14.CustomizationFormText = "仓库"; + this.layoutControlItem14.Location = new System.Drawing.Point(0, 312); + this.layoutControlItem14.Name = "layoutControlItem14"; + this.layoutControlItem14.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem14.Text = "仓库"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(73, 14); + // + // txtwarehouse + // + this.txtwarehouse.EditValue = ""; + this.txtwarehouse.Location = new System.Drawing.Point(88, 324); + this.txtwarehouse.Name = "txtwarehouse"; + this.txtwarehouse.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtwarehouse.Properties.DisplayMember = "Name"; + this.txtwarehouse.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtwarehouse.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtwarehouse.Properties.ValueMember = "ID"; + this.txtwarehouse.Size = new System.Drawing.Size(1190, 20); + this.txtwarehouse.StyleController = this.layoutControl1; + this.txtwarehouse.TabIndex = 14; + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txtremark; + this.layoutControlItem15.CustomizationFormText = "备注"; + this.layoutControlItem15.Location = new System.Drawing.Point(0, 336); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.Size = new System.Drawing.Size(1270, 377); + this.layoutControlItem15.Text = "备注"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(73, 14); + // + // txtremark + // + this.txtremark.Location = new System.Drawing.Point(88, 348); + this.txtremark.Name = "txtremark"; + this.txtremark.Size = new System.Drawing.Size(1190, 20); + this.txtremark.StyleController = this.layoutControl1; + this.txtremark.TabIndex = 15; + // + // FrmproductionBOM + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1310, 806); + this.Controls.Add(this.xtraTabControl1); + this.Name = "FrmproductionBOM"; + this.Text = "FrmproductionBOM"; + this.Load += new System.EventHandler(this.FrmproductionBOM_Load); + this.Controls.SetChildIndex(this.xtraTabControl1, 0); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtmaterialid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtmaterialtype)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtwarehouse)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); + this.xtraTabControl1.ResumeLayout(false); + this.tabDataList.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.grdListView)).EndInit(); + this.tabDataDetail.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit(); + this.panelControl2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtprojectBOMcode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtproductionBOMcode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtnumber.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtmaterialcode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtmaterialid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtspec.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtmaterialtype.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtuintnumber.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtneednumber.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtunitprice.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txttotalprice.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private XtraTabControl xtraTabControl1; + private XtraTabPage tabDataList; + private XtraTabPage tabDataDetail; + private DevExpress.XtraGrid.GridControl grdList; + private DevExpress.XtraGrid.Views.Grid.GridView grdListView; + private PanelControl panelControl2; + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; + + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtid; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtprojectBOMcode; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtproductionBOMcode; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtnumber; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtmaterialcode; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtmaterialid; + + private DevExpress.XtraEditors.LookUpEdit txtmaterialid; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtspec; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtmaterialtype; + + private DevExpress.XtraEditors.LookUpEdit txtmaterialtype; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtuintnumber; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtneednumber; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtunit; + + private DevExpress.XtraEditors.LookUpEdit txtunit; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtunitprice; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txttotalprice; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtwarehouse; + + private DevExpress.XtraEditors.LookUpEdit txtwarehouse; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtremark; + + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.resx b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.cs b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.cs new file mode 100644 index 0000000..002d171 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.cs @@ -0,0 +1,385 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using WinformGeneralDeveloperFrame; +using WinformGeneralDeveloperFrame.Commons; +using DevExpress.XtraLayout; +using MES.Entity; +using System.Data.Entity.Migrations; +using System.Data.Entity; +using CCWin.SkinClass; +using DevExpress.XtraEditors; + +namespace MES.Form +{ + public partial class FrmproductionRequisition : FrmBaseForm + { + private Dictionary fieldDictionary = new Dictionary(); + public FrmproductionRequisition() + { + InitializeComponent(); + } + private void FrmproductionRequisition_Load(object sender, EventArgs e) + { + InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new productionRequisitionInfo(),gridControl1,new string[]{ "txtcode" }); + InitSearchDicData(); + repositoryItemLookUpEditmaterialid.EditValueChanged += RepositoryItemLookUpEditmaterialid_EditValueChanged; + } + + private void RepositoryItemLookUpEditmaterialid_EditValueChanged(object sender, EventArgs e) + { + LookUpEdit lookUpEdit = sender as LookUpEdit; + DataRowView data=lookUpEdit.GetSelectedDataRow() as DataRowView; + using (var db=new MESDB()) + { + int id = data.Row["ID"].ToInt32(); + int BOMid = data.Row["BOMid"].ToInt32(); + productBOMdetailInfo productBoMdetail = db.productBOMdetailInfo.Where(p => + p.materialid == id&& p.productBOMid == BOMid).ToList().First(); + gridView1.GetFocusedDataRow()["materialcode"] = productBoMdetail.materialcode; + gridView1.GetFocusedDataRow()["materialspec"] = productBoMdetail.materialspec; + gridView1.GetFocusedDataRow()["materialtype"] = productBoMdetail.materialtype; + gridView1.GetFocusedDataRow()["unitnumber"] = productBoMdetail.unitusenumber; + + gridView1.GetFocusedDataRow()["productnumber"] = txtnumber.Text; + gridView1.GetFocusedDataRow()["unit"] = productBoMdetail.unit; + gridView1.GetFocusedDataRow()["warehouse"] = productBoMdetail.warehouse; + // gridView1.GetFocusedDataRow()["unitnumber"] = productBoMdetail.materialcode; + + } + } + + /// + /// 数据源初始化 + /// + /// + private void Init() + { + txtproductID.Properties.DataSource = GetDataTableUtils.SqlTable("产品"); + repositoryItemtxtproductID.DataSource= GetDataTableUtils.SqlTable("产品"); + txtunit.Properties.DataSource = GetDataTableUtils.SqlTable("计量单位"); + repositoryItemtxtunit.DataSource= GetDataTableUtils.SqlTable("计量单位"); + txtpickingdept.Properties.DataSource = GetDataTableUtils.SqlTable("部门"); + repositoryItemTreeListtxtpickingdept.DataSource= GetDataTableUtils.SqlTable("部门"); + txtcreatorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户"); + repositoryItemtxtcreatorId.DataSource= GetDataTableUtils.SqlTable("用户"); + + repositoryItemLookUpEditwarehouse.DataSource = GetDataTableUtils.SqlTable("仓库"); + repositoryItemLookUpEditunit.DataSource = GetDataTableUtils.SqlTable("计量单位"); + repositoryItemLookUpEditmaterialid.DataSource = GetDataTableUtils.SqlTable("物料"); + repositoryItemLookUpEditmaterialtype.DataSource = GetDataTableUtils.SqlTable("物料类别"); + + } + /// + /// 搜索字段 + /// + /// + private void InitSearchDicData() + { + fieldDictionary.Add("领料单号","code"); + fieldDictionary.Add("工单号","wocode"); + fieldDictionary.Add("销售单号","salecode"); + } + + public override void InitgrdListDataSource() + { + using (var con=new MESDB())/// + { + grdList.DataSource=con.productionRequisitionInfo.ToList(); + } + Init(); + } + /// + /// 字段为空校验 + /// + /// + public override bool CheckInput() + { + if(string.IsNullOrEmpty(txtwocode.EditValue.ToString())) + { + "工单号不能为空".ShowWarning(); + txtwocode.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtpickingtime.EditValue.ToString())) + { + "领料日期不能为空".ShowWarning(); + txtpickingtime.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtproductID.EditValue.ToString())) + { + "产品不能为空".ShowWarning(); + txtproductID.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtproductcode.EditValue.ToString())) + { + "产品编号不能为空".ShowWarning(); + txtproductcode.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtproductspec.EditValue.ToString())) + { + "规格型号不能为空".ShowWarning(); + txtproductspec.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtnumber.EditValue.ToString())) + { + "生产数量不能为空".ShowWarning(); + txtnumber.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtunit.EditValue.ToString())) + { + "计量单位不能为空".ShowWarning(); + txtunit.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtpickingdept.EditValue.ToString())) + { + "领料部门不能为空".ShowWarning(); + txtpickingdept.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtcreatorId.EditValue.ToString())) + { + "制单人不能为空".ShowWarning(); + txtcreatorId.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtcreateTime.EditValue.ToString())) + { + "制单日期不能为空".ShowWarning(); + txtcreateTime.Focus(); + return false; + } + return true; + } + /// + /// 保存 + /// + /// + public override bool SaveFunction() + { + string code = "MOO" + DateTime.Now.GetDateTimeCode(); + + DataTable dt = gridControl1.DataSource as DataTable; + try + { + productionRequisitionInfo info = (productionRequisitionInfo)this.ControlDataToModel(new productionRequisitionInfo()); + using (var db = new MESDB()) + { + using (var tran = db.Database.BeginTransaction()) + { + try + { + Dictionary> dic = + dt.GetDataTableData(); + if (info.id == 0) //新增 + { + info.code = code; + db.productionRequisitionInfo.Add(info); + db.SaveChanges(); + txtid.Text = info.id.ToString(); + txtcode.Text = code; + if (dt != null) + { + List detaiListAdd = + dic["Add"]; + int num = 0; + detaiListAdd.ForEach(a => + { + num++; + string codedetail = "MOOD" + DateTime.Now.GetDateTimeCode() + num; + a.masterid = info.id; + a.mastercode = info.code; + a.wocode = info.wocode; + a.detailcode = codedetail; + }); + db.productionRequisitionDetailInfo.AddRange(detaiListAdd); + db.SaveChanges(); + } + } + else //更新 + { + db.Entry(info).State = EntityState.Modified; + db.SaveChanges(); + if (dt != null) + { + List detaiListAdd = + dic["Add"]; + int num = 0; + detaiListAdd.ForEach(a => + { + a.masterid = info.id; + a.mastercode = info.code; + num++; + string codedetail = "MOOD" + DateTime.Now.GetDateTimeCode() + num; + a.detailcode = codedetail; + a.wocode = info.wocode; + }); + db.productionRequisitionDetailInfo.AddRange(detaiListAdd); + + List detaiListEdit = + dic["Edit"]; + + detaiListEdit.ForEach((a) => + { + //a.buyercode = info.buyercode; + db.Entry(a).State = EntityState.Modified; + }); + + List detaiListDel = + dic["Del"]; + detaiListDel.ForEach((a) => { db.Entry(a).State = EntityState.Deleted; }); + db.SaveChanges(); + } + } + + tran.Commit(); + } + catch (Exception ex) + { + tran.Rollback(); + ex.Message.ShowError(); + return false; + } + finally + { + tran.Dispose(); + } + } + } + } + catch (Exception ex) + { + ex.Message.ShowError(); + return false; + } + + return true; + } + /// + /// 删除 + /// + /// + public override bool DelFunction() + { + try + { + productionRequisitionInfo info = (productionRequisitionInfo)this.ControlDataToModel(new productionRequisitionInfo()); + using (var db = new MESDB()) + { + db.Entry(info).State=EntityState.Deleted; + db.SaveChanges(); + } + } + catch (Exception ex) + { + ex.Message.ShowError(); + return false; + } + return true; + } + /// + /// 搜索 + /// + /// + public override void SearchFunction() + { + FrmSearch frm = new FrmSearch(fieldDictionary); + if (frm.ShowDialog()==DialogResult.OK) + { + string sql = frm.sql; + using (var db = new MESDB()) + { + if (string.IsNullOrEmpty(sql)) + { + grdList.DataSource = db.productionRequisitionInfo.SqlQuery("select * from productionRequisition").ToList(); + } + else + { + grdList.DataSource = db.productionRequisitionInfo.SqlQuery($"select * from productionRequisition where {sql}").ToList(); + } + } + } + } + + public override void EditFunction() + { + using (var db = new MESDB()) + { + var list = db.workorderInfo.Where(p => p.wordordercode == txtwocode.Text.ToUpper().Trim()).ToList(); + { + workorderInfo info = list.First(); + + repositoryItemLookUpEditmaterialid.DataSource = GetDataTableUtils.SqlTableBySql( + $"SELECT B.id ID,B.name Name,b.code Code,a.productBOMid BOMid FROM [winformdevfarme].[dbo].[productBOMdetail] A LEFT JOIN [winformdevfarme].[dbo].material B ON A.materialid = B.id where a.productBOMid = {info.bomid}"); + } + } + } + + public override void gridControlMouseDoubleClickFunction(object sender, EventArgs e) + { + productionRequisitionInfo info = grdListView.GetFocusedRow() as productionRequisitionInfo; + if (info != null) + { + using (var db = new MESDB()) + { + gridControl1.DataSource = db.productionRequisitionDetailInfo.Where(p => p.masterid== info.id).ToList().ToDataTable(); + gridView1.BestFitColumns(); + } + } + } + + public override void AddFunction() + { + txtpickingdept.EditValue = AppInfo.LoginUserInfo.deptId; + gridControl1.DataSource = new List().ToDataTable(); + } + + private void toolStripMenuItemAdd_Click(object sender, EventArgs e) + { + gridView1.AddNewRow(); + } + + private void toolStripMenuItemDel_Click(object sender, EventArgs e) + { + gridView1.DeleteRow(gridView1.FocusedRowHandle); + } + private void txtwocode_KeyPress(object sender, KeyPressEventArgs e) + { + if (e.KeyChar == 13) + { + using (var db = new MESDB()) + { + var list = db.workorderInfo.Where(p => p.wordordercode == txtwocode.Text.ToUpper().Trim()).ToList(); + if (list.Count == 0) + { + "工单号不存在！".ShowTips(); + } + else + { + workorderInfo info = list.First(); + txtsalecode.Text = info.salecode; + txtproductID.EditValue = info.productid; + txtproductcode.Text = info.productcode; + txtproductspec.Text = info.spec; + txtnumber.EditValue = info.productnumber; + txtunit.EditValue = info.unit; + + repositoryItemLookUpEditmaterialid.DataSource = GetDataTableUtils.SqlTableBySql($"SELECT B.id ID,B.name Name,b.code Code,a.productBOMid BOMid FROM [winformdevfarme].[dbo].[productBOMdetail] A LEFT JOIN [winformdevfarme].[dbo].material B ON A.materialid = B.id where a.productBOMid = {info.bomid}"); + + } + } + } + } + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.designer.cs new file mode 100644 index 0000000..0ba75a9 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.designer.cs @@ -0,0 +1,1218 @@ + +using DevExpress.XtraEditors; +using DevExpress.XtraLayout; +using DevExpress.XtraTab; + +namespace MES.Form +{ + partial class FrmproductionRequisition + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemtxtproductID = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemtxtunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemTreeListtxtpickingdept = new DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit(); + this.repositoryItemTreeListtxtpickingdeptTreeList = new DevExpress.XtraTreeList.TreeList(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemtxtcreatorId = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); + this.tabDataList = new DevExpress.XtraTab.XtraTabPage(); + this.grdList = new DevExpress.XtraGrid.GridControl(); + this.grdListView = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage(); + this.panelControl2 = new DevExpress.XtraEditors.PanelControl(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); + this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.gridControl1 = new DevExpress.XtraGrid.GridControl(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItemDel = new System.Windows.Forms.ToolStripMenuItem(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditmaterialid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditmaterialtype = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.txtid = new DevExpress.XtraEditors.TextEdit(); + this.txtcode = new DevExpress.XtraEditors.TextEdit(); + this.txtwocode = new DevExpress.XtraEditors.TextEdit(); + this.txtsalecode = new DevExpress.XtraEditors.TextEdit(); + this.txtpickingtime = new DevExpress.XtraEditors.DateEdit(); + this.txtproductID = new DevExpress.XtraEditors.LookUpEdit(); + this.txtproductcode = new DevExpress.XtraEditors.TextEdit(); + this.txtproductspec = new DevExpress.XtraEditors.TextEdit(); + this.txtnumber = new DevExpress.XtraEditors.TextEdit(); + this.txtunit = new DevExpress.XtraEditors.LookUpEdit(); + this.txtpickingdept = new DevExpress.XtraEditors.TreeListLookUpEdit(); + this.txtpickingdeptTreeList = new DevExpress.XtraTreeList.TreeList(); + this.txtcreatorId = new DevExpress.XtraEditors.LookUpEdit(); + this.txtcreateTime = new DevExpress.XtraEditors.DateEdit(); + this.txtremark = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproductID)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpickingdept)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpickingdeptTreeList)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); + this.xtraTabControl1.SuspendLayout(); + this.tabDataList.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.grdListView)).BeginInit(); + this.tabDataDetail.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit(); + this.panelControl2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); + this.xtraTabControl2.SuspendLayout(); + this.xtraTabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit(); + this.contextMenuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialtype)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtwocode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtpickingtime.Properties.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtpickingtime.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtproductID.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtproductspec.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtnumber.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtpickingdept.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtpickingdeptTreeList)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + this.SuspendLayout(); + // + // gridColumn1 + // + this.gridColumn1.Caption = "id"; + this.gridColumn1.FieldName = "id"; + this.gridColumn1.Name = "gridColumn1"; + // + // gridColumn2 + // + this.gridColumn2.Caption = "领料单号"; + this.gridColumn2.FieldName = "code"; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 0; + this.gridColumn2.Width = 201; + // + // gridColumn3 + // + this.gridColumn3.Caption = "工单号"; + this.gridColumn3.FieldName = "wocode"; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 1; + this.gridColumn3.Width = 201; + // + // gridColumn4 + // + this.gridColumn4.Caption = "销售单号"; + this.gridColumn4.FieldName = "salecode"; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 2; + this.gridColumn4.Width = 201; + // + // gridColumn5 + // + this.gridColumn5.Caption = "领料日期"; + this.gridColumn5.DisplayFormat.FormatString = "G"; + this.gridColumn5.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn5.FieldName = "pickingtime"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 3; + this.gridColumn5.Width = 201; + // + // gridColumn6 + // + this.gridColumn6.Caption = "产品"; + this.gridColumn6.ColumnEdit = this.repositoryItemtxtproductID; + this.gridColumn6.FieldName = "productID"; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 4; + this.gridColumn6.Width = 201; + // + // repositoryItemtxtproductID + // + this.repositoryItemtxtproductID.AutoHeight = false; + this.repositoryItemtxtproductID.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemtxtproductID.DisplayMember = "Name"; + this.repositoryItemtxtproductID.Name = "repositoryItemtxtproductID"; + this.repositoryItemtxtproductID.ValueMember = "ID"; + // + // gridColumn7 + // + this.gridColumn7.Caption = "产品编号"; + this.gridColumn7.FieldName = "productcode"; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 5; + this.gridColumn7.Width = 201; + // + // gridColumn8 + // + this.gridColumn8.Caption = "规格型号"; + this.gridColumn8.FieldName = "productspec"; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 6; + this.gridColumn8.Width = 201; + // + // gridColumn9 + // + this.gridColumn9.Caption = "生产数量"; + this.gridColumn9.FieldName = "number"; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 7; + this.gridColumn9.Width = 201; + // + // gridColumn10 + // + this.gridColumn10.Caption = "计量单位"; + this.gridColumn10.ColumnEdit = this.repositoryItemtxtunit; + this.gridColumn10.FieldName = "unit"; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 8; + this.gridColumn10.Width = 201; + // + // repositoryItemtxtunit + // + this.repositoryItemtxtunit.AutoHeight = false; + this.repositoryItemtxtunit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemtxtunit.DisplayMember = "Name"; + this.repositoryItemtxtunit.Name = "repositoryItemtxtunit"; + this.repositoryItemtxtunit.ValueMember = "ID"; + // + // gridColumn11 + // + this.gridColumn11.Caption = "领料部门"; + this.gridColumn11.ColumnEdit = this.repositoryItemTreeListtxtpickingdept; + this.gridColumn11.FieldName = "pickingdept"; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 9; + this.gridColumn11.Width = 201; + // + // repositoryItemTreeListtxtpickingdept + // + this.repositoryItemTreeListtxtpickingdept.AutoHeight = false; + this.repositoryItemTreeListtxtpickingdept.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemTreeListtxtpickingdept.DisplayMember = "Name"; + this.repositoryItemTreeListtxtpickingdept.Name = "repositoryItemTreeListtxtpickingdept"; + this.repositoryItemTreeListtxtpickingdept.TreeList = this.repositoryItemTreeListtxtpickingdeptTreeList; + this.repositoryItemTreeListtxtpickingdept.ValueMember = "ID"; + // + // repositoryItemTreeListtxtpickingdeptTreeList + // + this.repositoryItemTreeListtxtpickingdeptTreeList.Location = new System.Drawing.Point(0, 0); + this.repositoryItemTreeListtxtpickingdeptTreeList.Name = "repositoryItemTreeListtxtpickingdeptTreeList"; + this.repositoryItemTreeListtxtpickingdeptTreeList.OptionsView.ShowIndentAsRowStyle = true; + this.repositoryItemTreeListtxtpickingdeptTreeList.ParentFieldName = "PID"; + this.repositoryItemTreeListtxtpickingdeptTreeList.Size = new System.Drawing.Size(400, 200); + this.repositoryItemTreeListtxtpickingdeptTreeList.TabIndex = 0; + // + // gridColumn12 + // + this.gridColumn12.Caption = "制单人"; + this.gridColumn12.ColumnEdit = this.repositoryItemtxtcreatorId; + this.gridColumn12.FieldName = "creatorId"; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 10; + this.gridColumn12.Width = 201; + // + // repositoryItemtxtcreatorId + // + this.repositoryItemtxtcreatorId.AutoHeight = false; + this.repositoryItemtxtcreatorId.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemtxtcreatorId.DisplayMember = "Name"; + this.repositoryItemtxtcreatorId.Name = "repositoryItemtxtcreatorId"; + this.repositoryItemtxtcreatorId.ValueMember = "ID"; + // + // gridColumn13 + // + this.gridColumn13.Caption = "制单日期"; + this.gridColumn13.DisplayFormat.FormatString = "G"; + this.gridColumn13.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn13.FieldName = "createTime"; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 11; + this.gridColumn13.Width = 201; + // + // gridColumn14 + // + this.gridColumn14.Caption = "备注"; + this.gridColumn14.FieldName = "remark"; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Visible = true; + this.gridColumn14.VisibleIndex = 12; + this.gridColumn14.Width = 201; + // + // xtraTabControl1 + // + this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.xtraTabControl1.Location = new System.Drawing.Point(0, 34); + this.xtraTabControl1.Name = "xtraTabControl1"; + this.xtraTabControl1.SelectedTabPage = this.tabDataList; + this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766); + this.xtraTabControl1.TabIndex = 1; + this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.tabDataList, + this.tabDataDetail}); + // + // tabDataList + // + this.tabDataList.Controls.Add(this.grdList); + this.tabDataList.Name = "tabDataList"; + this.tabDataList.Size = new System.Drawing.Size(1294, 737); + this.tabDataList.Text = "数据列表"; + // + // grdList + // + this.grdList.Dock = System.Windows.Forms.DockStyle.Fill; + this.grdList.Location = new System.Drawing.Point(0, 0); + this.grdList.MainView = this.grdListView; + this.grdList.Name = "grdList"; + this.grdList.Size = new System.Drawing.Size(1294, 737); + this.grdList.TabIndex = 0; + this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.grdListView}); + // + // grdListView + // + this.grdListView.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn1, + this.gridColumn2, + this.gridColumn3, + this.gridColumn4, + this.gridColumn5, + this.gridColumn6, + this.gridColumn7, + this.gridColumn8, + this.gridColumn9, + this.gridColumn10, + this.gridColumn11, + this.gridColumn12, + this.gridColumn13, + this.gridColumn14}); + this.grdListView.GridControl = this.grdList; + this.grdListView.Name = "grdListView"; + this.grdListView.OptionsBehavior.Editable = false; + this.grdListView.OptionsView.ColumnAutoWidth = false; + this.grdListView.OptionsView.ShowGroupPanel = false; + // + // tabDataDetail + // + this.tabDataDetail.Controls.Add(this.panelControl2); + this.tabDataDetail.Name = "tabDataDetail"; + this.tabDataDetail.Size = new System.Drawing.Size(1294, 737); + this.tabDataDetail.Text = "数据编辑"; + // + // panelControl2 + // + this.panelControl2.Controls.Add(this.layoutControl1); + this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelControl2.Location = new System.Drawing.Point(0, 0); + this.panelControl2.Name = "panelControl2"; + this.panelControl2.Size = new System.Drawing.Size(1294, 737); + this.panelControl2.TabIndex = 0; + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.xtraTabControl2); + this.layoutControl1.Controls.Add(this.txtid); + this.layoutControl1.Controls.Add(this.txtcode); + this.layoutControl1.Controls.Add(this.txtwocode); + this.layoutControl1.Controls.Add(this.txtsalecode); + this.layoutControl1.Controls.Add(this.txtpickingtime); + this.layoutControl1.Controls.Add(this.txtproductID); + this.layoutControl1.Controls.Add(this.txtproductcode); + this.layoutControl1.Controls.Add(this.txtproductspec); + this.layoutControl1.Controls.Add(this.txtnumber); + this.layoutControl1.Controls.Add(this.txtunit); + this.layoutControl1.Controls.Add(this.txtpickingdept); + this.layoutControl1.Controls.Add(this.txtcreatorId); + this.layoutControl1.Controls.Add(this.txtcreateTime); + this.layoutControl1.Controls.Add(this.txtremark); + this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutControl1.Location = new System.Drawing.Point(2, 2); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.layoutControlGroup1; + this.layoutControl1.Size = new System.Drawing.Size(1290, 733); + this.layoutControl1.TabIndex = 6; + this.layoutControl1.Text = "layoutControl1"; + // + // xtraTabControl2 + // + this.xtraTabControl2.Location = new System.Drawing.Point(12, 180); + this.xtraTabControl2.Name = "xtraTabControl2"; + this.xtraTabControl2.SelectedTabPage = this.xtraTabPage2; + this.xtraTabControl2.Size = new System.Drawing.Size(1266, 541); + this.xtraTabControl2.TabIndex = 15; + this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.xtraTabPage2}); + // + // xtraTabPage2 + // + this.xtraTabPage2.Controls.Add(this.gridControl1); + this.xtraTabPage2.Name = "xtraTabPage2"; + this.xtraTabPage2.Size = new System.Drawing.Size(1260, 512); + this.xtraTabPage2.Text = "领料明细"; + // + // gridControl1 + // + this.gridControl1.ContextMenuStrip = this.contextMenuStrip1; + this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gridControl1.Location = new System.Drawing.Point(0, 0); + this.gridControl1.MainView = this.gridView1; + this.gridControl1.Name = "gridControl1"; + this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.repositoryItemLookUpEditmaterialid, + this.repositoryItemLookUpEditmaterialtype, + this.repositoryItemLookUpEditunit, + this.repositoryItemLookUpEditwarehouse}); + this.gridControl1.Size = new System.Drawing.Size(1260, 512); + this.gridControl1.TabIndex = 1; + this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItemAdd, + this.toolStripMenuItemDel}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(113, 48); + // + // toolStripMenuItemAdd + // + this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd"; + this.toolStripMenuItemAdd.Size = new System.Drawing.Size(112, 22); + this.toolStripMenuItemAdd.Text = "新增行"; + this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click); + // + // toolStripMenuItemDel + // + this.toolStripMenuItemDel.Name = "toolStripMenuItemDel"; + this.toolStripMenuItemDel.Size = new System.Drawing.Size(112, 22); + this.toolStripMenuItemDel.Text = "删除行"; + this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click); + // + // gridView1 + // + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn15, + this.gridColumn16, + this.gridColumn17, + this.gridColumn18, + this.gridColumn19, + this.gridColumn20, + this.gridColumn21, + this.gridColumn22, + this.gridColumn23, + this.gridColumn24, + this.gridColumn25, + this.gridColumn26, + this.gridColumn27, + this.gridColumn28, + this.gridColumn29}); + this.gridView1.GridControl = this.gridControl1; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsBehavior.Editable = false; + this.gridView1.OptionsView.ColumnAutoWidth = false; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // gridColumn15 + // + this.gridColumn15.Caption = "id"; + this.gridColumn15.FieldName = "id"; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.Width = 201; + // + // gridColumn16 + // + this.gridColumn16.Caption = "主表ID"; + this.gridColumn16.FieldName = "masterid"; + this.gridColumn16.Name = "gridColumn16"; + this.gridColumn16.Width = 201; + // + // gridColumn17 + // + this.gridColumn17.Caption = "领料单号"; + this.gridColumn17.FieldName = "mastercode"; + this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.Visible = true; + this.gridColumn17.VisibleIndex = 11; + this.gridColumn17.Width = 201; + // + // gridColumn18 + // + this.gridColumn18.Caption = "领料明细单号"; + this.gridColumn18.FieldName = "detailcode"; + this.gridColumn18.Name = "gridColumn18"; + this.gridColumn18.Visible = true; + this.gridColumn18.VisibleIndex = 12; + this.gridColumn18.Width = 201; + // + // gridColumn19 + // + this.gridColumn19.Caption = "物料"; + this.gridColumn19.ColumnEdit = this.repositoryItemLookUpEditmaterialid; + this.gridColumn19.FieldName = "materialid"; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Visible = true; + this.gridColumn19.VisibleIndex = 0; + this.gridColumn19.Width = 201; + // + // repositoryItemLookUpEditmaterialid + // + this.repositoryItemLookUpEditmaterialid.AutoHeight = false; + this.repositoryItemLookUpEditmaterialid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditmaterialid.DisplayMember = "Name"; + this.repositoryItemLookUpEditmaterialid.Name = "repositoryItemLookUpEditmaterialid"; + this.repositoryItemLookUpEditmaterialid.NullText = ""; + this.repositoryItemLookUpEditmaterialid.ValueMember = "ID"; + // + // gridColumn20 + // + this.gridColumn20.Caption = "物料编码"; + this.gridColumn20.FieldName = "materialcode"; + this.gridColumn20.Name = "gridColumn20"; + this.gridColumn20.Visible = true; + this.gridColumn20.VisibleIndex = 1; + this.gridColumn20.Width = 201; + // + // gridColumn21 + // + this.gridColumn21.Caption = "规格型号"; + this.gridColumn21.FieldName = "materialspec"; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.Visible = true; + this.gridColumn21.VisibleIndex = 2; + this.gridColumn21.Width = 201; + // + // gridColumn22 + // + this.gridColumn22.Caption = "物料类型"; + this.gridColumn22.ColumnEdit = this.repositoryItemLookUpEditmaterialtype; + this.gridColumn22.FieldName = "materialtype"; + this.gridColumn22.Name = "gridColumn22"; + this.gridColumn22.Visible = true; + this.gridColumn22.VisibleIndex = 3; + this.gridColumn22.Width = 201; + // + // repositoryItemLookUpEditmaterialtype + // + this.repositoryItemLookUpEditmaterialtype.AutoHeight = false; + this.repositoryItemLookUpEditmaterialtype.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditmaterialtype.DisplayMember = "Name"; + this.repositoryItemLookUpEditmaterialtype.Name = "repositoryItemLookUpEditmaterialtype"; + this.repositoryItemLookUpEditmaterialtype.NullText = ""; + this.repositoryItemLookUpEditmaterialtype.ValueMember = "ID"; + // + // gridColumn23 + // + this.gridColumn23.Caption = "单位用量"; + this.gridColumn23.FieldName = "unitnumber"; + this.gridColumn23.Name = "gridColumn23"; + this.gridColumn23.Visible = true; + this.gridColumn23.VisibleIndex = 4; + this.gridColumn23.Width = 201; + // + // gridColumn24 + // + this.gridColumn24.Caption = "产品生产数量"; + this.gridColumn24.FieldName = "productnumber"; + this.gridColumn24.Name = "gridColumn24"; + this.gridColumn24.Visible = true; + this.gridColumn24.VisibleIndex = 5; + this.gridColumn24.Width = 201; + // + // gridColumn25 + // + this.gridColumn25.Caption = "领料数量"; + this.gridColumn25.FieldName = "picknumber"; + this.gridColumn25.Name = "gridColumn25"; + this.gridColumn25.Visible = true; + this.gridColumn25.VisibleIndex = 6; + this.gridColumn25.Width = 201; + // + // gridColumn26 + // + this.gridColumn26.Caption = "计量单位"; + this.gridColumn26.ColumnEdit = this.repositoryItemLookUpEditunit; + this.gridColumn26.FieldName = "unit"; + this.gridColumn26.Name = "gridColumn26"; + this.gridColumn26.Visible = true; + this.gridColumn26.VisibleIndex = 7; + this.gridColumn26.Width = 201; + // + // repositoryItemLookUpEditunit + // + this.repositoryItemLookUpEditunit.AutoHeight = false; + this.repositoryItemLookUpEditunit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditunit.DisplayMember = "Name"; + this.repositoryItemLookUpEditunit.Name = "repositoryItemLookUpEditunit"; + this.repositoryItemLookUpEditunit.NullText = ""; + this.repositoryItemLookUpEditunit.ValueMember = "ID"; + // + // gridColumn27 + // + this.gridColumn27.Caption = "仓库"; + this.gridColumn27.ColumnEdit = this.repositoryItemLookUpEditwarehouse; + this.gridColumn27.FieldName = "warehouse"; + this.gridColumn27.Name = "gridColumn27"; + this.gridColumn27.Visible = true; + this.gridColumn27.VisibleIndex = 8; + this.gridColumn27.Width = 201; + // + // repositoryItemLookUpEditwarehouse + // + this.repositoryItemLookUpEditwarehouse.AutoHeight = false; + this.repositoryItemLookUpEditwarehouse.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditwarehouse.DisplayMember = "Name"; + this.repositoryItemLookUpEditwarehouse.Name = "repositoryItemLookUpEditwarehouse"; + this.repositoryItemLookUpEditwarehouse.NullText = ""; + this.repositoryItemLookUpEditwarehouse.ValueMember = "ID"; + // + // gridColumn28 + // + this.gridColumn28.Caption = "备注"; + this.gridColumn28.FieldName = "remark"; + this.gridColumn28.Name = "gridColumn28"; + this.gridColumn28.Visible = true; + this.gridColumn28.VisibleIndex = 9; + this.gridColumn28.Width = 201; + // + // gridColumn29 + // + this.gridColumn29.Caption = "工单号"; + this.gridColumn29.FieldName = "wocode"; + this.gridColumn29.Name = "gridColumn29"; + this.gridColumn29.Visible = true; + this.gridColumn29.VisibleIndex = 10; + this.gridColumn29.Width = 201; + // + // txtid + // + this.txtid.Location = new System.Drawing.Point(63, 12); + this.txtid.Name = "txtid"; + this.txtid.Size = new System.Drawing.Size(578, 20); + this.txtid.StyleController = this.layoutControl1; + this.txtid.TabIndex = 1; + // + // txtcode + // + this.txtcode.Location = new System.Drawing.Point(696, 12); + this.txtcode.Name = "txtcode"; + this.txtcode.Size = new System.Drawing.Size(582, 20); + this.txtcode.StyleController = this.layoutControl1; + this.txtcode.TabIndex = 2; + // + // txtwocode + // + this.txtwocode.Location = new System.Drawing.Point(63, 36); + this.txtwocode.Name = "txtwocode"; + this.txtwocode.Size = new System.Drawing.Size(578, 20); + this.txtwocode.StyleController = this.layoutControl1; + this.txtwocode.TabIndex = 3; + this.txtwocode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtwocode_KeyPress); + // + // txtsalecode + // + this.txtsalecode.Location = new System.Drawing.Point(696, 36); + this.txtsalecode.Name = "txtsalecode"; + this.txtsalecode.Size = new System.Drawing.Size(582, 20); + this.txtsalecode.StyleController = this.layoutControl1; + this.txtsalecode.TabIndex = 4; + // + // txtpickingtime + // + this.txtpickingtime.EditValue = null; + this.txtpickingtime.ImeMode = System.Windows.Forms.ImeMode.Off; + this.txtpickingtime.Location = new System.Drawing.Point(63, 108); + this.txtpickingtime.Name = "txtpickingtime"; + this.txtpickingtime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtpickingtime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txtpickingtime.Properties.DisplayFormat.FormatString = "G"; + this.txtpickingtime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.txtpickingtime.Size = new System.Drawing.Size(578, 20); + this.txtpickingtime.StyleController = this.layoutControl1; + this.txtpickingtime.TabIndex = 5; + // + // txtproductID + // + this.txtproductID.EditValue = ""; + this.txtproductID.Location = new System.Drawing.Point(63, 60); + this.txtproductID.Name = "txtproductID"; + this.txtproductID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtproductID.Properties.DisplayMember = "Name"; + this.txtproductID.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtproductID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtproductID.Properties.ValueMember = "ID"; + this.txtproductID.Size = new System.Drawing.Size(578, 20); + this.txtproductID.StyleController = this.layoutControl1; + this.txtproductID.TabIndex = 6; + // + // txtproductcode + // + this.txtproductcode.Location = new System.Drawing.Point(696, 60); + this.txtproductcode.Name = "txtproductcode"; + this.txtproductcode.Size = new System.Drawing.Size(582, 20); + this.txtproductcode.StyleController = this.layoutControl1; + this.txtproductcode.TabIndex = 7; + // + // txtproductspec + // + this.txtproductspec.Location = new System.Drawing.Point(63, 84); + this.txtproductspec.Name = "txtproductspec"; + this.txtproductspec.Size = new System.Drawing.Size(578, 20); + this.txtproductspec.StyleController = this.layoutControl1; + this.txtproductspec.TabIndex = 8; + // + // txtnumber + // + this.txtnumber.Location = new System.Drawing.Point(696, 84); + this.txtnumber.Name = "txtnumber"; + this.txtnumber.Size = new System.Drawing.Size(263, 20); + this.txtnumber.StyleController = this.layoutControl1; + this.txtnumber.TabIndex = 9; + // + // txtunit + // + this.txtunit.EditValue = ""; + this.txtunit.Location = new System.Drawing.Point(1014, 84); + this.txtunit.Name = "txtunit"; + this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtunit.Properties.DisplayMember = "Name"; + this.txtunit.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtunit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtunit.Properties.ValueMember = "ID"; + this.txtunit.Size = new System.Drawing.Size(264, 20); + this.txtunit.StyleController = this.layoutControl1; + this.txtunit.TabIndex = 10; + // + // txtpickingdept + // + this.txtpickingdept.EditValue = ""; + this.txtpickingdept.Location = new System.Drawing.Point(696, 108); + this.txtpickingdept.Name = "txtpickingdept"; + this.txtpickingdept.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtpickingdept.Properties.DisplayMember = "Name"; + this.txtpickingdept.Properties.TreeList = this.txtpickingdeptTreeList; + this.txtpickingdept.Properties.ValueMember = "ID"; + this.txtpickingdept.Size = new System.Drawing.Size(582, 20); + this.txtpickingdept.StyleController = this.layoutControl1; + this.txtpickingdept.TabIndex = 11; + // + // txtpickingdeptTreeList + // + this.txtpickingdeptTreeList.Location = new System.Drawing.Point(0, 0); + this.txtpickingdeptTreeList.Name = "txtpickingdeptTreeList"; + this.txtpickingdeptTreeList.OptionsView.ShowIndentAsRowStyle = true; + this.txtpickingdeptTreeList.ParentFieldName = "PID"; + this.txtpickingdeptTreeList.Size = new System.Drawing.Size(400, 200); + this.txtpickingdeptTreeList.TabIndex = 0; + // + // txtcreatorId + // + this.txtcreatorId.EditValue = ""; + this.txtcreatorId.Location = new System.Drawing.Point(63, 132); + this.txtcreatorId.Name = "txtcreatorId"; + this.txtcreatorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtcreatorId.Properties.DisplayMember = "Name"; + this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtcreatorId.Properties.ValueMember = "ID"; + this.txtcreatorId.Size = new System.Drawing.Size(578, 20); + this.txtcreatorId.StyleController = this.layoutControl1; + this.txtcreatorId.TabIndex = 12; + // + // txtcreateTime + // + this.txtcreateTime.EditValue = null; + this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off; + this.txtcreateTime.Location = new System.Drawing.Point(696, 132); + this.txtcreateTime.Name = "txtcreateTime"; + this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtcreateTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txtcreateTime.Properties.DisplayFormat.FormatString = "G"; + this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.txtcreateTime.Size = new System.Drawing.Size(582, 20); + this.txtcreateTime.StyleController = this.layoutControl1; + this.txtcreateTime.TabIndex = 13; + // + // txtremark + // + this.txtremark.Location = new System.Drawing.Point(63, 156); + this.txtremark.Name = "txtremark"; + this.txtremark.Size = new System.Drawing.Size(1215, 20); + this.txtremark.StyleController = this.layoutControl1; + this.txtremark.TabIndex = 14; + // + // layoutControlGroup1 + // + this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1"; + this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem1, + this.layoutControlItem3, + this.layoutControlItem6, + this.layoutControlItem8, + this.layoutControlItem12, + this.layoutControlItem14, + this.layoutControlItem2, + this.layoutControlItem4, + this.layoutControlItem7, + this.layoutControlItem9, + this.layoutControlItem11, + this.layoutControlItem5, + this.layoutControlItem10, + this.layoutControlItem13, + this.layoutControlItem15}); + this.layoutControlGroup1.Name = "layoutControlGroup1"; + this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733); + this.layoutControlGroup1.TextVisible = false; + // + // layoutControlItem1 + // + this.layoutControlItem1.Control = this.txtid; + this.layoutControlItem1.CustomizationFormText = "id"; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Size = new System.Drawing.Size(633, 24); + this.layoutControlItem1.Text = "id"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txtwocode; + this.layoutControlItem3.CustomizationFormText = "工单号"; + this.layoutControlItem3.Location = new System.Drawing.Point(0, 24); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.Size = new System.Drawing.Size(633, 24); + this.layoutControlItem3.Text = "工单号"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txtproductID; + this.layoutControlItem6.CustomizationFormText = "产品"; + this.layoutControlItem6.Location = new System.Drawing.Point(0, 48); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.Size = new System.Drawing.Size(633, 24); + this.layoutControlItem6.Text = "产品"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.txtproductspec; + this.layoutControlItem8.CustomizationFormText = "规格型号"; + this.layoutControlItem8.Location = new System.Drawing.Point(0, 72); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.Size = new System.Drawing.Size(633, 24); + this.layoutControlItem8.Text = "规格型号"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txtcreatorId; + this.layoutControlItem12.CustomizationFormText = "制单人"; + this.layoutControlItem12.Location = new System.Drawing.Point(0, 120); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.Size = new System.Drawing.Size(633, 24); + this.layoutControlItem12.Text = "制单人"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem14 + // + this.layoutControlItem14.Control = this.txtremark; + this.layoutControlItem14.CustomizationFormText = "备注"; + this.layoutControlItem14.Location = new System.Drawing.Point(0, 144); + this.layoutControlItem14.Name = "layoutControlItem14"; + this.layoutControlItem14.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem14.Text = "备注"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txtcode; + this.layoutControlItem2.CustomizationFormText = "领料单号"; + this.layoutControlItem2.Location = new System.Drawing.Point(633, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(637, 24); + this.layoutControlItem2.Text = "领料单号"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txtsalecode; + this.layoutControlItem4.CustomizationFormText = "销售单号"; + this.layoutControlItem4.Location = new System.Drawing.Point(633, 24); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.Size = new System.Drawing.Size(637, 24); + this.layoutControlItem4.Text = "销售单号"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txtproductcode; + this.layoutControlItem7.CustomizationFormText = "产品编号"; + this.layoutControlItem7.Location = new System.Drawing.Point(633, 48); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.Size = new System.Drawing.Size(637, 24); + this.layoutControlItem7.Text = "产品编号"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txtnumber; + this.layoutControlItem9.CustomizationFormText = "生产数量"; + this.layoutControlItem9.Location = new System.Drawing.Point(633, 72); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.Size = new System.Drawing.Size(318, 24); + this.layoutControlItem9.Text = "生产数量"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txtpickingdept; + this.layoutControlItem11.CustomizationFormText = "领料部门"; + this.layoutControlItem11.Location = new System.Drawing.Point(633, 96); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.Size = new System.Drawing.Size(637, 24); + this.layoutControlItem11.Text = "领料部门"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txtpickingtime; + this.layoutControlItem5.CustomizationFormText = "领料日期"; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 96); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.Size = new System.Drawing.Size(633, 24); + this.layoutControlItem5.Text = "领料日期"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txtunit; + this.layoutControlItem10.CustomizationFormText = "计量单位"; + this.layoutControlItem10.Location = new System.Drawing.Point(951, 72); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.Size = new System.Drawing.Size(319, 24); + this.layoutControlItem10.Text = "计量单位"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txtcreateTime; + this.layoutControlItem13.CustomizationFormText = "制单日期"; + this.layoutControlItem13.Location = new System.Drawing.Point(633, 120); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.Size = new System.Drawing.Size(637, 24); + this.layoutControlItem13.Text = "制单日期"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.xtraTabControl2; + this.layoutControlItem15.Location = new System.Drawing.Point(0, 168); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.Size = new System.Drawing.Size(1270, 545); + this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem15.TextVisible = false; + // + // FrmproductionRequisition + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1300, 800); + this.Controls.Add(this.xtraTabControl1); + this.Name = "FrmproductionRequisition"; + this.Text = "生产领料申请单"; + this.Load += new System.EventHandler(this.FrmproductionRequisition_Load); + this.Controls.SetChildIndex(this.xtraTabControl1, 0); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproductID)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpickingdept)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpickingdeptTreeList)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); + this.xtraTabControl1.ResumeLayout(false); + this.tabDataList.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.grdListView)).EndInit(); + this.tabDataDetail.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit(); + this.panelControl2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); + this.xtraTabControl2.ResumeLayout(false); + this.xtraTabPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit(); + this.contextMenuStrip1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialtype)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtwocode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtpickingtime.Properties.CalendarTimeProperties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtpickingtime.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtproductID.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtproductspec.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtnumber.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtpickingdept.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtpickingdeptTreeList)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private XtraTabControl xtraTabControl1; + private XtraTabPage tabDataList; + private XtraTabPage tabDataDetail; + private DevExpress.XtraGrid.GridControl grdList; + private DevExpress.XtraGrid.Views.Grid.GridView grdListView; + private PanelControl panelControl2; + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; + + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtid; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtcode; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtwocode; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtsalecode; + /////////////////////////////// + private DevExpress.XtraEditors.DateEdit txtpickingtime; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtproductID; + + private DevExpress.XtraEditors.LookUpEdit txtproductID; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtproductcode; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtproductspec; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtnumber; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtunit; + + private DevExpress.XtraEditors.LookUpEdit txtunit; + private DevExpress.XtraTreeList.TreeList txtpickingdeptTreeList; + private DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit repositoryItemTreeListtxtpickingdept; + private DevExpress.XtraTreeList.TreeList repositoryItemTreeListtxtpickingdeptTreeList; + + private DevExpress.XtraEditors.TreeListLookUpEdit txtpickingdept; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtcreatorId; + + private DevExpress.XtraEditors.LookUpEdit txtcreatorId; + /////////////////////////////// + private DevExpress.XtraEditors.DateEdit txtcreateTime; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtremark; + + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; + private XtraTabControl xtraTabControl2; + private XtraTabPage xtraTabPage2; + private LayoutControlItem layoutControlItem15; + private DevExpress.XtraGrid.GridControl gridControl1; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn26; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn28; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditmaterialid; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditmaterialtype; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditunit; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditwarehouse; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemAdd; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemDel; + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.resx b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.resx new file mode 100644 index 0000000..ad53752 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/Frmquotation.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmquotation.designer.cs index 8bb3a05..7ed2466 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmquotation.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/Frmquotation.designer.cs @@ -284,7 +284,7 @@ namespace MES.Form this.xtraTabControl1.Location = new System.Drawing.Point(0, 34); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabDataList; - this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766); + this.xtraTabControl1.Size = new System.Drawing.Size(1310, 772); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabDataList, @@ -294,7 +294,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1294, 737); + this.tabDataList.Size = new System.Drawing.Size(1305, 746); this.tabDataList.Text = "数据列表"; // // grdList @@ -303,7 +303,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(1294, 737); + this.grdList.Size = new System.Drawing.Size(1305, 746); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -855,7 +855,7 @@ namespace MES.Form // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1300, 800); + this.ClientSize = new System.Drawing.Size(1310, 806); this.Controls.Add(this.xtraTabControl1); this.Name = "Frmquotation"; this.Text = "客户报价单"; diff --git a/WinformGeneralDeveloperFrame/Form/Frmreturnsale.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmreturnsale.designer.cs index 8401d1a..dd296ae 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmreturnsale.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/Frmreturnsale.designer.cs @@ -76,6 +76,7 @@ namespace MES.Form this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemLookUpEditunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemGridLookUpEdit = new DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit(); this.repositoryItemGridLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView(); this.txtid = new DevExpress.XtraEditors.TextEdit(); @@ -100,7 +101,6 @@ namespace MES.Form this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomerid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomertype)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcontactuser)).BeginInit(); @@ -284,7 +284,7 @@ namespace MES.Form this.xtraTabControl1.Location = new System.Drawing.Point(0, 34); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabDataList; - this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766); + this.xtraTabControl1.Size = new System.Drawing.Size(1310, 772); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabDataList, @@ -294,7 +294,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1294, 737); + this.tabDataList.Size = new System.Drawing.Size(1305, 746); this.tabDataList.Text = "数据列表"; // // grdList @@ -303,7 +303,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(1294, 737); + this.grdList.Size = new System.Drawing.Size(1305, 746); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -573,6 +573,15 @@ namespace MES.Form this.gridColumn22.VisibleIndex = 10; this.gridColumn22.Width = 201; // + // gridColumn23 + // + this.gridColumn23.Caption = "明细单号"; + this.gridColumn23.FieldName = "returnsaledetailcode"; + this.gridColumn23.Name = "gridColumn23"; + this.gridColumn23.OptionsColumn.AllowEdit = false; + this.gridColumn23.Visible = true; + this.gridColumn23.VisibleIndex = 0; + // // repositoryItemGridLookUpEdit // this.repositoryItemGridLookUpEdit.AutoHeight = false; @@ -834,20 +843,11 @@ namespace MES.Form this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; // - // gridColumn23 - // - this.gridColumn23.Caption = "明细单号"; - this.gridColumn23.FieldName = "returnsaledetailcode"; - this.gridColumn23.Name = "gridColumn23"; - this.gridColumn23.OptionsColumn.AllowEdit = false; - this.gridColumn23.Visible = true; - this.gridColumn23.VisibleIndex = 0; - // // Frmreturnsale // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1300, 800); + this.ClientSize = new System.Drawing.Size(1310, 806); this.Controls.Add(this.xtraTabControl1); this.Name = "Frmreturnsale"; this.Text = "销售退货单"; diff --git a/WinformGeneralDeveloperFrame/Form/Frmsale.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmsale.designer.cs index 3d8e0a2..b72552d 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmsale.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/Frmsale.designer.cs @@ -92,6 +92,7 @@ namespace MES.Form this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemtxtproductid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); this.txtid = new DevExpress.XtraEditors.TextEdit(); this.txtsaleordercode = new DevExpress.XtraEditors.TextEdit(); @@ -123,7 +124,6 @@ namespace MES.Form this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); - this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomerid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomertype)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcontactuser)).BeginInit(); @@ -364,7 +364,7 @@ namespace MES.Form this.xtraTabControl1.Location = new System.Drawing.Point(0, 34); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabDataList; - this.xtraTabControl1.Size = new System.Drawing.Size(944, 636); + this.xtraTabControl1.Size = new System.Drawing.Size(954, 642); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabDataList, @@ -374,7 +374,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(938, 607); + this.tabDataList.Size = new System.Drawing.Size(949, 616); this.tabDataList.Text = "数据列表"; // // grdList @@ -383,7 +383,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(938, 607); + this.grdList.Size = new System.Drawing.Size(949, 616); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -783,6 +783,15 @@ namespace MES.Form this.gridColumn37.VisibleIndex = 21; this.gridColumn37.Width = 201; // + // gridColumn38 + // + this.gridColumn38.Caption = "明细单号"; + this.gridColumn38.FieldName = "saledetailcode"; + this.gridColumn38.Name = "gridColumn38"; + this.gridColumn38.OptionsColumn.AllowEdit = false; + this.gridColumn38.Visible = true; + this.gridColumn38.VisibleIndex = 0; + // // repositoryItemtxtproductid // this.repositoryItemtxtproductid.AutoHeight = false; @@ -1127,20 +1136,11 @@ namespace MES.Form this.layoutControlItem14.Text = "备注"; this.layoutControlItem14.TextSize = new System.Drawing.Size(48, 14); // - // gridColumn38 - // - this.gridColumn38.Caption = "明细单号"; - this.gridColumn38.FieldName = "saledetailcode"; - this.gridColumn38.Name = "gridColumn38"; - this.gridColumn38.OptionsColumn.AllowEdit = false; - this.gridColumn38.Visible = true; - this.gridColumn38.VisibleIndex = 0; - // // Frmsale // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(944, 670); + this.ClientSize = new System.Drawing.Size(954, 676); this.Controls.Add(this.xtraTabControl1); this.Name = "Frmsale"; this.Text = "销售订单"; diff --git a/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs b/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs index 532c2af..80e6738 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs +++ b/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs @@ -12,6 +12,8 @@ using DevExpress.XtraLayout; using MES.Entity; using System.Data.Entity.Migrations; using System.Data.Entity; +using CCWin.SkinClass; + namespace MES.Form { public partial class Frmworkorder : FrmBaseForm @@ -23,7 +25,7 @@ namespace MES.Form } private void Frmworkorder_Load(object sender, EventArgs e) { - InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new workorderInfo()); + InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new workorderInfo(),gridControl1,new []{ "txtwordordercode", "txtsalecode" }); InitSearchDicData(); } /// @@ -32,8 +34,8 @@ namespace MES.Form /// private void Init() { - txtworkordertype.Properties.DataSource = GetDataTableUtils.SqlTable("部门"); - repositoryItemtxtworkordertype.DataSource= GetDataTableUtils.SqlTable("部门"); + txtworkordertype.Properties.DataSource = GetDataTableUtils.SqlTable("工单类型"); + repositoryItemtxtworkordertype.DataSource= GetDataTableUtils.SqlTable("工单类型"); txtproductdept.Properties.DataSource = GetDataTableUtils.SqlTable("部门"); repositoryItemtxtproductdept.DataSource= GetDataTableUtils.SqlTable("部门"); txtproductid.Properties.DataSource = GetDataTableUtils.SqlTable("产品"); @@ -43,8 +45,11 @@ namespace MES.Form txtwarehouse.Properties.DataSource = GetDataTableUtils.SqlTable("仓库"); repositoryItemtxtwarehouse.DataSource= GetDataTableUtils.SqlTable("仓库"); txtcreatorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户"); - repositoryItemtxtcreatorId.DataSource= GetDataTableUtils.SqlTable("用户"); - } + repositoryItemtxtcreatorId.DataSource= GetDataTableUtils.SqlTable("用户"); + txtproducttype.Properties.DataSource = GetDataTableUtils.SqlTable("产品类别"); + repositoryItemLookUpEditmaterialid.DataSource = GetDataTableUtils.SqlTable("物料"); + repositoryItemLookUpEditmaterialtype.DataSource = GetDataTableUtils.SqlTable("物料类别"); + } /// /// 搜索字段 /// @@ -73,7 +78,7 @@ namespace MES.Form public override void InitgrdListDataSource() { - using (var con=new MESDB())/// + using (var con=new MESDB()) { grdList.DataSource=con.workorderInfo.ToList(); } @@ -85,24 +90,24 @@ namespace MES.Form /// public override bool CheckInput() { - if(string.IsNullOrEmpty(txtwordordercode.EditValue.ToString())) - { - "工单号不能为空".ShowWarning(); - txtwordordercode.Focus(); - return false; - } - if(string.IsNullOrEmpty(txtsalecode.EditValue.ToString())) - { - "销售单号不能为空".ShowWarning(); - txtsalecode.Focus(); - return false; - } - if(string.IsNullOrEmpty(txtsaledetailcode.EditValue.ToString())) - { - "销售明细单号不能为空".ShowWarning(); - txtsaledetailcode.Focus(); - return false; - } + //if(string.IsNullOrEmpty(txtwordordercode.EditValue.ToString())) + //{ + // "工单号不能为空".ShowWarning(); + // txtwordordercode.Focus(); + // return false; + //} + //if(string.IsNullOrEmpty(txtsalecode.EditValue.ToString())) + //{ + // "销售单号不能为空".ShowWarning(); + // txtsalecode.Focus(); + // return false; + //} + //if(string.IsNullOrEmpty(txtsaledetailcode.EditValue.ToString())) + //{ + // "销售明细单号不能为空".ShowWarning(); + // txtsaledetailcode.Focus(); + // return false; + //} if(string.IsNullOrEmpty(txtworkordertype.EditValue.ToString())) { "工单类型不能为空".ShowWarning(); @@ -192,10 +197,21 @@ namespace MES.Form try { workorderInfo info= (workorderInfo)this.ControlDataToModel(new workorderInfo()); - using (var db = new MESDB()) + + using (var db = new MESDB()) { - db.workorderInfo.AddOrUpdate(info); - db.SaveChanges(); + if (info.id == 0) //新增 + { + string code = "GD" + DateTime.Now.GetDateTimeCode(); + info.wordordercode = code; + db.workorderInfo.Add(info); + db.SaveChanges(); + } + else + { + db.Entry(info).State = EntityState.Modified; + db.SaveChanges(); + } } } catch (Exception ex) @@ -250,5 +266,120 @@ namespace MES.Form } } } - } + + public override void AddFunction() + { + gridControl1.DataSource = null; + } + + public override void gridControlMouseDoubleClickFunction(object sender, EventArgs e) + { + using (var db = new MESDB()) + { + productBOMInfo info = db.productBOMInfo.Find(txtbomid.EditValue); + List boMdetailInfo = + db.productBOMdetailInfo.Where(p => p.productBOMid == info.id).ToList(); + List list = new List(); + foreach (var item in boMdetailInfo) + { + productionBOMInfo info1 = new productionBOMInfo() + { + number = txtproductnumber.Text.ToDecimal(1), + materialcode = item.materialcode, + materialid = item.materialid, + materialtype = item.materialtype, + spec = item.materialspec, + uintnumber = item.unitusenumber, + neednumber = item.unitusenumber * txtproductnumber.Text.ToDecimal(1), + unit = item.unit, + unitprice = item.unitprice, + totalprice = item.unitprice * txtproductnumber.Text.ToDecimal(1) * item.unitusenumber, + warehouse = item.warehouse, + remark = item.remark + }; + list.Add(info1); + } + + gridControl1.DataSource = list; + + } + } + + private void txtsaledetailcode_KeyPress(object sender, KeyPressEventArgs e) + { + if (e.KeyChar == 13) + { + using (var db=new MESDB()) + { + var list= db.saledetailInfo + .Where(p => p.saledetailcode == txtsaledetailcode.Text.ToUpper()).ToList(); + if (list.Count > 0) + { + saledetailInfo info = list[0]; + txtsalecode.Text = info.salecode; + txtproductid.EditValue = info.productid; + txtproductcode.Text = info.productcode; + txtspec.Text = info.productspec; + txtproductnumber.Text = info.salenumber.ToString(); + txtunit.EditValue = info.unit; + txtdeliverdate.DateTime = info.deliverdate; + txtwarehouse.EditValue = info.warehouse; + txtbomid.Properties.DataSource = db.productBOMInfo.Where(p => p.productid == info.productid) + .Select(p => new { ID=p.productid,Name=p.version}).ToList(); + } + } + } + } + + private void txtproductid_EditValueChanged(object sender, EventArgs e) + { + using (var db = new MESDB()) + { + productInfo info = db.productInfo.Find(txtproductid.EditValue); + var list = db.productBOMInfo.Where(p => p.productid == info.id) + .Select(p => new {ID = p.id, Name = p.version}).ToList(); + txtbomid.Properties.DataSource = list; + txtproducttype.EditValue = info.producttype; + txtproductcode.Text = info.productcode; + txtunit.EditValue = info.unit; + txtwarehouse.EditValue = info.warehouse; + } + } + + private void toolStripMenuItem1_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(txtproductid.Text) && !string.IsNullOrEmpty(txtbomid.Text)) + { + using (var db = new MESDB()) + { + productBOMInfo info = db.productBOMInfo.Find(txtbomid.EditValue); + List boMdetailInfo = + db.productBOMdetailInfo.Where(p => p.productBOMid == info.id).ToList(); + List list = new List(); + foreach (var item in boMdetailInfo) + { + productionBOMInfo info1 = new productionBOMInfo() + { + number = txtproductnumber.Text.ToDecimal(1), + materialcode = item.materialcode, + materialid = item.materialid, + materialtype = item.materialtype, + spec = item.materialspec, + uintnumber=item.unitusenumber, + neednumber=item.unitusenumber * txtproductnumber.Text.ToDecimal(1), + unit=item.unit, + unitprice=item.unitprice, + totalprice = item.unitprice * txtproductnumber.Text.ToDecimal(1)* item.unitusenumber, + warehouse = item.warehouse, + remark = item.remark + }; + list.Add(info1); + } + + gridControl1.DataSource = list; + + } + } + } + } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/Frmworkorder.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmworkorder.designer.cs index 2fb3ad3..4efd0c7 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmworkorder.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/Frmworkorder.designer.cs @@ -33,6 +33,7 @@ namespace MES.Form /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -64,43 +65,74 @@ namespace MES.Form this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage(); this.panelControl2 = new DevExpress.XtraEditors.PanelControl(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.txtproducttype = new DevExpress.XtraEditors.LookUpEdit(); + this.txtbomid = new DevExpress.XtraEditors.LookUpEdit(); + this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); + this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.gridControl1 = new DevExpress.XtraGrid.GridControl(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditmaterialid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditmaterialtype = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.gridControl2 = new DevExpress.XtraGrid.GridControl(); + this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.txtid = new DevExpress.XtraEditors.TextEdit(); + this.txtwordordercode = new DevExpress.XtraEditors.TextEdit(); + this.txtsalecode = new DevExpress.XtraEditors.TextEdit(); + this.txtsaledetailcode = new DevExpress.XtraEditors.TextEdit(); + this.txtworkordertype = new DevExpress.XtraEditors.LookUpEdit(); + this.txtproductdate = new DevExpress.XtraEditors.DateEdit(); + this.txtproductdept = new DevExpress.XtraEditors.LookUpEdit(); + this.txtproductcode = new DevExpress.XtraEditors.TextEdit(); + this.txtproductid = new DevExpress.XtraEditors.LookUpEdit(); + this.txtspec = new DevExpress.XtraEditors.TextEdit(); + this.txtproductnumber = new DevExpress.XtraEditors.TextEdit(); + this.txtunit = new DevExpress.XtraEditors.LookUpEdit(); + this.txtfinishdate = new DevExpress.XtraEditors.DateEdit(); + this.txtdeliverdate = new DevExpress.XtraEditors.DateEdit(); + this.txtwarehouse = new DevExpress.XtraEditors.LookUpEdit(); + this.txtcreatorId = new DevExpress.XtraEditors.LookUpEdit(); + this.txtcreateTime = new DevExpress.XtraEditors.DateEdit(); + this.txtremark = new DevExpress.XtraEditors.TextEdit(); this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtid = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtwordordercode = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtsalecode = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtsaledetailcode = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtworkordertype = new DevExpress.XtraEditors.LookUpEdit(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtproductdate = new DevExpress.XtraEditors.DateEdit(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtproductdept = new DevExpress.XtraEditors.LookUpEdit(); - this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtproductcode = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtproductid = new DevExpress.XtraEditors.LookUpEdit(); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtspec = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtproductnumber = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtunit = new DevExpress.XtraEditors.LookUpEdit(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtfinishdate = new DevExpress.XtraEditors.DateEdit(); - this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtdeliverdate = new DevExpress.XtraEditors.DateEdit(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtwarehouse = new DevExpress.XtraEditors.LookUpEdit(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtcreatorId = new DevExpress.XtraEditors.LookUpEdit(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtcreateTime = new DevExpress.XtraEditors.DateEdit(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txtremark = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtworkordertype)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproductdept)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproductid)).BeginInit(); @@ -117,47 +149,63 @@ namespace MES.Form this.panelControl2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); this.layoutControl1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtproducttype.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtbomid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); + this.xtraTabControl2.SuspendLayout(); + this.xtraTabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit(); + this.contextMenuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialtype)).BeginInit(); + this.xtraTabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtwordordercode.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtsaledetailcode.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtworkordertype.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductdate.Properties.CalendarTimeProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductdate.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductdept.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductid.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtspec.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductnumber.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtfinishdate.Properties.CalendarTimeProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtfinishdate.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties.CalendarTimeProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); this.SuspendLayout(); // // gridColumn1 @@ -305,6 +353,7 @@ namespace MES.Form new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemtxtunit.DisplayMember = "Name"; this.repositoryItemtxtunit.Name = "repositoryItemtxtunit"; + this.repositoryItemtxtunit.NullText = ""; this.repositoryItemtxtunit.ValueMember = "ID"; // // gridColumn13 @@ -393,7 +442,7 @@ namespace MES.Form this.xtraTabControl1.Location = new System.Drawing.Point(0, 34); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabDataList; - this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766); + this.xtraTabControl1.Size = new System.Drawing.Size(1072, 655); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabDataList, @@ -403,7 +452,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1294, 737); + this.tabDataList.Size = new System.Drawing.Size(1067, 629); this.tabDataList.Text = "数据列表"; // // grdList @@ -412,7 +461,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(1294, 737); + this.grdList.Size = new System.Drawing.Size(1067, 629); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -447,7 +496,7 @@ namespace MES.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(1294, 737); + this.tabDataDetail.Size = new System.Drawing.Size(1067, 629); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -456,11 +505,14 @@ namespace MES.Form this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(1294, 737); + this.panelControl2.Size = new System.Drawing.Size(1067, 629); this.panelControl2.TabIndex = 0; // // layoutControl1 // + this.layoutControl1.Controls.Add(this.txtproducttype); + this.layoutControl1.Controls.Add(this.txtbomid); + this.layoutControl1.Controls.Add(this.xtraTabControl2); this.layoutControl1.Controls.Add(this.txtid); this.layoutControl1.Controls.Add(this.txtwordordercode); this.layoutControl1.Controls.Add(this.txtsalecode); @@ -483,35 +535,530 @@ namespace MES.Form this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup1; - this.layoutControl1.Size = new System.Drawing.Size(1290, 733); + this.layoutControl1.Size = new System.Drawing.Size(1063, 625); this.layoutControl1.TabIndex = 6; this.layoutControl1.Text = "layoutControl1"; // + // txtproducttype + // + this.txtproducttype.Location = new System.Drawing.Point(87, 84); + this.txtproducttype.Name = "txtproducttype"; + this.txtproducttype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtproducttype.Properties.DisplayMember = "Name"; + this.txtproducttype.Properties.NullText = ""; + this.txtproducttype.Properties.ReadOnly = true; + this.txtproducttype.Properties.ValueMember = "ID"; + this.txtproducttype.Size = new System.Drawing.Size(442, 20); + this.txtproducttype.StyleController = this.layoutControl1; + this.txtproducttype.TabIndex = 21; + // + // txtbomid + // + this.txtbomid.Location = new System.Drawing.Point(87, 132); + this.txtbomid.Name = "txtbomid"; + this.txtbomid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtbomid.Properties.DisplayMember = "Name"; + this.txtbomid.Properties.NullText = ""; + this.txtbomid.Properties.ValueMember = "ID"; + this.txtbomid.Size = new System.Drawing.Size(442, 20); + this.txtbomid.StyleController = this.layoutControl1; + this.txtbomid.TabIndex = 20; + // + // xtraTabControl2 + // + this.xtraTabControl2.Location = new System.Drawing.Point(12, 252); + this.xtraTabControl2.Name = "xtraTabControl2"; + this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1; + this.xtraTabControl2.Size = new System.Drawing.Size(1039, 361); + this.xtraTabControl2.TabIndex = 19; + this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.xtraTabPage1, + this.xtraTabPage2}); + // + // xtraTabPage1 + // + this.xtraTabPage1.Controls.Add(this.gridControl1); + this.xtraTabPage1.Name = "xtraTabPage1"; + this.xtraTabPage1.Size = new System.Drawing.Size(1034, 335); + this.xtraTabPage1.Text = "物料需求明细"; + // + // gridControl1 + // + this.gridControl1.ContextMenuStrip = this.contextMenuStrip1; + this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gridControl1.Location = new System.Drawing.Point(0, 0); + this.gridControl1.MainView = this.gridView1; + this.gridControl1.Name = "gridControl1"; + this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.repositoryItemLookUpEditmaterialid, + this.repositoryItemLookUpEditmaterialtype}); + this.gridControl1.Size = new System.Drawing.Size(1034, 335); + this.gridControl1.TabIndex = 1; + this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItem1}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(149, 26); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(148, 22); + this.toolStripMenuItem1.Text = "物料需求明细"; + this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); + // + // gridView1 + // + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn19, + this.gridColumn20, + this.gridColumn21, + this.gridColumn22, + this.gridColumn23, + this.gridColumn24, + this.gridColumn25, + this.gridColumn26, + this.gridColumn27, + this.gridColumn28, + this.gridColumn29, + this.gridColumn30, + this.gridColumn31, + this.gridColumn32, + this.gridColumn33}); + this.gridView1.GridControl = this.gridControl1; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsBehavior.Editable = false; + this.gridView1.OptionsView.ColumnAutoWidth = false; + // + // gridColumn19 + // + this.gridColumn19.Caption = "id"; + this.gridColumn19.FieldName = "id"; + this.gridColumn19.Name = "gridColumn19"; + // + // gridColumn20 + // + this.gridColumn20.Caption = "工程BOM编号"; + this.gridColumn20.FieldName = "projectBOMcode"; + this.gridColumn20.Name = "gridColumn20"; + this.gridColumn20.Width = 201; + // + // gridColumn21 + // + this.gridColumn21.Caption = "生产BOM编号"; + this.gridColumn21.FieldName = "productionBOMcode"; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.Width = 201; + // + // gridColumn22 + // + this.gridColumn22.Caption = "产品生产数量"; + this.gridColumn22.FieldName = "number"; + this.gridColumn22.Name = "gridColumn22"; + this.gridColumn22.Visible = true; + this.gridColumn22.VisibleIndex = 0; + this.gridColumn22.Width = 201; + // + // gridColumn23 + // + this.gridColumn23.Caption = "物料编码"; + this.gridColumn23.FieldName = "materialcode"; + this.gridColumn23.Name = "gridColumn23"; + this.gridColumn23.Visible = true; + this.gridColumn23.VisibleIndex = 1; + this.gridColumn23.Width = 201; + // + // gridColumn24 + // + this.gridColumn24.Caption = "物料名称"; + this.gridColumn24.ColumnEdit = this.repositoryItemLookUpEditmaterialid; + this.gridColumn24.FieldName = "materialid"; + this.gridColumn24.Name = "gridColumn24"; + this.gridColumn24.Visible = true; + this.gridColumn24.VisibleIndex = 2; + this.gridColumn24.Width = 201; + // + // repositoryItemLookUpEditmaterialid + // + this.repositoryItemLookUpEditmaterialid.AutoHeight = false; + this.repositoryItemLookUpEditmaterialid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditmaterialid.DisplayMember = "Name"; + this.repositoryItemLookUpEditmaterialid.Name = "repositoryItemLookUpEditmaterialid"; + this.repositoryItemLookUpEditmaterialid.NullText = ""; + this.repositoryItemLookUpEditmaterialid.ValueMember = "ID"; + // + // gridColumn25 + // + this.gridColumn25.Caption = "规格型号"; + this.gridColumn25.FieldName = "spec"; + this.gridColumn25.Name = "gridColumn25"; + this.gridColumn25.Visible = true; + this.gridColumn25.VisibleIndex = 3; + this.gridColumn25.Width = 201; + // + // gridColumn26 + // + this.gridColumn26.Caption = "物料类型"; + this.gridColumn26.ColumnEdit = this.repositoryItemLookUpEditmaterialtype; + this.gridColumn26.FieldName = "materialtype"; + this.gridColumn26.Name = "gridColumn26"; + this.gridColumn26.Visible = true; + this.gridColumn26.VisibleIndex = 4; + this.gridColumn26.Width = 201; + // + // repositoryItemLookUpEditmaterialtype + // + this.repositoryItemLookUpEditmaterialtype.AutoHeight = false; + this.repositoryItemLookUpEditmaterialtype.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditmaterialtype.DisplayMember = "Name"; + this.repositoryItemLookUpEditmaterialtype.Name = "repositoryItemLookUpEditmaterialtype"; + this.repositoryItemLookUpEditmaterialtype.NullText = ""; + this.repositoryItemLookUpEditmaterialtype.ValueMember = "ID"; + // + // gridColumn27 + // + this.gridColumn27.Caption = "单位用量"; + this.gridColumn27.FieldName = "uintnumber"; + this.gridColumn27.Name = "gridColumn27"; + this.gridColumn27.Visible = true; + this.gridColumn27.VisibleIndex = 5; + this.gridColumn27.Width = 201; + // + // gridColumn28 + // + this.gridColumn28.Caption = "需求总量"; + this.gridColumn28.FieldName = "neednumber"; + this.gridColumn28.Name = "gridColumn28"; + this.gridColumn28.Visible = true; + this.gridColumn28.VisibleIndex = 7; + this.gridColumn28.Width = 201; + // + // gridColumn29 + // + this.gridColumn29.Caption = "计量单位"; + this.gridColumn29.ColumnEdit = this.repositoryItemtxtunit; + this.gridColumn29.FieldName = "unit"; + this.gridColumn29.Name = "gridColumn29"; + this.gridColumn29.Visible = true; + this.gridColumn29.VisibleIndex = 6; + this.gridColumn29.Width = 201; + // + // gridColumn30 + // + this.gridColumn30.Caption = "单价"; + this.gridColumn30.FieldName = "unitprice"; + this.gridColumn30.Name = "gridColumn30"; + this.gridColumn30.Visible = true; + this.gridColumn30.VisibleIndex = 8; + this.gridColumn30.Width = 201; + // + // gridColumn31 + // + this.gridColumn31.Caption = "总价"; + this.gridColumn31.FieldName = "totalprice"; + this.gridColumn31.Name = "gridColumn31"; + this.gridColumn31.Visible = true; + this.gridColumn31.VisibleIndex = 10; + this.gridColumn31.Width = 201; + // + // gridColumn32 + // + this.gridColumn32.Caption = "仓库"; + this.gridColumn32.ColumnEdit = this.repositoryItemtxtwarehouse; + this.gridColumn32.FieldName = "warehouse"; + this.gridColumn32.Name = "gridColumn32"; + this.gridColumn32.Visible = true; + this.gridColumn32.VisibleIndex = 9; + this.gridColumn32.Width = 201; + // + // gridColumn33 + // + this.gridColumn33.Caption = "备注"; + this.gridColumn33.FieldName = "remark"; + this.gridColumn33.Name = "gridColumn33"; + this.gridColumn33.Visible = true; + this.gridColumn33.VisibleIndex = 11; + this.gridColumn33.Width = 201; + // + // xtraTabPage2 + // + this.xtraTabPage2.Controls.Add(this.gridControl2); + this.xtraTabPage2.Name = "xtraTabPage2"; + this.xtraTabPage2.Size = new System.Drawing.Size(1034, 335); + this.xtraTabPage2.Text = "入库明细"; + // + // gridControl2 + // + this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill; + this.gridControl2.Location = new System.Drawing.Point(0, 0); + this.gridControl2.MainView = this.gridView2; + this.gridControl2.Name = "gridControl2"; + this.gridControl2.Size = new System.Drawing.Size(1034, 335); + this.gridControl2.TabIndex = 0; + this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView2}); + // + // gridView2 + // + this.gridView2.GridControl = this.gridControl2; + this.gridView2.Name = "gridView2"; + // + // txtid + // + this.txtid.Location = new System.Drawing.Point(87, 12); + this.txtid.Name = "txtid"; + this.txtid.Size = new System.Drawing.Size(442, 20); + this.txtid.StyleController = this.layoutControl1; + this.txtid.TabIndex = 1; + // + // txtwordordercode + // + this.txtwordordercode.Location = new System.Drawing.Point(608, 12); + this.txtwordordercode.Name = "txtwordordercode"; + this.txtwordordercode.Size = new System.Drawing.Size(443, 20); + this.txtwordordercode.StyleController = this.layoutControl1; + this.txtwordordercode.TabIndex = 2; + // + // txtsalecode + // + this.txtsalecode.Location = new System.Drawing.Point(608, 108); + this.txtsalecode.Name = "txtsalecode"; + this.txtsalecode.Size = new System.Drawing.Size(443, 20); + this.txtsalecode.StyleController = this.layoutControl1; + this.txtsalecode.TabIndex = 3; + // + // txtsaledetailcode + // + this.txtsaledetailcode.Location = new System.Drawing.Point(87, 108); + this.txtsaledetailcode.Name = "txtsaledetailcode"; + this.txtsaledetailcode.Size = new System.Drawing.Size(442, 20); + this.txtsaledetailcode.StyleController = this.layoutControl1; + this.txtsaledetailcode.TabIndex = 4; + this.txtsaledetailcode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtsaledetailcode_KeyPress); + // + // txtworkordertype + // + this.txtworkordertype.EditValue = ""; + this.txtworkordertype.Location = new System.Drawing.Point(87, 36); + this.txtworkordertype.Name = "txtworkordertype"; + this.txtworkordertype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtworkordertype.Properties.DisplayMember = "Name"; + this.txtworkordertype.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtworkordertype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtworkordertype.Properties.ValueMember = "ID"; + this.txtworkordertype.Size = new System.Drawing.Size(442, 20); + this.txtworkordertype.StyleController = this.layoutControl1; + this.txtworkordertype.TabIndex = 5; + // + // txtproductdate + // + this.txtproductdate.EditValue = null; + this.txtproductdate.ImeMode = System.Windows.Forms.ImeMode.Off; + this.txtproductdate.Location = new System.Drawing.Point(608, 36); + this.txtproductdate.Name = "txtproductdate"; + this.txtproductdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtproductdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txtproductdate.Properties.DisplayFormat.FormatString = "G"; + this.txtproductdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.txtproductdate.Size = new System.Drawing.Size(443, 20); + this.txtproductdate.StyleController = this.layoutControl1; + this.txtproductdate.TabIndex = 6; + // + // txtproductdept + // + this.txtproductdept.EditValue = ""; + this.txtproductdept.Location = new System.Drawing.Point(608, 84); + this.txtproductdept.Name = "txtproductdept"; + this.txtproductdept.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtproductdept.Properties.DisplayMember = "Name"; + this.txtproductdept.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtproductdept.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtproductdept.Properties.ValueMember = "ID"; + this.txtproductdept.Size = new System.Drawing.Size(443, 20); + this.txtproductdept.StyleController = this.layoutControl1; + this.txtproductdept.TabIndex = 7; + // + // txtproductcode + // + this.txtproductcode.Location = new System.Drawing.Point(608, 60); + this.txtproductcode.Name = "txtproductcode"; + this.txtproductcode.Size = new System.Drawing.Size(443, 20); + this.txtproductcode.StyleController = this.layoutControl1; + this.txtproductcode.TabIndex = 8; + // + // txtproductid + // + this.txtproductid.EditValue = ""; + this.txtproductid.Location = new System.Drawing.Point(87, 60); + this.txtproductid.Name = "txtproductid"; + this.txtproductid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtproductid.Properties.DisplayMember = "Name"; + this.txtproductid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtproductid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtproductid.Properties.ValueMember = "ID"; + this.txtproductid.Size = new System.Drawing.Size(442, 20); + this.txtproductid.StyleController = this.layoutControl1; + this.txtproductid.TabIndex = 9; + this.txtproductid.EditValueChanged += new System.EventHandler(this.txtproductid_EditValueChanged); + // + // txtspec + // + this.txtspec.Location = new System.Drawing.Point(608, 132); + this.txtspec.Name = "txtspec"; + this.txtspec.Size = new System.Drawing.Size(443, 20); + this.txtspec.StyleController = this.layoutControl1; + this.txtspec.TabIndex = 10; + // + // txtproductnumber + // + this.txtproductnumber.Location = new System.Drawing.Point(87, 156); + this.txtproductnumber.Name = "txtproductnumber"; + this.txtproductnumber.Size = new System.Drawing.Size(442, 20); + this.txtproductnumber.StyleController = this.layoutControl1; + this.txtproductnumber.TabIndex = 11; + // + // txtunit + // + this.txtunit.EditValue = ""; + this.txtunit.Location = new System.Drawing.Point(608, 156); + this.txtunit.Name = "txtunit"; + this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtunit.Properties.DisplayMember = "Name"; + this.txtunit.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtunit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtunit.Properties.ValueMember = "ID"; + this.txtunit.Size = new System.Drawing.Size(443, 20); + this.txtunit.StyleController = this.layoutControl1; + this.txtunit.TabIndex = 12; + // + // txtfinishdate + // + this.txtfinishdate.EditValue = null; + this.txtfinishdate.ImeMode = System.Windows.Forms.ImeMode.Off; + this.txtfinishdate.Location = new System.Drawing.Point(87, 180); + this.txtfinishdate.Name = "txtfinishdate"; + this.txtfinishdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtfinishdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txtfinishdate.Properties.DisplayFormat.FormatString = "G"; + this.txtfinishdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.txtfinishdate.Size = new System.Drawing.Size(442, 20); + this.txtfinishdate.StyleController = this.layoutControl1; + this.txtfinishdate.TabIndex = 13; + // + // txtdeliverdate + // + this.txtdeliverdate.EditValue = null; + this.txtdeliverdate.ImeMode = System.Windows.Forms.ImeMode.Off; + this.txtdeliverdate.Location = new System.Drawing.Point(608, 180); + this.txtdeliverdate.Name = "txtdeliverdate"; + this.txtdeliverdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtdeliverdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txtdeliverdate.Properties.DisplayFormat.FormatString = "G"; + this.txtdeliverdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.txtdeliverdate.Size = new System.Drawing.Size(443, 20); + this.txtdeliverdate.StyleController = this.layoutControl1; + this.txtdeliverdate.TabIndex = 14; + // + // txtwarehouse + // + this.txtwarehouse.EditValue = ""; + this.txtwarehouse.Location = new System.Drawing.Point(87, 204); + this.txtwarehouse.Name = "txtwarehouse"; + this.txtwarehouse.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtwarehouse.Properties.DisplayMember = "Name"; + this.txtwarehouse.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtwarehouse.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtwarehouse.Properties.ValueMember = "ID"; + this.txtwarehouse.Size = new System.Drawing.Size(442, 20); + this.txtwarehouse.StyleController = this.layoutControl1; + this.txtwarehouse.TabIndex = 15; + // + // txtcreatorId + // + this.txtcreatorId.EditValue = ""; + this.txtcreatorId.Location = new System.Drawing.Point(87, 228); + this.txtcreatorId.Name = "txtcreatorId"; + this.txtcreatorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtcreatorId.Properties.DisplayMember = "Name"; + this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtcreatorId.Properties.ValueMember = "ID"; + this.txtcreatorId.Size = new System.Drawing.Size(442, 20); + this.txtcreatorId.StyleController = this.layoutControl1; + this.txtcreatorId.TabIndex = 16; + // + // txtcreateTime + // + this.txtcreateTime.EditValue = null; + this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off; + this.txtcreateTime.Location = new System.Drawing.Point(608, 228); + this.txtcreateTime.Name = "txtcreateTime"; + this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtcreateTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txtcreateTime.Properties.DisplayFormat.FormatString = "G"; + this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.txtcreateTime.Size = new System.Drawing.Size(443, 20); + this.txtcreateTime.StyleController = this.layoutControl1; + this.txtcreateTime.TabIndex = 17; + // + // txtremark + // + this.txtremark.Location = new System.Drawing.Point(608, 204); + this.txtremark.Name = "txtremark"; + this.txtremark.Size = new System.Drawing.Size(443, 20); + this.txtremark.StyleController = this.layoutControl1; + this.txtremark.TabIndex = 18; + // // layoutControlGroup1 // this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1"; this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem1, - this.layoutControlItem2, - this.layoutControlItem3, this.layoutControlItem4, - this.layoutControlItem5, - this.layoutControlItem6, - this.layoutControlItem7, - this.layoutControlItem8, - this.layoutControlItem9, - this.layoutControlItem10, this.layoutControlItem11, - this.layoutControlItem12, this.layoutControlItem13, - this.layoutControlItem14, this.layoutControlItem15, this.layoutControlItem16, + this.layoutControlItem2, + this.layoutControlItem10, + this.layoutControlItem14, + this.layoutControlItem18, this.layoutControlItem17, - this.layoutControlItem18}); + this.layoutControlItem19, + this.layoutControlItem5, + this.layoutControlItem6, + this.layoutControlItem20, + this.layoutControlItem12, + this.layoutControlItem9, + this.layoutControlItem8, + this.layoutControlItem3, + this.layoutControlItem21, + this.layoutControlItem7}); this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733); + this.layoutControlGroup1.Size = new System.Drawing.Size(1063, 625); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem1 @@ -520,406 +1067,215 @@ namespace MES.Form this.layoutControlItem1.CustomizationFormText = "id"; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem1.Size = new System.Drawing.Size(521, 24); this.layoutControlItem1.Text = "id"; this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14); // - // txtid - // - this.txtid.Location = new System.Drawing.Point(87, 12); - this.txtid.Name = "txtid"; - this.txtid.Size = new System.Drawing.Size(1191, 20); - this.txtid.StyleController = this.layoutControl1; - this.txtid.TabIndex = 1; - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.txtwordordercode; - this.layoutControlItem2.CustomizationFormText = "工单号"; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 24); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(1270, 24); - this.layoutControlItem2.Text = "工单号"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14); - // - // txtwordordercode - // - this.txtwordordercode.Location = new System.Drawing.Point(87, 36); - this.txtwordordercode.Name = "txtwordordercode"; - this.txtwordordercode.Size = new System.Drawing.Size(1191, 20); - this.txtwordordercode.StyleController = this.layoutControl1; - this.txtwordordercode.TabIndex = 2; - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.txtsalecode; - this.layoutControlItem3.CustomizationFormText = "销售单号"; - this.layoutControlItem3.Location = new System.Drawing.Point(0, 48); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(1270, 24); - this.layoutControlItem3.Text = "销售单号"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14); - // - // txtsalecode - // - this.txtsalecode.Location = new System.Drawing.Point(87, 60); - this.txtsalecode.Name = "txtsalecode"; - this.txtsalecode.Size = new System.Drawing.Size(1191, 20); - this.txtsalecode.StyleController = this.layoutControl1; - this.txtsalecode.TabIndex = 3; - // // layoutControlItem4 // this.layoutControlItem4.Control = this.txtsaledetailcode; this.layoutControlItem4.CustomizationFormText = "销售明细单号"; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 72); + this.layoutControlItem4.Location = new System.Drawing.Point(0, 96); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem4.Size = new System.Drawing.Size(521, 24); this.layoutControlItem4.Text = "销售明细单号"; this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14); // - // txtsaledetailcode - // - this.txtsaledetailcode.Location = new System.Drawing.Point(87, 84); - this.txtsaledetailcode.Name = "txtsaledetailcode"; - this.txtsaledetailcode.Size = new System.Drawing.Size(1191, 20); - this.txtsaledetailcode.StyleController = this.layoutControl1; - this.txtsaledetailcode.TabIndex = 4; - // - // layoutControlItem5 - // - this.layoutControlItem5.Control = this.txtworkordertype; - this.layoutControlItem5.CustomizationFormText = "工单类型"; - this.layoutControlItem5.Location = new System.Drawing.Point(0, 96); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(1270, 24); - this.layoutControlItem5.Text = "工单类型"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14); - // - // txtworkordertype - // - this.txtworkordertype.EditValue = ""; - this.txtworkordertype.Location = new System.Drawing.Point(87, 108); - this.txtworkordertype.Name = "txtworkordertype"; - this.txtworkordertype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtworkordertype.Properties.DisplayMember = "Name"; - this.txtworkordertype.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; - this.txtworkordertype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; - this.txtworkordertype.Properties.ValueMember = "ID"; - this.txtworkordertype.Size = new System.Drawing.Size(1191, 20); - this.txtworkordertype.StyleController = this.layoutControl1; - this.txtworkordertype.TabIndex = 5; - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txtproductdate; - this.layoutControlItem6.CustomizationFormText = "生产日期"; - this.layoutControlItem6.Location = new System.Drawing.Point(0, 120); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(1270, 24); - this.layoutControlItem6.Text = "生产日期"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14); - // - // txtproductdate - // - this.txtproductdate.EditValue = null; - this.txtproductdate.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtproductdate.Location = new System.Drawing.Point(87, 132); - this.txtproductdate.Name = "txtproductdate"; - this.txtproductdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtproductdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton()}); - this.txtproductdate.Properties.DisplayFormat.FormatString = "G"; - this.txtproductdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txtproductdate.Size = new System.Drawing.Size(1191, 20); - this.txtproductdate.StyleController = this.layoutControl1; - this.txtproductdate.TabIndex = 6; - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.txtproductdept; - this.layoutControlItem7.CustomizationFormText = "生产单位"; - this.layoutControlItem7.Location = new System.Drawing.Point(0, 144); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(1270, 24); - this.layoutControlItem7.Text = "生产单位"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14); - // - // txtproductdept - // - this.txtproductdept.EditValue = ""; - this.txtproductdept.Location = new System.Drawing.Point(87, 156); - this.txtproductdept.Name = "txtproductdept"; - this.txtproductdept.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtproductdept.Properties.DisplayMember = "Name"; - this.txtproductdept.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; - this.txtproductdept.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; - this.txtproductdept.Properties.ValueMember = "ID"; - this.txtproductdept.Size = new System.Drawing.Size(1191, 20); - this.txtproductdept.StyleController = this.layoutControl1; - this.txtproductdept.TabIndex = 7; - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.txtproductcode; - this.layoutControlItem8.CustomizationFormText = "产品编号"; - this.layoutControlItem8.Location = new System.Drawing.Point(0, 168); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(1270, 24); - this.layoutControlItem8.Text = "产品编号"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14); - // - // txtproductcode - // - this.txtproductcode.Location = new System.Drawing.Point(87, 180); - this.txtproductcode.Name = "txtproductcode"; - this.txtproductcode.Size = new System.Drawing.Size(1191, 20); - this.txtproductcode.StyleController = this.layoutControl1; - this.txtproductcode.TabIndex = 8; - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txtproductid; - this.layoutControlItem9.CustomizationFormText = "产品名称"; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 192); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(1270, 24); - this.layoutControlItem9.Text = "产品名称"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14); - // - // txtproductid - // - this.txtproductid.EditValue = ""; - this.txtproductid.Location = new System.Drawing.Point(87, 204); - this.txtproductid.Name = "txtproductid"; - this.txtproductid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtproductid.Properties.DisplayMember = "Name"; - this.txtproductid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; - this.txtproductid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; - this.txtproductid.Properties.ValueMember = "ID"; - this.txtproductid.Size = new System.Drawing.Size(1191, 20); - this.txtproductid.StyleController = this.layoutControl1; - this.txtproductid.TabIndex = 9; - // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txtspec; - this.layoutControlItem10.CustomizationFormText = "规格型号"; - this.layoutControlItem10.Location = new System.Drawing.Point(0, 216); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.Size = new System.Drawing.Size(1270, 24); - this.layoutControlItem10.Text = "规格型号"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14); - // - // txtspec - // - this.txtspec.Location = new System.Drawing.Point(87, 228); - this.txtspec.Name = "txtspec"; - this.txtspec.Size = new System.Drawing.Size(1191, 20); - this.txtspec.StyleController = this.layoutControl1; - this.txtspec.TabIndex = 10; - // // layoutControlItem11 // this.layoutControlItem11.Control = this.txtproductnumber; this.layoutControlItem11.CustomizationFormText = "生产数量"; - this.layoutControlItem11.Location = new System.Drawing.Point(0, 240); + this.layoutControlItem11.Location = new System.Drawing.Point(0, 144); this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem11.Size = new System.Drawing.Size(521, 24); this.layoutControlItem11.Text = "生产数量"; this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14); // - // txtproductnumber - // - this.txtproductnumber.Location = new System.Drawing.Point(87, 252); - this.txtproductnumber.Name = "txtproductnumber"; - this.txtproductnumber.Size = new System.Drawing.Size(1191, 20); - this.txtproductnumber.StyleController = this.layoutControl1; - this.txtproductnumber.TabIndex = 11; - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txtunit; - this.layoutControlItem12.CustomizationFormText = "计量单位"; - this.layoutControlItem12.Location = new System.Drawing.Point(0, 264); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.Size = new System.Drawing.Size(1270, 24); - this.layoutControlItem12.Text = "计量单位"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14); - // - // txtunit - // - this.txtunit.EditValue = ""; - this.txtunit.Location = new System.Drawing.Point(87, 276); - this.txtunit.Name = "txtunit"; - this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtunit.Properties.DisplayMember = "Name"; - this.txtunit.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; - this.txtunit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; - this.txtunit.Properties.ValueMember = "ID"; - this.txtunit.Size = new System.Drawing.Size(1191, 20); - this.txtunit.StyleController = this.layoutControl1; - this.txtunit.TabIndex = 12; - // // layoutControlItem13 // this.layoutControlItem13.Control = this.txtfinishdate; this.layoutControlItem13.CustomizationFormText = "完工日期"; - this.layoutControlItem13.Location = new System.Drawing.Point(0, 288); + this.layoutControlItem13.Location = new System.Drawing.Point(0, 168); this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem13.Size = new System.Drawing.Size(521, 24); this.layoutControlItem13.Text = "完工日期"; this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14); // - // txtfinishdate - // - this.txtfinishdate.EditValue = null; - this.txtfinishdate.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtfinishdate.Location = new System.Drawing.Point(87, 300); - this.txtfinishdate.Name = "txtfinishdate"; - this.txtfinishdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtfinishdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton()}); - this.txtfinishdate.Properties.DisplayFormat.FormatString = "G"; - this.txtfinishdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txtfinishdate.Size = new System.Drawing.Size(1191, 20); - this.txtfinishdate.StyleController = this.layoutControl1; - this.txtfinishdate.TabIndex = 13; - // - // layoutControlItem14 - // - this.layoutControlItem14.Control = this.txtdeliverdate; - this.layoutControlItem14.CustomizationFormText = "交货日期"; - this.layoutControlItem14.Location = new System.Drawing.Point(0, 312); - this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.Size = new System.Drawing.Size(1270, 24); - this.layoutControlItem14.Text = "交货日期"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14); - // - // txtdeliverdate - // - this.txtdeliverdate.EditValue = null; - this.txtdeliverdate.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtdeliverdate.Location = new System.Drawing.Point(87, 324); - this.txtdeliverdate.Name = "txtdeliverdate"; - this.txtdeliverdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtdeliverdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton()}); - this.txtdeliverdate.Properties.DisplayFormat.FormatString = "G"; - this.txtdeliverdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txtdeliverdate.Size = new System.Drawing.Size(1191, 20); - this.txtdeliverdate.StyleController = this.layoutControl1; - this.txtdeliverdate.TabIndex = 14; - // // layoutControlItem15 // this.layoutControlItem15.Control = this.txtwarehouse; this.layoutControlItem15.CustomizationFormText = "仓库"; - this.layoutControlItem15.Location = new System.Drawing.Point(0, 336); + this.layoutControlItem15.Location = new System.Drawing.Point(0, 192); this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem15.Size = new System.Drawing.Size(521, 24); this.layoutControlItem15.Text = "仓库"; this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14); // - // txtwarehouse - // - this.txtwarehouse.EditValue = ""; - this.txtwarehouse.Location = new System.Drawing.Point(87, 348); - this.txtwarehouse.Name = "txtwarehouse"; - this.txtwarehouse.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtwarehouse.Properties.DisplayMember = "Name"; - this.txtwarehouse.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; - this.txtwarehouse.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; - this.txtwarehouse.Properties.ValueMember = "ID"; - this.txtwarehouse.Size = new System.Drawing.Size(1191, 20); - this.txtwarehouse.StyleController = this.layoutControl1; - this.txtwarehouse.TabIndex = 15; - // // layoutControlItem16 // this.layoutControlItem16.Control = this.txtcreatorId; this.layoutControlItem16.CustomizationFormText = "制单人"; - this.layoutControlItem16.Location = new System.Drawing.Point(0, 360); + this.layoutControlItem16.Location = new System.Drawing.Point(0, 216); this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem16.Size = new System.Drawing.Size(521, 24); this.layoutControlItem16.Text = "制单人"; this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 14); // - // txtcreatorId + // layoutControlItem2 // - this.txtcreatorId.EditValue = ""; - this.txtcreatorId.Location = new System.Drawing.Point(87, 372); - this.txtcreatorId.Name = "txtcreatorId"; - this.txtcreatorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtcreatorId.Properties.DisplayMember = "Name"; - this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; - this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; - this.txtcreatorId.Properties.ValueMember = "ID"; - this.txtcreatorId.Size = new System.Drawing.Size(1191, 20); - this.txtcreatorId.StyleController = this.layoutControl1; - this.txtcreatorId.TabIndex = 16; + this.layoutControlItem2.Control = this.txtwordordercode; + this.layoutControlItem2.CustomizationFormText = "工单号"; + this.layoutControlItem2.Location = new System.Drawing.Point(521, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(522, 24); + this.layoutControlItem2.Text = "工单号"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14); // - // layoutControlItem17 + // layoutControlItem10 // - this.layoutControlItem17.Control = this.txtcreateTime; - this.layoutControlItem17.CustomizationFormText = "制单日期"; - this.layoutControlItem17.Location = new System.Drawing.Point(0, 384); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.Size = new System.Drawing.Size(1270, 24); - this.layoutControlItem17.Text = "制单日期"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14); + this.layoutControlItem10.Control = this.txtspec; + this.layoutControlItem10.CustomizationFormText = "规格型号"; + this.layoutControlItem10.Location = new System.Drawing.Point(521, 120); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.Size = new System.Drawing.Size(522, 24); + this.layoutControlItem10.Text = "规格型号"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14); // - // txtcreateTime + // layoutControlItem14 // - this.txtcreateTime.EditValue = null; - this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtcreateTime.Location = new System.Drawing.Point(87, 396); - this.txtcreateTime.Name = "txtcreateTime"; - this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtcreateTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton()}); - this.txtcreateTime.Properties.DisplayFormat.FormatString = "G"; - this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txtcreateTime.Size = new System.Drawing.Size(1191, 20); - this.txtcreateTime.StyleController = this.layoutControl1; - this.txtcreateTime.TabIndex = 17; + this.layoutControlItem14.Control = this.txtdeliverdate; + this.layoutControlItem14.CustomizationFormText = "交货日期"; + this.layoutControlItem14.Location = new System.Drawing.Point(521, 168); + this.layoutControlItem14.Name = "layoutControlItem14"; + this.layoutControlItem14.Size = new System.Drawing.Size(522, 24); + this.layoutControlItem14.Text = "交货日期"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem18 // this.layoutControlItem18.Control = this.txtremark; this.layoutControlItem18.CustomizationFormText = "备注"; - this.layoutControlItem18.Location = new System.Drawing.Point(0, 408); + this.layoutControlItem18.Location = new System.Drawing.Point(521, 192); this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.Size = new System.Drawing.Size(1270, 305); + this.layoutControlItem18.Size = new System.Drawing.Size(522, 24); this.layoutControlItem18.Text = "备注"; this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 14); // - // txtremark + // layoutControlItem17 // - this.txtremark.Location = new System.Drawing.Point(87, 420); - this.txtremark.Name = "txtremark"; - this.txtremark.Size = new System.Drawing.Size(1191, 20); - this.txtremark.StyleController = this.layoutControl1; - this.txtremark.TabIndex = 18; + this.layoutControlItem17.Control = this.txtcreateTime; + this.layoutControlItem17.CustomizationFormText = "制单日期"; + this.layoutControlItem17.Location = new System.Drawing.Point(521, 216); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.Size = new System.Drawing.Size(522, 24); + this.layoutControlItem17.Text = "制单日期"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14); + // + // layoutControlItem19 + // + this.layoutControlItem19.Control = this.xtraTabControl2; + this.layoutControlItem19.Location = new System.Drawing.Point(0, 240); + this.layoutControlItem19.Name = "layoutControlItem19"; + this.layoutControlItem19.Size = new System.Drawing.Size(1043, 365); + this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem19.TextVisible = false; + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txtworkordertype; + this.layoutControlItem5.CustomizationFormText = "工单类型"; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 24); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.Size = new System.Drawing.Size(521, 24); + this.layoutControlItem5.Text = "工单类型"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txtproductdate; + this.layoutControlItem6.CustomizationFormText = "生产日期"; + this.layoutControlItem6.Location = new System.Drawing.Point(521, 24); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.Size = new System.Drawing.Size(522, 24); + this.layoutControlItem6.Text = "生产日期"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14); + // + // layoutControlItem20 + // + this.layoutControlItem20.Control = this.txtbomid; + this.layoutControlItem20.Location = new System.Drawing.Point(0, 120); + this.layoutControlItem20.Name = "layoutControlItem20"; + this.layoutControlItem20.Size = new System.Drawing.Size(521, 24); + this.layoutControlItem20.Text = "bom"; + this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txtunit; + this.layoutControlItem12.CustomizationFormText = "计量单位"; + this.layoutControlItem12.Location = new System.Drawing.Point(521, 144); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.Size = new System.Drawing.Size(522, 24); + this.layoutControlItem12.Text = "计量单位"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txtproductid; + this.layoutControlItem9.CustomizationFormText = "产品名称"; + this.layoutControlItem9.Location = new System.Drawing.Point(0, 48); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.Size = new System.Drawing.Size(521, 24); + this.layoutControlItem9.Text = "产品名称"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14); + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.txtproductcode; + this.layoutControlItem8.CustomizationFormText = "产品编号"; + this.layoutControlItem8.Location = new System.Drawing.Point(521, 48); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.Size = new System.Drawing.Size(522, 24); + this.layoutControlItem8.Text = "产品编号"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txtsalecode; + this.layoutControlItem3.CustomizationFormText = "销售单号"; + this.layoutControlItem3.Location = new System.Drawing.Point(521, 96); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.Size = new System.Drawing.Size(522, 24); + this.layoutControlItem3.Text = "销售单号"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14); + // + // layoutControlItem21 + // + this.layoutControlItem21.Control = this.txtproducttype; + this.layoutControlItem21.Location = new System.Drawing.Point(0, 72); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.Size = new System.Drawing.Size(521, 24); + this.layoutControlItem21.Text = "产品类型"; + this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txtproductdept; + this.layoutControlItem7.CustomizationFormText = "生产单位"; + this.layoutControlItem7.Location = new System.Drawing.Point(521, 72); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.Size = new System.Drawing.Size(522, 24); + this.layoutControlItem7.Text = "生产单位"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14); // // Frmworkorder // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1300, 800); + this.ClientSize = new System.Drawing.Size(1072, 689); this.Controls.Add(this.xtraTabControl1); this.Name = "Frmworkorder"; - this.Text = "Frmworkorder"; + this.Text = "工单"; this.Load += new System.EventHandler(this.Frmworkorder_Load); this.Controls.SetChildIndex(this.xtraTabControl1, 0); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtworkordertype)).EndInit(); @@ -938,47 +1294,63 @@ namespace MES.Form this.panelControl2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); this.layoutControl1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtproducttype.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtbomid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); + this.xtraTabControl2.ResumeLayout(false); + this.xtraTabPage1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit(); + this.contextMenuStrip1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialtype)).EndInit(); + this.xtraTabPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtwordordercode.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtsaledetailcode.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtworkordertype.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductdate.Properties.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductdate.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductdept.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductid.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtspec.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductnumber.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtfinishdate.Properties.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtfinishdate.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); this.ResumeLayout(false); } @@ -1073,5 +1445,36 @@ namespace MES.Form private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private XtraTabControl xtraTabControl2; + private XtraTabPage xtraTabPage1; + private XtraTabPage xtraTabPage2; + private LayoutControlItem layoutControlItem19; + private DevExpress.XtraGrid.GridControl gridControl2; + private DevExpress.XtraGrid.Views.Grid.GridView gridView2; + private LookUpEdit txtbomid; + private LayoutControlItem layoutControlItem20; + private LookUpEdit txtproducttype; + private LayoutControlItem layoutControlItem21; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; + private DevExpress.XtraGrid.GridControl gridControl1; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn26; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn28; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn30; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn32; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn33; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditmaterialid; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditmaterialtype; } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/Frmworkorder.resx b/WinformGeneralDeveloperFrame/Form/Frmworkorder.resx index 1af7de1..ad53752 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmworkorder.resx +++ b/WinformGeneralDeveloperFrame/Form/Frmworkorder.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/FrmBaseForm.cs b/WinformGeneralDeveloperFrame/FrmBaseForm.cs index 34d2d91..00044c0 100644 --- a/WinformGeneralDeveloperFrame/FrmBaseForm.cs +++ b/WinformGeneralDeveloperFrame/FrmBaseForm.cs @@ -19,6 +19,7 @@ using MES.Entity; using WinformGeneralDeveloperFrame.Commons; using MES; + namespace WinformGeneralDeveloperFrame { public partial class FrmBaseForm : XtraForm @@ -47,6 +48,12 @@ namespace WinformGeneralDeveloperFrame InitFrom(xtraTab, gridControl, gridView, controlGroups); this.DataType = DataType; } + public void InitFrom(XtraTabControl xtraTab, GridControl gridControl, GridView gridView, LayoutControlGroup[] controlGroups, object DataType, string[] readcontrols) + { + InitFrom(xtraTab, gridControl, gridView, controlGroups); + this.DataType = DataType; + readonlycon = readcontrols; + } public void InitFrom(XtraTabControl xtraTab, GridControl gridControl, GridView gridView, LayoutControlGroup[] controlGroups) { initTools(); diff --git a/WinformGeneralDeveloperFrame/MainForm.Designer.cs b/WinformGeneralDeveloperFrame/MainForm.Designer.cs index 060c8d1..48ce2b1 100644 --- a/WinformGeneralDeveloperFrame/MainForm.Designer.cs +++ b/WinformGeneralDeveloperFrame/MainForm.Designer.cs @@ -53,6 +53,7 @@ namespace WinformGeneralDeveloperFrame this.timer1 = new System.Windows.Forms.Timer(this.components); this.bsi_UserName = new DevExpress.XtraBars.BarStaticItem(); this.barStaticItem1 = new DevExpress.XtraBars.BarStaticItem(); + this.defaultLookAndFeel1 = new DevExpress.LookAndFeel.DefaultLookAndFeel(this.components); ((System.ComponentModel.ISupportInitialize)(this.ribbonControl1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTimeEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabbedMdiManager1)).BeginInit(); @@ -61,7 +62,12 @@ namespace WinformGeneralDeveloperFrame // // ribbonControl1 // + resources.ApplyResources(this.ribbonControl1, "ribbonControl1"); this.ribbonControl1.ExpandCollapseItem.Id = 0; + this.ribbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex = ((int)(resources.GetObject("ribbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex"))); + this.ribbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("ribbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex"))); + this.ribbonControl1.ExpandCollapseItem.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("ribbonControl1.ExpandCollapseItem.ImageOptions.SvgImage"))); + this.ribbonControl1.ExpandCollapseItem.SearchTags = resources.GetString("ribbonControl1.ExpandCollapseItem.SearchTags"); this.ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { this.ribbonControl1.ExpandCollapseItem, this.ribbonControl1.SearchEditItem, @@ -77,7 +83,6 @@ namespace WinformGeneralDeveloperFrame this.barButtonItem2, this.barStaticItem2, this.barButtonItem3}); - this.ribbonControl1.Location = new System.Drawing.Point(0, 0); this.ribbonControl1.MaxItemId = 13; this.ribbonControl1.Name = "ribbonControl1"; this.ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { @@ -85,105 +90,141 @@ namespace WinformGeneralDeveloperFrame this.ribbonControl1.QuickToolbarItemLinks.Add(this.ribbonGalleryBarItem1); this.ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemTimeEdit1}); - this.ribbonControl1.Size = new System.Drawing.Size(1157, 148); this.ribbonControl1.StatusBar = this.ribbonStatusBar1; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // // ribbonGalleryBarItem1 // - this.ribbonGalleryBarItem1.Caption = "ribbonGalleryBarItem1"; + resources.ApplyResources(this.ribbonGalleryBarItem1, "ribbonGalleryBarItem1"); this.ribbonGalleryBarItem1.Id = 1; + this.ribbonGalleryBarItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("ribbonGalleryBarItem1.ImageOptions.ImageIndex"))); + this.ribbonGalleryBarItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("ribbonGalleryBarItem1.ImageOptions.LargeImageIndex"))); + this.ribbonGalleryBarItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("ribbonGalleryBarItem1.ImageOptions.SvgImage"))); this.ribbonGalleryBarItem1.Name = "ribbonGalleryBarItem1"; // // skinPaletteRibbonGalleryBarItem1 // + resources.ApplyResources(this.skinPaletteRibbonGalleryBarItem1, "skinPaletteRibbonGalleryBarItem1"); this.skinPaletteRibbonGalleryBarItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right; - this.skinPaletteRibbonGalleryBarItem1.Caption = "skinPaletteRibbonGalleryBarItem1"; this.skinPaletteRibbonGalleryBarItem1.Id = 2; + this.skinPaletteRibbonGalleryBarItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("skinPaletteRibbonGalleryBarItem1.ImageOptions.ImageIndex"))); + this.skinPaletteRibbonGalleryBarItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("skinPaletteRibbonGalleryBarItem1.ImageOptions.LargeImageIndex"))); + this.skinPaletteRibbonGalleryBarItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("skinPaletteRibbonGalleryBarItem1.ImageOptions.SvgImage"))); this.skinPaletteRibbonGalleryBarItem1.Name = "skinPaletteRibbonGalleryBarItem1"; // // barEditItem1 // + resources.ApplyResources(this.barEditItem1, "barEditItem1"); this.barEditItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right; - this.barEditItem1.Caption = "barEditItem1"; this.barEditItem1.Edit = this.repositoryItemTimeEdit1; this.barEditItem1.Id = 3; + this.barEditItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("barEditItem1.ImageOptions.ImageIndex"))); + this.barEditItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barEditItem1.ImageOptions.LargeImageIndex"))); + this.barEditItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barEditItem1.ImageOptions.SvgImage"))); this.barEditItem1.Name = "barEditItem1"; // // repositoryItemTimeEdit1 // - this.repositoryItemTimeEdit1.AutoHeight = false; + resources.ApplyResources(this.repositoryItemTimeEdit1, "repositoryItemTimeEdit1"); this.repositoryItemTimeEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("repositoryItemTimeEdit1.Buttons"))))}); + this.repositoryItemTimeEdit1.Mask.EditMask = resources.GetString("repositoryItemTimeEdit1.Mask.EditMask"); this.repositoryItemTimeEdit1.Name = "repositoryItemTimeEdit1"; // // bsi_Date // + resources.ApplyResources(this.bsi_Date, "bsi_Date"); this.bsi_Date.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right; - this.bsi_Date.Caption = "DateTime"; this.bsi_Date.Id = 4; this.bsi_Date.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.time_16x16; + this.bsi_Date.ImageOptions.ImageIndex = ((int)(resources.GetObject("bsi_Date.ImageOptions.ImageIndex"))); this.bsi_Date.ImageOptions.LargeImage = global::WinformGeneralDeveloperFrame.Properties.Resources.time_32x32; + this.bsi_Date.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("bsi_Date.ImageOptions.LargeImageIndex"))); + this.bsi_Date.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("bsi_Date.ImageOptions.SvgImage"))); this.bsi_Date.Name = "bsi_Date"; this.bsi_Date.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; // // barListItem1 // - this.barListItem1.Caption = "barListItem1"; + resources.ApplyResources(this.barListItem1, "barListItem1"); this.barListItem1.Id = 5; + this.barListItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("barListItem1.ImageOptions.ImageIndex"))); + this.barListItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barListItem1.ImageOptions.LargeImageIndex"))); + this.barListItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barListItem1.ImageOptions.SvgImage"))); this.barListItem1.Name = "barListItem1"; // // barUserName // - this.barUserName.Caption = "用户名:admin"; + resources.ApplyResources(this.barUserName, "barUserName"); this.barUserName.Id = 6; this.barUserName.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.bocustomer_16x16; + this.barUserName.ImageOptions.ImageIndex = ((int)(resources.GetObject("barUserName.ImageOptions.ImageIndex"))); this.barUserName.ImageOptions.LargeImage = global::WinformGeneralDeveloperFrame.Properties.Resources.bocustomer_32x321; + this.barUserName.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barUserName.ImageOptions.LargeImageIndex"))); + this.barUserName.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barUserName.ImageOptions.SvgImage"))); this.barUserName.Name = "barUserName"; this.barUserName.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; // // barStaticItem3 // - this.barStaticItem3.Caption = "barStaticItem3"; + resources.ApplyResources(this.barStaticItem3, "barStaticItem3"); this.barStaticItem3.Id = 7; + this.barStaticItem3.ImageOptions.ImageIndex = ((int)(resources.GetObject("barStaticItem3.ImageOptions.ImageIndex"))); + this.barStaticItem3.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barStaticItem3.ImageOptions.LargeImageIndex"))); + this.barStaticItem3.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barStaticItem3.ImageOptions.SvgImage"))); this.barStaticItem3.Name = "barStaticItem3"; // // btnabout // - this.btnabout.Caption = "关于"; + resources.ApplyResources(this.btnabout, "btnabout"); this.btnabout.Id = 8; this.btnabout.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.operatingsystem_16x16; + this.btnabout.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnabout.ImageOptions.ImageIndex"))); this.btnabout.ImageOptions.LargeImage = global::WinformGeneralDeveloperFrame.Properties.Resources.operatingsystem_32x32; + this.btnabout.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("btnabout.ImageOptions.LargeImageIndex"))); + this.btnabout.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnabout.ImageOptions.SvgImage"))); this.btnabout.Name = "btnabout"; this.btnabout.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large; // // barButtonItem1 // - this.barButtonItem1.Caption = "bug反馈 "; + resources.ApplyResources(this.barButtonItem1, "barButtonItem1"); this.barButtonItem1.Id = 9; this.barButtonItem1.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.mail_16x16; + this.barButtonItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("barButtonItem1.ImageOptions.ImageIndex"))); this.barButtonItem1.ImageOptions.LargeImage = global::WinformGeneralDeveloperFrame.Properties.Resources.mail_32x32; + this.barButtonItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barButtonItem1.ImageOptions.LargeImageIndex"))); + this.barButtonItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barButtonItem1.ImageOptions.SvgImage"))); this.barButtonItem1.Name = "barButtonItem1"; this.barButtonItem1.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem1_ItemClick); // // barButtonItem2 // - this.barButtonItem2.Caption = "barButtonItem2"; + resources.ApplyResources(this.barButtonItem2, "barButtonItem2"); this.barButtonItem2.Id = 10; + this.barButtonItem2.ImageOptions.ImageIndex = ((int)(resources.GetObject("barButtonItem2.ImageOptions.ImageIndex"))); + this.barButtonItem2.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barButtonItem2.ImageOptions.LargeImageIndex"))); + this.barButtonItem2.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barButtonItem2.ImageOptions.SvgImage"))); this.barButtonItem2.Name = "barButtonItem2"; // // barStaticItem2 // - this.barStaticItem2.Caption = "barStaticItem2"; + resources.ApplyResources(this.barStaticItem2, "barStaticItem2"); this.barStaticItem2.Id = 11; + this.barStaticItem2.ImageOptions.ImageIndex = ((int)(resources.GetObject("barStaticItem2.ImageOptions.ImageIndex"))); + this.barStaticItem2.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barStaticItem2.ImageOptions.LargeImageIndex"))); + this.barStaticItem2.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barStaticItem2.ImageOptions.SvgImage"))); this.barStaticItem2.Name = "barStaticItem2"; // // barButtonItem3 // - this.barButtonItem3.Caption = "注销"; + resources.ApplyResources(this.barButtonItem3, "barButtonItem3"); this.barButtonItem3.Id = 12; this.barButtonItem3.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.removepivotfield_16x16; + this.barButtonItem3.ImageOptions.ImageIndex = ((int)(resources.GetObject("barButtonItem3.ImageOptions.ImageIndex"))); this.barButtonItem3.ImageOptions.LargeImage = global::WinformGeneralDeveloperFrame.Properties.Resources.removepivotfield_32x32; + this.barButtonItem3.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barButtonItem3.ImageOptions.LargeImageIndex"))); + this.barButtonItem3.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barButtonItem3.ImageOptions.SvgImage"))); this.barButtonItem3.Name = "barButtonItem3"; this.barButtonItem3.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem3_ItemClick); // @@ -192,7 +233,7 @@ namespace WinformGeneralDeveloperFrame this.ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { this.ribbonPageGroup1}); this.ribbonPage1.Name = "ribbonPage1"; - this.ribbonPage1.Text = "帮助"; + resources.ApplyResources(this.ribbonPage1, "ribbonPage1"); // // ribbonPageGroup1 // @@ -203,12 +244,11 @@ namespace WinformGeneralDeveloperFrame // // ribbonStatusBar1 // + resources.ApplyResources(this.ribbonStatusBar1, "ribbonStatusBar1"); this.ribbonStatusBar1.ItemLinks.Add(this.bsi_Date); this.ribbonStatusBar1.ItemLinks.Add(this.barUserName); - this.ribbonStatusBar1.Location = new System.Drawing.Point(0, 766); this.ribbonStatusBar1.Name = "ribbonStatusBar1"; this.ribbonStatusBar1.Ribbon = this.ribbonControl1; - this.ribbonStatusBar1.Size = new System.Drawing.Size(1157, 32); // // xtraTabbedMdiManager1 // @@ -216,16 +256,12 @@ namespace WinformGeneralDeveloperFrame // // navBarControl1 // + resources.ApplyResources(this.navBarControl1, "navBarControl1"); this.navBarControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat; - this.navBarControl1.Dock = System.Windows.Forms.DockStyle.Left; - this.navBarControl1.Location = new System.Drawing.Point(0, 148); this.navBarControl1.Name = "navBarControl1"; - this.navBarControl1.OptionsNavPane.ExpandedWidth = 184; + this.navBarControl1.OptionsNavPane.ExpandedWidth = ((int)(resources.GetObject("resource.ExpandedWidth"))); this.navBarControl1.PaintStyleKind = DevExpress.XtraNavBar.NavBarViewKind.NavigationPane; - this.navBarControl1.Size = new System.Drawing.Size(184, 618); this.navBarControl1.StoreDefaultPaintStyleName = true; - this.navBarControl1.TabIndex = 8; - this.navBarControl1.Text = "navBarControl1"; this.navBarControl1.Click += new System.EventHandler(this.navBarControl1_Click); // // timer1 @@ -236,34 +272,46 @@ namespace WinformGeneralDeveloperFrame // // bsi_UserName // - this.bsi_UserName.Caption = "用戶名: 管理員"; + resources.ApplyResources(this.bsi_UserName, "bsi_UserName"); this.bsi_UserName.Id = 29; this.bsi_UserName.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("bsi_UserName.ImageOptions.Image"))); + this.bsi_UserName.ImageOptions.ImageIndex = ((int)(resources.GetObject("bsi_UserName.ImageOptions.ImageIndex"))); + this.bsi_UserName.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("bsi_UserName.ImageOptions.LargeImageIndex"))); + this.bsi_UserName.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("bsi_UserName.ImageOptions.SvgImage"))); this.bsi_UserName.Name = "bsi_UserName"; this.bsi_UserName.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; // // barStaticItem1 // - this.barStaticItem1.Caption = "用戶名: 管理員"; + resources.ApplyResources(this.barStaticItem1, "barStaticItem1"); this.barStaticItem1.Id = 29; this.barStaticItem1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barStaticItem1.ImageOptions.Image"))); + this.barStaticItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("barStaticItem1.ImageOptions.ImageIndex"))); + this.barStaticItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barStaticItem1.ImageOptions.LargeImageIndex"))); + this.barStaticItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barStaticItem1.ImageOptions.SvgImage"))); this.barStaticItem1.Name = "barStaticItem1"; this.barStaticItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; // + // defaultLookAndFeel1 + // + this.defaultLookAndFeel1.LookAndFeel.SkinName = "Office 2007 Silver"; + // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + resources.ApplyResources(this, "$this"); + this.Appearance.BackColor = System.Drawing.Color.White; + this.Appearance.ForeColor = System.Drawing.Color.Transparent; + this.Appearance.Options.UseBackColor = true; + this.Appearance.Options.UseForeColor = true; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1157, 798); this.Controls.Add(this.navBarControl1); this.Controls.Add(this.ribbonStatusBar1); this.Controls.Add(this.ribbonControl1); this.IsMdiContainer = true; this.Name = "MainForm"; this.Ribbon = this.ribbonControl1; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StatusBar = this.ribbonStatusBar1; - this.Text = "主界面"; + this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.MainForm_Load); ((System.ComponentModel.ISupportInitialize)(this.ribbonControl1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTimeEdit1)).EndInit(); @@ -298,6 +346,7 @@ namespace WinformGeneralDeveloperFrame private DevExpress.XtraBars.BarButtonItem barButtonItem2; private DevExpress.XtraBars.BarStaticItem barStaticItem2; private DevExpress.XtraBars.BarButtonItem barButtonItem3; + private DevExpress.LookAndFeel.DefaultLookAndFeel defaultLookAndFeel1; } } diff --git a/WinformGeneralDeveloperFrame/MainForm.resx b/WinformGeneralDeveloperFrame/MainForm.resx index 15d85cb..0b1030d 100644 --- a/WinformGeneralDeveloperFrame/MainForm.resx +++ b/WinformGeneralDeveloperFrame/MainForm.resx @@ -117,61 +117,194 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - 219, 17 - + + skinPaletteRibbonGalleryBarItem1 + + + + -1 + + + -1 + + + barStaticItem1 + + + 3 + + + + + + + bug反馈 + + + barStaticItem3 + + + -1 + + + + + + + + + barStaticItem2 + + + barButtonItem1 + + + 1 + + + -1 + + + DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 关于 + + + $this + + + barListItem1 + + + defaultLookAndFeel1 + + + + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + barEditItem1 + + + 用户名:admin + + + barUserName + - - - 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 - + + 184, 626 + + + -1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + + + + DevExpress.XtraBars.BarEditItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + False + + + bsi_UserName + + + ribbonPage1 + + + -1 + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + barStaticItem3 + + + $this + + + skinPaletteRibbonGalleryBarItem1 + + + barListItem1 + + + ribbonPageGroup1 + + + + + + -1 + + + DevExpress.XtraBars.BarListItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 1165, 798 + + + -1 + + + + + + 0 + + + 用戶名: 管理員 + + + -1 + + + 184 + + + 7, 14 + + + bsi_Date + + + ribbonControl1 + + + + + + barButtonItem2 + + + barButtonItem2 + + + + + + DevExpress.XtraBars.SkinPaletteRibbonGalleryBarItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + @@ -222,4 +355,279 @@ YzbnA2IOwfwxv8w/S5gS57g/AGl5Af+OTEZOAAAAAElFTkSuQmCC + + CenterScreen + + + ribbonGalleryBarItem1 + + + -1 + + + barEditItem1 + + + + + + -1 + + + DevExpress.XtraBars.RibbonGalleryBarItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + + + + + 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 + + + + + + + -1 + + + ribbonGalleryBarItem1 + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + + + + DevExpress.LookAndFeel.DefaultLookAndFeel, DevExpress.Utils.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnabout + + + -1 + + + 帮助 + + + -1 + + + T + + + -1 + + + 0, 775 + + + ribbonStatusBar1 + + + barStaticItem2 + + + 注销 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 1165, 23 + + + -1 + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Left + + + DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + MainForm + + + 8 + + + navBarControl1 + + + -1 + + + repositoryItemTimeEdit1 + + + -1 + + + 1165, 149 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 0, 149 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + -1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + 0, 0 + + + barButtonItem3 + + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + timer1 + + + 主界面 + + + DevExpress.XtraEditors.Repository.RepositoryItemTimeEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + -1 + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 用戶名: 管理員 + + + DateTime + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + + Combo + + + + + + + + + navBarControl1 + + + xtraTabbedMdiManager1 + + + True + + + zh-CN + + + 219, 17 + + + 17, 17 + + + 309, 17 + \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/MainForm.zh-CN.resx b/WinformGeneralDeveloperFrame/MainForm.zh-CN.resx new file mode 100644 index 0000000..94ae15d --- /dev/null +++ b/WinformGeneralDeveloperFrame/MainForm.zh-CN.resx @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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 + + + \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj index b0a2ab7..7e6f5e4 100644 --- a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj +++ b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj @@ -149,6 +149,9 @@ + + + @@ -223,6 +226,18 @@ FrmproductBOM.cs + + Form + + + FrmproductionBOM.cs + + + Form + + + FrmproductionRequisition.cs + Form @@ -448,6 +463,12 @@ FrmproductBOM.cs + + FrmproductionBOM.cs + + + FrmproductionRequisition.cs + Frmquotation.cs @@ -532,6 +553,9 @@ MainForm.cs + + MainForm.cs + ResXFileCodeGenerator