From 639f338c38d84b01ef9034fe6dfddadd416ae33d Mon Sep 17 00:00:00 2001 From: llllon Date: Fri, 26 Sep 2025 10:04:03 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=98=B2=E6=B0=B4=E6=B6=82=E6=96=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SaleCountDimensionImpl.class | Bin 40810 -> 40776 bytes .../impl/SaleDataSyncServiceImpl.class | Bin 40945 -> 40964 bytes .../compileJava/previous-compilation-data.bin | Bin 9396131 -> 9396131 bytes .../bnbm/datalinkup/job/NineGridCountJob.java | 28 ++++++++++++++--- .../WaterproofPaintAccountsReceivableJob.java | 29 ++++++++---------- .../service/impl/SaleCountDimensionImpl.java | 5 ++- .../service/impl/SaleDataSyncServiceImpl.java | 3 +- 7 files changed, 40 insertions(+), 25 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/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 0f2d4c940373f94fb7c69f79ec2a9aeee3918888..2432cf19291453acd05cd06a5269d457fcad5a80 100644 GIT binary patch delta 2388 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 delta 1960 zcmX|BcX-y-6+Y*@@67~4@+BdGCqYJlf&-9Uu_UBHgffIM!jNeV$atVq62?~uJA?oq zVA!ZAmJ|w4Sk|&j3y}`AwGTsO*|LfRM7Hz>ZGZQV^PczKbME<_ac3Q{iv6}NK0mUR zL`bTL>ljMOKcu}vXY*_6>CnUc%x2HW-Aj&*yT42FcS+VtsqdA$UWt3))m4)4KlR}g zHEh%4S!L6w41?AQotr*De;jHbY#9@9iQYMNh=}fzF`*g3k-?tmp}o;dC!x2_Lbev8 zkFG*reGmO~8~W=<$k8JhpdVwPeu_bQ27~niUezlYq7@jbcQMSOFx-+b!s=n9HN(%X z19Gh+M%ycR!}?&1hy$%sWB>LMR$n1V)_ zisqPxj+l-t1ko8Y&=oV$69pKA*%*&GD8yVW!hCGO0_^tM0W3s0ig3}h*HMgnSd51# zq9H_wWsJgdCSoO@!Ya1IYIegKjzDlVbFr3_u#N>-&&AllwRoGG@h*2@BX{F{9>XU7 z6Cd!Vmv^w)MWfVJ!*5&w+gu{HxFl?KPvf_)y_Xr-u0wrx=Sf37BiZIOM-udcbh9vB zB8hrMI$5}8OAW1%4i=#~K}piP($*q9nXHqf+@icmJi;ZzqCHBoN7B`*=xC{7eKg#v zdM;o&3aeIm&c2YK#b}8n;G*|*#d9gxEnTd-M>TLjGW3#OmL!x*8;kW^GPd}zD*Yv* zPzo&==g9yT$-F0S;@M8dTR_K3fVq-x@!mLIzQF-Y@FsC`6~`=5KbKfJ&J3&J&&9ZC ziO_XEgm9N6jrDcSm6*x~)?qqa{O8epe}_Inn|&7S2`cpnB0;}B+i$ayH1Ws@TnF9i z^AYAm z^r)In_EEGD_rtH{N#KXz^L(IA`(30XGg<2QX z44qmuxNLhtC@i>Ffc+Bg(;S6^z66JSdJp>o9FZ*iN&4br8IHfoX#7nk;)G1WC$a#4 zm*x0OevQ+z1E0%5d@1EPE0=LjZsNRF#{~`GD{YB?X(s-y-Em1@!BzbQuIWttM~iS> zOYpV6iyOK%hzk7>H}x=X=`nnxCvaO&;afe2J9-Is^=sVIZ*kuu@W2xB(CXlkJ%`8k zBGu9f>p@y?I_t+U8^&-8GQ!p~%6`viJIShchSlr=W8hdFF^t7ij6*#J(17u1$^-<{ z{Xk{120AerFS91Pvla$01!I|t`K*nFtbj&Z9v)|Gm>jpHlF+ft>Ko|3W-3y((xrwbUAF#bv+Ia8{z zKw>ycYI3%uajrDtJb8wN(waq*!9~6+izS07YxlhZvUq9s`JY~uyRY7l89sOM_hPVWb_7Cg? zmyGGI7UsAVEOn_^?P_DAtBdU}4SQUJ9ysY5?t~tYfX%k#4Hgs*- z%Du=;_Y?MX9ogHZvyaR0CC*}=>%`e!E^sfi$i2j3*O?n#m$H*9u2bI%9bKKJD?%}A Qy6N&z#oC0jiEEbNzd)zSO#lD@ 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 a99fe4f11e76f780a2b19669ae502ff5b2f7cb7e..55c4f8aae0dbcd5b0a3c3d91015c34d01a0acd74 100644 GIT binary patch delta 646 zcmWl~Nl=Xe007|W6)m=3B@}ujWEa`8lq{jh+A5-m=oPY*{ZYy~#f%xIOGlTu)S<@F z5f>L{@8IO%=-_ks<{SDno-oAAXz=cD*4yvzQ$D`wEBH~J_p0T?z+hbPvvTa)?~3;H zNOt6NVbEVSP#k(4v^I2%{>te8`lT`X&u}=WEgB2;#6ofWKb{08Fp)%(NG63zOlAsG znMS~LQb{A78Dub%SGo3n^ zra$0jn*PBa{D2NlK8J6<*vxcdjL*@~??`Lg&%fcweBqDwuj$c=$?N^ zWlcE^)!7*{1>+ULFQMAT*^}*l2v4}nl*%3OE&9RPY$_kU?X|tvx&`Yp@2fRvW+6PvxA-NVmEu( z%Rcr~%mGR`$RSEOOc~`=P)QX>I7&4&)KbSWj#JMGPI8I{PIHE{oTHKRT%d`IM7TsV zEnMabS81h7|b- Y?|4r?0}S$kj|}mNVMeCn!O`jFe}cah*8l(j diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/job/NineGridCountJob.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/job/NineGridCountJob.java index 65a2bb4..6db7a52 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/job/NineGridCountJob.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/job/NineGridCountJob.java @@ -48,10 +48,30 @@ public class NineGridCountJob implements IJob { //查询采购数据 RowMap cgsj = DBSql.getMap("SELECT (SUM(DHJE)/10000) AS JSHJHYF FROM BO_EU_DWD_ORDER_RKD_HZ WHERE DJRQ >= '" + nowYearFirstDayStr + " 00:00:00'"); bo.set("ZB2",cgsj.getString("JSHJHYF"));//采购总额 - bo.set("ZB3","");//利润总额 - bo.set("ZB4","");//预算完成率 - bo.set("ZB5","");//石膏板产量 - bo.set("ZB6","");//龙骨产量 + //取财务数据 + int lastMonthValue = now.minusMonths(1).getMonthValue(); + int year = now.minusMonths(1).getYear(); + RowMap cwsj = DBSql.getMap("SELECT DNSJLJ FROM BO_EU_CWSJ_INTERFACE_LRZE " + + "WHERE BK = '公司整体' AND DWMC = '合并' AND YEAR = '" + year + "' AND MONTH = '" + lastMonthValue + "'"); + bo.set("ZB3",cwsj.getString("DNSJLJ"));//利润总额 + //预算完成率 + RowMap yswcl = DBSql.getMap("select hz.ysze AS ysze,BUDGETTARGET,(hz.ysze / mb.BUDGETTARGET)*100 AS yewcl " + + " from " + + " (select sum( `BHSYYSR`) / 10000 ysze " + + " from BO_EU_XS_YESR " + + " where `YEARMONTH` >= concat(substring('" + nowYearMonthStr + "', 1, 4), '-01') " + + " and `YEARMONTH` <= '" + nowYearMonthStr + "') hz left join " + + " (select SUM(`BUDGETTARGET`) AS BUDGETTARGET from BO_EU_ANNUAL_BUDGET WHERE YEAR = '" + year + "') mb on 1=1"); + bo.set("ZB4",yswcl.getString("yewcl"));//预算完成率 + String lastMonth = now.minusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM")); + RowMap cl = DBSql.getMap("SELECT YEARS_MONTH," + + " MAX(CASE WHEN PRODEUCT = '石膏板' THEN YTD END) AS SGBYTD," + + " MAX(CASE WHEN PRODEUCT = '轻钢龙骨' THEN YTD END) AS QGLGYTD" + + " FROM BO_EU_CLMXB" + + " WHERE YEARS_MONTH = '" + lastMonth + "' AND GONGCHANG IN ('小计（万㎡）','小计（吨）')" + + " AND PRODEUCT IN ('石膏板', '轻钢龙骨') GROUP BY YEARS_MONTH"); + bo.set("ZB5",cl.getString("SGBYTD"));//石膏板产量 + bo.set("ZB6",cl.getString("QGLGYTD"));//龙骨产量 bo.set("ZB7",map.getString("gypsum_board_avg_price"));// 石膏板均价 bo.set("ZB8",map.getString("steel_keel_avg_price"));// 龙骨均价 bo.set("ZB9","");//总运费 diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/job/WaterproofPaintAccountsReceivableJob.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/job/WaterproofPaintAccountsReceivableJob.java index 63daa3d..c40e3a6 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/job/WaterproofPaintAccountsReceivableJob.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/job/WaterproofPaintAccountsReceivableJob.java @@ -117,13 +117,8 @@ public class WaterproofPaintAccountsReceivableJob implements IJob { // 计算该月的日期范围（月初到月末或昨天） LocalDate monthStartDate = monthEndDate.withDayOfMonth(1); LocalDate monthEnd = monthEndDate; - int i =0; // 遍历每个销售组织-客户组合 for (RowMap row : maps) { - if (i==1){ - break; - } - i++; try { String manageRegionName = row.getString("QYGS"); String saleOrgUnit = row.getString("XSZZ"); @@ -149,7 +144,7 @@ public class WaterproofPaintAccountsReceivableJob implements IJob { // 计算应收余额 BigDecimal ysye = qcye.add(ljxs).subtract(ljhk); - LOGGER.info("计算应收余额={}",ysye.doubleValue()); +// LOGGER.info("计算应收余额={}",ysye.doubleValue()); // 计算账龄分析（需要查询历史数据） Map zlfx = calculateMonthlyAgingAnalysis(section, saleOrgUnit, custName, monthEndDate, ysye); @@ -255,8 +250,8 @@ public class WaterproofPaintAccountsReceivableJob implements IJob { " WHERE XSZZ = ? AND FCUSTNAME = ? AND DZRQ >= ? AND DZRQ< ?", saleOrgUnit, custName, startDateStr, endDateStr ); - LOGGER.info("期初余额-应收单总额sql:SELECT SUM(SSJERMB) as total FROM " + section.getYsdTable() + - " WHERE XSZZ = "+saleOrgUnit+" AND FCUSTNAME = "+custName+" AND DZRQ >= "+startDateStr+" AND DZRQ< "+endDateStr+""); +// LOGGER.info("期初余额-应收单总额sql:SELECT SUM(SSJERMB) as total FROM " + section.getYsdTable() + +// " WHERE XSZZ = "+saleOrgUnit+" AND FCUSTNAME = "+custName+" AND DZRQ >= "+startDateStr+" AND DZRQ< "+endDateStr+""); BigDecimal ysTotal = ysResult != null && ysResult.get("total") != null ? new BigDecimal(ysResult.get("total").toString()) : BigDecimal.ZERO; @@ -267,8 +262,8 @@ public class WaterproofPaintAccountsReceivableJob implements IJob { " WHERE FSALEORGUNIT = ? AND FCUSTNAME = ? AND FBILLDATE >= ? AND FBILLDATE < ?", saleOrgUnit, custName, startDateStr, endDateStr ); - LOGGER.info("期初余额-收款单总额sql:SELECT SUM(FSALEAMOUNTRMB) as total FROM " + section.getSkdTable() + - " WHERE FSALEORGUNIT = "+saleOrgUnit+" AND FCUSTNAME = "+custName+" AND FBILLDATE >= "+startDateStr+" AND FBILLDATE< "+endDateStr+""); +// LOGGER.info("期初余额-收款单总额sql:SELECT SUM(FSALEAMOUNTRMB) as total FROM " + section.getSkdTable() + +// " WHERE FSALEORGUNIT = "+saleOrgUnit+" AND FCUSTNAME = "+custName+" AND FBILLDATE >= "+startDateStr+" AND FBILLDATE< "+endDateStr+""); BigDecimal skTotal = skResult != null && skResult.get("total") != null ? new BigDecimal(skResult.get("total").toString()) : BigDecimal.ZERO; @@ -279,13 +274,13 @@ public class WaterproofPaintAccountsReceivableJob implements IJob { " WHERE FSALEORGUNIT = ? AND FCUSTNAME = ? AND FBILLDATE >= ? AND FBILLDATE < ?", saleOrgUnit, custName, startDateStr, endDateStr ); - LOGGER.info("期初余额-收款退款单总额sql:SELECT SUM(FSALEAMOUNTRMB) as total FROM " + section.getSktkdTable() + - " WHERE FSALEORGUNIT = "+saleOrgUnit+" AND FCUSTNAME = "+custName+" AND FBILLDATE >= "+startDateStr+" AND FBILLDATE< "+endDateStr+""); +// LOGGER.info("期初余额-收款退款单总额sql:SELECT SUM(FSALEAMOUNTRMB) as total FROM " + section.getSktkdTable() + +// " WHERE FSALEORGUNIT = "+saleOrgUnit+" AND FCUSTNAME = "+custName+" AND FBILLDATE >= "+startDateStr+" AND FBILLDATE< "+endDateStr+""); BigDecimal sktkTotal = sktkResult != null && sktkResult.get("total") != null ? new BigDecimal(sktkResult.get("total").toString()) : BigDecimal.ZERO; - LOGGER.info("期初余额:{}",sktkTotal.doubleValue()); +// LOGGER.info("期初余额:{}",sktkTotal.doubleValue()); // 期初余额 = 应收单总额 - 收款单总额 + 收款退款单总额 return ysTotal.subtract(skTotal).add(sktkTotal); @@ -308,8 +303,8 @@ public class WaterproofPaintAccountsReceivableJob implements IJob { " WHERE XSZZ = ? AND FCUSTNAME = ? AND DZRQ >= ? AND DZRQ < ?", saleOrgUnit, custName, startDateStr, endDateStr ); - LOGGER.info("计算累计销售：SELECT SUM(SSJERMB) as total FROM " + section.getYsdTable() + - " WHERE XSZZ = "+saleOrgUnit+" AND FCUSTNAME = "+custName+" AND DZRQ >= "+startDateStr+" AND DZRQ < "+endDateStr+""); +// LOGGER.info("计算累计销售：SELECT SUM(SSJERMB) as total FROM " + section.getYsdTable() + +// " WHERE XSZZ = "+saleOrgUnit+" AND FCUSTNAME = "+custName+" AND DZRQ >= "+startDateStr+" AND DZRQ < "+endDateStr+""); // LOGGER.info("累计销售={}",result != null && result.get("total") != null ? // new BigDecimal(result.get("total").toString()) : BigDecimal.ZERO); @@ -336,8 +331,8 @@ public class WaterproofPaintAccountsReceivableJob implements IJob { " WHERE FSALEORGUNIT = ? AND FCUSTNAME = ? AND FBILLDATE >= ? AND FBILLDATE < ?", saleOrgUnit, custName, startDateStr, endDateStr ); - LOGGER.info("计算累计还款:SELECT SUM(FSALEAMOUNTRMB) as total FROM " + section.getSkdTable() + - " WHERE FSALEORGUNIT = "+saleOrgUnit+" AND FCUSTNAME = "+custName+" AND FBILLDATE >= "+startDateStr+" AND FBILLDATE < "+endDateStr+""); +// LOGGER.info("计算累计还款:SELECT SUM(FSALEAMOUNTRMB) as total FROM " + section.getSkdTable() + +// " WHERE FSALEORGUNIT = "+saleOrgUnit+" AND FCUSTNAME = "+custName+" AND FBILLDATE >= "+startDateStr+" AND FBILLDATE < "+endDateStr+""); BigDecimal skTotal = skResult != null && skResult.get("total") != null ? new BigDecimal(skResult.get("total").toString()) : BigDecimal.ZERO; 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/SaleCountDimensionImpl.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/SaleCountDimensionImpl.java index 523fb73..f2a52c5 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/SaleCountDimensionImpl.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/SaleCountDimensionImpl.java @@ -448,7 +448,7 @@ public class SaleCountDimensionImpl implements DataSummaryService { " LB_2, LB_3, SQ, CS, QY, SUM(ZSSL) AS XL," + " SUM(SSJERMB) AS XE, SUM(XSSL) AS TSXL, SUM(NMNY) AS BHSXE,YEARMONTH" + " FROM " + SALES_DETAIL_TABLE + - " WHERE DZRQ >= ? AND DZRQ < ? AND BKGS = ?" + + " WHERE DZRQ >= ? AND BKGS = ?" + " GROUP BY QYGS, KCZZ, " + " CASE " + " WHEN BKGS = '龙牌' AND LB_1 IN ('装饰石膏板', '鲁班装饰万能板', '石膏板') THEN '石膏板'" + @@ -471,8 +471,7 @@ public class SaleCountDimensionImpl implements DataSummaryService { // " t1.YEARMONTH ORDER BY t1.DZRQ, t1.QYGS, t1.KCZZ"; LOGGER.info("销量销额数据查询，SQL: {}", querySql); - List maps = DBSql.getMaps(querySql, DATE_FORMAT.format(dateRange.getStartDate()), - DATE_FORMAT.format(dateRange.getEndDate()), bkgs); + List maps = DBSql.getMaps(querySql, DATE_FORMAT.format(dateRange.getStartDate()), bkgs); if (maps.isEmpty()) { LOGGER.info("销量销额数据无数据，停止查询"); 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 d975764..8df30af 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 @@ -844,7 +844,8 @@ public class SaleDataSyncServiceImpl implements DataSyncService { } if ("北新防水".equals(map.getString("BKGS")) && "否".equals(map.getString("F_SFNBJY")) && !map.getString("XSZZ").equals("北新防水工程（辽宁）有限公司") - && !map.getString("XSZZ").equals("北新防水工程（四川）有限公司")){ + && !map.getString("XSZZ").equals("北新防水工程（四川）有限公司") + && StringUtils.isBlank(map.getString("F_SFNBJY"))){ continue; } // 复制所有字段（排除系统字段）