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 cf80070..feba41d 100644
Binary files 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 and 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 differ
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/job/PurchaseDataLinkUpJob.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/job/PurchaseDataLinkUpJob.class
index 93da102..04baae6 100644
Binary files a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/job/PurchaseDataLinkUpJob.class and b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/job/PurchaseDataLinkUpJob.class differ
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 ee96031..bf7f2e6 100644
Binary files 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 and 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 differ
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 a57c9c1..5c4e529 100644
Binary files 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 and 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 differ
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 a6ce132..969766f 100644
Binary files 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 and 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 differ
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 a4dd9be..e852e24 100644
Binary files 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 and 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 differ
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 b873c06..63795d0 100644
Binary files a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin and b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin differ
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 b7328f5..c334a61 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
@@ -168,7 +168,7 @@ public class ProductionDataSyncServiceImpl implements DataSyncService {
         try {
             String deleteSql = "DELETE FROM " + targetTable +
                     " WHERE " + targetTimeField + " >= ? ";
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             String startDateStr = simpleDateFormat.format(startDate)+" 00:00:00";
             String endDateStr = simpleDateFormat.format(endDate)+" 23:59:59";
             int deletedCount = DBSql.update(deleteSql, new Object[]{startDateStr});
@@ -742,7 +742,7 @@ public class ProductionDataSyncServiceImpl implements DataSyncService {
                         // 按时间范围删除
                         String deleteSql = "DELETE FROM " + hzb +
                                 " WHERE BKGS = '"+bkgs+"' AND " + targetTimeField + " >= ? ";
-                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                         String startDateStr = simpleDateFormat.format(startDate)+" 00:00:00";
                         int deletedCount = DBSql.update(deleteSql, new Object[]{startDate});
                         LOGGER.info("已删除目标表[{}]中{}条数据（时间范围: {} ）",
@@ -773,7 +773,7 @@ public class ProductionDataSyncServiceImpl implements DataSyncService {
         boolean hasMore;
         String pageSql = "";
         List<RowMap> pageData = null;
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String startDate = "";
         String endDate = "";
         try {
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 3c45f6b..097cc7e 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
@@ -334,7 +334,7 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService {
             int update = DBSql.update(deleteSql, new Object[]{bkgs, yearMonth});
             LOGGER.info("采购_基地_年月采购明细：{}年月物料采购月度汇总数据，板块公司：{}，删除了{}条数据", yearMonth, bkgs, update);
 
-            String currentMonthSql = "SELECT " +
+            String currentMonthSql = "SELECT c.BKGS AS BKGS," +
                     " CONCAT(c.Year, '-', LPAD(c.Month, 2, '0')) AS ny, " +
                     " c.Year AS year, " +
                     " c.Month AS month, " +
@@ -345,7 +345,7 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService {
                     " tstotalAmount/totalQuantity AS PJDJ " +
                     " FROM (" +
                     "    SELECT " +
-                    "        WLMC, " +
+                    "        WLMC, BKGS, " +
                     "        SUM(DHJE) AS tstotalAmount, " +
                     "        SUM(RKSL) AS totalQuantity, " +
                     "        SLGC, " +
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 95d65f4..271e305 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
@@ -196,7 +196,7 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
         try {
             String deleteSql = "DELETE FROM " + targetTable +
                     " WHERE " + targetTimeField + " >= ? ";
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             String startDateStr = simpleDateFormat.format(startDate)+" 00:00:00";
             String endDateStr = simpleDateFormat.format(endDate)+" 23:59:59";
             int deletedCount = DBSql.update(deleteSql, new Object[]{startDateStr});
@@ -784,7 +784,7 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
                         for (String bkgs : bkgsArr) {
                             String deleteSql = "DELETE FROM " + hzb +
                                     " WHERE BKGS = '"+bkgs+"' AND " + targetTimeField + " >= ? ";
-                            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                             String startDateStr = simpleDateFormat.format(startDate)+" 00:00:00";
                             int deletedCount = DBSql.update(deleteSql, new Object[]{startDateStr});
                             LOGGER.info("已删除目标表["+hzb+"]中{}条数据（时间范围: {} ）",
@@ -817,7 +817,7 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService {
         boolean hasMore;
         String pageSql = "";
         List<RowMap> pageData = null;
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String startDate = "";
         String endDate = "";
         PurchaseUtil purchaseUtil = new PurchaseUtil();
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 6636cb4..ecc17f7 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
@@ -473,7 +473,7 @@ public class SaleCountDimensionImpl implements DataSummaryService {
                         bo.set("JD", location.getLongitude());
                         bo.set("WD", location.getLatitude());
                     }
-                    if ("石膏板".equals(map.getString("LB_1"))){
+                    if ("石膏板".equals(lb_1) || "高分子".equals(lb_1)){
                         bo.set("XL", map.getDouble("TSXL"));
                         bo.set("SNTQXL", map.getString("sntqtsxl"));
                     }else {
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 1d24a56..596bc43 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
@@ -459,7 +459,7 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
         try {
             String deleteSql = "DELETE FROM " + targetTable +
                     " WHERE " + targetTimeField + " >= ? ";
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             String startDateStr = simpleDateFormat.format(startDate)+" 00:00:00";
             String endDateStr = simpleDateFormat.format(endDate)+" 23:59:59";
             int deletedCount = DBSql.update(deleteSql, new Object[]{startDateStr});
@@ -773,7 +773,7 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
                         for (String bkgs : bkgsArr) {
                             String deleteSql = "DELETE FROM " + hzb +
                                     " WHERE BKGS = '"+bkgs+"' AND " + targetTimeField + " >= ? ";
-                            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                             String startDateStr = simpleDateFormat.format(startDate)+" 00:00:00";
                             int deletedCount = DBSql.update(deleteSql, new Object[]{startDateStr});
                             LOGGER.info("已删除目标表["+hzb+"]中{}条数据（时间范围: {} ）",
@@ -809,7 +809,7 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
         boolean hasMore;
         String pageSql = "";
         List<RowMap> pageData = null;
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String startDate = "";
         String endDate = "";
         // 查询梦牌区域