From e3bb506579f395c5dbca3d9f0e1e10a18170240f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 26 四月 2021 15:01:15 +0800
Subject: [PATCH] Merge branch 'htwms' of https://gitee.com/luxiaotao1123/wms-cloud into htwms
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index f0c48c5..70383e2 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -424,7 +424,7 @@
public void getOrdersExecute(){
try {
Map<String, Object> json = new HashMap<>();
- json.put("vchType", 151);
+ json.put("vchType", 11);
String response = new HttpHandler.Builder()
.setUri(URI)
.setPath(GET_ORDERS)
@@ -747,7 +747,7 @@
public void getCancelOrdersExecute(){
try {
Map<String, Object> json = new HashMap<>();
- json.put("vchType", 151);
+ json.put("vchType", 11);
json.put("flag", 2);
String response = new HttpHandler.Builder()
.setUri(URI)
@@ -770,12 +770,13 @@
}
for (String number : existNumbers) {
Order order = orderService.selectByOrderNo(number);
- if (order.getSettle() != 3L && order.getSettle() != 5L) {
- if (!orderService.updateSettle(number, 5L)) {
+ if (order != null) {
+ if (order.getSettle() != 3L && order.getSettle() != 5L) {
+ if (!orderService.updateSettle(number, 5L)) {
// throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+ }
}
}
-
}
}
--
Gitblit v1.9.1