From facf104ca0830f96fe11d54048d17f4b646032e0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 29 一月 2026 16:42:06 +0800
Subject: [PATCH] 库存明细查询去除库区信息
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 86 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 8d350c7..d413cf1 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -5,10 +5,9 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.mes.MesInApply;
-import com.zy.asrs.entity.mes.MesRecvFeedback;
-import com.zy.asrs.entity.mes.MesReturn;
+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;
@@ -148,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();
@@ -161,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);
-// }
-// }
+ }
+ }
}
}
@@ -180,7 +179,7 @@
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("settle", 4)
- .eq("doc_type", 3).orderBy("update_time"));
+ .in("doc_type", 3).orderBy("update_time"));
if (orderPakin == null) {
return;
}
@@ -189,16 +188,59 @@
MesInApply result = JSONObject.parseObject(orderPakin.getMemo(), MesInApply.class);
result.setQty(orderDetl.getQty().intValue());
-// String url = MES_URL + "loadComplete";
-// String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(result));
-// if (!StringUtils.isEmpty(response) && response.contains("Success")) {
-// MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
-// if ("1".equals(mesReturn.getSuccess())) {
+ String url = MES_URL + "loadComplete";
+ String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(result));
+ 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={}", orderPakin.getOrderNo());
-// }
-// }
+ }
+ }
+ }
+ }
+ }
+
+ // 鍑哄簱瀹屾垚涓婃姤
+ @Scheduled(cron = "0/10 * * * * ? ")
+ @Async("orderThreadPool")
+ void outOrderCompleteReport() {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectList(new EntityWrapper<OrderPakout>().eq("settle", 4).orderBy("update_time"));
+ if (orderPakoutList.size() == 0) {
+ return;
+ }
+
+ for(OrderPakout orderPakout:orderPakoutList) {
+ try {
+ MesOutApply mesOutApply = JSONObject.parseObject(orderPakout.getMemo(), MesOutApply.class);
+ MesOutFeedback mesOutFeedback = new MesOutFeedback();
+ mesOutFeedback.setTaskno(mesOutApply.getTaskno());
+ mesOutFeedback.setTaskname(mesOutApply.getTaskname());
+ mesOutFeedback.setProductLineId(mesOutApply.getProductLineId());
+ mesOutFeedback.setStationId(mesOutApply.getStationId());
+ mesOutFeedback.setItemno(mesOutApply.getItemno());
+ mesOutFeedback.setTuoPanId(orderPakout.getNumber());
+ mesOutFeedback.setQty(mesOutApply.getQty());
+ mesOutFeedback.setItemBarcode(mesOutApply.getItemBarcode());
+ mesOutFeedback.setOrderNo(mesOutApply.getOrderNo());
+
+ String url = MES_URL + "Aprs/issueComplete";
+ String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(mesOutFeedback));
+ if (!StringUtils.isEmpty(response) && response.contains("Success")) {
+ MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
+ if ("1".equals(mesReturn.getSuccess())) {
+ orderPakout.setSettle(6L);
+ orderPakoutService.updateById(orderPakout);
+ log.info("璁㈠崟涓婃姤鎴愬姛锛宱rderNo={}", orderPakout.getOrderNo());
+ }
+ }
+ }catch (Exception e) {
+ log.error("鍑哄簱璁㈠崟涓婃姤澶辫触,orderNo:{},exception:{}",orderPakout.getOrderNo(),e);
+ }
}
}
}
--
Gitblit v1.9.1