From adb6105fded63aa12af98f699849c292e253a488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sat, 24 Dec 2016 23:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E8=A1=8C=E7=9A=84=E9=87=91=E9=A2=9D?= =?UTF-8?q?=EF=BC=8C=E5=90=88=E8=AE=A1=E9=87=91=E9=A2=9D=EF=BC=8C=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E8=B4=A6=E6=88=B7=EF=BC=8C=E4=BB=98=E6=AC=BE=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E7=AD=89=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=94=B9=E5=8A=A8?= =?UTF-8?q?=E8=BE=83=E5=A4=A7=EF=BC=8C=E4=B8=BA=E4=B8=B4=E6=97=B6=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/action/basic/DepotAction.class | Bin 11270 -> 11236 bytes .../jsh/action/materials/BuildingAction.class | Bin 9008 -> 0 bytes .../action/materials/DepotHeadAction.class | Bin 15954 -> 13796 bytes .../action/materials/DepotItemAction.class | Bin 13989 -> 14029 bytes .../jsh/action/materials/MaterialAction.class | Bin 11319 -> 11380 bytes .../jsh/action/materials/PersonAction.class | Bin 9170 -> 8853 bytes .../com/jsh/dao/materials/BuildingDAO.class | Bin 646 -> 0 bytes .../com/jsh/dao/materials/BuildingIDAO.class | Bin 249 -> 0 bytes .../classes/com/jsh/model/po/Building.class | Bin 1866 -> 0 bytes .../classes/com/jsh/model/po/Building.hbm.xml | 29 - .../classes/com/jsh/model/po/DepotHead.class | Bin 5539 -> 4815 bytes .../com/jsh/model/po/DepotHead.hbm.xml | 39 +- .../classes/com/jsh/model/po/DepotItem.class | Bin 2766 -> 2754 bytes .../com/jsh/model/po/DepotItem.hbm.xml | 6 +- .../classes/com/jsh/model/po/Person.class | Bin 1541 -> 1227 bytes .../classes/com/jsh/model/po/Person.hbm.xml | 3 - .../model/vo/materials/BuildingModel.class | Bin 2971 -> 0 bytes .../model/vo/materials/DepotHeadModel.class | Bin 6148 -> 5509 bytes .../model/vo/materials/DepotItemModel.class | Bin 5546 -> 5534 bytes .../jsh/model/vo/materials/PersonModel.class | Bin 2595 -> 2386 bytes .../service/materials/BuildingIService.class | Bin 269 -> 0 bytes .../service/materials/BuildingService.class | Bin 896 -> 0 bytes .../classes/hibernate/hibernate.cfg.xml | 93 ++- .../spring/basic-applicationContext.xml | 708 +++++++++--------- .../classes/spring/dao-applicationContext.xml | 112 ++- .../classes/struts2/building-struts.xml | 11 - .../easyui-1.3.5/locale/easyui-lang-zh_CN.js | 12 +- WebRoot/pages/manage/user.jsp | 2 +- .../pages/materials/allocation_out_list.jsp | 2 +- WebRoot/pages/materials/other_in_list.jsp | 2 +- WebRoot/pages/materials/other_out_list.jsp | 2 +- WebRoot/pages/materials/person.jsp | 33 +- .../pages/materials/purchase_back_list.jsp | 2 +- WebRoot/pages/materials/purchase_in_list.jsp | 337 ++++++--- WebRoot/pages/materials/sale_back_list.jsp | 2 +- WebRoot/pages/materials/sale_out_list.jsp | 2 +- config/hibernate/hibernate.cfg.xml | 93 ++- config/spring/basic-applicationContext.xml | 708 +++++++++--------- config/spring/dao-applicationContext.xml | 112 ++- config/struts2/building-struts.xml | 11 - sql/jsh_erp.sql | 65 +- src/com/jsh/action/basic/DepotAction.java | 18 +- .../action/materials/AccountHeadAction.java | 1 - .../jsh/action/materials/BuildingAction.java | 274 ------- .../jsh/action/materials/DepotHeadAction.java | 88 +-- .../jsh/action/materials/DepotItemAction.java | 17 +- .../jsh/action/materials/MaterialAction.java | 5 +- .../jsh/action/materials/PersonAction.java | 7 +- src/com/jsh/dao/materials/BuildingDAO.java | 17 - src/com/jsh/dao/materials/BuildingIDAO.java | 9 - src/com/jsh/model/po/Building.hbm.xml | 29 - src/com/jsh/model/po/Building.java | 70 -- src/com/jsh/model/po/DepotHead.hbm.xml | 39 +- src/com/jsh/model/po/DepotHead.java | 86 +-- src/com/jsh/model/po/DepotItem.hbm.xml | 6 +- src/com/jsh/model/po/DepotItem.java | 14 +- src/com/jsh/model/po/Person.hbm.xml | 3 - src/com/jsh/model/po/Person.java | 12 +- .../jsh/model/vo/materials/BuildingModel.java | 133 ---- .../model/vo/materials/BuildingShowModel.java | 37 - .../model/vo/materials/DepotHeadModel.java | 65 +- .../model/vo/materials/DepotItemModel.java | 10 +- .../jsh/model/vo/materials/PersonModel.java | 12 - .../service/materials/BuildingIService.java | 9 - .../service/materials/BuildingService.java | 24 - 65 files changed, 1292 insertions(+), 2079 deletions(-) delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/action/materials/BuildingAction.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/dao/materials/BuildingDAO.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/dao/materials/BuildingIDAO.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/model/po/Building.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/model/po/Building.hbm.xml delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/BuildingModel.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingIService.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingService.class delete mode 100644 WebRoot/WEB-INF/classes/struts2/building-struts.xml delete mode 100644 config/struts2/building-struts.xml delete mode 100644 src/com/jsh/action/materials/BuildingAction.java delete mode 100644 src/com/jsh/dao/materials/BuildingDAO.java delete mode 100644 src/com/jsh/dao/materials/BuildingIDAO.java delete mode 100644 src/com/jsh/model/po/Building.hbm.xml delete mode 100644 src/com/jsh/model/po/Building.java delete mode 100644 src/com/jsh/model/vo/materials/BuildingModel.java delete mode 100644 src/com/jsh/model/vo/materials/BuildingShowModel.java delete mode 100644 src/com/jsh/service/materials/BuildingIService.java delete mode 100644 src/com/jsh/service/materials/BuildingService.java diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class index 14ef4bcc92a6301ec2464b17b70d3d8c61f8fada..b945f52673029be229b432dddac82ded70e723a8 100644 GIT binary patch delta 598 zcmZXR&1+LZ6vfYZF(JmJV$!@M7{Bwhd1Hx$T0bBZv7$o7O==QQ5Nf(onzk-13L>I{ z;KrfgLbCB6uso^S+QiRR+~~rUuEf@ri&jM{YW2Rfir{AMy=Uh9?wy&-#py!e#llz( zK$g!(0#k-JIM_FE+IejZukuZg>zOg_^fgzxl zW*NX7gP3QNQ@1V{=i~4*fhHzlat+pVEi7(8D>q^nH=&a$9Oh;exdlg=#vm2WaVxH} z6*rhcm07%F8{V^>5$mJ%Bxhc0^ks0PQ4|? z<=5bWA@UCWF|G39Y`E<{+C3uTw*r1tzqrtUI9DkPnC{o; zPj)JCs^N5-K?YqMgsk(S&M3><4=)FFNv-od;$wYQSvs$h`hoJtCgd7KNL-f7bKUkR TpXj$Lx$>D*1}Ax^5vP6waD{*& delta 682 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 rwF1WD_}HPxIN+cUthLU7l>vOMkb44phCe> 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 delta 871 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 khe#?3wwjQfPDf>bPgi} WGZ3=^y~n`7#J~G#3E7heWmj diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/Building.class b/WebRoot/WEB-INF/classes/com/jsh/model/po/Building.class deleted file mode 100644 index d3812833995923f0a6a474d8b7b55e2316bb6df1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1866 zcmaKr+fEZ<6ouE6c1mjzY|Ci?YXzk(hfzRLA(#M?m^7Gx;eKc*Ww7m#QoQiWN7BT` z#0ww5hcd1`hj!Xd4Wa+vnYGvc_Mw0N{`w7I3;S_I6wFubhJJl}r8n%VS=VoD{qWAJ zSFL6(j;MmEYvZ$_*NtXP|8RM2R@!l>3bM{q%hu1$mSxnfFUDovR1kSzWkk6bQns75 zJq59h-#-87ma z+_#!m`#`~1p?E>hBbJoJ7_uo$;emq5veh(C?;4k8>!VAYF54BOeqpc*8ha0;?JMh6 z!NM@D-x}u16aolNoyCg;7?naC;|k6S!{KhRfjFZ)&h{nm&N)seS1=uHuJ>Ln614D_Awji&Px5(pH>UgC{q`wHGN3D(31;v$ zk|KF--?b{{i6sj?;SYRMb{cs$dyM}v{zYWW{2fJP9?r>WI45V}oSX#D3F^6g{7m!P zHcy3Ttn?F^?~ZJmpGn$)VNr(6I5$UxS` z>p0E0YR^eB3AR8?VbSyaN==NBn(w((TJIoN+UOu(nvZs{+{>XsrE-=z=9pui>!vZ= z0&j~>z8%-8n@@AvBh_el!U~05!&BabRl_PPj*_E*qDQ0ibX)WT+Bb?KkQS-V!(3>4 zO5OGxP%SCcf!4SUUMAd1pe - - - - - - - - - - - - - 名称 - - - - - 备注 - - - - - 启用 - - - - diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.class b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.class index 62f067904f18fbce4b77ed0476090959f8bc742f..ff405213a9362bcd1fca9f96dd1254d2feb9d974 100644 GIT binary patch literal 4815 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 - 采购/领料-经手人Id + 经手人Id - - - 仓管员-经手人Id + + + 账户Id - - - 现金/记账 + + + 变动金额(收款/付款) - - - 单元Id - - 调拨时，对方项目Id + + + 合计金额 + + 备注 - - - 草稿/已生效/废弃/待审核/未通过 - - - - - 撤审人 - - - - - 撤审原因 - - diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.class b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.class index f442364c9aa8d1e2c27eacf6cf0c81dad234c07b..47455307b8d780f72c6e3f14d7e35b6ce392a86b 100644 GIT binary patch delta 68 zcmX>ndPsD_cTNt+oScB7%;eO~%!~&aIXMzx+zU(@j8fd`sUkdQNo0cOGufyyVQ3)Vz|!oZ?N42N`*|GZ6xtPcdaMD)6PJmLREOWZ)}C5!md* HQpN@Vr}G@` diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.hbm.xml b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.hbm.xml index 558018e2..c6de4ed9 100644 --- a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.hbm.xml +++ b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.hbm.xml @@ -27,9 +27,9 @@ 单价 - - - 运杂费 + + + 金额 diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.class b/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.class index f949b757ab2be2d16ed6877b397d1ab2c6976047..bf6861e2bb75909affe2671830e6dc1fbc356529 100644 GIT binary patch literal 1227 zcmZ{jZ)?*~6vm&Mrj705x@BEwH{CyVYdcv$Un+Ye41_X;j)5=JE_5kvGTKbgPo>}x zeBlT1Ly6D*vo$N}i{6{ud(Lxy&pGMef4~0#c#R_mmcT|o8T-TOl|N1{!;ycT_@Bbb zG>IM90xQGdOW==!c;J8R4a0uwpd?UJr%~c}!$}m3qHjTO6be`$E}7AprF4>b@K(S+ z|9Z`9FLTpPCy~B83&y-Fy^G=~JrO80TNliDPnHS_SaIRvu|TyG#o^h_xED^&buq7# z^n=kwKmZmuhjw}uO$8dA1)d1A*34iiz}7_>Y=a92j|2|0_XabQVNP_;ri(HvGW)5E zB~%EWDyw#^TonglDtqEJTNw${mEu%iS`i~0M(Qrr9>m`F$zik(SkD2JJ(Ci;nKD*C zRl3Q|q#vF}ay(0VuE%md*dug-zam#lI_DQ*NjGYz7w*y+yU%r*Z*RB@?#1>mRDYWj&=-H_BQ`){vMI z!o?G#`I#{)^G>tTesznjnXpGm5XB}&8FhkeDDhoW@J_snXDlH7Rk5v13G86kl<~Q1 z?>|xh&LE4NKuH~L=K9{d_kF@>>AN)NS$A%mBiPCKEt$?q^?l>_IbP&|H0D9}b3tC> zz$8BaY0P@0K@JFVxBx`=hJTJ+kga);b}mRWA0#s@4RTBne*uUbjT}Ww&7l1sHjAv> literal 1541 zcmZ{iT~8B17=_Qa+YicGuq;q02qK9&zJG#b3nkeD=J0^xos8(7kINxPWnuhK+f z;)OrJA7wo6%+fCH_M$t}ne(1`-ZS&}-|s&F_OPEr%D{XxXgk-vE2kY?crE89a6Wt8 zUeL+GG%$VbesP_a+qra(&#%2^m_ycptycZOIq|x_+w#A;=Pl1b>eB@)8iSHX(7AkT zAami}1fhX)W8|ohvO|e^`t^nmrC9Mv*!5MpdE~aamwo4V{P4g)x>`G9#RuXRkVeTu z5mN@H8h*z+x^16(-BZm|Y6MNUb>@Xf>!@1J6;Fr-nNVOfg7 z##7EDwr5z6PIfrzIDVr1o$?edfvj3wN{r%pKZ*mYC5r4&3_8qJ;;zLa$oAo~co9YL z64eBd$}q@!B1jGOsQ3X$WssN#sS>0%21K5WB(Q)&EDwY15M*}@ nh+L9@IEf%D!yvB`L3WZsVsA(%@|qxT#(>Bh5s+Q=820`HpXB3< diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.hbm.xml b/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.hbm.xml index 8b71ec75..f3e03159 100644 --- a/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.hbm.xml +++ b/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.hbm.xml @@ -7,9 +7,6 @@ - - - 类型 diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/BuildingModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/BuildingModel.class deleted file mode 100644 index 91672c50b9b620aaff7de4fac6081b1ca906e74f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2971 zcmb7^Yf~Fl7{~t$fskdnG+fl8t)-|TASp$P6hwuV8kz!VjKPR`%&dCgYk({&VJeS{jZvX!G*FOMmBNs-OfmqfnBu>i5 ziGp|Nh6U)E}6faw@|0(*Zqco*8R(8p?~`bQQ8Lkus}{!bMi_4!n0=i`o0!1W2n<}e5Jq1g zZWw@k-?Y#VOLp&B7=UHs15AezGjOF9m-?$L#4*E{pWFE}XXnVkcW&CVHX^XBUvYBq(&{T>@K;xgcvR={AJ01x^pvD@rQHXZx2pF*v(P%Np!Ru`0hl?RG|?8U%FvwcOi z^<}2Lvr^XCbY*Zw8(^xy<|K`{!Q^%G*8>w>(x056U6M<+vOm?z?o=!LO0Db=wX#3d z%I;7rdqb`446b9e%aOtVH~ICO@&jzdU*fI!-)H0`ww8@F6zo7#(ul;3lqP22+^FG?pl} ziUq7wZjI6wfrx=m@flYGpYx`MnBXdRJ@G$r?GJ9cAWnMK;T@lHPg8jV_v*@Pl2mbagYC*oo4|U~M`%ZA! z1VKs!DR%&o;U^%r7GyaHa;^o*=s}i)AQuGrsRM{iUjfN#Q?n9G&CgnpLw#y|Gq*O- Sej&)O9YAFK3y7m~aP&VD7wm-q diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotHeadModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotHeadModel.class index cb952e7c8a3121f9325f02f6c56938142c36cd27..3e6248fb22623224e16a7ddf995c114ab9df36f9 100644 GIT binary patch literal 5509 zcmb7``*Raj6vt0WNl3bV&;ma2g%4%^8qUHQC-YRM8-2?k%TpD#3NHyB%x=Gw5i84kq#qeW!D+{a1W0KsMJSQ z`znCS1FObi)mA64|FjC8+|®_ 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 diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotItemModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotItemModel.class index 6bb52bdd4f38dd0cecbcd8b1dc1e6a36ca0831bc..7b4500532feebe886ef9c7e4e9cd6e28b774b80f 100644 GIT binary patch delta 75 zcmZ3bJx_ZB6C)>wV@^&$QD$=LW3cQHbok%1!- Krm2e6KmY&|92B7d delta 87 zcmbQIy-Irn6C)3|XI^qN!5+p%R21bTb9tM5}UPcDKViYMx N2JTEG-Fd7A0swob8ZrO? diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/PersonModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/PersonModel.class index 6b62987ce929b89e463fffb72f6ff8f8fc3f03a0..19202e2d29e726ffbfb623450737ea6a226ce98e 100644 GIT binary patch literal 2386 zcma)+>rN9v6vzKlN|!FHKmkEP5m9Wn$|`uJiWd|u)`HZKsENr^S6FPjq%9bI1K-6D zn%HPG@d11&<2kcSTi0puLp!%~`OP{1*##)+xmz-B?E#MhpyMNW)P9^ZzfP zV-zEC2#g!h(9?qx0^s#Yg9e>vrwsH$*Kr!t8qNqDZe5gbVBjp00@|Kk+I3c53k)Wg zQ{h{39Mgb-Lp(cY;IJQi#y}tXdGCUO0e?1YAOT&VFXvXA{BC)}sXq0)l*oBSyR>do z!>Mb*X0*QLQst5dcTM(}x?*fP^=1bJW|FCceVg{|U;E47`j6BtckY=+0KRI5D0i!z zP2Fge!8aIA{(COlUYDxlNWR9{#h*nhQgpp^#PJ3u~a& z{}>YMx)S6Oa)EP8tYh@7!XVEHOspn=4~W zm+oHEGmz=-2QQSafu+isUTP=OYgFCt1Y*AYj6N$vrq-Z5am`DL=Wgo_y%c-Ml7$w|C#0J6SnVG5Sau32~sRu&)NLlZX)oI8DA z3waa_n8$AO$lH2uU^c&5h}~SpMC{zOa1L3SePm%ewCz}!!Fk#H*g`IxePUr2mVxPt z-}b6Utv#=^6J{(|3F>Zh*JbjV!Dutx+xHo{{Mi{)xn_E-hSwWp(?Bs_I9qohFZ$h6 z`pz4;9;!>u1Rz#HIRc!H>6%33p2b9DLw7Oh*?dx1OlA&;6=~9ZSb=k=EDvhX3 z`M9y@Tvb(1Rj^nJ>s3_3S-PzXcuMXtsNpFd4_E4b(HT=C@j5x=QfUs#oK?(1SNem! zbiSI{UEBtRkju!b?V-RFC9J;dR2KZN`!HhaUJ7-oS{ug!SkU> zNto5hf>$HUU5zYPHL_UM$Wm1!3ssFQQ;xH=$Ij#T0$0B(`@ow03UAy0;L_7qxZKAT zJNI563+lUQXa2(VK5VsGvS+e=6zy~$%W7lg4`uuozqSIHK$@V_?2mc6xXj-*ETF)K zbSQC)-&IWDQ_5R}pljU59gYS*!{-r}!%@!0?LTqlcTQ4N1l447C8j(+P+p~>@J=O4 zr$pMm$(s!EvTFA>qj^VJxDZN37R0(lSRCKQ7m=+vNGS=jss;HHU+F+fNstmj?u`Js z&qxZ$Iv!|17Lp+MwIE+(LkF^u1lb_S!x114Rgw&RqXk(^f^2F*%6gE+BuJGYTO&X= zBam;ksj-tFkF_8beQN9^$Sy&ii~x}?lhi!YMr0`o@}m}{s*lK0667a>{5%3g+FU@k zu+6VDbG%rKzi}hpHG5i+@9;QM9(E1;znBDhPLRe35P4?=q^1Q~PJ$e0L3Z>Y%Sn(n sL4pw=^3Vy$_uAB~BvaGTg6!&36MN>ucjTBLFGhgKODiBxR1SXlAA!!AN&o-= diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingIService.class b/WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingIService.class deleted file mode 100644 index 91fb4834c6e10c746543dd7a50f882b7002b1f59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmX^0Z`VEs1_mPrZgvJHMh30q{9OI4;tc)b)S|M?l=VWY+5iFDz?|>w?U5w(!W=>VRlp4yFSA%|A`ZuEONQRk)XA7q#s3-E{U?%LTfMGW+I$Ch7 zmueRS874D{H1Cwt{C`AOS~)Px7hqwWNV+mScS99EoH`;P4YTD+<5t`Y?g+QbqafAF zHC5LY;lQU34t^t!(!zZjfWz;+^tEdBnuS${}lAhvD_q7@Z zJ1z0^ssAsYri~tH@&{_zqRE)F#%LLOK=d=UPj5+ff;>(;qkXLUg2EFW3>3*`qo9Qn zoeM(%rZ7z&y*Osc>f}114UMkuK4b1HJ0C@hRJIf`EDTXGgJ#!K=zC!Si*&a{90ryn e&OM52LFUZLV-)_9GyhGF8Iu`Ui%{z^$;Kyd^V!}2 diff --git a/WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml b/WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml index 366b9e51..a7f61903 100644 --- a/WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml +++ b/WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml @@ -1,47 +1,46 @@ - - - - - - - org.hibernate.dialect.MySQL5Dialect - - true - - update - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + org.hibernate.dialect.MySQL5Dialect + + true + + update + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml b/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml index 2f391ae5..ec9d563d 100644 --- a/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml +++ b/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml @@ -1,360 +1,348 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml b/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml index e2a57851..8261312c 100644 --- a/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml +++ b/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml @@ -1,57 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebRoot/WEB-INF/classes/struts2/building-struts.xml b/WebRoot/WEB-INF/classes/struts2/building-struts.xml deleted file mode 100644 index be7b854b..00000000 --- a/WebRoot/WEB-INF/classes/struts2/building-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/WebRoot/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js b/WebRoot/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js index 21729608..24a3a18a 100644 --- a/WebRoot/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js +++ b/WebRoot/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js @@ -14,23 +14,23 @@ if ($.messager){ $.messager.defaults.cancel = '取消'; } if ($.fn.validatebox){ - $.fn.validatebox.defaults.missingMessage = '该输入项为必输项'; + $.fn.validatebox.defaults.missingMessage = '必填'; $.fn.validatebox.defaults.rules.email.message = '请输入有效的电子邮件地址'; $.fn.validatebox.defaults.rules.url.message = '请输入有效的URL地址'; $.fn.validatebox.defaults.rules.length.message = '输入内容长度必须介于{0}和{1}之间'; $.fn.validatebox.defaults.rules.remote.message = '请修正该字段'; } if ($.fn.numberbox){ - $.fn.numberbox.defaults.missingMessage = '该输入项为必输项'; + $.fn.numberbox.defaults.missingMessage = '必填'; } if ($.fn.combobox){ - $.fn.combobox.defaults.missingMessage = '该输入项为必输项'; + $.fn.combobox.defaults.missingMessage = '必填'; } if ($.fn.combotree){ - $.fn.combotree.defaults.missingMessage = '该输入项为必输项'; + $.fn.combotree.defaults.missingMessage = '必填'; } if ($.fn.combogrid){ - $.fn.combogrid.defaults.missingMessage = '该输入项为必输项'; + $.fn.combogrid.defaults.missingMessage = '必填'; } if ($.fn.calendar){ $.fn.calendar.defaults.weeks = ['日','一','二','三','四','五','六']; @@ -40,7 +40,7 @@ if ($.fn.datebox){ $.fn.datebox.defaults.currentText = '今天'; $.fn.datebox.defaults.closeText = '关闭'; $.fn.datebox.defaults.okText = '确定'; - $.fn.datebox.defaults.missingMessage = '该输入项为必输项'; + $.fn.datebox.defaults.missingMessage = '必填'; $.fn.datebox.defaults.formatter = function(date){ var y = date.getFullYear(); var m = date.getMonth()+1; diff --git a/WebRoot/pages/manage/user.jsp b/WebRoot/pages/manage/user.jsp index 50a11794..270e2f83 100644 --- a/WebRoot/pages/manage/user.jsp +++ b/WebRoot/pages/manage/user.jsp @@ -46,7 +46,7 @@ 查询   重置   分配角色   - 分配部门 + 分配仓库 diff --git a/WebRoot/pages/materials/allocation_out_list.jsp b/WebRoot/pages/materials/allocation_out_list.jsp index 784828b8..a2f152cf 100644 --- a/WebRoot/pages/materials/allocation_out_list.jsp +++ b/WebRoot/pages/materials/allocation_out_list.jsp @@ -78,7 +78,7 @@ - 仓管员： + 经手人： diff --git a/WebRoot/pages/materials/other_in_list.jsp b/WebRoot/pages/materials/other_in_list.jsp index de2dfa79..648755fc 100644 --- a/WebRoot/pages/materials/other_in_list.jsp +++ b/WebRoot/pages/materials/other_in_list.jsp @@ -80,7 +80,7 @@ - 仓管员： + 经手人： diff --git a/WebRoot/pages/materials/other_out_list.jsp b/WebRoot/pages/materials/other_out_list.jsp index 40401ef5..2bda9552 100644 --- a/WebRoot/pages/materials/other_out_list.jsp +++ b/WebRoot/pages/materials/other_out_list.jsp @@ -78,7 +78,7 @@ - 仓管员： + 经手人： diff --git a/WebRoot/pages/materials/person.jsp b/WebRoot/pages/materials/person.jsp index 42510c16..c26d29a7 100644 --- a/WebRoot/pages/materials/person.jsp +++ b/WebRoot/pages/materials/person.jsp @@ -26,16 +26,15 @@
- + @@ -60,25 +59,20 @@
仓库：姓名： - + 类型：
- - - - - +
仓库 - -
类型
姓名 + +
@@ -184,13 +178,12 @@ pageList: initPageNum, columns:[[ { field: 'Id',width:35,align:"center",checkbox:true}, - { title: '仓库',field: 'ProjectName',width:180}, - { title: '类型',field: 'Type',width:180}, - { title: '经手人',field: 'Name',width:180}, + { title: '姓名',field: 'Name',width:180}, + { title: '类型',field: 'Type',width:180}, { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec) { var str = ''; - var rowInfo = rec.Id + 'AaBb' + rec.ProjectId+ 'AaBb' + rec.Type+ 'AaBb' + rec.Name; + var rowInfo = rec.Id + 'AaBb' + rec.Type+ 'AaBb' + rec.Name; if(1 == value) { str += ' 编辑  '; @@ -403,7 +396,6 @@ dataType: "json", async : false, data: ({ - ProjectId : $.trim($("#ProjectId").val()), Type : $.trim($("#Type").val()), Name : $.trim($("#Name").val()), clientIp:'<%=clientIp %>' @@ -442,16 +434,15 @@ var personInfo = personTotalInfo.split("AaBb"); $("#clientIp").val('<%=clientIp %>'); - $("#ProjectId").focus().val(personInfo[1]); - $("#Type").val(personInfo[2]); - $("#Name").val(personInfo[3]); + $("#Type").val(personInfo[1]); + $("#Name").val(personInfo[2]); //orgPerson = personInfo[1]; $('#personDlg').dialog('open').dialog('setTitle',' 编辑经手人信息'); $(".window-mask").css({ width: webW ,height: webH}); personID = personInfo[0]; //焦点在名称输入框==定焦在输入文字后面 - $("#Name").val("").focus().val(personInfo[3]); + $("#Name").val("").focus().val(personInfo[2]); url = '<%=path %>/person/update.action?personID=' + personInfo[0]; } @@ -479,7 +470,7 @@ url: "<%=path %>/person/findBy.action", dataType: "json", data: ({ - ProjectId:$.trim($("#searchProjectId").val()), + Name:$.trim($("#searchName").val()), Type:$.trim($("#searchType").val()), pageNo:pageNo, pageSize:pageSize diff --git a/WebRoot/pages/materials/purchase_back_list.jsp b/WebRoot/pages/materials/purchase_back_list.jsp index 1a38139e..02e2e56b 100644 --- a/WebRoot/pages/materials/purchase_back_list.jsp +++ b/WebRoot/pages/materials/purchase_back_list.jsp @@ -80,7 +80,7 @@ - 仓管员： + 经手人： diff --git a/WebRoot/pages/materials/purchase_in_list.jsp b/WebRoot/pages/materials/purchase_in_list.jsp index 35c6ce99..0c79e3a5 100644 --- a/WebRoot/pages/materials/purchase_in_list.jsp +++ b/WebRoot/pages/materials/purchase_in_list.jsp @@ -31,11 +31,11 @@ - 单据号： + 单据编号： - 入库时间： + 单据日期： @@ -64,40 +64,38 @@ 收货仓库： - + - 入库时间： + 单据日期： - + - 供应商： + 供货单位： - + - 采购人： + 经手人： - + - - 仓管员： + + 付款账户： - + - 结算方式： + 付款金额： - + - 备注： + 单据编号： - - - 单据号： - + + 单据备注： + + + 商品列表： @@ -119,39 +117,39 @@ - - - + - - + - - + - - + - - + - - - - + + + + @@ -184,6 +182,10 @@ initSelectInfo_UB(); initSystemData_depot(); initSelectInfo_depot(); + initSystemData_person(); + initSelectInfo_person(); + initSystemData_account(); + initSelectInfo_account(); initSupplier(); //供应商 initTableData(); ininPager(); @@ -233,7 +235,7 @@ { if(userBusinessList.length>0) { - //用户对应的部门列表 [1][2][3]... + //用户对应的仓库列表 [1][2][3]... userdepot =userBusinessList[0].value; } } @@ -297,11 +299,11 @@ } //初始化系统基础信息 - function initSystemData_person(ProjectSearch) + function initSystemData_person() { $.ajax({ type:"post", - url: "<%=path%>/person/getBasicData.action?ProjectId="+ProjectSearch, + url: "<%=path%>/person/getBasicData.action", //设置为同步 async:false, dataType: "json", @@ -321,7 +323,6 @@ function initSelectInfo_person() { var options1 = ""; - var options2 = ""; if(personList !=null) { @@ -332,30 +333,50 @@ { personID = person.id; } - if(person.type=="采购人") + if(person.type=="仓管员") { options1 += ''; - } - else if(person.type=="仓管员") - { - options2 += ''; - } + } } $("#HandsPersonId").empty().append(options1); - $("#WareHousePersonId").empty().append(options2); } } - - $("#ProjectId").change( - function(){ - var ProjectId=$("#ProjectId").val(); - if(ProjectId!='') + //获取账户信息 + function initSystemData_account() + { + $.ajax({ + type:"post", + url: "<%=path%>/account/getAccount.action", + //设置为同步 + async:false, + dataType: "json", + success: function (systemInfo) + { + accountList = systemInfo.showModel.map.accountList; + var msgTip = systemInfo.showModel.msgTip; + if(msgTip == "exceptoin") { - initSystemData_person(ProjectId); - initSelectInfo_person(); - } + $.messager.alert('提示','查找账户信息异常,请与管理员联系！','error'); + return; + } } - ); + }); + } + //获取账户信息 + function initSelectInfo_account() + { + var options = ""; + if(accountList !=null) + { + options = ""; + for(var i = 0 ;i < accountList.length;i ++) + { + var account = accountList[i]; + options += ''; + } + $("#AccountId").empty().append(options); + } + } //防止表单提交重复 function initForm() @@ -394,19 +415,18 @@ pageList: initPageNum, columns:[[ { field: 'Id',width:35,align:"center",checkbox:true}, - { title: '单据号',field: 'Number',width:100}, - { title: '入库时间 ',field: 'OperTime',width:100}, + { title: '单据编号',field: 'Number',width:100}, + { title: '单据日期 ',field: 'OperTime',width:100}, { title: '创建时间',field: 'CreateTime',width:100}, { title: '操作员',field: 'OperPersonName',width:100}, - { title: '备注',field: 'Remark',width:100}, + { title: '单据备注',field: 'Remark',width:100}, { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec) { var str = ''; var rowInfo = rec.Id + 'AaBb' + rec.ProjectId+ 'AaBb' + rec.Number+ 'AaBb' + rec.OperPersonName + 'AaBb' + rec.OperTime+ 'AaBb' + rec.OrganId+ 'AaBb' + rec.HandsPersonId - + 'AaBb' + rec.WareHousePersonId+ 'AaBb' + rec.SettlementWay+ 'AaBb' + rec.Remark - + 'AaBb' + rec.ProjectName+ 'AaBb' + rec.OrganName+ 'AaBb' + rec.HandsPersonName+ 'AaBb' + rec.WareHousePersonName - + 'AaBb' + rec.ReAuditPersonName+ 'AaBb' + rec.Reason; + + 'AaBb' + rec.AccountId+ 'AaBb' + rec.ChangeAmount+ 'AaBb' + rec.Remark + + 'AaBb' + rec.ProjectName+ 'AaBb' + rec.OrganName+ 'AaBb' + rec.HandsPersonName+ 'AaBb' + rec.AccountName + 'AaBb' + rec.TotalPrice; if(1 == value) { str += ' 查看  '; @@ -446,7 +466,7 @@ } //初始化表格数据-商品列表-编辑状态 - function initTableData_material() + function initTableData_material(type,TotalPrice) { $('#materialData').datagrid({ height:300, @@ -460,34 +480,34 @@ //fitColumns:true, //单击行是否选中 //checkOnSelect : false, - url:'<%=path %>/depotItem/findBy.action?HeaderId=' + depotHeadID, pagination: true, //交替出现背景 striped : true, + showFooter: true, //loadFilter: pagerFilter, onClickRow: onClickRow, pageSize: 50, pageList: [50,100,150], columns:[[ - { field: 'Id',width:35,align:"center",checkbox:true}, - { title: '名称',field: 'MaterialId',width:230, - formatter:function(value,row,index){ - return row.MaterialName; - }, - editor:{ - type:'combobox', - options:{ - valueField:'Id', - textField:'MaterialName', - method:'get', - url: "<%=path%>/material/findBySelect.action" - } - } - }, - { title: '数量',field: 'OperNumber',editor:'validatebox',width:50}, - { title: '单价',field: 'UnitPrice',editor:'validatebox',width:50}, - { title: '备注',field: 'Remark',editor:'validatebox',width:150}, - { title: '图片',field: 'Img',editor:'validatebox',width:110}, + { field: 'Id',width:35,align:"center",checkbox:true}, + { title: '商品名称',field: 'MaterialId',width:230, + formatter:function(value,row,index){ + return row.MaterialName; + }, + editor:{ + type:'combobox', + options:{ + valueField:'Id', + textField:'MaterialName', + method:'get', + url: "<%=path%>/material/findBySelect.action" + } + } + }, + { title: '数量',field: 'OperNumber',editor:'validatebox',width:50}, + { title: '单价',field: 'UnitPrice',editor:'validatebox',width:50}, + { title: '金额',field: 'AllPrice',editor:'validatebox',width:50}, + { title: '备注',field: 'Remark',editor:'validatebox',width:150} ]], toolbar:[ { @@ -524,11 +544,31 @@ return; } }); - } - + $.ajax({ + type:"post", + url:'<%=path %>/depotItem/findBy.action?HeaderId=' + depotHeadID, + dataType: "json", + success: function (res) { + var AllPrice = 0 + if(type === "edit") { + AllPrice = TotalPrice; + } + var array = []; + array.push({ + "AllPrice": AllPrice + }); + res.footer = array; + $("#materialData").datagrid('loadData',res); + + }, + error:function() { + $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); + } + }); + } //初始化表格数据-商品列表-查看状态 - function initTableData_material_show() + function initTableData_material_show(TotalPrice) { $('#materialDataShow').datagrid({ height:300, @@ -542,21 +582,21 @@ //fitColumns:true, //单击行是否选中 //checkOnSelect : false, - url:'<%=path %>/depotItem/findBy.action?HeaderId=' + depotHeadID, pagination: true, //交替出现背景 striped : true, + showFooter: true, //loadFilter: pagerFilter, onClickRow: onClickRow, pageSize: 50, pageList: [50,100,150], columns:[[ { field: 'Id',width:35,align:"center",checkbox:true}, - { title: '名称',field: 'MaterialName',width:230}, + { title: '商品名称',field: 'MaterialName',width:230}, { title: '数量',field: 'OperNumber',width:50}, { title: '单价',field: 'UnitPrice',width:50}, - { title: '备注',field: 'Remark',width:150}, - { title: '图片',field: 'Img',width:110}, + { title: '金额',field: 'AllPrice',width:50}, + { title: '备注',field: 'Remark',width:150} ]], onLoadError:function() { @@ -564,6 +604,24 @@ return; } }); + $.ajax({ + type:"post", + url:'<%=path %>/depotItem/findBy.action?HeaderId=' + depotHeadID, + dataType: "json", + success: function (res) { + var AllPrice = TotalPrice; + var array = []; + array.push({ + "AllPrice": AllPrice + }); + res.footer = array; + $("#materialDataShow").datagrid('loadData',res); + + }, + error:function() { + $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); + } + }); } //初始化键盘enter事件 @@ -724,7 +782,7 @@ orgDepotHead = ""; depotHeadID = 0; - initTableData_material(); //商品列表 + initTableData_material("add"); //商品列表 reject(); //撤销下、刷新商品列表 url = '<%=path %>/depotHead/create.action'; } @@ -750,8 +808,9 @@ OperTime: $("#OperTime").val(), OrganId: $('#OrganId').combobox('getValue'), HandsPersonId: $.trim($("#HandsPersonId").val()), - WareHousePersonId: $.trim($("#WareHousePersonId").val()), - SettlementWay: $.trim($("#SettlementWay").val()), + AccountId: $.trim($("#AccountId").val()), + ChangeAmount: $.trim($("#ChangeAmount").val()), + TotalPrice: $("#depotHeadFM .datagrid-footer [field='AllPrice'] div").text(), Remark: $.trim($("#Remark").val()), clientIp:'<%=clientIp %>' }), @@ -810,16 +869,17 @@ $("#OperTime").val(depotHeadInfo[4]); $('#OrganId').combobox('setValue', depotHeadInfo[5]); $("#HandsPersonId").val(depotHeadInfo[6]); - $("#WareHousePersonId").val(depotHeadInfo[7]); - $("#SettlementWay").val(depotHeadInfo[8]); + $("#AccountId").val(depotHeadInfo[7]); + $("#ChangeAmount").val(depotHeadInfo[8]); $("#Remark").val(depotHeadInfo[9]); + var TotalPrice = depotHeadInfo[14]; //orgDepotHead = depotHeadInfo[1]; $('#depotHeadDlg').dialog('open').dialog('setTitle',' 编辑采购入库信息'); $(".window-mask").css({ width: webW ,height: webH}); depotHeadID = depotHeadInfo[0]; - initTableData_material(); //商品列表 + initTableData_material("edit",TotalPrice); //商品列表 reject(); //撤销下、刷新商品列表 url = '<%=path %>/depotHead/update.action?depotHeadID=' + depotHeadInfo[0]; } @@ -833,16 +893,15 @@ $("#OperTimeShow").text(depotHeadInfo[4]); $('#OrganIdShow').text(depotHeadInfo[11]); $("#HandsPersonIdShow").text(depotHeadInfo[12]); - $("#WareHousePersonIdShow").text(depotHeadInfo[13]); - $("#SettlementWayShow").text(depotHeadInfo[8]); + $("#AccountIdShow").text(depotHeadInfo[13]); + $("#ChangeAmountShow").text(depotHeadInfo[8]); $("#RemarkShow").text(depotHeadInfo[9]); - var audit=(depotHeadInfo[14]!="undefined"&&depotHeadInfo[15]!="undefined"&&depotHeadInfo[14]!=""&&depotHeadInfo[15]!="")?" 撤审人:"+depotHeadInfo[14]+" 撤审原因:"+depotHeadInfo[15]:""; - audit=""+audit+""; - $('#depotHeadDlgShow').dialog('open').dialog('setTitle',' 查看采购入库信息'+audit); + var TotalPrice = depotHeadInfo[14]; + $('#depotHeadDlgShow').dialog('open').dialog('setTitle',' 查看采购入库信息'); $(".window-mask").css({ width: webW ,height: webH}); depotHeadID = depotHeadInfo[0]; - initTableData_material_show(); //商品列表-查看状态 + initTableData_material_show(TotalPrice); //商品列表-查看状态 } //搜索处理 @@ -909,7 +968,59 @@ $("#searchBtn").click(); } }); - + //自动计算事件 + function autoReckon() { + //延时绑定事件 + setTimeout(function(){ + var body =$("#depotHeadFM .datagrid-body"); + var footer =$("#depotHeadFM .datagrid-footer"); + var input = ".datagrid-editable-input"; + + //修改单价，自动计算金额和合计 + body.find("[field='UnitPrice']").find(input).off("keyup").on("keyup",function(){ + var UnitPrice =$(this).val()-0; //单价 + var TotalPrice = 0; + var OperNumber = body.find("[field='OperNumber']").find(input).val(); //数量 + body.find("[field='AllPrice']").find(input).val((UnitPrice*OperNumber).toFixed(2)); + body.find("[field='AllPrice']").each(function(){ + if($(this).find("div").text()!==""){ + TotalPrice = TotalPrice + parseFloat($(this).find("div").text().toString()); + } + }); + TotalPrice = TotalPrice + UnitPrice*OperNumber; + footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2)); + }); + //修改数量，自动计算金额和合计 + body.find("[field='OperNumber']").find(input).off("keyup").on("keyup",function(){ + var UnitPrice = body.find("[field='UnitPrice']").find(input).val(); //单价 + var TotalPrice = 0; + var OperNumber =$(this).val()-0; //数量 + body.find("[field='AllPrice']").find(input).val((UnitPrice*OperNumber).toFixed(2)); + body.find("[field='AllPrice']").each(function(){ + if($(this).find("div").text()!==""){ + TotalPrice = TotalPrice + parseFloat($(this).find("div").text().toString()); + } + }); + TotalPrice = TotalPrice + UnitPrice*OperNumber; + footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2)); + }); + //修改金额，自动计算单价和合计 + body.find("[field='AllPrice']").find(input).off("keyup").on("keyup",function(){ + var OperNumber = body.find("[field='OperNumber']").find(input).val(); //数量 + var TotalPrice = 0; + var AllPrice =$(this).val()-0; //金额 + body.find("[field='UnitPrice']").find(input).val((AllPrice/OperNumber).toFixed(2)); + body.find("[field='AllPrice']").each(function(){ + if($(this).find("div").text()!==""){ + TotalPrice = TotalPrice + parseFloat($(this).find("div").text().toString()); + } + }); + TotalPrice = TotalPrice + AllPrice; + footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2)); + }); + },500); + } + //结束编辑 var editIndex = undefined; function endEditing() { @@ -929,9 +1040,9 @@ function onClickRow(index) { if (editIndex != index) { if (endEditing()) { - $('#materialData').datagrid('selectRow', index) - .datagrid('beginEdit', index); + $('#materialData').datagrid('selectRow', index).datagrid('beginEdit', index); editIndex = index; + autoReckon(); } else { $('#materialData').datagrid('selectRow', editIndex); } @@ -943,8 +1054,8 @@ if (endEditing()) { $('#materialData').datagrid('appendRow', {}); editIndex = $('#materialData').datagrid('getRows').length - 1; - $('#materialData').datagrid('selectRow', editIndex) - .datagrid('beginEdit', editIndex); + $('#materialData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex); + autoReckon(); } } //删除 diff --git a/WebRoot/pages/materials/sale_back_list.jsp b/WebRoot/pages/materials/sale_back_list.jsp index 83462154..166a458f 100644 --- a/WebRoot/pages/materials/sale_back_list.jsp +++ b/WebRoot/pages/materials/sale_back_list.jsp @@ -78,7 +78,7 @@ - + diff --git a/WebRoot/pages/materials/sale_out_list.jsp b/WebRoot/pages/materials/sale_out_list.jsp index d97706b0..8cada165 100644 --- a/WebRoot/pages/materials/sale_out_list.jsp +++ b/WebRoot/pages/materials/sale_out_list.jsp @@ -78,7 +78,7 @@ - + diff --git a/config/hibernate/hibernate.cfg.xml b/config/hibernate/hibernate.cfg.xml index 366b9e51..a7f61903 100644 --- a/config/hibernate/hibernate.cfg.xml +++ b/config/hibernate/hibernate.cfg.xml @@ -1,47 +1,46 @@ - - - - - - - org.hibernate.dialect.MySQL5Dialect - - true - - update - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + org.hibernate.dialect.MySQL5Dialect + + true + + update + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/spring/basic-applicationContext.xml b/config/spring/basic-applicationContext.xml index 2f391ae5..ec9d563d 100644 --- a/config/spring/basic-applicationContext.xml +++ b/config/spring/basic-applicationContext.xml @@ -1,360 +1,348 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/spring/dao-applicationContext.xml b/config/spring/dao-applicationContext.xml index e2a57851..8261312c 100644 --- a/config/spring/dao-applicationContext.xml +++ b/config/spring/dao-applicationContext.xml @@ -1,57 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/struts2/building-struts.xml b/config/struts2/building-struts.xml deleted file mode 100644 index be7b854b..00000000 --- a/config/struts2/building-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/sql/jsh_erp.sql b/sql/jsh_erp.sql index 4ddcf14e..09a45cfc 100644 --- a/sql/jsh_erp.sql +++ b/sql/jsh_erp.sql @@ -2,7 +2,7 @@ MySQL Backup Source Server Version: 5.1.54 Source Database: jsh_erp -Date: 2016-12-11 22:44:47 +Date: 2016-12-24 23:56:10 */ SET FOREIGN_KEY_CHECKS=0; @@ -42,7 +42,7 @@ CREATE TABLE `jsh_accounthead` ( CONSTRAINT `FK9F4C0D8DAAE50527` FOREIGN KEY (`AccountId`) REFERENCES `jsh_account` (`Id`), CONSTRAINT `FK9F4C0D8DB610FC06` FOREIGN KEY (`OrganId`) REFERENCES `jsh_supplier` (`id`), CONSTRAINT `FK9F4C0D8DC4170B37` FOREIGN KEY (`HandsPersonId`) REFERENCES `jsh_person` (`Id`) -) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_accountitem` @@ -62,7 +62,7 @@ CREATE TABLE `jsh_accountitem` ( CONSTRAINT `FK9F4CBAC0AAE50527` FOREIGN KEY (`AccountId`) REFERENCES `jsh_account` (`Id`), CONSTRAINT `FK9F4CBAC0C5FE6007` FOREIGN KEY (`HeaderId`) REFERENCES `jsh_accounthead` (`Id`) ON DELETE CASCADE, CONSTRAINT `FK9F4CBAC0D203EDC5` FOREIGN KEY (`InOutItemId`) REFERENCES `jsh_inoutitem` (`Id`) -) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_app` @@ -177,7 +177,7 @@ CREATE TABLE `jsh_depot` ( `sort` varchar(10) DEFAULT NULL COMMENT '排序', `remark` varchar(100) DEFAULT NULL COMMENT '描述', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_depothead` @@ -194,28 +194,23 @@ CREATE TABLE `jsh_depothead` ( `OperTime` datetime DEFAULT NULL COMMENT '出入库时间', `OrganId` bigint(20) DEFAULT NULL COMMENT '供应商Id', `HandsPersonId` bigint(20) DEFAULT NULL COMMENT '采购/领料-经手人Id', - `WareHousePersonId` bigint(20) NOT NULL COMMENT '仓管员-经手人Id', - `SettlementWay` varchar(50) DEFAULT NULL COMMENT '现金/记账', - `BuildingId` bigint(20) DEFAULT NULL COMMENT '单元Id', + `AccountId` bigint(20) DEFAULT NULL COMMENT '账户Id', + `ChangeAmount` double DEFAULT NULL COMMENT '变动金额(收款/付款)', `AllocationProjectId` bigint(20) DEFAULT NULL COMMENT '调拨时，对方项目Id', + `TotalPrice` double DEFAULT NULL COMMENT '合计金额', `Remark` varchar(1000) DEFAULT NULL COMMENT '备注', - `State` varchar(50) DEFAULT NULL COMMENT '草稿/已生效/废弃/待审核/未通过', - `ReAuditPersonName` varchar(50) DEFAULT NULL COMMENT '撤审人', - `Reason` varchar(100) DEFAULT NULL COMMENT '撤审原因', PRIMARY KEY (`Id`), KEY `FK2A80F214CA633ABA` (`AllocationProjectId`), KEY `FK2A80F214C4170B37` (`HandsPersonId`), KEY `FK2A80F214B610FC06` (`OrganId`), - KEY `FK2A80F2148E0FA916` (`WareHousePersonId`), KEY `FK2A80F2142888F9A` (`ProjectId`), - KEY `FK2A80F214F039F8D1` (`BuildingId`), + KEY `FK2A80F214AAE50527` (`AccountId`), + CONSTRAINT `FK2A80F214AAE50527` FOREIGN KEY (`AccountId`) REFERENCES `jsh_account` (`Id`), CONSTRAINT `jsh_depothead_ibfk_1` FOREIGN KEY (`ProjectId`) REFERENCES `jsh_depot` (`id`), - CONSTRAINT `jsh_depothead_ibfk_2` FOREIGN KEY (`WareHousePersonId`) REFERENCES `jsh_person` (`Id`), CONSTRAINT `jsh_depothead_ibfk_3` FOREIGN KEY (`OrganId`) REFERENCES `jsh_supplier` (`id`), CONSTRAINT `jsh_depothead_ibfk_4` FOREIGN KEY (`HandsPersonId`) REFERENCES `jsh_person` (`Id`), - CONSTRAINT `jsh_depothead_ibfk_5` FOREIGN KEY (`AllocationProjectId`) REFERENCES `jsh_depot` (`id`), - CONSTRAINT `jsh_depothead_ibfk_6` FOREIGN KEY (`BuildingId`) REFERENCES `jsh_building` (`Id`) -) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8; + CONSTRAINT `jsh_depothead_ibfk_5` FOREIGN KEY (`AllocationProjectId`) REFERENCES `jsh_depot` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_depotitem` @@ -227,7 +222,7 @@ CREATE TABLE `jsh_depotitem` ( `MaterialId` bigint(20) NOT NULL COMMENT '材料Id', `OperNumber` double DEFAULT NULL COMMENT '数量', `UnitPrice` double DEFAULT NULL COMMENT '单价', - `Incidentals` double DEFAULT NULL COMMENT '运杂费', + `AllPrice` double DEFAULT NULL COMMENT '金额', `Remark` varchar(200) DEFAULT NULL COMMENT '描述', `Img` varchar(50) DEFAULT NULL COMMENT '图片', PRIMARY KEY (`Id`), @@ -235,7 +230,7 @@ CREATE TABLE `jsh_depotitem` ( KEY `FK2A819F474BB6190E` (`HeaderId`), CONSTRAINT `jsh_depotitem_ibfk_1` FOREIGN KEY (`HeaderId`) REFERENCES `jsh_depothead` (`Id`) ON DELETE CASCADE, CONSTRAINT `jsh_depotitem_ibfk_2` FOREIGN KEY (`MaterialId`) REFERENCES `jsh_material` (`Id`) -) ENGINE=InnoDB AUTO_INCREMENT=1023 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1028 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_functions` @@ -282,7 +277,7 @@ CREATE TABLE `jsh_log` ( PRIMARY KEY (`id`), KEY `FKF2696AA13E226853` (`userID`), CONSTRAINT `FKF2696AA13E226853` FOREIGN KEY (`userID`) REFERENCES `jsh_user` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1941 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=2023 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_material` @@ -325,13 +320,10 @@ CREATE TABLE `jsh_materialcategory` ( DROP TABLE IF EXISTS `jsh_person`; CREATE TABLE `jsh_person` ( `Id` bigint(20) NOT NULL AUTO_INCREMENT, - `ProjectId` bigint(20) NOT NULL, `Type` varchar(20) DEFAULT NULL COMMENT '类型', `Name` varchar(50) DEFAULT NULL COMMENT '姓名', - PRIMARY KEY (`Id`), - KEY `FK5AF487552888F9A` (`ProjectId`), - CONSTRAINT `FK5AF487552888F9A` FOREIGN KEY (`ProjectId`) REFERENCES `jsh_depot` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; + PRIMARY KEY (`Id`) +) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_role` @@ -416,34 +408,29 @@ CREATE TABLE `jsh_visitaccount` ( CONSTRAINT `FKFF4AAE822888F9A` FOREIGN KEY (`ProjectId`) REFERENCES `jsh_depot` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- ---------------------------- --- View definition for `jsh_view_in_out_stock` --- ---------------------------- -DROP VIEW IF EXISTS `jsh_view_in_out_stock`; -CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `jsh_view_in_out_stock` AS select `jsh_depotitem`.`Id` AS `Id`,`jsh_depotitem`.`HeaderId` AS `HeaderId`,`jsh_depotitem`.`MaterialId` AS `MaterialId`,`jsh_depotitem`.`OperNumber` AS `OperNumber`,`jsh_depotitem`.`UnitPrice` AS `UnitPrice`,`jsh_depotitem`.`Incidentals` AS `Incidentals`,`jsh_depotitem`.`Remark` AS `Remark`,`jsh_depotitem`.`Img` AS `Img` from `jsh_depotitem` group by `jsh_depotitem`.`MaterialId`; - -- ---------------------------- -- Records -- ---------------------------- INSERT INTO `jsh_account` VALUES ('4','南通建行','3241423','121','34','66666'), ('9','公司总账1','4123411','423','412','77777'); -INSERT INTO `jsh_accounthead` VALUES ('3','收入','1','3','333','9','33No','2016-12-10 00:00:00','444aa'), ('9','收入','1','3','213','4','3134','2016-12-10 00:00:00','12341'), ('12','收入','1','3','123','4','NO123','2016-12-10 00:00:00','666666'), ('13','收入','1','3','45','4','N666','2016-12-11 00:00:00','111'), ('14','支出','1','3','55','9','aa','2016-12-11 00:00:00','123'), ('15','收款','1','3','123','9','34124','2016-12-11 00:00:00','123'), ('16','付款','1','3','1234','4','234234','2016-12-11 00:00:00','2342'), ('17','转账','1','3','23','4','234','2016-12-11 00:00:00','234'); -INSERT INTO `jsh_accountitem` VALUES ('3','9',NULL,'5',NULL,'123414'), ('6','12',NULL,'8','12','啊啊啊'), ('7','13',NULL,'7','1111','2222'), ('8','3',NULL,'9','11',''), ('9','3',NULL,'8','22',''), ('10','14',NULL,'10','123','123'), ('11','15',NULL,'7','12341','124'), ('12','16',NULL,'1','3423','2342'), ('13','17',NULL,'10','12','1'); +INSERT INTO `jsh_accounthead` VALUES ('3','收入','1','3','333','9','33No','2016-12-10 00:00:00','444aa'), ('9','收入','1','3','213','4','3134','2016-12-10 00:00:00','12341'), ('12','收入','1','3','123','4','NO123','2016-12-10 00:00:00','666666'), ('13','收入','1','3','45','4','N666','2016-12-11 00:00:00','111'), ('14','支出','1','3','55','9','aa','2016-12-11 00:00:00','123'), ('15','收款','1','3','123','9','34124','2016-12-11 00:00:00','123'), ('16','付款','1','3','1234','4','234234','2016-12-11 00:00:00','2342'), ('17','转账','1','3','23','4','234','2016-12-11 00:00:00','234'), ('18','收款','1','3','11','4','123123','2016-12-18 00:00:00','123'); +INSERT INTO `jsh_accountitem` VALUES ('3','9',NULL,'5',NULL,'123414'), ('6','12',NULL,'8','12','啊啊啊'), ('7','13',NULL,'7','1111','2222'), ('8','3',NULL,'9','11',''), ('9','3',NULL,'8','22',''), ('10','14',NULL,'10','123','123'), ('11','15','4','7','12341','124'), ('12','16',NULL,'1','3423','2342'), ('13','17',NULL,'10','12','1'), ('14','18','9',NULL,'11','123'), ('15','18','4',NULL,'22','aaa'); INSERT INTO `jsh_app` VALUES ('1','','企业邮箱','app','0000000001.png','../EmailManage/Email','600','400','\0','\0','\0','desk','010','','\0'), ('3','00','系统管理','app','0000000004.png','','1024','600','','\0','\0','desk','198','',''), ('6','','个人信息','app','0000000005.png','../user/password.jsp','600','400','\0','\0','\0','dock','200','',''), ('7','01','基础数据','app','0000000006.png','','1024','600','','\0','\0','desk','120','',''), ('8','02','进销存','app','0000000007.png','','1024','600','','\0','\0','desk','030','',''), ('20','13','公告管理','app','0000000020.png',NULL,'1024','600','','\0','\0','desk','125',NULL,'\0'), ('21','','今日留言','app','0000000021.png','../phone/msg','1024','600','','\0','\0','dock','000','','\0'), ('22','03','报表查询','app','0000000022.png','','1024','600','','\0','\0','desk','115','',''); INSERT INTO `jsh_asset` VALUES ('1','27','weizhi','','0',NULL,'11','2016-10-22 00:00:00','2016-10-21 00:00:00','2016-11-03 00:00:00','1231241','123124123','2','','2016-10','2016-10-22 20:04:48','63','2016-10-22 20:04:48','63'); INSERT INTO `jsh_assetcategory` VALUES ('14','递延资产','1','递延资产'), ('15','无形资产','1','无形资产'), ('16','长期投资','1','长期投资'), ('17','固定资产','1','固定资产'), ('18','流动资产','1','流动资产'); INSERT INTO `jsh_assetname` VALUES ('1','联想Y450','17','1','','1'), ('2','惠普打印机','15','1','','0'), ('12','乐萌水杯','16','1','','1'), ('13','机顶盒','17','1','机顶盒','0'), ('14','TCL电视','17','1','','1'), ('15','手机','17','1','','1'), ('16','硬盘','16','1','','0'), ('17','毛笔','17','1','','0'), ('18','杯子','17','1','','0'), ('19','建造师证书','15','1','','0'), ('20','算量软件','14','1','','1'), ('21','cad软件','15','1','','0'), ('22','办公桌','17','1','','0'), ('23','笔记本','17','1','笔记本','1'), ('24','打印机','17','1','打印机','0'), ('25','电脑','17','1','电脑','0'), ('26','电动车','16','1','电动车','0'), ('27','电源线','17','1','电源线','0'); -INSERT INTO `jsh_depot` VALUES ('1','上海花边店','2',''), ('2','公司总部','1','总部'); -INSERT INTO `jsh_depothead` VALUES ('29','入库','采购','1','1234','李四','2016-11-08 22:14:37','2016-11-08 00:00:00','1','2','1','记账',NULL,NULL,'','草稿',NULL,NULL), ('30','入库','采购','1','1235','李四','2016-11-08 22:15:16','2016-11-08 00:00:00','1','2','1','记账',NULL,NULL,'','草稿',NULL,NULL), ('31','出库','销售','1','123A','李四','2016-11-08 22:16:11','2016-11-08 00:00:00','2',NULL,'1','',NULL,NULL,'','草稿',NULL,NULL), ('32','入库','采购','1','ww123','季圣华','2016-11-25 22:14:46','2016-11-25 00:00:00','1','2','1','现金',NULL,NULL,'','草稿',NULL,NULL), ('33','入库','其它','1','234234','季圣华','2016-12-11 18:15:39','2016-12-11 00:00:00','1','2','1','现金',NULL,NULL,'12312','草稿',NULL,NULL), ('34','出库','其它','1','1234','季圣华','2016-12-11 18:44:50','2016-12-11 00:00:00','2',NULL,'1','',NULL,NULL,'41234','草稿',NULL,NULL), ('35','出库','其它','1','bbb','季圣华','2016-12-11 22:31:49','2016-12-11 00:00:00','2',NULL,'1','',NULL,NULL,'aa666','草稿',NULL,NULL), ('36','出库','调拨','1','bb22','季圣华','2016-12-11 22:32:52','2016-12-11 00:00:00',NULL,NULL,'1','',NULL,'2','aa11','草稿',NULL,NULL); -INSERT INTO `jsh_depotitem` VALUES ('1014','29','485','300','0.4',NULL,'',''), ('1015','29','487','200','0.2',NULL,'',''), ('1016','30','498','432','0.5',NULL,'',''), ('1017','31','485','100','0.6',NULL,'',''), ('1018','32','498','1','0.9',NULL,'',''), ('1019','33','487','1','2',NULL,'',''), ('1020','34','498','21','12',NULL,'',''), ('1021','35','487','1','1',NULL,'',''), ('1022','36','498','1',NULL,NULL,'2','3'); +INSERT INTO `jsh_depot` VALUES ('1','上海花边店','2',''), ('2','公司总部','1','总部'), ('3','苏州花边店','3',''); +INSERT INTO `jsh_depothead` VALUES ('29','入库','采购','1','1234','李四','2016-11-08 22:14:37','2016-11-08 00:00:00','1','2',NULL,NULL,NULL,NULL,''), ('30','入库','采购','1','1235','李四','2016-11-08 22:15:16','2016-11-08 00:00:00','1','2',NULL,NULL,NULL,NULL,''), ('31','出库','销售','1','123A','李四','2016-11-08 22:16:11','2016-11-08 00:00:00','2',NULL,NULL,NULL,NULL,NULL,''), ('32','入库','采购','1','ww123','季圣华','2016-11-25 22:14:46','2016-11-25 00:00:00','1','2',NULL,NULL,NULL,NULL,''), ('33','入库','其它','1','234234','季圣华','2016-12-11 18:15:39','2016-12-11 00:00:00','1','2',NULL,NULL,NULL,NULL,'12312'), ('34','出库','其它','1','1234','季圣华','2016-12-11 18:44:50','2016-12-11 00:00:00','2',NULL,NULL,NULL,NULL,NULL,'41234'), ('35','出库','其它','1','bbb','季圣华','2016-12-11 22:31:49','2016-12-11 00:00:00','2',NULL,NULL,NULL,NULL,NULL,'aa666'), ('36','出库','调拨','1','bb22','季圣华','2016-12-11 22:32:52','2016-12-11 00:00:00',NULL,NULL,NULL,NULL,'2',NULL,'aa11'), ('37','入库','采购','3','123a','季圣华','2016-12-24 14:33:02','2016-12-24 00:00:00','4','2','9','36',NULL,NULL,'1212a'), ('38','入库','采购','3','123132','季圣华','2016-12-24 23:14:22','2016-12-24 00:00:00','1','1','9','44',NULL,'24','312'), ('39','入库','采购','3','222','季圣华','2016-12-24 23:43:50','2016-12-24 00:00:00','4','2','9','44',NULL,'85.8','3333'); +INSERT INTO `jsh_depotitem` VALUES ('1014','29','485','300','0.4',NULL,'',''), ('1015','29','487','200','0.2',NULL,'',''), ('1016','30','498','432','0.5',NULL,'',''), ('1017','31','485','100','0.6',NULL,'',''), ('1018','32','498','1','0.9',NULL,'',''), ('1019','33','487','1','2',NULL,'',''), ('1020','34','498','21','12',NULL,'',''), ('1021','35','487','1','1',NULL,'',''), ('1022','36','498','1',NULL,NULL,'2','3'), ('1023','37','485','12','2.6','31.2','beizhu','img'), ('1024','37','498','12','1.4','16.8','a','b'), ('1025','38','485','12','2','24','',NULL), ('1026','39','498','22','2.1','46.2','',NULL), ('1027','39','487','33','1.2','39.6','',NULL); INSERT INTO `jsh_functions` VALUES ('1','00','系统管理','0','','','0010','','电脑版'), ('2','01','基础数据','0','','','0020','','电脑版'), ('3','02','进销存','0','','','0030','','电脑版'), ('11','0001','系统管理','00','','\0','0110','','电脑版'), ('12','000101','应用管理','0001','../manage/app.jsp','\0','0132','','电脑版'), ('13','000102','角色管理','0001','../manage/role.jsp','\0','0130','','电脑版'), ('14','000103','用户管理','0001','../manage/user.jsp','\0','0140','','电脑版'), ('15','000104','日志管理','0001','../manage/log.jsp','\0','0160','','电脑版'), ('16','000105','功能管理','0001','../manage/functions.jsp','\0','0135','','电脑版'), ('21','0101','商品管理','01','','\0','0220','','电脑版'), ('22','010101','商品类别管理','0101','../materials/materialcategory.jsp','\0','0230','','电脑版'), ('23','010102','商品信息管理','0101','../materials/material.jsp','\0','0240','','电脑版'), ('24','0102','基本资料','01','','\0','0250','','电脑版'), ('25','010201','单位信息','0102','../manage/vendor.jsp','\0','0260','','电脑版'), ('26','010202','仓库管理','0102','../manage/depot.jsp','\0','0270','','电脑版'), ('31','010206','经手人管理','0102','../materials/person.jsp','\0','0284','','电脑版'), ('32','0202','入库管理','02','','\0','0330','','电脑版'), ('33','020201','采购入库','0202','../materials/purchase_in_list.jsp','\0','0340','','电脑版'), ('38','0203','出库管理','02','','\0','0390','','电脑版'), ('40','020302','调拨出库','0203','../materials/allocation_out_list.jsp','\0','0420','','电脑版'), ('41','020303','销售出库','0203','../materials/sale_out_list.jsp','\0','0410','','电脑版'), ('44','0204','财务管理','02','','\0','0450','','电脑版'), ('59','030101','项目进销存报表','0301','../reports/in_out_stock_report.jsp','\0','0600','','电脑版'), ('194','010204','收支项目','0102','../manage/inOutItem.jsp','\0','0282','','电脑版'), ('195','010205','结算账户','0102','../manage/account.jsp','\0','0283','','电脑版'), ('196','03','报表查询','0','','','0040','','电脑版'), ('197','020402','收入单','0204','../financial/item_in.jsp','\0','0465','','电脑版'), ('198','0301','报表查询','03','','\0','0570','','电脑版'), ('199','020304','采购退货','0203','../materials/purchase_back_list.jsp','\0','0415','','电脑版'), ('200','020202','销售退货','0202','../materials/sale_back_list.jsp','\0','0350','','电脑版'), ('201','020203','其它入库','0202','../materials/other_in_list.jsp','\0','0360','','电脑版'), ('202','020305','其它出库','0203','../materials/other_out_list.jsp','\0','0418','','电脑版'), ('203','020403','支出单','0204','../financial/item_out.jsp','\0','0470','','电脑版'), ('204','020404','收款单','0204','../financial/money_in.jsp','\0','0475','','电脑版'), ('205','020405','付款单','0204','../financial/money_out.jsp','\0','0480','','电脑版'), ('206','020406','转账单','0204','../financial/giro.jsp','\0','0490','','电脑版'); INSERT INTO `jsh_inoutitem` VALUES ('1','办公耗材','支出','办公耗材'), ('5','房租收入','收入','房租收入'), ('7','利息收入','收入','利息收入'), ('8','水电费','支出','水电费水电费'), ('9','快递费','支出','快递费'), ('10','交通报销费','支出','交通报销费'), ('11','差旅费','支出','差旅费'); INSERT INTO `jsh_log` VALUES ('1722','63','登录系统','192.168.1.104','2016-11-27 13:17:17','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1723','63','登录系统','192.168.1.104','2016-11-27 13:17:30','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1724','63','退出系统','192.168.1.104','2016-11-27 13:17:48','0','管理用户：jsh 退出系统','jsh 退出系统'), ('1725','65','登录系统','192.168.1.104','2016-11-27 13:17:52','0','管理用户：ls 登录系统','ls 登录系统'), ('1726','65','退出系统','192.168.1.104','2016-11-27 13:18:18','0','管理用户：ls 退出系统','ls 退出系统'), ('1727','63','登录系统','192.168.1.104','2016-11-27 13:18:22','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1728','63','更新UserBusiness','192.168.1.104','2016-11-27 13:18:44','0','更新UserBusiness的ID为 6 成功！','更新UserBusiness成功'), ('1729','63','退出系统','192.168.1.104','2016-11-27 13:18:48','0','管理用户：jsh 退出系统','jsh 退出系统'), ('1730','65','登录系统','192.168.1.104','2016-11-27 13:18:53','0','管理用户：ls 登录系统','ls 登录系统'), ('1731','63','登录系统','192.168.1.104','2016-12-04 10:38:50','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1732','63','增加物料','192.168.1.104','2016-12-04 10:40:52','0','增加物料名称为 11 成功！','增加物料成功'), ('1733','63','更新物料','192.168.1.104','2016-12-04 10:59:57','0','更新物料ID为 499 成功！','更新物料成功'), ('1734','63','更新物料','192.168.1.104','2016-12-04 11:00:13','0','更新物料ID为 499 成功！','更新物料成功'), ('1735','63','删除物料','192.168.1.104','2016-12-04 11:00:38','0','删除物料ID为 499 成功！','删除物料成功'), ('1736','63','增加物料','192.168.1.104','2016-12-04 11:02:35','0','增加物料名称为 11 成功！','增加物料成功'), ('1737','63','批量删除物料','192.168.1.104','2016-12-04 11:02:41','0','批量删除物料ID为 500 成功！','批量删除物料成功'), ('1738','63','更新功能','192.168.1.104','2016-12-04 11:04:43','0','更新功能ID为 26 成功！','更新功能成功'), ('1739','63','增加供应商','192.168.1.104','2016-12-04 11:38:13','0','增加供应商名称为 aa 成功！','增加供应商成功'), ('1740','63','增加供应商','192.168.1.104','2016-12-04 11:48:36','0','增加供应商名称为 aaaa 成功！','增加供应商成功'), ('1741','63','删除供应商','192.168.1.104','2016-12-04 11:48:53','0','删除供应商ID为 3,名称为 aa成功！','删除供应商成功'), ('1742','63','更新供应商','192.168.1.104','2016-12-04 11:48:59','0','更新供应商ID为 4 成功！','更新供应商成功'), ('1743','63','更新功能','192.168.1.104','2016-12-04 13:06:24','0','更新功能ID为 31 成功！','更新功能成功'), ('1744','63','删除功能','192.168.1.104','2016-12-04 13:06:47','0','删除功能ID为 30 成功！','删除功能成功'), ('1745','63','更新功能','192.168.1.104','2016-12-04 13:08:35','0','更新功能ID为 24 成功！','更新功能成功'), ('1746','63','更新功能','192.168.1.104','2016-12-04 13:09:52','0','更新功能ID为 24 成功！','更新功能成功'), ('1747','63','更新功能','192.168.1.104','2016-12-04 13:11:00','0','更新功能ID为 21 成功！','更新功能成功'), ('1748','63','更新功能','192.168.1.104','2016-12-04 13:11:08','0','更新功能ID为 22 成功！','更新功能成功'), ('1749','63','更新功能','192.168.1.104','2016-12-04 13:11:16','0','更新功能ID为 23 成功！','更新功能成功'), ('1750','63','更新功能','192.168.1.104','2016-12-04 13:11:31','0','更新功能ID为 23 成功！','更新功能成功'), ('1751','63','更新应用','192.168.1.104','2016-12-04 13:34:39','0','更新应用ID为 22 成功！','更新应用成功'), ('1752','63','更新应用','192.168.1.104','2016-12-04 13:35:13','0','更新应用ID为 22 成功！','更新应用成功'), ('1753','63','登录系统','192.168.1.104','2016-12-04 13:36:45','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1754','63','登录系统','192.168.1.104','2016-12-04 13:38:31','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1755','63','增加功能','192.168.1.104','2016-12-04 13:40:10','0','增加功能名称为 报表管理 成功！','增加功能成功'), ('1756','63','更新功能','192.168.1.104','2016-12-04 13:40:38','0','更新功能ID为 58 成功！','更新功能成功'), ('1757','63','更新功能','192.168.1.104','2016-12-04 13:40:54','0','更新功能ID为 59 成功！','更新功能成功'), ('1758','63','更新应用','192.168.1.104','2016-12-04 13:42:15','0','更新应用ID为 22 成功！','更新应用成功'), ('1759','63','更新功能','192.168.1.104','2016-12-04 13:43:23','0','更新功能ID为 58 成功！','更新功能成功'), ('1760','63','更新应用','192.168.1.104','2016-12-04 13:43:44','0','更新应用ID为 22 成功！','更新应用成功'), ('1761','63','更新应用','192.168.1.104','2016-12-04 13:47:17','0','更新应用ID为 22 成功！','更新应用成功'), ('1762','63','登录系统','192.168.112.102','2016-12-04 21:00:14','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1763','63','更新应用','192.168.112.102','2016-12-04 21:01:40','0','更新应用ID为 7 成功！','更新应用成功'), ('1764','63','更新应用','192.168.112.102','2016-12-04 21:02:40','0','更新应用ID为 7 成功！','更新应用成功'), ('1765','63','登录系统','192.168.112.102','2016-12-04 21:14:18','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1766','63','登录系统','192.168.112.102','2016-12-04 21:49:44','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1767','63','登录系统','192.168.4.108','2016-12-10 14:24:27','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1768','63','登录系统','192.168.4.108','2016-12-10 14:30:33','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1769','63','退出系统','192.168.4.108','2016-12-10 14:31:27','0','管理用户：jsh 退出系统','jsh 退出系统'), ('1770','63','登录系统','192.168.4.108','2016-12-10 14:31:33','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1771','63','增加经手人','192.168.4.108','2016-12-10 14:55:24','0','增加经手人名称为 赵五-财务 成功！','增加经手人成功'), ('1772','63','更新经手人','192.168.4.108','2016-12-10 14:55:33','0','更新经手人ID为 2 成功！','更新经手人成功'), ('1773','63','更新经手人','192.168.4.108','2016-12-10 14:55:45','0','更新经手人ID为 1 成功！','更新经手人成功'), ('1774','63','增加功能','192.168.4.108','2016-12-10 15:29:27','0','增加功能名称为 收入单 成功！','增加功能成功'), ('1775','63','更新UserBusiness','192.168.4.108','2016-12-10 15:30:47','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1776','63','更新功能','192.168.4.108','2016-12-10 15:35:04','0','更新功能ID为 58 成功！','更新功能成功'), ('1777','63','更新功能','192.168.4.108','2016-12-10 15:35:59','0','更新功能ID为 58 成功！','更新功能成功'), ('1778','63','更新功能','192.168.4.108','2016-12-10 15:37:40','0','更新功能ID为 196 成功！','更新功能成功'), ('1779','63','更新功能','192.168.4.108','2016-12-10 15:39:07','0','更新功能ID为 196 成功！','更新功能成功'), ('1780','63','更新功能','192.168.4.108','2016-12-10 15:39:23','0','更新功能ID为 59 成功！','更新功能成功'), ('1781','63','删除功能','192.168.4.108','2016-12-10 15:39:45','0','删除功能ID为 58 成功！','删除功能成功'), ('1782','63','更新功能','192.168.4.108','2016-12-10 15:40:03','0','更新功能ID为 59 成功！','更新功能成功'), ('1783','63','更新UserBusiness','192.168.4.108','2016-12-10 15:41:52','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1784','63','增加功能','192.168.4.108','2016-12-10 15:44:39','0','增加功能名称为 报表管理 成功！','增加功能成功'), ('1785','63','更新功能','192.168.4.108','2016-12-10 15:44:51','0','更新功能ID为 59 成功！','更新功能成功'), ('1786','63','更新功能','192.168.4.108','2016-12-10 15:46:30','0','更新功能ID为 198 成功！','更新功能成功'), ('1787','63','增加经手人','192.168.4.108','2016-12-10 16:48:36','0','增加经手人名称为 赵六-财务 成功！','增加经手人成功'), ('1788','63','更新经手人','192.168.4.108','2016-12-10 16:48:43','0','更新经手人ID为 3 成功！','更新经手人成功'), ('1789','63','更新经手人','192.168.4.108','2016-12-10 16:48:49','0','更新经手人ID为 3 成功！','更新经手人成功'), ('1790','63','增加仓库','192.168.4.108','2016-12-10 16:59:41','0','增加仓库名称为 总部 成功！','增加仓库成功'), ('1791','63','更新仓库','192.168.4.108','2016-12-10 16:59:52','0','更新仓库ID为 2 成功！','更新仓库成功'), ('1792','63','更新仓库','192.168.4.108','2016-12-10 17:00:03','0','更新仓库ID为 1 成功！','更新仓库成功'), ('1793','63','更新经手人','192.168.4.108','2016-12-10 17:00:15','0','更新经手人ID为 3 成功！','更新经手人成功'), ('1794','63','更新经手人','192.168.4.108','2016-12-10 17:00:23','0','更新经手人ID为 4 成功！','更新经手人成功'), ('1795','63','登录系统','192.168.4.108','2016-12-10 17:10:40','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1796','63','退出系统','192.168.4.108','2016-12-10 17:39:05','0','管理用户：jsh 退出系统','jsh 退出系统'), ('1797','63','登录系统','192.168.4.108','2016-12-10 17:39:16','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1798','63','批量删除功能','192.168.4.108','2016-12-10 17:44:39','0','批量删除功能ID为 51,193 成功！','批量删除功能成功'), ('1799','63','批量删除功能','192.168.4.108','2016-12-10 17:44:54','0','批量删除功能ID为 46,47,48,49,50 成功！','批量删除功能成功'), ('1800','63','批量删除功能','192.168.4.108','2016-12-10 17:45:26','0','批量删除功能ID为 52,53,54,55 成功！','批量删除功能成功'), ('1801','63','批量删除功能','192.168.4.108','2016-12-10 17:45:49','0','批量删除功能ID为 45 成功！','批量删除功能成功'), ('1802','63','登录系统','192.168.112.102','2016-12-10 20:19:13','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1803','63','增加财务','192.168.112.102','2016-12-10 20:20:06','0','增加财务编号为 33 成功！','增加财务成功'), ('1804','63','增加财务','192.168.112.102','2016-12-10 20:20:11','0','增加财务编号为 33 成功！','增加财务成功'), ('1805','63','增加财务','192.168.112.102','2016-12-10 20:20:12','0','增加财务编号为 33 成功！','增加财务成功'), ('1806','63','增加财务','192.168.112.102','2016-12-10 20:25:48','0','增加财务编号为 123 成功！','增加财务成功'), ('1807','63','登录系统','192.168.112.102','2016-12-10 20:50:11','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1808','63','增加财务','192.168.112.102','2016-12-10 20:51:41','0','增加财务编号为 3123 成功！','增加财务成功'), ('1809','63','增加财务','192.168.112.102','2016-12-10 20:53:58','0','增加财务编号为 3123 成功！','增加财务成功'), ('1810','63','增加财务','192.168.112.102','2016-12-10 21:08:57','0','增加财务编号为 123 成功！','增加财务成功'), ('1811','63','增加财务','192.168.112.102','2016-12-10 21:47:45','0','增加财务编号为 123 成功！','增加财务成功'), ('1812','63','保存财务明细','192.168.112.102','2016-12-10 21:47:46','0','保存财务明细对应主表编号为 8 成功！','保存财务明细成功'), ('1813','63','登录系统','192.168.112.102','2016-12-10 22:49:54','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1814','63','删除财务','192.168.112.102','2016-12-10 22:52:43','0','删除财务ID为 5 成功！','删除财务成功'), ('1815','63','批量删除财务','192.168.112.102','2016-12-10 22:52:49','0','批量删除财务ID为 4 成功！','批量删除财务成功'), ('1816','63','增加财务','192.168.112.102','2016-12-10 22:53:19','0','增加财务编号为 3134 成功！','增加财务成功'), ('1817','63','保存财务明细','192.168.112.102','2016-12-10 22:53:20','0','保存财务明细对应主表编号为 9 成功！','保存财务明细成功'), ('1818','63','删除财务','192.168.112.102','2016-12-10 22:53:35','0','删除财务ID为 7 成功！','删除财务成功'), ('1819','63','增加财务','192.168.112.102','2016-12-10 22:54:05','0','增加财务编号为 N123 成功！','增加财务成功'), ('1820','63','保存财务明细','192.168.112.102','2016-12-10 22:54:06','0','保存财务明细对应主表编号为 10 成功！','保存财务明细成功'), ('1821','63','更新财务','192.168.112.102','2016-12-10 22:54:28','0','更新财务ID为 10 成功！','更新财务成功'); INSERT INTO `jsh_log` VALUES ('1822','63','更新财务','192.168.112.102','2016-12-10 23:06:54','0','更新财务ID为 10 成功！','更新财务成功'), ('1823','63','增加财务','192.168.112.102','2016-12-10 23:07:51','0','增加财务编号为 124 成功！','增加财务成功'), ('1824','63','保存财务明细','192.168.112.102','2016-12-10 23:07:51','0','保存财务明细对应主表编号为 11 成功！','保存财务明细成功'), ('1825','63','登录系统','192.168.112.102','2016-12-10 23:09:32','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1826','63','更新财务','192.168.112.102','2016-12-10 23:09:55','0','更新财务ID为 10 成功！','更新财务成功'), ('1827','63','更新收支项目','192.168.112.102','2016-12-10 23:10:18','0','更新收支项目ID为 7 成功！','更新收支项目成功'), ('1828','63','更新收支项目','192.168.112.102','2016-12-10 23:10:32','0','更新收支项目ID为 5 成功！','更新收支项目成功'), ('1829','63','更新收支项目','192.168.112.102','2016-12-10 23:10:47','0','更新收支项目ID为 1 成功！','更新收支项目成功'), ('1830','63','增加收支项目','192.168.112.102','2016-12-10 23:11:05','0','增加收支项目名称为 水电费 成功！','增加收支项目成功'), ('1831','63','增加收支项目','192.168.112.102','2016-12-10 23:11:18','0','增加收支项目名称为 快递费 成功！','增加收支项目成功'), ('1832','63','增加收支项目','192.168.112.102','2016-12-10 23:11:30','0','增加收支项目名称为 交通报销费 成功！','增加收支项目成功'), ('1833','63','增加收支项目','192.168.112.102','2016-12-10 23:11:50','0','增加收支项目名称为 差旅费 成功！','增加收支项目成功'), ('1834','63','增加财务','192.168.112.102','2016-12-10 23:12:45','0','增加财务编号为 NO123 成功！','增加财务成功'), ('1835','63','保存财务明细','192.168.112.102','2016-12-10 23:12:46','0','保存财务明细对应主表编号为 12 成功！','保存财务明细成功'), ('1836','63','更新财务','192.168.112.102','2016-12-10 23:27:12','0','更新财务ID为 12 成功！','更新财务成功'), ('1837','63','更新财务','192.168.112.102','2016-12-10 23:27:46','0','更新财务ID为 12 成功！','更新财务成功'), ('1838','63','登录系统','192.168.112.102','2016-12-10 23:29:10','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1839','63','更新财务','192.168.112.102','2016-12-10 23:30:01','0','更新财务ID为 12 成功！','更新财务成功'), ('1840','63','更新财务','192.168.112.102','2016-12-10 23:30:43','0','更新财务ID为 12 成功！','更新财务成功'), ('1841','63','更新财务','192.168.112.102','2016-12-10 23:31:17','0','更新财务ID为 12 成功！','更新财务成功'), ('1842','63','更新财务','192.168.112.102','2016-12-10 23:38:58','0','更新财务ID为 12 成功！','更新财务成功'), ('1843','63','更新财务','192.168.112.102','2016-12-10 23:42:13','0','更新财务ID为 12 成功！','更新财务成功'), ('1844','63','登录系统','192.168.112.102','2016-12-10 23:45:16','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1845','63','更新财务','192.168.112.102','2016-12-10 23:45:34','0','更新财务ID为 12 成功！','更新财务成功'), ('1846','63','增加财务','192.168.112.102','2016-12-10 23:46:22','0','增加财务编号为 12312 成功！','增加财务成功'), ('1847','63','保存财务明细','192.168.112.102','2016-12-10 23:46:23','0','保存财务明细对应主表编号为 13 成功！','保存财务明细成功'), ('1848','63','更新财务','192.168.112.102','2016-12-10 23:46:50','0','更新财务ID为 13 成功！','更新财务成功'), ('1849','63','删除财务','192.168.112.102','2016-12-10 23:47:54','1','删除财务ID为 9 失败！','删除财务失败'), ('1850','63','删除财务','192.168.112.102','2016-12-10 23:48:00','1','删除财务ID为 10 失败！','删除财务失败'), ('1851','63','批量删除财务','192.168.112.102','2016-12-10 23:48:07','1','批量删除财务ID为 10 失败！','批量删除财务失败'), ('1852','63','删除财务','192.168.112.102','2016-12-10 23:53:36','0','删除财务ID为 10 成功！','删除财务成功'), ('1853','63','删除财务','192.168.112.102','2016-12-10 23:53:39','0','删除财务ID为 8 成功！','删除财务成功'), ('1854','63','批量删除财务','192.168.112.102','2016-12-10 23:53:44','0','批量删除财务ID为 6 成功！','批量删除财务成功'), ('1855','63','登录系统','192.168.4.107','2016-12-11 09:50:41','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1856','63','删除财务','192.168.4.107','2016-12-11 09:51:09','0','删除财务ID为 11 成功！','删除财务成功'), ('1857','63','增加财务','192.168.4.107','2016-12-11 09:51:42','0','增加财务编号为 N666 成功！','增加财务成功'), ('1858','63','保存财务明细','192.168.4.107','2016-12-11 09:51:43','0','保存财务明细对应主表编号为 13 成功！','保存财务明细成功'), ('1859','63','批量删除功能','192.168.4.107','2016-12-11 10:08:23','0','批量删除功能ID为 34,35,36,37,39 成功！','批量删除功能成功'), ('1860','63','批量删除功能','192.168.4.107','2016-12-11 10:08:49','0','批量删除功能ID为 42,43 成功！','批量删除功能成功'), ('1861','63','更新功能','192.168.4.107','2016-12-11 10:15:14','0','更新功能ID为 40 成功！','更新功能成功'), ('1862','63','更新功能','192.168.4.107','2016-12-11 10:15:32','0','更新功能ID为 41 成功！','更新功能成功'), ('1863','63','更新功能','192.168.4.107','2016-12-11 10:17:58','0','更新功能ID为 3 成功！','更新功能成功'), ('1864','63','更新功能','192.168.4.107','2016-12-11 10:18:32','0','更新功能ID为 3 成功！','更新功能成功'), ('1865','63','删除功能','192.168.4.107','2016-12-11 10:18:56','0','删除功能ID为 10 成功！','删除功能成功'), ('1866','63','更新功能','192.168.4.107','2016-12-11 10:20:32','0','更新功能ID为 196 成功！','更新功能成功'), ('1867','63','更新功能','192.168.4.107','2016-12-11 10:33:16','0','更新功能ID为 15 成功！','更新功能成功'), ('1868','63','更新功能','192.168.4.107','2016-12-11 10:34:36','0','更新功能ID为 14 成功！','更新功能成功'), ('1869','63','登录系统','192.168.4.107','2016-12-11 14:36:43','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1870','63','增加功能','192.168.4.107','2016-12-11 15:11:33','0','增加功能名称为 入库退货 成功！','增加功能成功'), ('1871','63','增加功能','192.168.4.107','2016-12-11 15:12:44','0','增加功能名称为 销售退货 成功！','增加功能成功'), ('1872','63','更新功能','192.168.4.107','2016-12-11 15:13:08','0','更新功能ID为 199 成功！','更新功能成功'), ('1873','63','更新UserBusiness','192.168.4.107','2016-12-11 15:13:39','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1874','63','增加功能','192.168.4.107','2016-12-11 15:20:11','0','增加功能名称为 其他入库 成功！','增加功能成功'), ('1875','63','增加功能','192.168.4.107','2016-12-11 15:21:11','0','增加功能名称为 其他出库 成功！','增加功能成功'), ('1876','63','更新UserBusiness','192.168.4.107','2016-12-11 15:21:26','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1877','63','更新功能','192.168.4.107','2016-12-11 15:24:06','0','更新功能ID为 200 成功！','更新功能成功'), ('1878','63','更新功能','192.168.4.107','2016-12-11 15:24:43','0','更新功能ID为 199 成功！','更新功能成功'), ('1879','63','更新UserBusiness','192.168.4.107','2016-12-11 15:25:05','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1880','63','更新UserBusiness','192.168.4.107','2016-12-11 15:25:28','0','更新UserBusiness的ID为 6 成功！','更新UserBusiness成功'), ('1881','63','更新功能','192.168.4.107','2016-12-11 15:27:25','0','更新功能ID为 197 成功！','更新功能成功'), ('1882','63','更新功能','192.168.4.107','2016-12-11 15:30:42','0','更新功能ID为 197 成功！','更新功能成功'), ('1883','63','增加功能','192.168.4.107','2016-12-11 15:31:43','0','增加功能名称为 支出单 成功！','增加功能成功'), ('1884','63','更新功能','192.168.4.107','2016-12-11 15:31:56','0','更新功能ID为 203 成功！','更新功能成功'), ('1885','63','更新UserBusiness','192.168.4.107','2016-12-11 15:32:12','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1886','63','更新UserBusiness','192.168.4.107','2016-12-11 15:32:23','0','更新UserBusiness的ID为 6 成功！','更新UserBusiness成功'), ('1887','63','更新功能','192.168.4.107','2016-12-11 15:39:07','0','更新功能ID为 197 成功！','更新功能成功'), ('1888','63','更新功能','192.168.4.107','2016-12-11 15:39:14','0','更新功能ID为 203 成功！','更新功能成功'), ('1889','63','增加功能','192.168.4.107','2016-12-11 15:40:32','0','增加功能名称为 收款单 成功！','增加功能成功'), ('1890','63','增加功能','192.168.4.107','2016-12-11 15:41:18','0','增加功能名称为 付款单 成功！','增加功能成功'), ('1891','63','增加功能','192.168.4.107','2016-12-11 15:42:11','0','增加功能名称为 转账单 成功！','增加功能成功'), ('1892','63','更新功能','192.168.4.107','2016-12-11 15:42:26','0','更新功能ID为 204 成功！','更新功能成功'), ('1893','63','更新UserBusiness','192.168.4.107','2016-12-11 15:42:37','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1894','63','更新功能','192.168.4.107','2016-12-11 15:43:50','0','更新功能ID为 206 成功！','更新功能成功'), ('1895','63','登录系统','192.168.112.100','2016-12-11 18:02:00','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1896','63','增加仓管通','192.168.112.100','2016-12-11 18:15:39','0','增加仓管通编号为 234234 成功！','增加仓管通成功'), ('1897','63','保存仓管通明细','192.168.112.100','2016-12-11 18:15:40','0','保存仓管通明细对应主表编号为 33 成功！','保存仓管通明细成功'), ('1898','63','更新功能','192.168.112.100','2016-12-11 18:23:48','0','更新功能ID为 201 成功！','更新功能成功'), ('1899','63','更新功能','192.168.112.100','2016-12-11 18:23:58','0','更新功能ID为 202 成功！','更新功能成功'), ('1900','63','增加仓管通','192.168.112.100','2016-12-11 18:44:50','0','增加仓管通编号为 1234 成功！','增加仓管通成功'), ('1901','63','保存仓管通明细','192.168.112.100','2016-12-11 18:44:51','0','保存仓管通明细对应主表编号为 34 成功！','保存仓管通明细成功'), ('1902','63','登录系统','192.168.112.100','2016-12-11 20:14:46','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1903','63','更新财务','192.168.112.100','2016-12-11 21:29:17','0','更新财务ID为 13 成功！','更新财务成功'), ('1904','63','更新财务','192.168.112.100','2016-12-11 21:29:47','0','更新财务ID为 13 成功！','更新财务成功'), ('1905','63','更新财务','192.168.112.100','2016-12-11 21:30:26','0','更新财务ID为 9 成功！','更新财务成功'), ('1906','63','更新财务','192.168.112.100','2016-12-11 21:32:31','0','更新财务ID为 13 成功！','更新财务成功'), ('1907','63','更新财务','192.168.112.100','2016-12-11 21:44:38','0','更新财务ID为 13 成功！','更新财务成功'), ('1908','63','登录系统','192.168.112.100','2016-12-11 21:50:51','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1909','63','更新财务','192.168.112.100','2016-12-11 21:51:18','0','更新财务ID为 13 成功！','更新财务成功'), ('1910','63','更新财务','192.168.112.100','2016-12-11 21:59:18','0','更新财务ID为 13 成功！','更新财务成功'), ('1911','63','保存财务明细','192.168.112.100','2016-12-11 21:59:19','0','保存财务明细对应主表编号为 13 成功！','保存财务明细成功'), ('1912','63','更新财务','192.168.112.100','2016-12-11 22:00:04','0','更新财务ID为 12 成功！','更新财务成功'), ('1913','63','保存财务明细','192.168.112.100','2016-12-11 22:00:05','0','保存财务明细对应主表编号为 12 成功！','保存财务明细成功'), ('1914','63','更新财务','192.168.112.100','2016-12-11 22:01:32','0','更新财务ID为 13 成功！','更新财务成功'), ('1915','63','保存财务明细','192.168.112.100','2016-12-11 22:01:33','0','保存财务明细对应主表编号为 13 成功！','保存财务明细成功'), ('1916','63','更新仓管通','192.168.112.100','2016-12-11 22:08:09','0','更新仓管通ID为 32 成功！','更新仓管通成功'), ('1917','63','保存仓管通明细','192.168.112.100','2016-12-11 22:08:09','0','保存仓管通明细对应主表编号为 32 成功！','保存仓管通明细成功'), ('1918','63','登录系统','192.168.112.100','2016-12-11 22:29:23','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1919','63','登录系统','192.168.112.100','2016-12-11 22:29:44','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1920','63','删除财务','192.168.112.100','2016-12-11 22:30:04','0','删除财务ID为 1 成功！','删除财务成功'), ('1921','63','批量删除财务','192.168.112.100','2016-12-11 22:30:09','0','批量删除财务ID为 2 成功！','批量删除财务成功'); -INSERT INTO `jsh_log` VALUES ('1922','63','更新财务','192.168.112.100','2016-12-11 22:30:25','0','更新财务ID为 3 成功！','更新财务成功'), ('1923','63','更新财务','192.168.112.100','2016-12-11 22:30:35','0','更新财务ID为 3 成功！','更新财务成功'), ('1924','63','保存财务明细','192.168.112.100','2016-12-11 22:30:35','0','保存财务明细对应主表编号为 3 成功！','保存财务明细成功'), ('1925','63','更新财务','192.168.112.100','2016-12-11 22:30:44','0','更新财务ID为 3 成功！','更新财务成功'), ('1926','63','保存财务明细','192.168.112.100','2016-12-11 22:30:44','0','保存财务明细对应主表编号为 3 成功！','保存财务明细成功'), ('1927','63','更新财务','192.168.112.100','2016-12-11 22:30:53','0','更新财务ID为 3 成功！','更新财务成功'), ('1928','63','增加仓管通','192.168.112.100','2016-12-11 22:31:49','0','增加仓管通编号为 bbb 成功！','增加仓管通成功'), ('1929','63','保存仓管通明细','192.168.112.100','2016-12-11 22:31:50','0','保存仓管通明细对应主表编号为 35 成功！','保存仓管通明细成功'), ('1930','63','更新仓管通','192.168.112.100','2016-12-11 22:32:16','0','更新仓管通ID为 35 成功！','更新仓管通成功'), ('1931','63','增加仓管通','192.168.112.100','2016-12-11 22:32:52','0','增加仓管通编号为 bb22 成功！','增加仓管通成功'), ('1932','63','保存仓管通明细','192.168.112.100','2016-12-11 22:32:53','0','保存仓管通明细对应主表编号为 36 成功！','保存仓管通明细成功'), ('1933','63','增加财务','192.168.112.100','2016-12-11 22:37:44','0','增加财务编号为 aa 成功！','增加财务成功'), ('1934','63','保存财务明细','192.168.112.100','2016-12-11 22:37:45','0','保存财务明细对应主表编号为 14 成功！','保存财务明细成功'), ('1935','63','增加财务','192.168.112.100','2016-12-11 22:38:12','0','增加财务编号为 34124 成功！','增加财务成功'), ('1936','63','保存财务明细','192.168.112.100','2016-12-11 22:38:12','0','保存财务明细对应主表编号为 15 成功！','保存财务明细成功'), ('1937','63','增加财务','192.168.112.100','2016-12-11 22:38:44','0','增加财务编号为 234234 成功！','增加财务成功'), ('1938','63','保存财务明细','192.168.112.100','2016-12-11 22:38:44','0','保存财务明细对应主表编号为 16 成功！','保存财务明细成功'), ('1939','63','增加财务','192.168.112.100','2016-12-11 22:39:23','0','增加财务编号为 234 成功！','增加财务成功'), ('1940','63','保存财务明细','192.168.112.100','2016-12-11 22:39:23','0','保存财务明细对应主表编号为 17 成功！','保存财务明细成功'); +INSERT INTO `jsh_log` VALUES ('1922','63','更新财务','192.168.112.100','2016-12-11 22:30:25','0','更新财务ID为 3 成功！','更新财务成功'), ('1923','63','更新财务','192.168.112.100','2016-12-11 22:30:35','0','更新财务ID为 3 成功！','更新财务成功'), ('1924','63','保存财务明细','192.168.112.100','2016-12-11 22:30:35','0','保存财务明细对应主表编号为 3 成功！','保存财务明细成功'), ('1925','63','更新财务','192.168.112.100','2016-12-11 22:30:44','0','更新财务ID为 3 成功！','更新财务成功'), ('1926','63','保存财务明细','192.168.112.100','2016-12-11 22:30:44','0','保存财务明细对应主表编号为 3 成功！','保存财务明细成功'), ('1927','63','更新财务','192.168.112.100','2016-12-11 22:30:53','0','更新财务ID为 3 成功！','更新财务成功'), ('1928','63','增加仓管通','192.168.112.100','2016-12-11 22:31:49','0','增加仓管通编号为 bbb 成功！','增加仓管通成功'), ('1929','63','保存仓管通明细','192.168.112.100','2016-12-11 22:31:50','0','保存仓管通明细对应主表编号为 35 成功！','保存仓管通明细成功'), ('1930','63','更新仓管通','192.168.112.100','2016-12-11 22:32:16','0','更新仓管通ID为 35 成功！','更新仓管通成功'), ('1931','63','增加仓管通','192.168.112.100','2016-12-11 22:32:52','0','增加仓管通编号为 bb22 成功！','增加仓管通成功'), ('1932','63','保存仓管通明细','192.168.112.100','2016-12-11 22:32:53','0','保存仓管通明细对应主表编号为 36 成功！','保存仓管通明细成功'), ('1933','63','增加财务','192.168.112.100','2016-12-11 22:37:44','0','增加财务编号为 aa 成功！','增加财务成功'), ('1934','63','保存财务明细','192.168.112.100','2016-12-11 22:37:45','0','保存财务明细对应主表编号为 14 成功！','保存财务明细成功'), ('1935','63','增加财务','192.168.112.100','2016-12-11 22:38:12','0','增加财务编号为 34124 成功！','增加财务成功'), ('1936','63','保存财务明细','192.168.112.100','2016-12-11 22:38:12','0','保存财务明细对应主表编号为 15 成功！','保存财务明细成功'), ('1937','63','增加财务','192.168.112.100','2016-12-11 22:38:44','0','增加财务编号为 234234 成功！','增加财务成功'), ('1938','63','保存财务明细','192.168.112.100','2016-12-11 22:38:44','0','保存财务明细对应主表编号为 16 成功！','保存财务明细成功'), ('1939','63','增加财务','192.168.112.100','2016-12-11 22:39:23','0','增加财务编号为 234 成功！','增加财务成功'), ('1940','63','保存财务明细','192.168.112.100','2016-12-11 22:39:23','0','保存财务明细对应主表编号为 17 成功！','保存财务明细成功'), ('1941','63','登录系统','192.168.1.103','2016-12-18 11:47:14','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1942','63','增加财务','192.168.1.103','2016-12-18 12:57:39','0','增加财务编号为 123123 成功！','增加财务成功'), ('1943','63','保存财务明细','192.168.1.103','2016-12-18 12:57:40','0','保存财务明细对应主表编号为 18 成功！','保存财务明细成功'), ('1944','63','更新供应商','192.168.1.103','2016-12-18 13:02:15','0','更新供应商ID为 4 成功！','更新供应商成功'), ('1945','63','更新财务','192.168.1.103','2016-12-18 13:02:40','0','更新财务ID为 18 成功！','更新财务成功'), ('1946','63','保存财务明细','192.168.1.103','2016-12-18 13:02:41','0','保存财务明细对应主表编号为 18 成功！','保存财务明细成功'), ('1947','63','更新财务','192.168.1.103','2016-12-18 13:03:01','0','更新财务ID为 18 成功！','更新财务成功'), ('1948','63','保存财务明细','192.168.1.103','2016-12-18 13:03:02','0','保存财务明细对应主表编号为 18 成功！','保存财务明细成功'), ('1949','63','更新财务','192.168.1.103','2016-12-18 13:05:58','0','更新财务ID为 15 成功！','更新财务成功'), ('1950','63','保存财务明细','192.168.1.103','2016-12-18 13:05:58','0','保存财务明细对应主表编号为 15 成功！','保存财务明细成功'), ('1951','63','登录系统','192.168.112.101','2016-12-18 21:32:52','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1952','63','更新UserBusiness','192.168.112.101','2016-12-18 22:00:16','0','更新UserBusiness的ID为 18 成功！','更新UserBusiness成功'), ('1953','63','登录系统','127.0.0.1','2016-12-20 12:30:58','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1954','63','登录系统','127.0.0.1','2016-12-20 12:45:18','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1955','63','登录系统','192.168.112.102','2016-12-23 22:08:55','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1956','63','增加仓管通','192.168.112.102','2016-12-23 23:12:33','1','增加仓管通编号为 wrwq 失败！','增加仓管通失败'), ('1957','63','登录系统','192.168.112.102','2016-12-24 08:45:28','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1958','63','登录系统','192.168.112.102','2016-12-24 12:12:45','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1959','63','增加仓库','192.168.112.102','2016-12-24 12:33:18','0','增加仓库名称为 苏州花边店 成功！','增加仓库成功'), ('1960','63','更新UserBusiness','192.168.112.102','2016-12-24 12:44:03','0','更新UserBusiness的ID为 18 成功！','更新UserBusiness成功'), ('1961','63','更新UserBusiness','192.168.112.102','2016-12-24 13:10:12','0','更新UserBusiness的ID为 18 成功！','更新UserBusiness成功'), ('1962','63','增加经手人','192.168.112.102','2016-12-24 13:28:51','1','增加经手人名称为 失败！','增加经手人失败'), ('1963','63','增加经手人','192.168.112.102','2016-12-24 13:36:27','0','增加经手人名称为 成功！','增加经手人成功'), ('1964','63','增加经手人','192.168.112.102','2016-12-24 13:40:00','0','增加经手人名称为 成功！','增加经手人成功'), ('1965','63','增加经手人','192.168.112.102','2016-12-24 13:40:06','0','增加经手人名称为 成功！','增加经手人成功'), ('1966','63','增加经手人','192.168.112.102','2016-12-24 13:42:26','0','增加经手人名称为 成功！','增加经手人成功'), ('1967','63','增加经手人','192.168.112.102','2016-12-24 13:45:11','0','增加经手人名称为 成功！','增加经手人成功'), ('1968','63','增加经手人','192.168.112.102','2016-12-24 13:46:29','0','增加经手人名称为 成功！','增加经手人成功'), ('1969','63','批量删除经手人','192.168.112.102','2016-12-24 13:48:20','0','批量删除经手人ID为 5,6,7,8,9,10 成功！','批量删除经手人成功'), ('1970','63','增加经手人','192.168.112.102','2016-12-24 13:49:03','0','增加经手人名称为 655aaaa 成功！','增加经手人成功'), ('1971','63','增加经手人','192.168.112.102','2016-12-24 13:50:08','0','增加经手人名称为 11111 成功！','增加经手人成功'), ('1972','63','删除经手人','192.168.112.102','2016-12-24 13:50:11','0','删除经手人ID为 12 成功！','删除经手人成功'), ('1973','63','删除经手人','192.168.112.102','2016-12-24 13:50:15','0','删除经手人ID为 11 成功！','删除经手人成功'), ('1974','63','增加经手人','192.168.112.102','2016-12-24 13:50:31','0','增加经手人名称为 rrrrr 成功！','增加经手人成功'), ('1975','63','更新经手人','192.168.112.102','2016-12-24 13:50:36','0','更新经手人ID为 13 成功！','更新经手人成功'), ('1976','63','删除经手人','192.168.112.102','2016-12-24 13:53:27','0','删除经手人ID为 13 成功！','删除经手人成功'), ('1977','63','删除经手人','192.168.112.102','2016-12-24 13:55:13','1','删除经手人ID为 2 失败！','删除经手人失败'), ('1978','63','删除经手人','192.168.112.102','2016-12-24 13:55:19','1','删除经手人ID为 2 失败！','删除经手人失败'), ('1979','63','增加经手人','192.168.112.102','2016-12-24 13:55:25','0','增加经手人名称为 123123 成功！','增加经手人成功'), ('1980','63','删除经手人','192.168.112.102','2016-12-24 13:55:28','0','删除经手人ID为 14 成功！','删除经手人成功'), ('1981','63','删除经手人','192.168.112.102','2016-12-24 13:55:32','1','删除经手人ID为 2 失败！','删除经手人失败'), ('1982','63','删除经手人','192.168.112.102','2016-12-24 13:56:05','1','删除经手人ID为 2 失败！','删除经手人失败'), ('1983','63','更新经手人','192.168.112.102','2016-12-24 13:56:18','0','更新经手人ID为 2 成功！','更新经手人成功'), ('1984','63','更新经手人','192.168.112.102','2016-12-24 13:56:33','0','更新经手人ID为 2 成功！','更新经手人成功'), ('1985','63','增加仓管通','192.168.112.102','2016-12-24 14:07:11','1','增加仓管通编号为 1111 失败！','增加仓管通失败'), ('1986','63','增加仓管通','192.168.112.102','2016-12-24 14:07:20','1','增加仓管通编号为 1111 失败！','增加仓管通失败'), ('1987','63','增加仓管通','192.168.112.102','2016-12-24 14:17:53','1','增加仓管通编号为 33 失败！','增加仓管通失败'), ('1988','63','增加仓管通','192.168.112.102','2016-12-24 14:18:15','1','增加仓管通编号为 33 失败！','增加仓管通失败'), ('1989','63','增加仓管通','192.168.112.102','2016-12-24 14:33:03','0','增加仓管通编号为 123 成功！','增加仓管通成功'), ('1990','63','保存仓管通明细','192.168.112.102','2016-12-24 14:33:03','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('1991','63','更新仓管通','192.168.112.102','2016-12-24 14:35:40','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('1992','63','更新仓管通','192.168.112.102','2016-12-24 14:37:08','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('1993','63','保存仓管通明细','192.168.112.102','2016-12-24 14:37:08','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('1994','63','更新仓管通','192.168.112.102','2016-12-24 14:37:32','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('1995','63','更新仓管通','192.168.112.102','2016-12-24 14:51:08','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('1996','63','更新仓管通','192.168.112.102','2016-12-24 14:51:47','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('1997','63','保存仓管通明细','192.168.112.102','2016-12-24 14:51:48','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('1998','63','登录系统','192.168.112.102','2016-12-24 15:32:37','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1999','63','登录系统','192.168.112.102','2016-12-24 16:14:10','0','管理用户：jsh 登录系统','jsh 登录系统'), ('2000','63','登录系统','192.168.112.102','2016-12-24 17:43:55','0','管理用户：jsh 登录系统','jsh 登录系统'), ('2001','63','登录系统','192.168.112.102','2016-12-24 17:45:17','0','管理用户：jsh 登录系统','jsh 登录系统'), ('2002','63','登录系统','192.168.112.102','2016-12-24 19:47:51','0','管理用户：jsh 登录系统','jsh 登录系统'), ('2003','63','更新仓管通','192.168.112.102','2016-12-24 22:12:26','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('2004','63','保存仓管通明细','192.168.112.102','2016-12-24 22:12:27','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('2005','63','更新仓管通','192.168.112.102','2016-12-24 22:54:10','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('2006','63','保存仓管通明细','192.168.112.102','2016-12-24 22:54:11','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('2007','63','更新仓管通','192.168.112.102','2016-12-24 23:01:32','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('2008','63','保存仓管通明细','192.168.112.102','2016-12-24 23:01:32','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('2009','63','增加仓管通','192.168.112.102','2016-12-24 23:14:22','0','增加仓管通编号为 123132 成功！','增加仓管通成功'), ('2010','63','更新仓管通','192.168.112.102','2016-12-24 23:29:31','0','更新仓管通ID为 38 成功！','更新仓管通成功'), ('2011','63','更新仓管通','192.168.112.102','2016-12-24 23:33:25','0','更新仓管通ID为 38 成功！','更新仓管通成功'), ('2012','63','更新仓管通','192.168.112.102','2016-12-24 23:37:28','0','更新仓管通ID为 38 成功！','更新仓管通成功'), ('2013','63','保存仓管通明细','192.168.112.102','2016-12-24 23:37:29','0','保存仓管通明细对应主表编号为 38 成功！','保存仓管通明细成功'), ('2014','63','更新仓管通','192.168.112.102','2016-12-24 23:41:41','0','更新仓管通ID为 38 成功！','更新仓管通成功'), ('2015','63','保存仓管通明细','192.168.112.102','2016-12-24 23:41:41','0','保存仓管通明细对应主表编号为 38 成功！','保存仓管通明细成功'), ('2016','63','增加仓管通','192.168.112.102','2016-12-24 23:43:50','0','增加仓管通编号为 222 成功！','增加仓管通成功'), ('2017','63','保存仓管通明细','192.168.112.102','2016-12-24 23:43:51','0','保存仓管通明细对应主表编号为 39 成功！','保存仓管通明细成功'), ('2018','63','更新仓管通','192.168.112.102','2016-12-24 23:44:16','0','更新仓管通ID为 39 成功！','更新仓管通成功'), ('2019','63','保存仓管通明细','192.168.112.102','2016-12-24 23:44:17','0','保存仓管通明细对应主表编号为 39 成功！','保存仓管通明细成功'), ('2020','63','更新仓管通','192.168.112.102','2016-12-24 23:46:56','0','更新仓管通ID为 39 成功！','更新仓管通成功'), ('2021','63','保存仓管通明细','192.168.112.102','2016-12-24 23:46:57','0','保存仓管通明细对应主表编号为 39 成功！','保存仓管通明细成功'); +INSERT INTO `jsh_log` VALUES ('2022','63','更新仓管通','192.168.112.102','2016-12-24 23:50:37','0','更新仓管通ID为 39 成功！','更新仓管通成功'); INSERT INTO `jsh_material` VALUES ('485','1','棉线','A21-4321','米色','码','',NULL,NULL,NULL,NULL), ('487','1','网布','12343','红色','码','',NULL,NULL,NULL,NULL), ('498','2','蕾丝','B123','蓝色','码','',NULL,NULL,NULL,NULL); INSERT INTO `jsh_materialcategory` VALUES ('1','根目录','1','1'), ('2','花边分类','1','1'); -INSERT INTO `jsh_person` VALUES ('1','1','仓管员','张三-仓管'), ('2','1','采购人','李四-采购'), ('3','2','财务员','王五-财务'), ('4','2','财务员','赵六-财务'); +INSERT INTO `jsh_person` VALUES ('1','仓管员','张三-仓管'), ('2','仓管员','李四-仓管'), ('3','财务员','王五-财务'), ('4','财务员','赵六-财务'); INSERT INTO `jsh_role` VALUES ('4','管理员'), ('5','仓管员'); -INSERT INTO `jsh_supplier` VALUES ('1','上海某某花边工厂','','','','','1','供应商','\0',NULL,NULL,NULL,NULL), ('2','客户AAAA','','','','','1','客户','\0',NULL,NULL,NULL,NULL), ('4','aaaa','11','22','312341@qq.com','55','1','供应商','\0','33','44',NULL,NULL); +INSERT INTO `jsh_supplier` VALUES ('1','上海某某花边工厂','','','','','1','供应商','\0',NULL,NULL,NULL,NULL), ('2','客户AAAA','','','','','1','客户','\0',NULL,NULL,NULL,NULL), ('4','苏州新源布料厂','11','22','312341@qq.com','55','1','供应商','\0','33','44',NULL,NULL); INSERT INTO `jsh_user` VALUES ('63','季圣华','jsh','e10adc3949ba59abbe56e057f20f883e','','','','','0','1','-1','',NULL), ('64','张三','zs','e10adc3949ba59abbe56e057f20f883e','','销售','','','0','1',NULL,'',NULL), ('65','李四','ls','e10adc3949ba59abbe56e057f20f883e','','销售','','','0','1',NULL,'',NULL); -INSERT INTO `jsh_userbusiness` VALUES ('1','RoleAPP','4','[21][1][8][11][10][19][16][15][12][7][17][20][18][3][6][22][23][24][25]'), ('2','RoleAPP','5','[8][7][3][6]'), ('3','RoleAPP','6','[21][1][8]'), ('4','RoleAPP','7','[21][1][8][11]'), ('5','RoleFunctions','4','[13][12][16][14][15][22][23][25][26][194][195][31][33][200][201][41][199][202][40][197][203][204][205][206][59]'), ('6','RoleFunctions','5','[22][23][25][26][194][195][31][33][200][201][41][199][202][40][59]'), ('7','RoleFunctions','6','[168][13][12][16][14][15][189][18][19]'), ('8','RoleAPP','8','[21][1][8][11][10]'), ('9','RoleFunctions','7','[168][13][12][16][14][15][189][18][19][132]'), ('10','RoleFunctions','8','[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187]'), ('11','RoleFunctions','9','[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187][188]'), ('12','UserRole','1','[5]'), ('13','UserRole','2','[6][7]'), ('14','UserDepot','2','[1][2][6][7]'), ('15','UserDepot','1','[1][2][5][6][7][10][12][14][15][17]'), ('16','UserRole','63','[4]'), ('17','RoleFunctions','13','[46][47][48][49]'), ('18','UserDepot','63','[1][6][45][46][50][51]'), ('19','UserDepot','5','[6][45][46][50]'), ('20','UserRole','5','[5]'), ('21','UserRole','64','[5]'), ('22','UserDepot','64','[1]'), ('23','UserRole','65','[5]'), ('24','UserDepot','65','[1]'); +INSERT INTO `jsh_userbusiness` VALUES ('1','RoleAPP','4','[21][1][8][11][10][19][16][15][12][7][17][20][18][3][6][22][23][24][25]'), ('2','RoleAPP','5','[8][7][3][6]'), ('3','RoleAPP','6','[21][1][8]'), ('4','RoleAPP','7','[21][1][8][11]'), ('5','RoleFunctions','4','[13][12][16][14][15][22][23][25][26][194][195][31][33][200][201][41][199][202][40][197][203][204][205][206][59]'), ('6','RoleFunctions','5','[22][23][25][26][194][195][31][33][200][201][41][199][202][40][59]'), ('7','RoleFunctions','6','[168][13][12][16][14][15][189][18][19]'), ('8','RoleAPP','8','[21][1][8][11][10]'), ('9','RoleFunctions','7','[168][13][12][16][14][15][189][18][19][132]'), ('10','RoleFunctions','8','[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187]'), ('11','RoleFunctions','9','[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187][188]'), ('12','UserRole','1','[5]'), ('13','UserRole','2','[6][7]'), ('14','UserDepot','2','[1][2][6][7]'), ('15','UserDepot','1','[1][2][5][6][7][10][12][14][15][17]'), ('16','UserRole','63','[4]'), ('17','RoleFunctions','13','[46][47][48][49]'), ('18','UserDepot','63','[1][3]'), ('19','UserDepot','5','[6][45][46][50]'), ('20','UserRole','5','[5]'), ('21','UserRole','64','[5]'), ('22','UserDepot','64','[1]'), ('23','UserRole','65','[5]'), ('24','UserDepot','65','[1]'); diff --git a/src/com/jsh/action/basic/DepotAction.java b/src/com/jsh/action/basic/DepotAction.java index 25b18511..d1c798e0 100644 --- a/src/com/jsh/action/basic/DepotAction.java +++ b/src/com/jsh/action/basic/DepotAction.java @@ -40,7 +40,7 @@ public class DepotAction extends BaseAction try { Map condition = pageUtil.getAdvSearch(); - condition.put("id_s_order", "asc"); + condition.put("sort_s_order", "asc"); depotService.find(pageUtil); mapData.put("depotList", pageUtil.getPageList()); } @@ -237,10 +237,6 @@ public class DepotAction extends BaseAction depotService.find(pageUtil); List dataList = pageUtil.getPageList(); - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} JSONObject outer = new JSONObject(); outer.put("total", pageUtil.getTotalCount()); //存放数据json数组 @@ -274,7 +270,7 @@ public class DepotAction extends BaseAction } /** - * 用户对应部门显示 + * 用户对应仓库显示 * @return */ public void findUserDepot() @@ -292,7 +288,7 @@ public class DepotAction extends BaseAction //开始拼接json数据 JSONObject outer = new JSONObject(); outer.put("id", 1); - outer.put("text", "部门列表"); + outer.put("text", "仓库列表"); outer.put("state", "open"); //存放数据json数组 JSONArray dataArray = new JSONArray(); @@ -311,7 +307,7 @@ public class DepotAction extends BaseAction } catch (DataAccessException e) { - Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的部门：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); + Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的仓库：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); } if (flag==true){item.put("checked", true);} //结束 @@ -324,11 +320,11 @@ public class DepotAction extends BaseAction } catch (DataAccessException e) { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找部门异常", e); + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库异常", e); } catch (IOException e) { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询部门结果异常", e); + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库结果异常", e); } } @@ -358,7 +354,7 @@ public class DepotAction extends BaseAction * 拼接搜索条件 */ Map condition = new HashMap(); - condition.put("Id_s_order", "asc"); + condition.put("sort_s_order", "asc"); return condition; } diff --git a/src/com/jsh/action/materials/AccountHeadAction.java b/src/com/jsh/action/materials/AccountHeadAction.java index 806f7f11..e16153a9 100644 --- a/src/com/jsh/action/materials/AccountHeadAction.java +++ b/src/com/jsh/action/materials/AccountHeadAction.java @@ -12,7 +12,6 @@ import net.sf.json.JSONObject; import org.springframework.dao.DataAccessException; import com.jsh.base.BaseAction; import com.jsh.base.Log; -import com.jsh.model.po.Building; import com.jsh.model.po.Account; import com.jsh.model.po.AccountHead; import com.jsh.model.po.Logdetails; diff --git a/src/com/jsh/action/materials/BuildingAction.java b/src/com/jsh/action/materials/BuildingAction.java deleted file mode 100644 index 5140cd15..00000000 --- a/src/com/jsh/action/materials/BuildingAction.java +++ /dev/null @@ -1,274 +0,0 @@ -package com.jsh.action.materials; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.Depot; -import com.jsh.model.po.Building; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.materials.BuildingModel; -import com.jsh.service.materials.BuildingIService; -import com.jsh.util.PageUtil; - -@SuppressWarnings("serial") -public class BuildingAction extends BaseAction -{ - private BuildingIService buildingService; - private BuildingModel model = new BuildingModel(); - - - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getBasicData() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.put("ProjectId_n_eq", model.getProjectId()); - condition.put("Id_s_order", "asc"); - buildingService.find(pageUtil); - mapData.put("buildingList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - /** - * 增加单元 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加单元信息方法create()==================="); - Boolean flag = false; - try - { - Building building = new Building(); - building.setDepot(new Depot(model.getProjectId())); - - building.setName(model.getName()); - building.setRemark(model.getRemark()); - building.setEnabled(model.getEnabled()); - buildingService.create(building); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加单元信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加单元信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加单元", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加单元名称为 "+ model.getName() + " " + tipMsg + "！", "增加单元" + tipMsg)); - Log.infoFileSync("==================结束调用增加单元方法create()==================="); - } - - /** - * 删除单元 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除单元信息方法delete()================"); - try - { - buildingService.delete(model.getBuildingID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getBuildingID() + " 的单元异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除单元", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除单元ID为 "+ model.getBuildingID() + " " + tipMsg + "！", "删除单元" + tipMsg)); - Log.infoFileSync("====================结束调用删除单元信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新单元 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Building building = buildingService.get(model.getBuildingID()); - building.setDepot(new Depot(model.getProjectId())); - - building.setName(model.getName()); - building.setRemark(model.getRemark()); - building.setEnabled(model.getEnabled()); - buildingService.update(building); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改单元ID为 ： " + model.getBuildingID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改单元回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新单元", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新单元ID为 "+ model.getBuildingID() + " " + tipMsg + "！", "更新单元" + tipMsg)); - } - - /** - * 批量删除指定ID单元 - * @return - */ - public String batchDelete() - { - try - { - buildingService.batchDelete(model.getBuildingIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除单元ID为：" + model.getBuildingIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除单元", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除单元ID为 "+ model.getBuildingIDs() + " " + tipMsg + "！", "批量删除单元" + tipMsg)); - return SUCCESS; - } - - /** - * 查找单元信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - buildingService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Building building:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", building.getId()); - item.put("ProjectId", building.getDepot().getId()); - item.put("ProjectName", building.getDepot().getName()); - item.put("Name", building.getName()); - item.put("Remark", building.getRemark()); - item.put("Enabled", building.getEnabled()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单元信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单元信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("ProjectId_n_eq", model.getProjectId()); - condition.put("Name_s_like", model.getName()); - condition.put("Id_s_order", "asc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public BuildingModel getModel() - { - return model; - } - public void setBuildingService(BuildingIService buildingService) - { - this.buildingService = buildingService; - } -} diff --git a/src/com/jsh/action/materials/DepotHeadAction.java b/src/com/jsh/action/materials/DepotHeadAction.java index 21af3e23..c903a0af 100644 --- a/src/com/jsh/action/materials/DepotHeadAction.java +++ b/src/com/jsh/action/materials/DepotHeadAction.java @@ -12,7 +12,7 @@ import net.sf.json.JSONObject; import org.springframework.dao.DataAccessException; import com.jsh.base.BaseAction; import com.jsh.base.Log; -import com.jsh.model.po.Building; +import com.jsh.model.po.Account; import com.jsh.model.po.Depot; import com.jsh.model.po.DepotHead; import com.jsh.model.po.Logdetails; @@ -81,13 +81,12 @@ public class DepotHeadAction extends BaseAction Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e); } if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));} - if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} - if(model.getWareHousePersonId()!=null){depotHead.setWareHousePersonId(new Person(model.getWareHousePersonId()));} + if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} + if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));} + depotHead.setChangeAmount(model.getChangeAmount()); if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));} - if(model.getBuildingId()!=null){depotHead.setBuildingId(new Building(model.getBuildingId()));} - depotHead.setSettlementWay(model.getSettlementWay()); + depotHead.setTotalPrice(model.getTotalPrice()); depotHead.setRemark(model.getRemark()); - depotHead.setState("草稿"); depotHeadService.create(depotHead); //========标识位=========== @@ -173,10 +172,10 @@ public class DepotHeadAction extends BaseAction } if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));} if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} - if(model.getWareHousePersonId()!=null){depotHead.setWareHousePersonId(new Person(model.getWareHousePersonId()));} + if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));} + depotHead.setChangeAmount(model.getChangeAmount()); if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));} - if(model.getBuildingId()!=null){depotHead.setBuildingId(new Building(model.getBuildingId()));} - depotHead.setSettlementWay(model.getSettlementWay()); + depotHead.setTotalPrice(model.getTotalPrice()); depotHead.setRemark(model.getRemark()); depotHeadService.update(depotHead); @@ -207,58 +206,6 @@ public class DepotHeadAction extends BaseAction , tipType, "更新仓管通ID为 "+ model.getDepotHeadID() + " " + tipMsg + "！", "更新仓管通" + tipMsg)); } - /** - * 更新状态 - * @return - */ - public void submit() - { - Log.infoFileSync("====================开始调用更新状态仓管通信息方法submit()================"); - Boolean flag = false; - String changeId=""; - try - { - String DepotHeadIDs=model.getDepotHeadIDs(); - String[] DepotHeadID=DepotHeadIDs.split(","); - for(int i=0;i>>>>>>>>>>>>更新状态仓管通ID为 ： " + model.getDepotHeadID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>更新状态仓管通回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新状态仓管通", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新状态-"+model.getState()+"-ID为 "+ changeId + " " + tipMsg + "！", "更新状态仓管通" + tipMsg)); - Log.infoFileSync("====================结束调用更新状态仓管通信息方法submit()================"); - } - /** * 批量删除指定ID仓管通 * @return @@ -301,10 +248,6 @@ public class DepotHeadAction extends BaseAction depotHeadService.find(pageUtil); List dataList = pageUtil.getPageList(); - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} JSONObject outer = new JSONObject(); outer.put("total", pageUtil.getTotalCount()); //存放数据json数组 @@ -325,17 +268,13 @@ public class DepotHeadAction extends BaseAction item.put("OrganName", depotHead.getOrganId()==null?"":depotHead.getOrganId().getSupplier()); item.put("HandsPersonId", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getId()); item.put("HandsPersonName", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getName()); - item.put("WareHousePersonId", depotHead.getWareHousePersonId()==null?"":depotHead.getWareHousePersonId().getId()); - item.put("WareHousePersonName", depotHead.getWareHousePersonId()==null?"":depotHead.getWareHousePersonId().getName()); + item.put("AccountId", depotHead.getAccountId()==null?"":depotHead.getAccountId().getId()); + item.put("AccountName", depotHead.getAccountId()==null?"":depotHead.getAccountId().getName()); + item.put("ChangeAmount", depotHead.getChangeAmount()); item.put("AllocationProjectId", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getId()); - item.put("AllocationProjectName", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getName()); - item.put("BuildingId", depotHead.getBuildingId()==null?"":depotHead.getBuildingId().getId()); - item.put("BuildingName", depotHead.getBuildingId()==null?"":depotHead.getBuildingId().getName()); //单元名称 - item.put("SettlementWay", depotHead.getSettlementWay()); + item.put("AllocationProjectName", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getName()); + item.put("TotalPrice", depotHead.getTotalPrice()); item.put("Remark", depotHead.getRemark()); - item.put("State", depotHead.getState()); - item.put("ReAuditPersonName", depotHead.getReAuditPersonName()); - item.put("Reason", depotHead.getReason()); item.put("op", 1); dataArray.add(item); } @@ -411,7 +350,6 @@ public class DepotHeadAction extends BaseAction condition.put("Number_s_like",model.getNumber()); condition.put("OperTime_s_gteq",model.getBeginTime()); condition.put("OperTime_s_lteq",model.getEndTime()); - condition.put("State_s_eq", model.getState()); condition.put("Id_s_order","desc"); return condition; } diff --git a/src/com/jsh/action/materials/DepotItemAction.java b/src/com/jsh/action/materials/DepotItemAction.java index 70cae83d..80505294 100644 --- a/src/com/jsh/action/materials/DepotItemAction.java +++ b/src/com/jsh/action/materials/DepotItemAction.java @@ -66,9 +66,8 @@ public class DepotItemAction extends BaseAction depotItem.setMaterialId(new Material(tempInsertedJson.getLong("MaterialId"))); depotItem.setOperNumber(tempInsertedJson.getDouble("OperNumber")); if(tempInsertedJson.get("UnitPrice")!=null){depotItem.setUnitPrice(tempInsertedJson.getDouble("UnitPrice"));} - if(tempInsertedJson.get("Incidentals")!=null){depotItem.setIncidentals(0.0);} + if(tempInsertedJson.get("AllPrice")!=null){depotItem.setAllPrice(tempInsertedJson.getDouble("AllPrice"));} depotItem.setRemark(tempInsertedJson.getString("Remark")); - depotItem.setImg(tempInsertedJson.getString("Img")); depotItemService.create(depotItem); } } @@ -89,9 +88,8 @@ public class DepotItemAction extends BaseAction depotItem.setMaterialId(new Material(tempUpdatedJson.getLong("MaterialId"))); depotItem.setOperNumber(tempUpdatedJson.getDouble("OperNumber")); if(tempUpdatedJson.get("UnitPrice")!=null){depotItem.setUnitPrice(tempUpdatedJson.getDouble("UnitPrice"));} - if(tempUpdatedJson.get("Incidentals")!=null){depotItem.setIncidentals(0.0);} + if(tempUpdatedJson.get("AllPrice")!=null){depotItem.setAllPrice(tempUpdatedJson.getDouble("AllPrice"));} depotItem.setRemark(tempUpdatedJson.getString("Remark")); - depotItem.setImg(tempUpdatedJson.getString("Img")); depotItemService.create(depotItem); } } @@ -143,10 +141,6 @@ public class DepotItemAction extends BaseAction depotItemService.find(pageUtil); List dataList = pageUtil.getPageList(); - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} JSONObject outer = new JSONObject(); outer.put("total", pageUtil.getTotalCount()); //存放数据json数组 @@ -158,10 +152,13 @@ public class DepotItemAction extends BaseAction JSONObject item = new JSONObject(); item.put("Id", depotItem.getId()); item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId()); - item.put("MaterialName", ((depotItem.getMaterialId().getModel().equals(""))?"":""+depotItem.getMaterialId().getModel())+" "+depotItem.getMaterialId().getName()+((depotItem.getMaterialId().getColor() == null)?"(":"("+depotItem.getMaterialId().getColor()) + ")"); + String MaterialName = ((depotItem.getMaterialId().getModel().equals(""))?"":""+depotItem.getMaterialId().getModel())+" "+depotItem.getMaterialId().getName() + +((depotItem.getMaterialId().getColor() == null)?"(":"("+depotItem.getMaterialId().getColor()) + ")" + +((depotItem.getMaterialId().getUnit() == null)?"(":"("+depotItem.getMaterialId().getUnit()) + ")"; + item.put("MaterialName", MaterialName); item.put("OperNumber", depotItem.getOperNumber()); item.put("UnitPrice", depotItem.getUnitPrice()); - item.put("Incidentals", depotItem.getIncidentals()); + item.put("AllPrice", depotItem.getAllPrice()); item.put("Remark", depotItem.getRemark()); item.put("Img", depotItem.getImg()); item.put("op", 1); diff --git a/src/com/jsh/action/materials/MaterialAction.java b/src/com/jsh/action/materials/MaterialAction.java index 0e3ecc48..4c1d034a 100644 --- a/src/com/jsh/action/materials/MaterialAction.java +++ b/src/com/jsh/action/materials/MaterialAction.java @@ -271,7 +271,10 @@ public class MaterialAction extends BaseAction JSONObject item = new JSONObject(); item.put("Id", material.getId()); //名称 - item.put("MaterialName", ((material.getModel().equals(""))?"":""+material.getModel()) +" "+ material.getName() + ((material.getColor() == null)?"":"("+material.getColor() + ")")); + String MaterialName = ((material.getModel().equals(""))?"":""+material.getModel()) +" "+ material.getName() + + ((material.getColor() == null)?"":"("+material.getColor() + ")") + + ((material.getUnit() == null)?"":"("+material.getUnit() + ")"); + item.put("MaterialName", MaterialName); dataArray.add(item); } } diff --git a/src/com/jsh/action/materials/PersonAction.java b/src/com/jsh/action/materials/PersonAction.java index 962cd038..94e9d984 100644 --- a/src/com/jsh/action/materials/PersonAction.java +++ b/src/com/jsh/action/materials/PersonAction.java @@ -36,7 +36,6 @@ public class PersonAction extends BaseAction try { Map condition = pageUtil.getAdvSearch(); - condition.put("ProjectId_n_eq", model.getProjectId()); condition.put("Id_s_order", "asc"); personService.find(pageUtil); mapData.put("personList", pageUtil.getPageList()); @@ -83,7 +82,6 @@ public class PersonAction extends BaseAction try { Person person = new Person(); - person.setDepot(new Depot(model.getProjectId())); person.setType(model.getType()); person.setName(model.getName()); @@ -157,7 +155,6 @@ public class PersonAction extends BaseAction try { Person person = personService.get(model.getPersonID()); - person.setDepot(new Depot(model.getProjectId())); person.setType(model.getType()); person.setName(model.getName()); @@ -242,8 +239,6 @@ public class PersonAction extends BaseAction { JSONObject item = new JSONObject(); item.put("Id", person.getId()); - item.put("ProjectId", person.getDepot().getId()); - item.put("ProjectName", person.getDepot().getName()); item.put("Type", person.getType()); item.put("Name", person.getName()); item.put("op", 1); @@ -274,7 +269,7 @@ public class PersonAction extends BaseAction * 拼接搜索条件 */ Map condition = new HashMap(); - condition.put("ProjectId_n_eq", model.getProjectId()); + condition.put("Name_s_like", model.getName()); condition.put("Type_s_eq", model.getType()); return condition; } diff --git a/src/com/jsh/dao/materials/BuildingDAO.java b/src/com/jsh/dao/materials/BuildingDAO.java deleted file mode 100644 index 50d48de6..00000000 --- a/src/com/jsh/dao/materials/BuildingDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Building; - -public class BuildingDAO extends BaseDAO implements BuildingIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Building.class; - } -} diff --git a/src/com/jsh/dao/materials/BuildingIDAO.java b/src/com/jsh/dao/materials/BuildingIDAO.java deleted file mode 100644 index f97df09d..00000000 --- a/src/com/jsh/dao/materials/BuildingIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Building; - -public interface BuildingIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/model/po/Building.hbm.xml b/src/com/jsh/model/po/Building.hbm.xml deleted file mode 100644 index 99f39b7a..00000000 --- a/src/com/jsh/model/po/Building.hbm.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - 名称 - - - - - 备注 - - - - - 启用 - - - - diff --git a/src/com/jsh/model/po/Building.java b/src/com/jsh/model/po/Building.java deleted file mode 100644 index dbf38e3b..00000000 --- a/src/com/jsh/model/po/Building.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Building implements java.io.Serializable -{ - private Long Id; - private Depot depot; - private String Name; - private String Remark; - private Boolean Enabled; - - public Building() - { - - } - - public Building(Long Id) - { - this.Id = Id; - } - - public Building(Depot depot, String name, String remark, Boolean enabled) { - super(); - this.depot = depot; - Name = name; - Remark = remark; - Enabled = enabled; - } - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public Depot getDepot() { - return depot; - } - - public void setDepot(Depot depot) { - this.depot = depot; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - - public Boolean getEnabled() { - return Enabled; - } - - public void setEnabled(Boolean enabled) { - Enabled = enabled; - } - -} \ No newline at end of file diff --git a/src/com/jsh/model/po/DepotHead.hbm.xml b/src/com/jsh/model/po/DepotHead.hbm.xml index d98fafd1..80352b74 100644 --- a/src/com/jsh/model/po/DepotHead.hbm.xml +++ b/src/com/jsh/model/po/DepotHead.hbm.xml @@ -49,48 +49,33 @@ - 采购/领料-经手人Id + 经手人Id - - - 仓管员-经手人Id + + + 账户Id - - - 现金/记账 + + + 变动金额(收款/付款) - - - 单元Id - - 调拨时，对方项目Id + + + 合计金额 + + 备注 - - - 草稿/已生效/废弃/待审核/未通过 - - - - - 撤审人 - - - - - 撤审原因 - - diff --git a/src/com/jsh/model/po/DepotHead.java b/src/com/jsh/model/po/DepotHead.java index 4b645303..6b15402f 100644 --- a/src/com/jsh/model/po/DepotHead.java +++ b/src/com/jsh/model/po/DepotHead.java @@ -15,15 +15,11 @@ public class DepotHead implements java.io.Serializable private Timestamp OperTime; private Supplier OrganId; private Person HandsPersonId; - private Person WareHousePersonId; - private String SettlementWay; - private Building BuildingId; + private Account AccountId; + private Double ChangeAmount; private Depot AllocationProjectId; - private String Remark; - private String State; - private String ReAuditPersonName; - private String Reason; - + private Double TotalPrice; + private String Remark; public DepotHead() { @@ -38,9 +34,7 @@ public class DepotHead implements java.io.Serializable public DepotHead(String type, String subType, Depot projectId, String number, String operPersonName, Timestamp createTime, Timestamp operTime, Supplier organId, Person handsPersonId, - Person wareHousePersonId, String settlementWay, - Building buildingId, Depot allocationProjectId, String remark, - String state, String reAuditPersonName, String reason) { + Account accountId, Double changeAmount, Depot allocationProjectId, Double totalPrice, String remark) { super(); Type = type; SubType = subType; @@ -51,14 +45,11 @@ public class DepotHead implements java.io.Serializable OperTime = operTime; OrganId = organId; HandsPersonId = handsPersonId; - WareHousePersonId = wareHousePersonId; - SettlementWay = settlementWay; - BuildingId = buildingId; + AccountId = accountId; + ChangeAmount = changeAmount; AllocationProjectId = allocationProjectId; + TotalPrice = totalPrice; Remark = remark; - State = state; - ReAuditPersonName = reAuditPersonName; - Reason = reason; } public Long getId() { @@ -140,29 +131,21 @@ public class DepotHead implements java.io.Serializable public void setHandsPersonId(Person handsPersonId) { HandsPersonId = handsPersonId; } - - public Person getWareHousePersonId() { - return WareHousePersonId; + + public Account getAccountId() { + return AccountId; } - public void setWareHousePersonId(Person wareHousePersonId) { - WareHousePersonId = wareHousePersonId; + public void setAccountId(Account accountId) { + AccountId = accountId; } - public String getSettlementWay() { - return SettlementWay; + public Double getChangeAmount() { + return ChangeAmount; } - public void setSettlementWay(String settlementWay) { - SettlementWay = settlementWay; - } - - public Building getBuildingId() { - return BuildingId; - } - - public void setBuildingId(Building buildingId) { - BuildingId = buildingId; + public void setChangeAmount(Double changeAmount) { + ChangeAmount = changeAmount; } public Depot getAllocationProjectId() { @@ -173,6 +156,14 @@ public class DepotHead implements java.io.Serializable AllocationProjectId = allocationProjectId; } + public Double getTotalPrice() { + return TotalPrice; + } + + public void setTotalPrice(Double totalPrice) { + TotalPrice = totalPrice; + } + public String getRemark() { return Remark; } @@ -180,31 +171,4 @@ public class DepotHead implements java.io.Serializable public void setRemark(String remark) { Remark = remark; } - - public String getState() { - return State; - } - - public void setState(String state) { - State = state; - } - - public String getReAuditPersonName() { - return ReAuditPersonName; - } - - public void setReAuditPersonName(String reAuditPersonName) { - ReAuditPersonName = reAuditPersonName; - } - - public String getReason() { - return Reason; - } - - public void setReason(String reason) { - Reason = reason; - } - - - } \ No newline at end of file diff --git a/src/com/jsh/model/po/DepotItem.hbm.xml b/src/com/jsh/model/po/DepotItem.hbm.xml index 558018e2..c6de4ed9 100644 --- a/src/com/jsh/model/po/DepotItem.hbm.xml +++ b/src/com/jsh/model/po/DepotItem.hbm.xml @@ -27,9 +27,9 @@ 单价 - - - 运杂费 + + + 金额 diff --git a/src/com/jsh/model/po/DepotItem.java b/src/com/jsh/model/po/DepotItem.java index 420d6062..f3cec78b 100644 --- a/src/com/jsh/model/po/DepotItem.java +++ b/src/com/jsh/model/po/DepotItem.java @@ -8,7 +8,7 @@ public class DepotItem implements java.io.Serializable private Material MaterialId; private Double OperNumber; private Double UnitPrice; - private Double Incidentals; + private Double AllPrice; private String Remark; private String Img; @@ -23,14 +23,14 @@ public class DepotItem implements java.io.Serializable } public DepotItem(DepotHead headerId, Material materialId, - Double operNumber, Double unitPrice, Double incidentals, + Double operNumber, Double unitPrice, Double allPrice, String remark, String img) { super(); HeaderId = headerId; MaterialId = materialId; OperNumber = operNumber; UnitPrice = unitPrice; - Incidentals = incidentals; + AllPrice = allPrice; Remark = remark; Img = img; } @@ -75,12 +75,12 @@ public class DepotItem implements java.io.Serializable UnitPrice = unitPrice; } - public Double getIncidentals() { - return Incidentals; + public Double getAllPrice() { + return AllPrice; } - public void setIncidentals(Double incidentals) { - Incidentals = incidentals; + public void setAllPrice(Double allPrice) { + AllPrice = allPrice; } public String getRemark() { diff --git a/src/com/jsh/model/po/Person.hbm.xml b/src/com/jsh/model/po/Person.hbm.xml index 8b71ec75..f3e03159 100644 --- a/src/com/jsh/model/po/Person.hbm.xml +++ b/src/com/jsh/model/po/Person.hbm.xml @@ -7,9 +7,6 @@ - - - 类型 diff --git a/src/com/jsh/model/po/Person.java b/src/com/jsh/model/po/Person.java index 7d9566d6..6e739bd1 100644 --- a/src/com/jsh/model/po/Person.java +++ b/src/com/jsh/model/po/Person.java @@ -4,7 +4,6 @@ package com.jsh.model.po; public class Person implements java.io.Serializable { private Long Id; - private Depot depot; private String Type; private String Name; @@ -18,8 +17,7 @@ public class Person implements java.io.Serializable this.Id = Id; } - public Person(Depot depot, String type, String name) { - this.depot = depot; + public Person(String type, String name) { Type = type; Name = name; } @@ -32,14 +30,6 @@ public class Person implements java.io.Serializable Id = id; } - public Depot getDepot() { - return depot; - } - - public void setDepot(Depot depot) { - this.depot = depot; - } - public String getType() { return Type; } diff --git a/src/com/jsh/model/vo/materials/BuildingModel.java b/src/com/jsh/model/vo/materials/BuildingModel.java deleted file mode 100644 index c3365b7d..00000000 --- a/src/com/jsh/model/vo/materials/BuildingModel.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class BuildingModel implements Serializable -{ - private BuildingShowModel showModel = new BuildingShowModel(); - - /**======开始接受页面参数=================**/ - /** - * ProjectId - */ - private Long ProjectId; - /** - * 名称 - */ - private String Name = ""; - /** - * 备注 - */ - private String Remark = ""; - /** - * 启用 - */ - private Boolean Enabled = false; - - /** - * 分类ID - */ - private Long buildingID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String buildingIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public BuildingShowModel getShowModel() { - return showModel; - } - - public void setShowModel(BuildingShowModel showModel) { - this.showModel = showModel; - } - - public Long getProjectId() { - return ProjectId; - } - - public void setProjectId(Long projectId) { - ProjectId = projectId; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - - public Boolean getEnabled() { - return Enabled; - } - - public void setEnabled(Boolean enabled) { - Enabled = enabled; - } - - public Long getBuildingID() { - return buildingID; - } - - public void setBuildingID(Long buildingID) { - this.buildingID = buildingID; - } - - public String getBuildingIDs() { - return buildingIDs; - } - - public void setBuildingIDs(String buildingIDs) { - this.buildingIDs = buildingIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - -} diff --git a/src/com/jsh/model/vo/materials/BuildingShowModel.java b/src/com/jsh/model/vo/materials/BuildingShowModel.java deleted file mode 100644 index 2363433f..00000000 --- a/src/com/jsh/model/vo/materials/BuildingShowModel.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class BuildingShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - -} diff --git a/src/com/jsh/model/vo/materials/DepotHeadModel.java b/src/com/jsh/model/vo/materials/DepotHeadModel.java index 584df683..f41ffb8b 100644 --- a/src/com/jsh/model/vo/materials/DepotHeadModel.java +++ b/src/com/jsh/model/vo/materials/DepotHeadModel.java @@ -16,14 +16,11 @@ public class DepotHeadModel implements Serializable private String OperTime; private Long OrganId; private Long HandsPersonId; - private Long WareHousePersonId; - private String SettlementWay = ""; - private Long BuildingId; + private Long AccountId; + private Double ChangeAmount; private Long AllocationProjectId; + private Double TotalPrice; private String Remark = ""; - private String State = ""; - private String ReAuditPersonName = ""; - private String Reason = ""; private String BeginTime; //查询开始时间 private String EndTime; //查询结束时间 @@ -117,28 +114,20 @@ public class DepotHeadModel implements Serializable HandsPersonId = handsPersonId; } - public Long getWareHousePersonId() { - return WareHousePersonId; + public Long getAccountId() { + return AccountId; } - public void setWareHousePersonId(Long wareHousePersonId) { - WareHousePersonId = wareHousePersonId; + public void setAccountId(Long accountId) { + AccountId = accountId; } - public String getSettlementWay() { - return SettlementWay; + public Double getChangeAmount() { + return ChangeAmount; } - public void setSettlementWay(String settlementWay) { - SettlementWay = settlementWay; - } - - public Long getBuildingId() { - return BuildingId; - } - - public void setBuildingId(Long buildingId) { - BuildingId = buildingId; + public void setChangeAmount(Double changeAmount) { + ChangeAmount = changeAmount; } public Long getAllocationProjectId() { @@ -149,6 +138,14 @@ public class DepotHeadModel implements Serializable AllocationProjectId = allocationProjectId; } + public Double getTotalPrice() { + return TotalPrice; + } + + public void setTotalPrice(Double totalPrice) { + TotalPrice = totalPrice; + } + public String getRemark() { return Remark; } @@ -157,30 +154,6 @@ public class DepotHeadModel implements Serializable Remark = remark; } - public String getState() { - return State; - } - - public void setState(String state) { - State = state; - } - - public String getReAuditPersonName() { - return ReAuditPersonName; - } - - public void setReAuditPersonName(String reAuditPersonName) { - ReAuditPersonName = reAuditPersonName; - } - - public String getReason() { - return Reason; - } - - public void setReason(String reason) { - Reason = reason; - } - public Long getDepotHeadID() { return depotHeadID; } diff --git a/src/com/jsh/model/vo/materials/DepotItemModel.java b/src/com/jsh/model/vo/materials/DepotItemModel.java index 01e9b466..ea6d890e 100644 --- a/src/com/jsh/model/vo/materials/DepotItemModel.java +++ b/src/com/jsh/model/vo/materials/DepotItemModel.java @@ -13,7 +13,7 @@ public class DepotItemModel implements Serializable private Long MaterialId; private Double OperNumber; private Double UnitPrice; - private Double Incidentals; + private Double AllPrice; private String Remark = ""; private String Img = ""; @@ -100,12 +100,12 @@ public class DepotItemModel implements Serializable UnitPrice = unitPrice; } - public Double getIncidentals() { - return Incidentals; + public Double getAllPrice() { + return AllPrice; } - public void setIncidentals(Double incidentals) { - Incidentals = incidentals; + public void setAllPrice(Double allPrice) { + AllPrice = allPrice; } public String getRemark() { diff --git a/src/com/jsh/model/vo/materials/PersonModel.java b/src/com/jsh/model/vo/materials/PersonModel.java index 251d4e43..d6c07271 100644 --- a/src/com/jsh/model/vo/materials/PersonModel.java +++ b/src/com/jsh/model/vo/materials/PersonModel.java @@ -8,10 +8,6 @@ public class PersonModel implements Serializable private PersonShowModel showModel = new PersonShowModel(); /**======开始接受页面参数=================**/ - /** - * ProjectId - */ - private Long ProjectId; /** * 类型 */ @@ -54,14 +50,6 @@ public class PersonModel implements Serializable this.showModel = showModel; } - public Long getProjectId() { - return ProjectId; - } - - public void setProjectId(Long projectId) { - ProjectId = projectId; - } - public String getType() { return Type; } diff --git a/src/com/jsh/service/materials/BuildingIService.java b/src/com/jsh/service/materials/BuildingIService.java deleted file mode 100644 index 746fa52d..00000000 --- a/src/com/jsh/service/materials/BuildingIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.Building; - -public interface BuildingIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/materials/BuildingService.java b/src/com/jsh/service/materials/BuildingService.java deleted file mode 100644 index acc1058b..00000000 --- a/src/com/jsh/service/materials/BuildingService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseService; -import com.jsh.dao.materials.BuildingIDAO; -import com.jsh.model.po.Building; - -public class BuildingService extends BaseService implements BuildingIService -{ - @SuppressWarnings("unused") - private BuildingIDAO buildingDao; - - - public void setBuildingDao(BuildingIDAO buildingDao) { - this.buildingDao = buildingDao; - } - - - @Override - protected Class getEntityClass() - { - return Building.class; - } - -}
收货仓库： + 入库时间： + 单据日期： 供应商： + 供货单位： 采购人： + 经手人：
仓管员： - + 付款账户： + 结算方式： - + 付款金额： + 备注： - - 单据号： + 单据编号： - 单据备注： + +
商品列表：
仓管员：经手人：
仓管员：经手人：