From c6ff506917d173b2cf90948d84a77f86b847ab89 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期三, 18 九月 2024 15:58:08 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderSyncHandler.java | 10 +++++++++-
zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
index 03e3868..bad136d 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
@@ -69,7 +69,7 @@
<select id="selectComplete" resultMap="BaseResultMap">
select top 5 *
- from man_order
+ from wms_order
where 1=1
and settle = 4
and status = 1
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderSyncHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderSyncHandler.java
index c53c911..6f63446 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderSyncHandler.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderSyncHandler.java
@@ -88,7 +88,15 @@
param.put("DanCode", orderNo);
param.put("Data", mats);
ReturnT<String> mesReturn = new PostMesDataUtils().getMesData("涓婃姤MES", ERP_URL, ERP_REPORT, param);
-
+ if (mesReturn.getCode()!=200){
+ order.setSettle(7L);
+ order.setCreateTime(new Date());
+ orderService.updateById(order);
+ } else {
+ order.setSettle(6L);
+ order.setCreateTime(new Date());
+ orderService.updateById(order);
+ }
return mesReturn;
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
index 04c6887..eeb987e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
@@ -40,7 +40,7 @@
} else {
//涓婃姤澶辫触
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤"+name);
+// throw new CoolException("涓婃姤"+name);
}
if (jsonObject.getInteger("code").equals(200) || jsonObject.getInteger("Code").equals(200)) {
--
Gitblit v1.9.1