From 39eda46cbbf3ebb393c3770a5a19e923cace2a13 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 四月 2021 14:05:54 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java | 2 +-
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java b/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
index 3dfd51d..17b97c5 100644
--- a/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/task/OrderScheduler.java
@@ -30,7 +30,7 @@
public void cancelOrderExecute(){
List<Order> cancelOrders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 5));
for (Order order : cancelOrders) {
-
+
if (!orderService.updateSettle(order.getOrderNo(), 3L)) {
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index abd9346..d98e4c6 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -240,9 +240,7 @@
return R.error("姝ゅ崟鎹凡澶辨晥锛岃鑱旂郴绠＄悊鍛�");
}
for (OrderDetl orderDetl : orderDetls) {
- try {
- Integer.parseInt(String.valueOf(orderDetl.getAnfme()));
- } catch (Exception e) {
+ if (Arith.remainder(orderDetl.getAnfme(), 1) > 0) {
return R.error(orderDetl.getMaktx() + "鏁伴噺蹇呴』涓烘暣鏁�");
}
}
--
Gitblit v1.9.1