From f06f0a8a0b39d89c5d0479e316605d7cc1b976cd Mon Sep 17 00:00:00 2001
From: llllon <chunyangli0323@163.com>
Date: Tue, 16 Sep 2025 13:50:47 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E5=BA=94=E6=94=B6?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B1=87=E6=80=BB=E6=96=B9=E6=B3=95=202?=
 =?UTF-8?q?=E3=80=81=E9=87=87=E8=B4=AD=E6=B3=B0=E5=B9=B4=E6=9C=88=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DataLinkUpController.class     | Bin 20792 -> 20851 bytes
 .../datalinkup/service/DataSyncService.class  | Bin 1974 -> 2005 bytes
 .../impl/PurchaseDataSyncServiceImpl.class    | Bin 29603 -> 30094 bytes
 .../service/impl/SaleCountDimensionImpl.class | Bin 38989 -> 38990 bytes
 .../impl/SaleDataSyncServiceImpl.class        | Bin 26779 -> 26792 bytes
 .../compileJava/previous-compilation-data.bin | Bin 9396485 -> 9396485 bytes
 .../controller/DataLinkUpController.java      |   7 +-
 .../datalinkup/service/DataSyncService.java   |   9 ++
 .../impl/ProductionDataSyncServiceImpl.java   |   5 +
 .../impl/PurchaseDataSummaryServiceImpl.java  |  27 ++--
 .../impl/PurchaseDataSyncServiceImpl.java     |  16 +++
 .../service/impl/SaleDataSyncServiceImpl.java | 136 ++++++++++++++++++
 12 files changed, 185 insertions(+), 15 deletions(-)

diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.class
index 8df70bfd967b812722f3d15d267a198ff31645a0..f196b6da502a328a3f923b648294f8a138d2548a 100644
GIT binary patch
delta 5366
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
E0}fYz{Qv*}

delta 5284
zcmbtX33wD$60W~`l78vwkYRw30djDJa0r1!!lhiIAzXqSf(MX=AaRjE2<xKgfPe;(
zLs||IML^_|GYTOBf*c}<fFdfO$SI;CiXx}kdOb1gy6}CwpYtWJtLt4=)%E|c-i7%n
zoR7?1zZGpFqQ-p1qA>Kas2F`C=rH;zWSaP!7yU87PlQ1hvhlFO-}Q*WCLXcKi#}cu
zhIj$w=w_&iVG6kx`7m4|&!U|ep`PzkF=*mRi(=77A!uPV#^{%)6viryQy8!Cw8AqA
z`FhC-7M{gKFP_6BElpOKVqq$t_hK3xg%|Yp(=E)vOodq{UbH9`v$d5knV4fy8eX=j
zDPA!#S3h6X&Agz(d<$t<V4*Qy)6GH)uVaygCRl7?36|<rmg(7V=w`XX3JXoO6Dv)u
zvM58FzFP0HMxnsOn-+D}s<%w6wWzBW*C`Y#tXC*fcw1qE!bWZKCWUuY5S#UKTfEd4
z@0!@EpW76+YfE<M<~@a-I+X8Q*oEC%`as8GkHUuvd$s@j^kVyUME7{n2p{R@V}%3S
zrce9?4APoUb@Q3R=L&}`9L5nHtuJK%FBOg|d}ZR8!f`$4ghiup(oc**3a2f6jWY`0
zD4aF%twrN?B8<m(y7^w=oSyN6iSrgsL?07BS~N-f{F8|b7ERUS&kDcz$<V9)s&Gkv
z;L8eEyl9K7Dh<~ZuIoux6@F7FR!oW^t1_Ex_{k&bMe{jKakygBFNruvafGvoTL$%@
zc*O~dt17N0q2cO&3g=p0uFZ86*R}W-uBTt>o1851;RcEu`pM)}Nm#zsPs$Aqrzvji
zrwDGU)y@25=`C(ke7oWndXJWV@=7Nab8E$I6yITTTZ`{xzN;X|=wX=YCbu&=qhNQq
z#}nD!<PIixG`W+>oePdw6X3ZU)YCa?-Q}#bPk1_ky1Fk%A`e9#rLS!6!d-3pg1&UN
zmg$&tkImh<JIL22Cns-sUT)^lPFZ<_as~{K3g;e*d)j<2_cFP+&G+&BApe<pi%%9V
zKfPw&={XZlEuVRM#alK%zz>4TJ)HTE%;XVy*@Kf?=jLXP?3g_~&*nbd*XDklY4hK>
zKd7$LHLS|CuqbCqlrM4s_mU81w6!^l2Rb{Vp7uUu^B~T)`C<OMbFZ&S%wQg9@*_46
z;T)5P+B}SNZ63~f&LUr8nGrVsgC8~dpEi%=$DBjH*ou$ygC>u%`3Zg!lyYM9)KeQq
zpIS80*;gUPsS{n!X<D{y(oqg-mq&{)Ik^udKRi5VNOJpbcXxJ;w&^I3vH2+;>kKPf
zvE5)EXY+V|8f1->U%gJ9>J1oR^D~@p^8|j@=862A$&+lJ%u{Th%FmlT&1Q#Ruz5Pq
zuz4oWviU`x?d&T%*67A#3VQnMBk?7k15#}=I=9Ven{YeG>>HA8ewlmO{0h$nB{}<Q
z#3ytek(E2Lb(ahqk^Cws{8W*1YPl>qkLTOGfM+>p$_=jY8qYF$q0O)JA{!Pjws{F>
zI@#sp{7d;!o0st$HZRv+t>Bf;i{(4`R`F=Xt8HGx1vbCQZ#h4gZ|_~JL%+`ELSFA=
zR2b@A#YHy1%^MVNbhcGU3*V&s-<cNuy4uWJY<`!wI4h!W6Q{Nod>`Ew*yg0fbThW|
z4ktgRh0&bfD|kPqCu*(Yt)NP7Y7EXC@=)?UBZlN<KazFlKl^75&CAXiqIjo{d6AP|
zDIM<@OsO=Gja59xxl|?HNso<B-^IHn5kK(p9(jD|gT!Yq?=yM7O=tNdA*WkR{@CUN
z{E5v6`BTZ`fA7^TFE@LLq||5pxwAYrwcH_{%ZF_~!e1!<(&nT5m2)AsUYTQBe_ZQN
zC_d@bk9$?T@2>ci&8PW6=Rlkj@wLro_#05F<Zo)hg7}3n&hobf9jZ=<bS~CUGQQ*Q
zorL7N#$i5J&^dXf;W4subDgUxUCRBS7r$Wg&o=+U7j4{&UQVCX+PGAZpSljX?6hjs
zvDaY=lXFi3rC}+ODY8IS+GFyTEKkTYtj;>ZY7v-@OB?PgYtadj?a%-^NvGrubeg`F
zQO62SHkt_>cSbdSJgA2~MmCsw(HZ)Nyp%)V(pmYpWX97aQ?>LReXo}j>6}RHN<WBX
zxYBu%Ji>}&=tufV?7kKE&;|Ng%;|)t^b1`S>$@P0ex*yA?<kHg(-n%ipRS4l(Xw1<
z!nM)~*JZ+Q(icab>(thyViWRS-jqYf1g_CslYEz{zZgzpG+@ZTXE?&-5f0OJbAOX4
z1IG)FHLnZpC!VC5*eAOy@v{bAqWcgb)+AuD*l3BZRV9pV;T2n}A)g+FExqx0l=2ZN
zy;U%Z#-fbqVlkc`LzGByoJjTH6W^=QQ}_mD;is~40)2&YqVv<&7>DvAl?&2&JdO$?
zmZ!_eMYKp2z*4YO6e(H`ntq58sUpftE(Ao1K`c6>l1Ks6#GR-tQYExQbyN{!DpL-#
z8%!T139ZE<PU6*oM<8B$6{T`65>S;Qs0lxUY6w=B?|B#ZMGYiMxH<{P)<lvdNDuCU
zTBuEt^Z;j|4(d`F8q7^`i;RonrBny?P+yiNKKFYr@Hr%lF_H_S(^(;(Ky(d6GAK;&
z&=4t-3$eW4&4qCOoGJv7DoWG++P6xYxFN@_r6IpAA$J2Ux+)<rMXDU~NF=3m0jtPY
zEcxj(>99#VLw_Ef8k8p4VWN>qO-)KQA+L>1G!a>>yiU!{Af#hwyuX;1Q2hTh-E=3G
z?)GOv?<yH5yA)GHs(#azgEz43e_UG9T>|Hoq$fd4!X*k6%V({8)2(i}Q&78q(?406
zZ0|LyBO|U*nPLH5)c>)*c0P^5|2%^PhNJ3+09xVS2yG@}^Ad#4Zgrjop%d?@971Rt
zO5hYqa&s;Yxk6W(lVXug=Uq;!Ld&q)MVX)8#NrUPXd~v9Kx>Co-7d6fFD8YcMV|=<
zU1-rUfuIId44oASYJ>&^SQT-bK&DcVW?`3$sIoMYBXB!fkdGb7%a$^*EI&i_U9)_W
z?0ZY0u(uQndrP6Pw-gGyN};eO1O>tB;u5Uh!V3hK)g`l=@pOS@Fj2m0Yo6@lQtEjr
zFElQ_)P;jCE^X?^IW8_EsXq@!E3_7@4&-dK!5xCtA|VtFGM@`Fq5cxzuF3hK!Q&&l
zm}XJgKYu0-9)V5pKXGG1ICqjM)wTY*Ln&~RX*Zj7v*ad<_g<%17p}NYZwQN<6q{pG
zaMWe0RV-X`GXrn7lSV~YF;%;9%KjH2gdB5oGx?8)M`e9_+$mAJE0mi=5y|pJY7=={
zIJc!gf!Ca(^rhI~WVNe@$&S<RNq^KDGW?qZG3#lVL0aD8G|0HU&by!@+Df#ZwlVp)
z7t)UP^d8e@+Sx2F5a-{%mfmj`uZQn)W@fZ1zniF8%|OjU`XDVyw1Geo?Qy=%XsJF7
zcNg93q_po^ZJ&%v3M7SXq_EybAhKI;PavXOA?;7ARWj!zXJPxa$|Z9?E~JLh)w2re
zsrA$-WZMDfV*7gd#HrDtT91PU1;PW-0lz<bEu{x4t)*ZQeM+>JK3g>|3X87wlKG8Y
z_dbt~iuRN)6bSbpT1yR9Ntn(V`;7xMN{C*n4$Pn|=cNuG2Pfd1+>0*=_%2~G15*S^
zQ`v`UoB)Sg;RQKlX7B@ekux!yhhPrp<7Ia63eUz|egm)a4teet{eHa02eFV(;&uKN
zi}(tb7$%k)HkKJNSYf1KrO^_rjqX@u3`BvEC(n^V=?G$-F%E^sbgVZP<85OdHW(ks
zb3e8i2e8pNh)u>>yklI&CJ$k=CxBj_cx?65z&1}Bw(G(PbEvjJzX{R>`ZakrHAFi(
z?UOj4?r<3-kq^qzl_6-WX0)Vc?zkkQI|UQnfwhbjN_Pj=G)$W376{dhaZ+^XDb*!D
zU!uK8l_WA--1EGO#AmfzFvUugo<|4SI8I`fkB;a>@e-|}QVpa~f^kqx&_{A58f(nJ
z-J<i+bH*fek<!B-r0L?jX25dvit)J1kL78Rk&CXPt3a!aY^lqn;Gp$JKex=NNbef=
zx?C7TJB)7VCcOd5GnTnj7^SoSce3-e_?_%TS90!)uH@YJG!?Q7x(C0fY6;sVc;e7q
zst}VBCCnkVOZ9l&A|!&Ec|0X#*T%S3LUtL(FC}Ex+c;H1cEgN4E@zhU)Q}2DQ(V;V
zRbwcAx@HK)FG$xY)@8dV^f8%t15UV6ksuW4(%b@y`7fHg*?7;57%r&KSR%ttu&evz
z7h!vgX(Gk_wN>?^vYjq9L^9FCL*k=U1U-OD)U%fOEPAa8hE(@m(NtRZuX^J;qYv?7
zYWu%MGBGt2N@3(ba;v7+o<2+8a-?iL=1l1l6BO16-BsZH;jUt$w_H6)iuC(RFFI9q
zsVTn*|KUP9Qb2~j?BEZVo!aEV{i0($;O;6{AUr6qKZ(vF@Ol1~f0VO6OWr%nU1y;5
pr$6LA4!Z3rx4o!a_PDL$8f0)H*W@JkJ;iMsxos1-ZSJ<M{sqA-ey0Ec

diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/DataSyncService.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/DataSyncService.class
index 86d3d18b5bff1085bc19a89cf97e022929c419c3..6e0cf3ab0a219d543956b77dd5ed4e5220ace740 100644
GIT binary patch
delta 76
zcmdnSf0bY0)W2Q(7#JAL8I;)>6xkV+HVVvU6BQ{g&CN|L%B)HaPR=h#bxABqj4YnK
elC6o6d$JCDgAfZNgB*i6P#YtIJdk8!PyhgQXA<!M

delta 46
zcmcc0zl~qu)W2Q(7#JAL8I;%=6xbOQHww&Vn|z3^fst#nGkXIU10#bRP@0KB9soS>
B3XuQ+

diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.class
index 8f2d392c52b968addaa8aab2ef2cb2093646d172..e3c6ca1e72fc385f08f6bae5e774a4dd96353a9a 100644
GIT binary patch
delta 7430
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
G#{UP;tbj-W

delta 6984
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

diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.class
index fa2de384699757dc270c013f8fefc290ba2187f1..37b766562ca96d33fe5a532a04b4150327b45250 100644
GIT binary patch
delta 20
ccmX@Rf$7`^rVR-SjQ1xeD$LmYLm{*r0AySVQvd(}

delta 20
ccmX@Nf$8i9rVR-SjQ1udD$LmYOCh8j0AyPUQvd(}

diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.class
index 13c11318cbfe3a4c5c172c8911d37ae1a80e9068..e736c7fa53da9a0b341667624601518920087742 100644
GIT binary patch
delta 5912
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

delta 5854
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

diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin
index 8caaf45a6b114b920e81c9169571e4136ebc0a6c..6ba84fb4e4c44d0cd16f10d382494181e28d856d 100644
GIT binary patch
delta 737
zcmWm9SxD0X0Dy7kR-Wa5Ic;vKbIqe>$E?h}R&$!OJlZUeEL&>La$1^}<&|sBYaaYX
zv<JaQUwjb}6b%yJ>&cJ^L5NTid-v$`;RoOA=l;4Rb7R;g<d0S<*Cw2u=I#B_Z*|iV
zBjS)SwUhUA@W-Mm$*{DylJ$99Oq4kEX)?=hgCk+x+w;ZQ8@)VjvSixKHk~qDB`i-Z
z$Q2|1z8ks}y2JK$ySOUp6VyTbZ4z&`dhBoDuNu2}AXfOy3dZ`F$>N!Tjo)^C(ZQy*
z+NG6xv{DItaMUs!!*Te+5B>;1AcAlLClL%`UMrPrj6(caZDWgVOQTx*voTlMoaeEc
z<T!;8C=iM;oQ4wNP(h6|h(IKwpg}aWI13$O5Q{j(;~dUIj|5!6MO?yV7?6l7xQc5?
z!gVC$22zlUG^8T~M%=_Ln2-rGvXG72$bkj9xP!Ymdd^1y3ULos*ieM~cz|M*pcG|z
zh;lr_V^rV??0AYwRG}Kr@Ei`*;00cy7EaWm9<T5k4QRw0G@%)9@eVC`j}K@?8`{x<
ePJBccT=)bxy5T_&deMh|48V)Qd8=t?Hu698Pzmb*

delta 737
zcmWm0OE8oH0KoC~kqt|q*J6`hYelgMmEN@LwdA#*N+HU#+Mco!O4hbn%VLc&<Ire^
z*@MOb<J2Y7q3L8s)2XRbW75TRVMfN^;WzVheEKMNVAw9qR&Kjj7KY=$E&pE)R&JO^
zydJ^d=Tc6Ozw;Z|H?e7L`k?ZrOIniOPbx;o)<-qngDZ^&ac$LTHi<c+J}O!*s3W9b
zbGKzaZBO98AK_c6-p>-3kTh;>?GXQH)!)~CE!NwLy|vPL;qQ8p>UXAlW=5gZ_#$^a
zcAd<rlSv@O-sRX2KPYej{s=%Iln6pF4nkPc$wIVQf^90)kZsn_l`d5Locv;tJ1xc#
zgdz;#h=2-_h(a{fID{A+Ml3YYA`UvlLyrU;K_ZfH6vvQ^6c}(EsW^c&q$2|-aSErA
zi8DBhb2yI+xQI*0LN+eL2orLUi#+6`0A>`T2v<;y5|pA0<*-0R1+L;6uA>q+a1&Li
zMh$ME7InCdJE%tk8qtJiwBRo8;XbT*fQNX5$9RILXvH(M!G?A`M+aV@6J6-WOT0o4
dUZWRw^ud8QaN;fc;lcpi7{t($#ps!j-34^421Eb=

diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.java
index 8b380ac..f6f725a 100644
--- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.java
+++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/controller/DataLinkUpController.java
@@ -388,6 +388,7 @@ public class DataLinkUpController {
                 LOGGER.info("汇总板块数据——采购的接口");
             }else {
                 LOGGER.error("{}当前表没有汇总表",ssyw);
+                return ro.err(ssyw+"当前表没有汇总表");
             }
 
             LOGGER.info("即将同步的数据：{}",plate);
@@ -437,7 +438,11 @@ public class DataLinkUpController {
                     // 根据时间范围增加数据分页查询数据存储到BO_EU_BNBM_DATALINKUP_XS_XSL_HZ
                     // 按时间范围分页迁移数据到汇总表
                     long summarizeStartTime = System.currentTimeMillis();
-                    dataSyncService.summarizeScopeData(targetTable, startDate, endDate, targetTimeField, hzb);
+//                    if (tablename.equals("应收表")){
+//                        dataSyncService.summarizeScopeDataYs(targetTable, startDate, endDate, targetTimeField, hzb);
+//                    }else {
+                        dataSyncService.summarizeScopeData(targetTable, startDate, endDate, targetTimeField, hzb);
+//                    }
                     LOGGER.info("范围数据汇总完成，耗时：{}ms", System.currentTimeMillis() - summarizeStartTime);
                 }
                 LOGGER.info("【完成处理】配置项[{}]，板块：{}，总耗时：{}ms",
diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/DataSyncService.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/DataSyncService.java
index 0711a6d..6d706d0 100644
--- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/DataSyncService.java
+++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/DataSyncService.java
@@ -100,4 +100,13 @@ public interface DataSyncService {
      * @return 转换后的BO对象
      */
     BO convertFields(RowMap source, List<BO> mappings);
+
+    /**
+     * 应收将范围内数据汇总
+     * @param targetTable
+     * @param startDate
+     * @param endDate
+     * @param targetTimeField
+     */
+    void summarizeScopeDataYs(String targetTable, Date startDated, Date endDated, String targetTimeField, String hzb);
 }
\ No newline at end of file
diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/ProductionDataSyncServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/ProductionDataSyncServiceImpl.java
index 2f424a4..5d54136 100644
--- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/ProductionDataSyncServiceImpl.java
+++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/ProductionDataSyncServiceImpl.java
@@ -797,4 +797,9 @@ public class ProductionDataSyncServiceImpl implements DataSyncService {
                     hzb, PAGE_SIZE, e.getMessage(), e);
         }
     }
+
+    @Override
+    public void summarizeScopeDataYs(String targetTable, Date startDated, Date endDated, String targetTimeField, String hzb) {
+
+    }
 }
diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.java
index efb023a..d348738 100644
--- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.java
+++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.java
@@ -169,29 +169,28 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService {
                     detailBO.set("WLMC", wlmc); // 物料名称
                     detailBO.set("GGXH", row.getString("GGXH")); // 规格型号
                     detailBO.set("GC", row.getString("SLGC")); // 收料工厂
-
                     // 处理入库数量，防止空值
                     Double rksl = row.getDouble("RKSL");
                     detailBO.set("RKSL", rksl != null ? rksl : 0.0); // 入库数量
-
                     detailBO.set("DW", row.getString("JLDW")); // 单位
-
                     // 处理单价和金额，添加除零检查
-                    Double jshjhyf = row.getDouble("JSHJHYF");
-                    double rkdj = 0.0;
-                    if (jshjhyf != null && jshjhyf != 0 && rksl != null && rksl != 0) {
-                        rkdj = jshjhyf / rksl;
-                    }
-                    detailBO.set("RKDJ", rkdj); // 入库单价
-
                     if ("泰山石膏".equals(bkgs)) {
-                    Double dhje = row.getDouble("DHJE");
-                    detailBO.set("RKJE", dhje != null ? dhje : 0.0); // 入库金额
+                        Double dhje = row.getDouble("DHJE");
+                        double rkdj = 0.0;
+                        if (dhje != null && dhje != 0 && rksl != null && rksl != 0) {
+                            rkdj = dhje / rksl;
+                        }
+                        detailBO.set("RKDJ", rkdj); // 入库单价
+                        detailBO.set("RKJE", dhje != null ? dhje : 0.0); // 入库单价
                     } else {
-//                        Double jshjhyf = row.getDouble("JSHJHYF");
+                        Double jshjhyf = row.getDouble("JSHJHYF");
+                        double rkdj = 0.0;
+                        if (jshjhyf != null && jshjhyf != 0 && rksl != null && rksl != 0) {
+                            rkdj = jshjhyf / rksl;
+                        }
+                        detailBO.set("RKDJ", rkdj); // 入库单价
                         detailBO.set("RKJE", jshjhyf != null ? jshjhyf : 0.0); // 入库金额
                     }
-
                     detailBO.set("GYS", row.getString("GYSNAME")); // 供应商
                     detailBO.set("DDBH", row.getString("CGDDH")); // 订单编号
                     detailBO.set("KCS", 0.00); // 库存数（默认为0，需后续计算）
diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java
index 0eedcf9..85b90b8 100644
--- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java
+++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java
@@ -895,6 +895,17 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
                                 && !allowedSuppliers.contains(bkgs)) {
                             continue;
                         }
+                        if (bkgs.equals("北新嘉宝莉")){
+                            Double thsl = bo.get("THSL",Double.class);
+                            double thsl2 = thsl!=null?thsl:0.0;
+                            Double rkslDou = bo.get("RKSL", Double.class);
+                            double rkslDou2 = rkslDou!=null?rkslDou:0.0;
+                            if (rkslDou2==0.0){
+                                bo.set("RKSL",rkslDou2-thsl2);
+                            }else {
+                                bo.set("RKSL",rkslDou2-thsl2);
+                            }
+                        }
                     }
                     bos.add(bo);
                 }
@@ -912,4 +923,9 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
             e.printStackTrace();
         }
     }
+
+    @Override
+    public void summarizeScopeDataYs(String targetTable, Date startDated, Date endDated, String targetTimeField, String hzb) {
+
+    }
 }
diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java
index 322a1ef..c3c23e0 100644
--- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java
+++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java
@@ -868,4 +868,140 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
         }
     }
 
+    /**
+     * 汇总各板块销售数据汇总
+     * @param targetTable 落地表字段
+     * @param startDated 开始时间
+     * @param endDated 结束时间
+     * @param targetTimeField 时间范围字段
+     * @param hzb 汇总表
+     */
+    @Override
+    public void summarizeScopeDataYs(String targetTable, Date startDated, Date endDated, String targetTimeField, String hzb) {
+        int pageNo = 1;
+        boolean hasMore;
+        String pageSql = "";
+        List<RowMap> pageData = null;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String startDate = "";
+        String endDate = "";
+        // 查询梦牌区域
+        List<BO> mpqyList = SDK.getBOAPI().query("BO_EU_DATALINKUP_QYGSED").addQuery("BKGS = ", "梦牌").list();
+        // 查询龙牌区域
+        List<BO> lpqyList = SDK.getBOAPI().query("BO_EU_QYGX").list();
+        try {
+            do {
+                // 构建查询每月最大日期的SQL
+                String maxDateSubQuery = "SELECT MAX(DATE(" + targetTimeField + ")) as max_date " +
+                        "FROM " + targetTable +
+                        " WHERE DATE_FORMAT(" + targetTimeField + ", '%Y-%m') = " +
+                        "DATE_FORMAT(t." + targetTimeField + ", '%Y-%m')";
+                if (startDated == null || endDated == null) {
+                    pageSql = "SELECT t.* FROM " + targetTable + " t " +
+                            "WHERE DATE(t." + targetTimeField + ") = (" + maxDateSubQuery + ") " +
+                            "ORDER BY t.ID LIMIT " + PAGE_SIZE + " OFFSET " + (pageNo - 1) * PAGE_SIZE;
+                    pageData = DBSql.getMaps(pageSql);
+                } else {
+                    startDate = simpleDateFormat.format(startDated);
+                    endDate = simpleDateFormat.format(endDated);
+                    pageSql = "SELECT t.* FROM " + targetTable + " t " +
+                            "WHERE t." + targetTimeField + " BETWEEN '" + startDate + "' AND '" + endDate + "' " +
+                            "AND DATE(t." + targetTimeField + ") = (" + maxDateSubQuery + ") " +
+                            "ORDER BY t.ID LIMIT " + PAGE_SIZE + " OFFSET " + (pageNo - 1) * PAGE_SIZE;
+                    LOGGER.info("执行查询的sql：{}", pageSql);
+                    pageData = DBSql.getMaps(pageSql);
+                }
+
+                if (pageData.isEmpty()) break;
+
+                List<BO> bos = new ArrayList<>();
+                for (RowMap map : pageData) {
+                    BO bo = new BO();
+                    if ("梦牌".equals(map.getString("BKGS")) && "梦牌新材料（平邑）有限公司".equals(map.getString("XSZZ"))){
+                        continue;
+                    }
+                    if ("北新防水".equals(map.getString("BKGS")) && "否".equals(map.getString("F_SFNBJY"))
+                            && !map.getString("XSZZ").equals("北新防水工程（辽宁）有限公司")
+                            && !map.getString("XSZZ").equals("北新防水工程（四川）有限公司")){
+                        continue;
+                    }
+                    // 复制所有字段（排除系统字段）
+                    for (String key : map.keySet()) {
+                        if (!key.equalsIgnoreCase("ID") &&
+                                !key.equalsIgnoreCase("ORGID") &&
+                                !key.equalsIgnoreCase("CREATEDATE") &&
+                                !key.equalsIgnoreCase("CREATEUSER") &&
+                                !key.equalsIgnoreCase("UPDATEDATE") &&
+                                !key.equalsIgnoreCase("UPDATEUSER") &&
+                                !key.equalsIgnoreCase("ISEND") &&
+                                !key.equalsIgnoreCase("BINDID")) {
+                            if (StringUtils.isNotBlank(targetTimeField)) {
+                                String targetTimeField1 = map.getString(targetTimeField);
+                                Date parse = UtilDate.parse(targetTimeField1);
+                                int year = UtilDate.getYear(parse);
+                                String monthFormat = UtilDate.monthFormat(parse);
+                                int day = UtilDate.getDay(parse);
+                                bo.set("YEARMONTH", year + monthFormat);
+                                bo.set("YEAR", year);
+                                bo.set("MONTH", monthFormat);
+                                bo.set("DAY", day);
+                            }
+                            bo.set(key, map.get(key));
+                        }
+                    }
+                    //销售汇总表修改区域公司
+                    if ("梦牌".equals(bo.getString("BKGS"))) {
+                        String cs = StringUtils.isBlank(bo.getString("CS"))?"":bo.getString("CS");
+                        String sq = StringUtils.isBlank(bo.getString("SQ"))?"":bo.getString("SQ");
+                        boolean found = false; // 标记是否找到匹配
+                        for (BO bo1 : mpqyList) {
+                            String ss = bo1.getString("SS");
+                            if (ss.contains(cs)) {
+                                bo.set("QYGS", bo1.getString("QYGS"));
+                                found = true;
+                                break; // 找到后立即跳出循环
+                            } else if (ss.contains(sq)) {
+                                bo.set("QYGS", bo1.getString("QYGS"));
+                                found = true;
+                                break; // 找到后立即跳出循环
+                            }
+                        }
+                        if (!found) {
+                            bo.set("QYGS", "其他"); // 循环结束后仍未找到则设為"其他"
+                        }
+                    }else if ("龙牌".equals(bo.getString("BKGS"))){
+                        String xszz = StringUtils.isBlank(bo.getString("XSZZ"))?"":bo.getString("XSZZ");
+                        boolean found = false; // 标记是否找到匹配
+                        // 修改龙牌的区域公司
+                        for (BO bo1 : lpqyList) {
+                            String swfb = bo1.getString("SWFB");
+                            String[] split = swfb.split(",");
+                            String qygs = bo1.getString("QYGS");
+                            for (String s : split) {
+                                if (xszz.equals(s)){
+                                    bo.set("QYGS",qygs);
+                                    found = true;
+                                }
+                            }
+                        }
+                        if (!found) {
+                            bo.set("QYGS", "其他"); // 循环结束后仍未找到则设為"其他"
+                        }
+                    }
+                    bos.add(bo);
+                }
+
+                SDK.getBOAPI().createDataBO(hzb, bos, UserContext.fromUID("admin"));
+                LOGGER.info("已迁移{}条数据到汇总表（页号: {}，时间范围: {} - {}）",
+                        bos.size(), pageNo, startDate, endDate);
+
+                hasMore = pageData.size() == PAGE_SIZE;
+                pageNo++;
+            } while (hasMore);
+        }catch (Exception e){
+            LOGGER.error("汇总数据失败 [汇总表={}, 第几页={}]: {}",
+                    hzb, PAGE_SIZE, e.getMessage(), e);
+        }
+    }
+
 }
\ No newline at end of file