From f8a1f67f7c1d63c136a3689b0076ebd4ce38d781 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 24 Jul 2024 06:19:08 +0800 Subject: [PATCH] md --- .../web/emis/EmisSettleBillController.java | 17 +++++++++-------- emis-biz/src/main/resources/tpl/bill_tpl.xlsx | Bin 10580 -> 10578 bytes .../main/resources/tpl/bill_tpl_simple.xlsx | Bin 10476 -> 10475 bytes 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index 1d6ffe73f..b17f1cd4f 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -243,9 +243,9 @@ public class EmisSettleBillController extends BaseController voMap.put("paymentType", DictUtils.getDictLabel("emis_payment_type",billItem.getWaybillDetail().getPaymentType())); voMap.put("productTypeName", billItem.getWaybillDetail().getProductTypeName()); voMap.put("parcelQty", billItem.getWaybillDetail().getParcelQty().toString()); - voMap.put("settlementWeight", billItem.getWaybillDetail().getSettlementWeight()); - voMap.put("totalVolume", billItem.getWaybillDetail().getTotalVolume().toString()); - voMap.put("freight", billItem.getWaybillDetail().getFreight().toString()); + voMap.put("settlementWeight", billItem.getWaybillDetail().getSettlementWeight().stripTrailingZeros().toPlainString()); + voMap.put("totalVolume", billItem.getWaybillDetail().getTotalVolume().stripTrailingZeros().toPlainString()); + voMap.put("freight", billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString()); voMap.put("feeRemark", billItem.getWaybillDetail().getFeeRemark()); //计算分项数据 @@ -279,11 +279,12 @@ public class EmisSettleBillController extends BaseController } } - voMap.put("transFee", transFee.toString()); - voMap.put("cebFee",cebFee.toString()); - voMap.put("declareFee", declareFee.toString()); - voMap.put("otherFee", otherFee.toString()); - + voMap.put("transFee",transFee.compareTo(BigDecimal.ZERO)==0?"0":transFee.stripTrailingZeros().toPlainString()); + voMap.put("cebFee",cebFee.compareTo(BigDecimal.ZERO)==0?"0":cebFee.stripTrailingZeros().toPlainString()); + voMap.put("declareFee",declareFee.compareTo(BigDecimal.ZERO)==0?"0": declareFee.stripTrailingZeros().toPlainString()); + voMap.put("otherFee", otherFee.compareTo(BigDecimal.ZERO)==0?"0":otherFee.stripTrailingZeros().toPlainString()); + }else{ + voMap.put("transFee",billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString()); } // {.transFee} {.cebFee} {.declareFee} {.otherFee} diff --git a/emis-biz/src/main/resources/tpl/bill_tpl.xlsx b/emis-biz/src/main/resources/tpl/bill_tpl.xlsx index 3b7e7a0906f0fc470ea3190bc2b82e699fd6d715..cd8dc12095eed7318a7ccff1004f8ed95a92722c 100644 GIT binary patch delta 1571 zcmV+;2Hg47Qqoeeq5%YPyOv#(rU5N~&MKkpKxJ1B1Sg7jAvx=cO&XGDw zlCR$*8SK!gsPF)`+ozBEa%{H--`|qhd*vz@G9CJ1t?qj~jpRb4tD*n<*Yw+k@8z1M z3l__i5B+zZ``<@@|25c3^^&hS*B%(seCV&W&iX-+M{Az2ye2cA;?7d4glSx=RghCQLJbG_W0*sbDl%2vpIu-cx)z^nZl? zSvBK{S8n}0g@G<%-&m`9o~AQj*HkTRJ^Ear2ggM0QaH`+K2{SIWLWp>Y(dd%Z^ z=wAbF6!R?Qi-FvNp>9I4d?o-EY4OSn^ivO_`_G1iQ^XUL0ewE-2RF4En<;O>muwS% z>#>agh=pDc{a!6>H7?rS{lCA5{3EwFT&&g_iL`4CvqmIi5aQoUgn1NvFJW)?xGl&U zNGh^*+_8r{x5A;Zb7&&d!Xa#*bZG4yaNMtO+5vZMNS)Fl#G)rc>h2tH+^=xj0S~)f z0mq#KTu&^3K3RO@Q_}D~_6UmV+BO=06^;f!b8w67FIrzEzLxjaU64-w;I#Kj?hVseb= z9U`ud5n-iF8_3iFsYGTW*A7Uf7Yn&@K&sYT$gKlXbBObruixT1zBHC$7}4K>_S z!yPsJq=tKHc%X(yYOpik;bYb$ioF zs|nYRZPecA&+HUP?altIY3fbwt^Ul$LGA7StnI>g`m>J9-s_`yX2LCrFob4o#UGej zi8S|O%+Q#XYhAo%RWY#^7nrZ@B=jsbM*Cut!uENhZvEh5-%RL@hAymln{j?UGZwmd9eT zO8*GG-UV-Fd@naU1Y^XW#28Gn<>qnpKad`?MhPwx38%XPy8#0L00Fao91sHubw_wJ z;2om{U$d4U%LM_QlVT-60R@wzB{Kmjlh-Aa1aZ5TU6XDm#{p53HYYX#c#~}>EgPr1 z0=oeN00037000yK0000000031AOHXWWRtZgK>=Bl_a{05CX+HKHUUkOX(&Jemy@a} VUIh|pIub{d4JkneH6;K5000AP;-&xq delta 1580 zcmV+{2GjY{Qq)qgq5%ZH#Ixd)rU5N~Iwzs+KxJ1B1Sg7jAvx=cO&XGDw~k#+D4##W8WQ5+EzfZ~m)RGFjOXC?gq~Ie`Kbg7%2#%o!3CdXiSZFyx8 zl6?Ih$zVgHN`(io-9CNPmt(s%`u>(C-YZvykXhu1ji&GMES3wAts?)Qzh~bre6P?f zTd+iCJo4Xp;eQ|h`NwE0)l0GFTzg>1ipXDUoezVch}S%2MMLI1!=0s6Dbu)AtDwjg zXAA3plqNx|+3W==6PaH!4AoaSxuK9%t%<(V!?6i=8&{KZ=2#h&eL@g=^6Vq4_8 zkLMu7X?dsO3p*$Ar6N|ckW1Z&Wg3*Bon|=*21j|O@d=TmSSeF4oBSJyb0qgH5~1I1 zy8D2*u6efGZDX4kjX2vyaZsSJA8K|e9@!4eRWKec1gdCS?f|b z`B#7&#XL*-VjwqQXqr$gp9z4)TD!RD=|NDE$UvhiR#cHjQNVm~4Ys4}EA^yEom`B0)Qubz#+mft> zq+(mg9ecQQD;-)phc+@T9m4LX4xOC?j{6lpcfeg6Qm=9dvFIlup^Vl6$NdVQJK$lr z4mj={;QGk|gB`wgkTiTxJ%X~jwv9%Ah2xQuTMtht%50j@u4-Gg1ro@ad9j4U5K4&+ z`Ul{~0(C`x0qg6yISO7OiWomoR=mjb9A3Z)Z|LSlqUZ1ePIy~xUWnivUcd=&+szBj zoWlz^;qAD2p}})_0Vlj&H!t+|1>RmI2;f1C_Em!DRm4^@m#2vSF=BFxxHv|COivMm zW5mx>L|7}+1~PL%YLQvUl><`i#X_zfkh=92a^ry1U9^x}2c&L@h5T|rNNMeBI`W~J zs`w$P?S08|1R=$Ja6m|PA5UXxk?PJJkh;1@uLiuJ&XO4LkQkoiD$5pW%B2HBnlf=f zNK>W`2x-bs2ZS_b=75lY-&nm^Dj$X&V}Vbk#e=N^JC$E#d4G3VeR89 zQCaH=*N$z}-WtyB6iDsu;k<3?P3@iG+{Que-Qm3J!uN*rp36QMqIhP)t%xv$=4{39 znOcdg@Dj|>n3WrSyhBwvv6dH@uk9rCEHy^^a+1RKibEI82Ea=x_5K127|tiIH@TOy zoU14Cf!!PiDX9cDQg;786#2PSS}~y^UD!V)ZY0xOnE4C?8n%gAVBW7Rpk3P~XLc=* zC1RER7J9u4-pu%3VRi_{h&_ohm}INX zEgVkG?cxCg00068000yK0000000031AOHXWW*n1%92S$xCn^D3ll3P$0VtC&C^i94 elV>PE0hyDiC|(8egU1_5lM5+91~(-D0001v) diff --git a/emis-biz/src/main/resources/tpl/bill_tpl_simple.xlsx b/emis-biz/src/main/resources/tpl/bill_tpl_simple.xlsx index b68c69e21764b533bbf63e980a0b5f071a3de68a..33c3a3ea8d4b322e3ec25c51442a2289d8377e15 100644 GIT binary patch delta 1548 zcmV+n2J`vsQR`8#q5%b#$~DYClcxb9e;9@D1>d3MzD?TBIYQfk%B~y;PA1-kEJ&DgDf{&!HVb*nZq8CDL!a4t!^PgnXjjV%bFt%z`j^c=*02FUTrOF)LEoR{a z1=cYoSluYd(H1P47N;i}*OWH~ZcL-WxC(6GNy<{LbF_9&Q;aQNgJd@H4&}vFe`6$b z{%T6B8GmFY;DnGdmf)CRj^Q0J)B_RqNWllBelm3j5FA4d5|pzzj$-`nbzr3ZbD&d> zoU(FT?RVJxLjnwEj%VhKVVHh@ zOJe7hik$H@bp1}(b!Zy#Elc;I`_JFYZ#S-!OOkF$%u^b=?=*M6&;I;lT5$1_A1IX$ z7}7j+4^n1<=jG9XCM56hjHZ9Mv*RKm5|?7{<(Z<DTbA>vg*$FCi>-ONKyvg@f;Q zETRh@9TS?$l0?v$NW`BXSe938Z`&{NZ3QWiYZcF@5Etd0n$I7!;!9X0c+PjS6Y<0= zLu+R_@g`?^CQ*yXQmllCmt*z~#2J!%W-*iRI^8NDDjS}nC^|)!ccOpv6vd|k`D2gD z`7xI~SrAFw*;Fg=OL(*CmZ6GDdPmS*=>G77^~8l;BmQNy$UmJsl00u{Oe0CRXcgD_ z;5^wxB&HkH2P^W?g(updA6cEIj3ffy(fAQjh zvi(6KkzuE&)`)lvLi{@kQ(M7x67r^xMM>5}QjxCXiQPZBl@7g=Lm!!z4*u|>!{FqA zW3|F%2i(;mjcNxUi(Uw6d~(3CTH&$-HoIN{$CCqGFDw9^G+uv|rb-&VZ4a-ku9i`C z;cO~+;b4cN%u0lQUE5j~v_MAGgT)VgbV{VqKLA%2bXVx+u)fZ^Q|}c`5#a~QniqLq z!wa~<>)Uyu?lruC8@xR`FPh*QUce3BzMU66a}6)x2JgVmiypj&7jT1jXy--0eSx=M zHw5q?hJ1BHjB0;k-7>dr#P}RBZzFEb5sNlra*nubBmAZ_bs$R%q-in@xwk-?e$kKz z3#5@=Lmn-VMnw&IvOpR^G~}lRVw84eff%)2TOdtw&vq=H8&@e0Je0=3{f5|5JQwl3&ejA<;enRL@Cv`K#c0H+K|3c z-L(bMRQF7Myh*N7Urh+-`@V08a$730 z!&-TP(NYfq&s<`vEr$qvSx|`F?Et*vTviuYKyhxUJZ4TtGAcIg10OP&A-G`phR~l5 zp__3b1z{3>2>S=ejd+nUHJV^H!55Nb7-0MldIua z88MD4gG#pkZkqiMkRG!f3Edk3Hk0}!KmneUJ0&v#!jo?$lLeN_HOxPg2PRYj0+U=O zKmlEoohC2=>XXhUHUbeMlP)40lOiW70VtDACqV%)laD7l0sWK8CpG~jlL06|0Wgz7 yC_DjvlYb~78)4bA(H#T;0DKJq02lxO000000096X00020le;J@2F@e^00021bkQLI delta 1549 zcmV+o2J-pqQS4E$q5%b-^5wHVlcxb9e-wuA1>d3MzD?R~ZiKc2m0dXyoG9Lf3nETh=N=aYRr6ir1o4MTTxyi*SYl z>zER(sug5t2Nuoq)032I%4-AHrq*Cw2{!N~WhvJg+Bl~v#+GkDG8_4Z^5MERf08+W zGzHd-Ke7UFLdY4G;Fw^J;T9O`frxsf-~&=WnW_T_j-dhx%2^yoG5+p4Fw*{cp-YaM zvUEG`XX@1MV(e*v=s1GWJPI}LKdAOrvaev`ojBY)yJ6n$T5 z|3j4bA%u@oBEo12r5^**XxZI)c7p+{Nt|^|)ArZzu|pDYEL0vK$<4XP*Y{k<*OTw> zN$k8)ku#o#uHWgp4oxGzVd*Y(|M`3I?bda2Nzx68c}hd~gXZq{>7Rd03NBvrJ*CnC zLz;)~Udk-+ygb^|gybEb(SH9o$O9)Hdk|7XZ;o#dX zi|Cw3hlHlGBoQO4MP@{^p2q0(EZ^DtFa5aM*PcYk)PZGOe0A*C>7WF z?UWAG+g?Kj_^KN7cVuLH^>! zBW1h2#8ifzo*E^y}Q#vY-YsqCPEt;G54fi!|>$WIHzNbS-BF><@IK$_&9typ|Fu2LR&D31kJEAJbk z+_fP+LzI~XVu&)gKnzjtEf7PLg#}`W@?e1&qC8q4hJPqe7KkCrvjx(KQmSu(7};I6 zA$=peD+{E_?wR`7Nv={Kcw^o74N>k&$Utw>YV(+xhPi3DHw_EZ@L(DqO~aFEcs30` zO~bM@oR)ImC?7OtYQB0hW!}n`sN72vDt5Yg%AJTGQY?rOK9IGwY43E$V%mGbN;g2J zy&tUlDt~#VeGsg49HxC3tcEuHO|a5UoQWR?$b@R{>KEw0GP0v9B6cjzofr)y8pX~C zyOJoIwekVYrQS?lxI|y8Z}&J`P>9^^0KDZ~Ru33JajvO6WKKphD%R{1M;Y`GTriv> z^x+|NGcKecOrj29|KxZP&oic46Z9rHBT0s4w_s8H>gX`p~ zJyu3E~! zTP8pOTa%n7Fahh6%_cSi5+ai=A{>(;Cn^CclT0T;0Wp(~CprQClgTGG0VR?sKmjq6 zK`1-{e3O1CAsagla={=3004ds000;O0000000031AOHXWsFS)VD+bRb00000LmA*o