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 | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index c6f6da8..69cab94 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -5,9 +5,7 @@
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.RcsServiceImpl;
import com.zy.asrs.task.core.ReturnT;
@@ -49,6 +47,8 @@
@Resource
private OrderDetlPakinService orderDetlPakinService;
+ @Resource
+ private OrderDetlPakoutService orderDetlPakoutService;
@Value("${mes.url}")
public String MES_URL;
@@ -130,7 +130,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",4).orderBy("update_time"));
+ .eq("doc_type",1).orderBy("update_time"));
if (orderPakin == null) {
return;
}
@@ -160,7 +160,7 @@
mesRecvFeedback.setOperuser(dbMemo.getString("operuser"));
mesRecvFeedback.setItemdata(list);
- String url = MES_URL + "MaterialReceiptAndReturn";
+ 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);
@@ -173,32 +173,71 @@
}
}
- // 鍏朵粬鍏ュ簱鍗曚笂鎶�
+ // 閰嶇洏鍏ュ簱鍗曚笂鎶�
@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)
- .eq("doc_type", 3).orderBy("update_time"));
+ .ne("doc_type", 1).orderBy("update_time"));
if (orderPakin == null) {
return;
}
List<OrderDetlPakin> orderDetlPakins = orderDetlPakinService.selectByOrderId(orderPakin.getId());
for (OrderDetlPakin orderDetl : orderDetlPakins) {
- MesInApply result = JSONObject.parseObject(orderPakin.getMemo(), MesInApply.class);
- result.setQty(orderDetl.getQty().intValue());
+ 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())) {
+ 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());
+ }
+ }
}
}
}
--
Gitblit v1.9.1