From 93645a8695f813d075bf1d9c4ff6fd6906fdb40d Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Sat, 22 Feb 2025 23:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=AF=BC=E5=85=A5=E5=B7=A5?=
=?UTF-8?q?=E5=8D=95=E9=9C=80=E6=B1=82=E6=95=B0=E9=87=8F=E4=B8=BA0?=
=?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 7 +++++++
.../excel/listener/UploadKateOrdersListener.java | 14 ++++++++------
src/main/resources/application.yml | 6 +++---
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index b00301b..903f1d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,6 +200,13 @@
UTF-8
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ true
+
+
diff --git a/src/main/java/com/wms/utils/excel/listener/UploadKateOrdersListener.java b/src/main/java/com/wms/utils/excel/listener/UploadKateOrdersListener.java
index 9044733..982e891 100644
--- a/src/main/java/com/wms/utils/excel/listener/UploadKateOrdersListener.java
+++ b/src/main/java/com/wms/utils/excel/listener/UploadKateOrdersListener.java
@@ -35,6 +35,7 @@ public class UploadKateOrdersListener implements ReadListener
private final String uploadUser;// 用户
private final Map oldKateOrdersMap;// 旧的工单数据
private final Map newKateOrdersMap = new HashMap<>();// 新的工单数据
+
public UploadKateOrdersListener(KateOrdersService kateOrdersService, Map oldKateOrdersMap, String uploadUser) {
this.kateOrdersService = kateOrdersService;
this.oldKateOrdersMap = oldKateOrdersMap;
@@ -51,18 +52,19 @@ public class UploadKateOrdersListener implements ReadListener
/**
* 这个每一条数据解析都会来调用
*
- * @param kateOrdersExcelVo one row value. It is same as {@link AnalysisContext#readRowHolder()}
- * @param analysisContext context
+ * @param kateOrdersExcelVo one row value. It is same as {@link AnalysisContext#readRowHolder()}
+ * @param analysisContext context
*/
@Override
public void invoke(KateOrdersExcelVo kateOrdersExcelVo, AnalysisContext analysisContext) {
if (StringUtils.isNotEmpty(slocFilterString) && Objects.equals(kateOrdersExcelVo.getSortString(), slocFilterString)) {
// 符合筛选字符串
if (StringUtils.isNotEmpty(kateOrdersExcelVo.getWorkOrder())
- && StringUtils.isNotEmpty(kateOrdersExcelVo.getGoodsId())
- && StringUtils.isNotEmpty(kateOrdersExcelVo.getSortString())
- && StringUtils.isNotEmpty(kateOrdersExcelVo.getSupplyArea())
- && kateOrdersExcelVo.getRequirementQuantity() != null) {
+ && StringUtils.isNotEmpty(kateOrdersExcelVo.getGoodsId())
+ && StringUtils.isNotEmpty(kateOrdersExcelVo.getSortString())
+ && StringUtils.isNotEmpty(kateOrdersExcelVo.getSupplyArea())
+ && kateOrdersExcelVo.getRequirementQuantity() != null
+ && kateOrdersExcelVo.getRequirementQuantity().compareTo(BigDecimal.ZERO) > 0) {
// 符合条件
cachedDataList.add(kateOrdersExcelVo);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 56ed7f9..ed8665d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -17,10 +17,10 @@ spring:
# username: coder
# password: coder
# driver-class-name: com.mysql.cj.jdbc.Driver
-# # 本地环境
+## # 本地环境
# url: jdbc:mysql://localhost:3306/wms_kate_suzhou?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
-# username: developer
-# password: developer
+# username: root
+# password: liangzhou
# driver-class-name: com.mysql.cj.jdbc.Driver
# 从库
# slave_1: