From eaa43b12bfe9185b4f0b8f09d9ca081895a4d185 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 12 三月 2026 21:27:44 +0800
Subject: [PATCH] 1.任务下发失败提醒 2.针对订单出库循环堵塞问题优化
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 202 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 191 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 19876f6..0bd578b 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -2,22 +2,25 @@
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.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
+import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.entity.Parameter;
+import com.zy.common.model.LocDto;
+import com.zy.common.model.TaskDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.List;
+import java.util.*;
/**
- * Created by vincent on 2020/7/7
+ * updated by IX in 2024/12/17
*/
@Slf4j
@Component
@@ -30,8 +33,29 @@
@Autowired
private ApiLogService apiLogService;
+ @Value("${erp.switch.ErpReportOld}")
+ private boolean ErpReportOld;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private LocAroundBindService locAroundBindService;
+
@Scheduled(cron = "0 0 1 * * ? ")
- public void clearApiLog(){
+ public void clearApiLog() {
try {
apiLogService.clearWeekBefore();
} catch (Exception e) {
@@ -39,19 +63,175 @@
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
+
+ @Scheduled(cron = "0/30 * * * * ? ")
+ public void checkOrderPakoutSettled() {
+ List<OrderPakout> list = orderPakoutService.selectBySettle(1L);
+ if (Cools.isEmpty(list)) {
+ return;
+ }
+ for (OrderPakout order : list) {
+ if (order.getDocType() != null) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType != null && Integer.valueOf(1).equals(docType.getPakout())) {
+ List<LocDto> locDtos = new ArrayList<>();
+ Set<String> exist = new HashSet<>();
+ Boolean flag = false;
+ // 鑾峰彇璇ヨ鍗曚腑璁㈠崟鏄庣粏閲岀殑id
+ List<OrderDetlPakout> detls = orderDetlPakoutService.selectByOrderId(order.getId());
+ if (!Cools.isEmpty(detls)) {
+ for (OrderDetlPakout detl : detls) {
+
+ double issued = Optional.of(detl.getAnfme() - detl.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
+ List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, detl.getMatnr(), detl.getBatch(),
+ detl.getBrand(), detl.getStandby1(), detl.getStandby2(), detl.getStandby3(), detl.getBoxType1(), detl.getBoxType2(), detl.getBoxType3());
+ for (LocDetl locDetl : locDetls) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()).eq("loc_sts", "F"));
+ if (locMast != null) {
+ LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locMast.getLocNo()));
+ if (!Cools.isEmpty(bLocNo)) {
+ continue;
+ }
+ }
+ if (issued > 0) {
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), detl.getOrderNo(),
+ issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
+ locDto.setFrozen(locDetl.getFrozen());
+ locDto.setFrozenLoc(locMast.getFrozen());
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+ locDto.setStaNos(staNos);
+ locDto.setBrand(detl.getBrand());
+ locDto.setStandby1(detl.getStandby1());
+ locDto.setStandby2(detl.getStandby2());
+ locDto.setStandby3(detl.getStandby3());
+ locDto.setBoxType1(detl.getBoxType1());
+ locDto.setBoxType2(detl.getBoxType2());
+ locDto.setBoxType3(detl.getBoxType3());
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+
+ break;
+ }
+ }
+ if (issued > 0) {
+ flag = true;
+ break;
+ }
+ }
+ if (flag) {
+ continue;
+ }
+ List<TaskDto> taskDtos = new ArrayList<>();
+ // 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
+ for (LocDto locDto : locDtos) {
+ if (locDto.isLack()) {
+ continue;
+ }
+ TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto, locDto.getStandby1());
+ if (TaskDto.has(taskDtos, taskDto)) {
+ TaskDto dto = TaskDto.find(taskDtos, taskDto);
+ assert dto != null;
+ dto.getLocDtos().addAll(taskDto.getLocDtos());
+ } else {
+ taskDtos.add(taskDto);
+ }
+ }
+ // -----------------------------------------------------------------------------------------------
+ int failCount = 0;
+ for (TaskDto taskDto : taskDtos) {
+ if (!stockOutSafely(taskDto, 9995L, "鑷姩璁㈠崟鍑哄簱")) {
+ failCount++;
+ }
+ }
+ if (failCount > 0) {
+ log.warn("鑷姩璁㈠崟鍑哄簱閮ㄥ垎澶辫触[orderNo={}]锛屾垚鍔焮}鏉★紝澶辫触{}鏉�",
+ order.getOrderNo(), taskDtos.size() - failCount, failCount);
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ // @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReport(){
+ public void completeAndReportOrderInAndOutUtil() {
+// String erpReport = Parameter.get().getErpReport();
+// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<Order> orders = OrderInAndOutUtil.selectComplete(null);
+ for (Order order : orders) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+ }
+ }
+// }
+ }
+
+ // @Scheduled(cron = "0/30 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeAndReportOrderReport() {
+ if (!ErpReportOld) {
+ return;
+ }
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1));
+ List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- ReturnT<String> result = orderSyncHandler.start(order);
- if (!result.isSuccess()) {
+ 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());
}
}
}
}
+ private boolean stockOutSafely(TaskDto taskDto, Long userId, String scene) {
+ try {
+ BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
+ workService.stockOut(staNo, taskDto, taskDto.getDeviceNo(), userId);
+ return true;
+ } catch (Exception e) {
+ log.error("{}澶辫触[locNo={}, staNo={}, deviceNo={}, orderNos={}]锛屽師鍥�: {}",
+ scene,
+ taskDto.getLocNo(),
+ taskDto.getStaNo(),
+ taskDto.getDeviceNo(),
+ collectOrderNos(taskDto),
+ getErrorMessage(e));
+ return false;
+ }
+ }
+
+ private String collectOrderNos(TaskDto taskDto) {
+ Set<String> orderNos = new LinkedHashSet<>();
+ for (LocDto locDto : taskDto.getLocDtos()) {
+ if (!Cools.isEmpty(locDto.getOrderNo())) {
+ orderNos.add(locDto.getOrderNo());
+ }
+ }
+ return orderNos.toString();
+ }
+
+ private String getErrorMessage(Exception e) {
+ return Cools.isEmpty(e.getMessage()) ? e.getClass().getSimpleName() : e.getMessage();
+ }
}
--
Gitblit v1.9.1