From 953e6eec997eecd20c848da4e496dd04d5c36849 Mon Sep 17 00:00:00 2001
From: llllon <chunyangli0323@163.com>
Date: Fri, 5 Sep 2025 09:58:17 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=80=E4=BD=93=E5=8C=96=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A1=E4=BF=AE=E6=94=B9=202=E3=80=81=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E6=B1=87=E6=80=BB=E8=AE=A1=E7=AE=97=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=A9=BA=E5=80=BC=EF=BC=8C=E5=8F=96=E5=80=BC?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PurchaseDataSummaryServiceImpl.class | Bin 27860 -> 28566 bytes
 .../impl/PurchaseDataSyncServiceImpl.class    | Bin 28204 -> 28307 bytes
 .../impl/SaleDataSummaryServiceImpl.class     | Bin 25789 -> 26822 bytes
 .../compileJava/previous-compilation-data.bin | Bin 9392465 -> 9392464 bytes
 .../impl/PurchaseDataSummaryServiceImpl.java  |  26 +++--
 .../impl/PurchaseDataSyncServiceImpl.java     |  16 +--
 .../impl/SaleDataSummaryServiceImpl.java      | 107 +++++++++---------
 7 files changed, 76 insertions(+), 73 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/PurchaseDataSummaryServiceImpl.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/PurchaseDataSummaryServiceImpl.class
index 78bc158062534faf03b88abb56d0ecb306623bad..4801f81ff833d6ac4b68085a9b776ba2fa184927 100644
GIT binary patch
delta 11074
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
H@tOYvvEO2~

delta 10178
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
M^Q+2;F8K3*0BNAQf&c&j

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 f13ea2f0708ff7edaeb96424fd138bfe0313fe5c..1e148c39bd2835a62c8903b27c19c00bc6419cbf 100644
GIT binary patch
delta 7152
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
MK;H`JI|2RjKP59bA^-pY

delta 7100
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
HeR}BMinJkQ

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/SaleDataSummaryServiceImpl.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/SaleDataSummaryServiceImpl.class
index a629aaa0d235e2d19912c99c31e8d5beff7f7792..92d0df93b5fadca88b7c72e6bc3cc188957a02ed 100644
GIT binary patch
delta 10465
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

delta 9809
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
PQ*L(3txkEXQ||m<Er0(0

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 5a67f0db759d40dfd0caa3783e8d59b1bed8074a..a242596fbfa71538b1089a3048a3c107d4099455 100644
GIT binary patch
delta 801
zcmZY6OH9%M0LO7bF*AifrA49!niV}Xq_PakFtY4Hnms6~G{vGcde}oUOq0I}F^P5J
z;%jS*4lUOHtF3j(gC}flt<}j@<JjDKxVBo~&K^FO@8x&+y&Zj(Hie<*LiPLZPG9K@
z)t3TeEXD7b3{Ut3wL7W!{`J8-`G?8R;i^BrNQ10Gs0}KAH^vHe{_)DEZxT<Ok*Mso
zpbsVM^}P=h(;7{S(>U53cgv^csfrYBpIsr^6*9<?iZm!ByCQw6Ul1ay_PURQ-*V$x
zQ+{k9DwYM(rLw?0^C#ig%g2FO)ZJk)ShHtpT7QUMR|e)wURUNb^PEA^GM0%2$U-)h
zP(gqi3$X|}$i-qTfd)&F2QBhZfI=*T4tf+xma*dEZXww=TQsC;D1Q{r>q^Z2G>9JE
za+F{NR$>+Y_tjW~wOEHzlwm!LD3?4s(}+*Vh{R`_lp_X5janEFDgTQ4VG}lBBQ~J|
zo3RCz*a|Z&*oN(>!VXD4Y|SZ|bCYPBu%a3}VZ$!eU^n)l7JIP|`*8qv97G-JaR?1K
zj3YRTV{qU&PM{G^oWv=dMiZKG1}$iX3vD=yb8zE4E}$J9xCjp};WDn^Dmrlu*Kq?k
l(FHGVp&Pg1Ll5qt7k#*ke)u6`0QWG60D`zL*(O3+!GElCSV{l@

delta 802
zcmZY5OHj-K0LO9rZ+FWIf9w*8B_U}&w%X)hDXTnc)mpNZM`R_jp)CI%8$JH^QNuLj
zV$4L-IOLEF|1pz^VaJS%I;Km;!DMhUZYE#nJ$%mJ-~1*Xzt&FT?h7%}Tjc!ZZi=0%
zc$=0{GdXfE;urf$KHQ(pH(2H#4n4{FEyVS^G&a%bt8=<q^{#~Br1b2+x$pZQXvW2c
zsj-;hv9PK9SxdER^p*U)Uiczt_45*~oerJi&}kqb23qJ;hfY7y9aT^)A-!q|#Y)qn
z&DT8gGAIk~&p$P(<8wb0*%OEPs_Ze0N>N2c8Z=-5;;|5muoxniU@4Zt2osiL1ro3l
ztB{D*NWvPdg&FIxUX=!uliS2ULvKD>zP+og{ggEm{MsH+yygu^!A5MtW~5>Z(y$fj
zuwWauV+VGsUbFR)Kk9wOJYYozGLZ!vvat&}*bND}$U{E%pg=Vb6dF^+z;tP5*-TYl
z@%OIA*{7x}iak<@y|7~+icpOGIDmsVgc6j(fx{?6Ih;5G7mnf>DsUWbRH6#iIDwNm
zh100P8JtBe&cTE8sKW)+<02Yx376qTBmVEdifd>>Gp@sj8@LG>Eoem>+TlkBZs9gM
X(S>gGK*1dZ5JU)J^s4qqUwrr<<S<*p

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 6c08c08..f5c2cdd 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
@@ -611,8 +611,10 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService {
                 summaryBO.set("YEARMONTH", yearMonth);
                 summaryBO.set("WLMC", wlmc);
                 if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")){
-                    double totalQuantity = currentMonthRow.getDouble("totalQuantity");
-                    double totalAmount = currentMonthRow.getDouble("totalAmount");
+                    Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity");
+                    double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0;
+                    Double totalAmount1 = currentMonthRow.getDouble("totalAmount");
+                    double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0;
                     summaryBO.set("CGZL", totalQuantity!=0?totalQuantity/1000:0);
                     if (totalAmount!=0 || totalQuantity!=0) {
                         avgPrice = totalAmount / (totalQuantity / 1000);
@@ -620,8 +622,10 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService {
                         avgPrice = 0;
                     }
                 }else {
-                    double totalQuantity = currentMonthRow.getDouble("totalQuantity");
-                    double totalAmount = currentMonthRow.getDouble("totalAmount");
+                    Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity");
+                    double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0;
+                    Double totalAmount1 = currentMonthRow.getDouble("totalAmount");
+                    double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0;
                     summaryBO.set("CGZL", totalQuantity);
                     if (totalAmount!=0 || totalQuantity!=0) {
                         avgPrice = totalAmount / totalQuantity;
@@ -635,8 +639,10 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService {
                 // 添加上月数据
                 RowMap lastMonthRow = lastMonthMap.get(wlmc);
                 if (lastMonthRow != null) {
-                    double totalQuantity = lastMonthRow.getDouble("totalQuantity");
-                    double totalAmount = lastMonthRow.getDouble("totalAmount");
+                    Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity");
+                    double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0;
+                    Double totalAmount1 = currentMonthRow.getDouble("totalAmount");
+                    double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0;
                     if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")){
                         summaryBO.set("SQCGZL", totalQuantity!=0?totalQuantity/1000:0);
                     }else {
@@ -648,8 +654,10 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService {
                 // 添加去年同期数据
                 RowMap lastYearMonthRow = lastYearMonthMap.get(wlmc);
                 if (lastYearMonthRow != null) {
-                    double totalQuantity = lastYearMonthRow.getDouble("totalQuantity");
-                    double totalAmount = lastYearMonthRow.getDouble("totalAmount");
+                    Double totalQuantity1 = currentMonthRow.getDouble("totalQuantity");
+                    double totalQuantity = totalQuantity1 != null ? totalQuantity1 : 0.0;
+                    Double totalAmount1 = currentMonthRow.getDouble("totalAmount");
+                    double totalAmount = totalAmount1 != null ? totalAmount1 : 0.0;
                     if (wlmc.equals("乳液") || wlmc.equals("钛白粉") || wlmc.equals("重钙")){
                         summaryBO.set("TQCGZL", totalQuantity!=0?totalQuantity/1000:0);
                     }else {
@@ -852,7 +860,7 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService {
                         detailBO.set("RKJE", row.getDouble("DHJE")); // 入库金额（金额含运费）
                     }else {
                         detailBO.set("RKDJ", row.getDouble("HSDJHYF")); // 入库单价（含税单价含运费）
-                        detailBO.set("RKJE", row.getDouble("JEHYF")); // 入库金额（金额含运费）
+                        detailBO.set("RKJE", row.getDouble("JSHJHYF")); // 入库金额（金额含运费）
                     }
                     detailBO.set("GYS", row.getString("GYSNAME")); // 供应商
                     detailBO.set("DDBH", row.getString("CGDDH")); // 订单编号
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 c5477ca..457bc08 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
@@ -818,18 +818,15 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
                         if (StringUtils.isNotBlank(wlmc) || StringUtils.isNotBlank(wlbm)
                                 || StringUtils.isNotBlank(jldw)
                                 || StringUtils.isNotBlank(wlfl)) {
-                            try {
-                                newWlmc = purchaseUtil.materialClassificationFiltering(bkgs.trim(),
-                                        wlmc.trim(), wlbm.trim(), jldw.trim(), djhyf, wlfl.trim());
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
+                            newWlmc = purchaseUtil.materialClassificationFiltering(bkgs.trim(),
+                                    wlmc.trim(), wlbm.trim(), jldw.trim(), djhyf, wlfl.trim());
                             if (bkgs.equals("北新嘉宝莉")) {
-                                if (wlmc.contains("盖") && djhyf < 5.0) {
+                                if (wlmc.contains("盖")&& !wlmc.contains("桶") && !wlmc.contains("罐") && djhyf < 3.5) {
                                     continue;
-                                } else if (wlmc.contains("桶身") && gaiSum > 0) {
+                                } else if (wlmc.contains("桶身")&& jldw.equals("个") && gaiSum > 0) {
                                     Double djhyf1 = bo.get("DJHYF", Double.class);
-                                    bo.set("DJHYF", djhyf1 + gaiAverage);
+                                    double djhyf2 = djhyf1 != null ? djhyf1 : 0.0;
+                                    bo.set("DJHYF", djhyf2 + gaiAverage);
                                     gaiSum--;
                                 }
                             }
@@ -844,7 +841,6 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
                             // 处理可能为null的值，默认设为0.0
                             double safeRksl = rksl != null ? rksl : 0.0;
                             double safeHsdjhyf = hsdjhyf != null ? hsdjhyf : 0.0;
-
                             BigDecimal multiply = BigDecimal.valueOf(safeRksl).multiply(BigDecimal.valueOf(safeHsdjhyf));
                             bo.set("DHJE", multiply.doubleValue());
                         }
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/SaleDataSummaryServiceImpl.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/SaleDataSummaryServiceImpl.java
index 92932d9..d1a4470 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/SaleDataSummaryServiceImpl.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/SaleDataSummaryServiceImpl.java
@@ -203,6 +203,11 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
         try {
             LOGGER.info("开始计算{}年{}月产品配套率数据", year, month);
 
+            //新增前删除数据
+            int delete = DBSql.update("DELETE FROM " + MATCHING_RATE_YEAR_TABLE
+                    + " WHERE YEARMONTH = '" + yearMonth + "' AND BKGS = '"+bkgs+"'");
+            LOGGER.info("准备同步{}年{}月产品配套率数据，删除了{}条数据",year, month,delete);
+
             // 获取石膏板年度销售量（万平方米） - 从当年1月到当前月
             BigDecimal gypsumSales = getSalesToMonth(year, month, "石膏板", bkgs);
             // 获取轻钢龙骨年度销售量（吨） - 从当年1月到当前月
@@ -238,12 +243,19 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
      */
     private void calculateAndSaveProductMonthly(int year, int month, String yearMonth, String bkgs) {
         try {
-            LOGGER.info("开始计算{}年{}月产品销售明细数据", year, month);
-            List<RowMap> maps = DBSql.getMaps("SELECT LB_1 FROM " + SALES_DETAIL_TABLE + " WHERE BKGS = '" + bkgs + "'" +
-                    "AND (SQ LIKE '%新疆%' OR SQ LIKE '%海南%' OR SQ LIKE '%西藏%') " + // 模糊查询
-                    " GROUP BY LB_1");
-            for (RowMap map : maps) {
-                String lb_1 = map.getString("LB_1");
+            LOGGER.info("开始计算{}年{}月-产品销售明细数据", year, month);
+
+            //新增前删除数据
+            int delete = DBSql.update("DELETE FROM " + PRODUCT_MONTHLY_TABLE
+                    + " WHERE YEARMONTH = '" + yearMonth + "' AND BKGS = '"+bkgs+"'");
+            LOGGER.info("准备同步{}年{}月-产品销售明细数据，删除了{}条数据",year, month,delete);
+
+//            List<RowMap> maps = DBSql.getMaps("SELECT LB_1 FROM " + SALES_DETAIL_TABLE + " WHERE BKGS = '" + bkgs + "'" +
+//                    "AND (SQ LIKE '%新疆%' OR SQ LIKE '%海南%' OR SQ LIKE '%西藏%') " + // 模糊查询
+//                    " GROUP BY LB_1");
+            String[] lb1s = new String[]{"石膏板","轻钢龙骨","涂料"};
+            for (String lb_1 : lb1s) {
+//                String lb_1 = map.getString("LB_1");
                 processProductData(lb_1, year, month, yearMonth, bkgs);
             }
             // 处理石膏板数据
@@ -332,6 +344,11 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
         try {
             LOGGER.info("开始计算{}年{}月应收账款品牌明细数据", year, month);
 
+            //新增前删除数据
+            int delete = DBSql.update("DELETE FROM " + RECEIVABLE_BRAND_MONTHLY_TABLE
+                    + " WHERE YEARMONTH = '" + yearMonth + "' AND BKGS = '"+bkgs+"'");
+            LOGGER.info("准备同步{}年{}月-应收账款品牌月明细，删除了{}条数据",year, month,delete);
+
             // 处理应收账款
             processReceivableData(getBoneReceivable(year, month, bkgs), yearMonth, bkgs);
             // 处理涂料应收账款
@@ -372,6 +389,12 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
     private void calculateAndSaveReceivableYear(int year, int month, String yearMonth, String bkgs) {
         try {
             LOGGER.info("开始计算{}年{}月应收账款累计数据", year, month);
+
+            //新增前删除数据
+            int delete = DBSql.update("DELETE FROM " + RECEIVABLE_YEAR_TABLE
+                    + " WHERE YEARMONTH = '" + yearMonth + "' AND BKGS = '"+bkgs+"'");
+            LOGGER.info("准备同步{}年{}月-应收账款年度汇总(按月存储)，删除了{}条数据",year, month,delete);
+
             int lastYear = year - 1;
             int lastYearMonth = month; // 去年同月
 
@@ -422,14 +445,22 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
     private void calculateAndSaveRevenueYear(int year, int month, String yearMonth, String bkgs) {
         try {
             LOGGER.info("开始计算{}年{}月营业收入累计数据", year, month);
+
+            //新增前删除数据
+            int delete = DBSql.update("DELETE FROM " + REVENUE_YEAR_TABLE
+                    + " WHERE YEARMONTH = '" + yearMonth + "' AND BKGS = '"+bkgs+"'");
+            LOGGER.info("准备同步{}年{}月-营业收入累计数据，删除了{}条数据",year, month,delete);
+
             int lastYear = year - 1;
             int lastYearMonth = month; // 去年同月
 
-            // 处理石膏板数据 - 当年当前月
-            saveRevenueYearData(yearMonth, "石膏板",
-                    getRevenueToMonth(year, month, "石膏板", bkgs),
-                    getRevenueToMonth(lastYear, lastYearMonth, "石膏板", bkgs),
-                    bkgs);
+            if (bkgs.equals("泰山石膏") || bkgs.equals("梦牌") || bkgs.equals("龙牌")) {
+                // 处理石膏板数据 - 当年当前月
+                saveRevenueYearData(yearMonth, "石膏板",
+                        getRevenueToMonth(year, month, "石膏板", bkgs),
+                        getRevenueToMonth(lastYear, lastYearMonth, "石膏板", bkgs),
+                        bkgs);
+            }
 
             // 处理轻钢龙骨数据 - 当年当前月
             saveRevenueYearData(yearMonth, "轻钢龙骨",
@@ -485,11 +516,17 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
         try {
             LOGGER.info("开始计算{}-{}-{}产品单价日明细数据", year, month, day);
 
+            //新增前删除数据YEAR(DZRQ) = '" + year + "' AND MONTH(DZRQ) = '" + month + "AND DAY(DZRQ) = '"+day+"'
+            int delete = DBSql.update("DELETE FROM " + UNIT_PRICE_DAILY_TABLE
+                    + " WHERE YEAR(DATE) = '" + year + "' AND MONTH(DATE) = '"+month+"' AND DAY(DATE) = '"+day+"' AND BKGS = '"+bkgs+"'");
+            LOGGER.info("准备同步{}-产品单价日明细数据，删除了{}条数据",date,delete);
+
             List<RowMap> maps = DBSql.getMaps("SELECT LB_1 FROM " + SALES_DETAIL_TABLE + " WHERE BKGS = '" + bkgs + "'" +
                     "AND (SQ LIKE '%新疆%' OR SQ LIKE '%海南%' OR SQ LIKE '%西藏%') " + // 模糊查询
                     " GROUP BY LB_1");
-            for (RowMap map : maps) {
-                String lb_1 = map.getString("LB_1");
+            String[] lb1s = new String[]{"石膏板","轻钢龙骨","涂料"};
+            for (String lb_1 : lb1s) {
+//                String lb_1 = map.getString("LB_1");
                 saveUnitPriceData(date, lb_1, year, month, day, bkgs);
             }
 
@@ -695,7 +732,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
                 .append("    SELECT MAX(RQ) ")
                 .append("    FROM " + RECEIVABLE_DETAIL_TABLE + " ")
                 .append("    WHERE YEAR(RQ) = '" + year + "' AND MONTH(RQ) = '" + month + "' AND BKGS = '" + bkgs + "' ")
-                .append(") AND BKGS = '" + bkgs + "'");
+                .append(") AND BKGS = '" + bkgs + "' AND SHENGQU IN( '新疆维吾尔自治区','海南','西藏')");
 
         Map<String, BigDecimal> result = new HashMap<>();
         List<RowMap> rows = DBSql.getMaps(sql.toString());
@@ -722,51 +759,13 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
      */
     private void saveSummaryData(BO summary, String tableName) {
         try {
-            // 根据表名构建唯一性查询条件
-            String whereClause = buildUniqueCondition(tableName, summary);
-            if (whereClause == null) {
-                SDK.getBOAPI().createDataBO(tableName, summary, UserContext.fromUID("admin"));
-                LOGGER.debug("{} 表创建新数据: {}", tableName, summary);
-                return;
-            }
-
-            // 查询已存在记录
-            String sql = "SELECT * FROM " + tableName + " WHERE " + whereClause;
-            LOGGER.info("查询已存在sql：{}",sql);
-            RowMap existing = DBSql.getMap(sql);
-            if (existing!=null){
-                if (StringUtils.isNotBlank(existing.getString("ID"))) {
-                    // 更新现有记录
-                    String id = existing.getString("ID");
-                    summary.set("ID", id);
-                    summary.set("ORGID", existing.getString("ORGID"));
-                    summary.set("BINDID", existing.getString("BINDID"));
-                    summary.set("CREATEDATE", existing.getString("CREATEDATE"));
-                    summary.set("CREATEUSER", existing.getString("CREATEUSER"));
-                    summary.set("UPDATEDATE",new Timestamp(System.currentTimeMillis()));
-                    summary.set("PROCESSDEFID", existing.getString("PROCESSDEFID"));
-                    summary.set("ISEND", existing.getString("ISEND"));
-                    SDK.getBOAPI().update(tableName, summary);
-                    LOGGER.debug("{} 表数据更新成功: ID={}", tableName, id);
-                }
-            } else {
-                // 创建新记录
-                SDK.getBOAPI().createDataBO(tableName, summary, UserContext.fromUID("admin"));
-                LOGGER.debug("{} 表创建新数据: {}", tableName, summary);
-            }
+            SDK.getBOAPI().createDataBO(tableName, summary, UserContext.fromUID("admin"));
+            LOGGER.debug("{} 表数据保存成功: {}", tableName, summary);
         } catch (Exception e) {
             String errorMsg = String.format("%s 表数据保存失败: %s", tableName, e.getMessage());
             LOGGER.error(errorMsg, e);
             throw new RuntimeException(errorMsg, e);
         }
-//        try {
-//            SDK.getBOAPI().createDataBO(tableName, summary, UserContext.fromUID("admin"));
-//            LOGGER.debug("{} 表数据保存成功: {}", tableName, summary);
-//        } catch (Exception e) {
-//            String errorMsg = String.format("%s 表数据保存失败: %s", tableName, e.getMessage());
-//            LOGGER.error(errorMsg, e);
-//            throw new RuntimeException(errorMsg, e);
-//        }
     }
 
     /**