From 87b9fcdce2b5459b54498d9b21c66031d06c5e5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 27 五月 2021 15:12:58 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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..02fdaf5 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
@@ -34,7 +34,7 @@
@RestController
public class ErpScheduler {
- public static final String URI = "http://8.133.182.21:8080/api";
+ public static final String URI = "http://8.133.182.21:6220/api";
public static final String GET_ORDERS = "cM/basis/getOrders";
public static final String GET_BASIS = "cM/basis/getBasis";
public static final String UPLOAD_BILL = "cM/basis/uploadBill";
@@ -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)
@@ -549,8 +549,8 @@
// 澶�
- getOrderResult0.setNumber(order.getUuid());
- getOrderResult0.setVchType(11); // todo:luxiaotao
+ getOrderResult0.setNumber(order.getOrderNo());
+ getOrderResult0.setVchType(11);
getOrderResult0.setBillDate(order.getOrderTime());
getOrderResult0.setBTypeID(order.getTel());
getOrderResult0.setKTypeID("瀹忔尯浠撳簱");
@@ -628,7 +628,7 @@
// 澶�
getOrderResult0.setNumber(order.getOrderNo());
- getOrderResult0.setVchType(6); // todo:luxiaotao
+ getOrderResult0.setVchType(6);
getOrderResult0.setBillDate(order.getOrderTime());
getOrderResult0.setBTypeID(order.getTel());
getOrderResult0.setKTypeID("瀹忔尯浠撳簱");
@@ -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