From a49cdaa669f18d92e8fef5d84da536c0465670db Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 21:21:07 +0800
Subject: [PATCH] 1.新增组托入库生成AGV搬运任务，执行AGV搬运任务时判断堆垛机接驳站点是否有空料架，有的话需要进行搬离（没有出库任务的情况下） 2.完善配盘出库单agv目标地点，可能是区域也可能是站点 Q为区域；Z为站点 3.完善立库入库找规则方法
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 201 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 181 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index ef69df3..69cab94 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,9 +1,13 @@
package com.zy.asrs.task;
+import com.alibaba.excel.util.StringUtils;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.mes.*;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.RcsServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -15,7 +19,11 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* updated by IX in 2024/12/17
@@ -30,6 +38,20 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+ @Resource
+ private OrderPakinService orderPakinService;
+ @Resource
+ private OrderPakoutService orderPakoutService;
+ @Resource
+ private MesService mesService;
+
+ @Resource
+ private OrderDetlPakinService orderDetlPakinService;
+ @Resource
+ private OrderDetlPakoutService orderDetlPakoutService;
+
+ @Value("${mes.url}")
+ public String MES_URL;
@Value("${erp.switch.ErpReportOld}")
private boolean ErpReportOld;
@@ -43,7 +65,7 @@
}
}
- @Scheduled(cron = "0 1 * * * ? ")
+// @Scheduled(cron = "0 1 * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderIssuedOnceMore() {
List<Order> orderList = orderService.selectComplete99();
@@ -60,7 +82,7 @@
}
}
- @Scheduled(cron = "0/30 * * * * ? ")
+// @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderIssued() {
// String erpReport = Parameter.get().getErpReport();
@@ -101,26 +123,165 @@
// }
}
-// @Scheduled(cron = "0/30 * * * * ? ")
+ // 鍏ュ簱璁㈠崟瀹屾垚涓婃姤-棰嗘枡鍗曪紝鍘熸潗鏂�
+ @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReportOrderReport() {
- if (!ErpReportOld){
- return;
- }
+ void inOrderCompleteReport() {
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = orderService.selectComplete();
- for (Order order : orders) {
- try {
- ReturnT<String> result = orderSyncHandler.startOrderReport(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- }
- } catch (Exception e) {
- log.error(e.getMessage());
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("settle", 4)
+ .eq("doc_type",1).orderBy("update_time"));
+ if (orderPakin == null) {
+ return;
+ }
+ String orderNo = orderPakin.getOrderNo();
+ List<OrderDetlPakin> orderDetlPakins = orderDetlPakinService.selectByOrderId(orderPakin.getId());
+ List<MesRecvFeedback.MesRecvFeedbackItem> list = new ArrayList<>();
+ JSONObject dbMemo = JSONObject.parseObject(orderPakin.getMemo());
+
+ for (OrderDetlPakin orderDetl : orderDetlPakins) {
+ MesRecvFeedback.MesRecvFeedbackItem item = new MesRecvFeedback.MesRecvFeedbackItem();
+ item.setItemNo(orderDetl.getMatnr());
+ item.setOrderNo(orderNo);
+ item.setQty(orderDetl.getAnfme().intValue());
+ item.setRealQty(orderDetl.getAnfme().intValue());
+ // 鍥炰紶鎵樼洏缁戝畾鐨勯浂浠朵簩缁寸爜
+ 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);
+ list.add(item);
+ }
+ MesRecvFeedback mesRecvFeedback = new MesRecvFeedback();
+ mesRecvFeedback.setSourceNo(dbMemo.getString("sourceNo"));
+ mesRecvFeedback.setOperuser(dbMemo.getString("operuser"));
+ mesRecvFeedback.setItemdata(list);
+
+ String url = MES_URL + "ActualInventoryFeedback";
+ 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);
}
}
}
}
+
+ // 閰嶇洏鍏ュ簱鍗曚笂鎶�
+ @Scheduled(cron = "0/30 * * * * ? ")
+ @Async("orderThreadPool")
+ void otherInOrderCompleteReport() {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("settle", 4)
+ .ne("doc_type", 1).orderBy("update_time"));
+ if (orderPakin == null) {
+ return;
+ }
+ List<OrderDetlPakin> orderDetlPakins = orderDetlPakinService.selectByOrderId(orderPakin.getId());
+ for (OrderDetlPakin orderDetl : orderDetlPakins) {
+ MesOutApply result = JSONObject.parseObject(orderPakin.getMemo(), MesOutApply.class);
+ for(MesOutApply.MesOutApplyItem mes:result.getItemdata()){
+ if (orderDetl.getMatnr().equals(mes.getItemno())){
+ mes.setWmsBarcode(orderDetl.getBarcode());
+ mes.setRackNumber(orderDetl.getSku());
+ }
+ }
+
+ 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/30 * * * * ? ")
+ @Async("orderThreadPool")
+ void otherOutOrderCompleteReport() {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ OrderPakout orderPakout = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("settle", 4).orderBy("update_time"));
+ if (orderPakout == null) {
+ return;
+ }
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectByOrderId(orderPakout.getId());
+ for (OrderDetlPakout orderDetl : orderDetlPakouts) {
+ MesOutApply result = JSONObject.parseObject(orderPakout.getMemo(), MesOutApply.class);
+ for(MesOutApply.MesOutApplyItem mes:result.getItemdata()){
+ if (orderDetl.getMatnr().equals(mes.getItemno())){
+ mes.setWmsBarcode(orderDetl.getBarcode());
+ mes.setRackNumber(orderDetl.getSku());
+ }
+ }
+
+ String url = MES_URL + "issueCompleteFit";
+ 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())) {
+ orderPakout.setSettle(6L);
+ orderPakoutService.updateById(orderPakout);
+ log.info("璁㈠崟涓婃姤鎴愬姛锛宱rderNo={}", orderPakout.getOrderNo());
+ }
+ }
+ }
+ }
+ }
+
+// @Scheduled(cron = "0/30 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeAndReportOrderReport() {
+
+// // 鍏ュ簱瀹屾垚
+// List<OrderPakin> pakins = orderPakinService.selectComplete();
+// for (OrderPakin orderPakin : pakins) {
+// try {
+// mesService.inFeedback(orderPakin.getOrderNo());
+// } catch (Exception e) {
+// log.error("鎺ㄩ�佸叆搴撳畬鎴愪俊鎭敊璇�, order{}", orderPakin, e);
+// }
+// }
+
+// List<OrderPakout> pakouts = orderPakoutService.selectComplete();
+// for (OrderPakout orderPakout : pakouts) {
+// try {
+// mesService.outFeedback(orderPakout.getOrderNo());
+// } catch (Exception e) {
+// log.error("鎺ㄩ�佸嚭搴撳畬鎴愪俊鎭敊璇�, order{}", orderPakout, e);
+// }
+// }
+
+// if (!ErpReportOld){
+// return;
+// }
+// String erpReport = Parameter.get().getErpReport();
+// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+// List<Order> orders = orderService.selectComplete();
+// for (Order order : orders) {
+// try {
+// ReturnT<String> result = orderSyncHandler.startOrderReport(order);
+// if (!result.isSuccess()) {
+// log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+// }
+// } catch (Exception e) {
+// log.error(e.getMessage());
+// log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+// }
+// }
+// }
+ }
}
--
Gitblit v1.9.1