From 78b8f5141aa11bfa0f94361407ed43362c8852ce Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 一月 2026 17:28:55 +0800
Subject: [PATCH] WMS功能完善
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 357d643..d413cf1 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -7,6 +7,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.mes.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.MesServiceImpl;
import com.zy.asrs.service.impl.RcsServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
@@ -146,11 +147,11 @@
// 鍥炰紶鎵樼洏缁戝畾鐨勯浂浠朵簩缁寸爜
String itemBarcode = orderDetl.getStandby1();
List<String> itemBarCodeList = new ArrayList<>();
- Matcher matcher = Pattern.compile("\"([^\"]*)\"").matcher(itemBarcode);
- while (matcher.find()) {
- itemBarCodeList.add(matcher.group(1));
- }
- item.setItemBarcode(itemBarCodeList);
+// Matcher matcher = Pattern.compile("\"([^\"]*)\"").matcher(itemBarcode);
+// while (matcher.find()) {
+// itemBarCodeList.add(matcher.group(1));
+// }
+ item.setItemBarcode(MesServiceImpl.barCodeStrToList(itemBarcode));
list.add(item);
}
MesRecvFeedback mesRecvFeedback = new MesRecvFeedback();
@@ -159,15 +160,15 @@
mesRecvFeedback.setItemdata(list);
String url = MES_URL + "MaterialReceiptAndReturn";
-// String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(mesRecvFeedback));
-// if (!StringUtils.isEmpty(response) && response.contains("Success")) {
-// MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
-// if ("1".equals(mesReturn.getSuccess())) {
+ String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(mesRecvFeedback));
+ if (!StringUtils.isEmpty(response) && response.contains("Success")) {
+ MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
+ if ("1".equals(mesReturn.getSuccess())) {
orderPakin.setSettle(6L);
orderPakinService.updateById(orderPakin);
log.info("璁㈠崟涓婃姤鎴愬姛锛宱rderNo={}", orderNo);
-// }
-// }
+ }
+ }
}
}
--
Gitblit v1.9.1