From 701542ac0a90cf0e3a0a81ec2bb8066b5de68e75 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 11:21:17 +0800
Subject: [PATCH] 更新为正式部署许可证
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 125 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 121 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 3e27a83..fa92e7c 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -4,14 +4,18 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.asrs.controller.OutController;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.mes.*;
+import com.zy.asrs.mapper.CanFinMapper;
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;
import com.zy.common.entity.Parameter;
+import com.zy.common.model.LocDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -20,8 +24,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -38,6 +41,8 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private CanFinMapper canFinMapper;
@Resource
private OrderPakinService orderPakinService;
@Resource
@@ -45,6 +50,8 @@
@Resource
private MesService mesService;
+ @Autowired
+ private TaskService taskService;
@Resource
private OrderDetlPakinService orderDetlPakinService;
@Resource
@@ -55,6 +62,19 @@
@Value("${erp.switch.ErpReportOld}")
private boolean ErpReportOld;
+
+
+ @Autowired
+ private LocDetlService locDetlService;
+
+ @Autowired
+ private LocMastService locMastService;
+
+ @Autowired
+ private StaDescService staDescService;
+
+ @Autowired
+ private OutController outController;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -179,7 +199,7 @@
void otherInOrderCompleteReport() {
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("settle", 4)
+ OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().ne("doc_type",1).eq("settle", 4)
.ne("doc_type", 1).orderBy("update_time"));
if (orderPakin == null) {
return;
@@ -228,7 +248,7 @@
}
}
- String url = MES_URL + "loadComplete";
+ 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);
@@ -284,4 +304,101 @@
// }
// }
}
+
+
+ // 瑁呴厤鍗曡嚜鍔ㄥ嚭搴�
+ @Scheduled(cron = "0/1 * * * * ? ")
+// @Async("orderThreadPool")
+ void AutoOutOrderPinOut() throws InterruptedException {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<OrderPakout> orderPakouts = orderPakoutService.selectList(new EntityWrapper<OrderPakout>()
+ .eq("settle", 1)
+ .eq("doc_type", 12)
+ .orderBy("update_time"));
+ if (orderPakouts.isEmpty()) {
+ return;
+ }
+ for (OrderPakout orderPakout : orderPakouts) {
+
+
+
+// // 鏌ヨcan_fin琛ㄤ腑鐩稿悓鍗曞彿鐨勫唴瀹�
+// List<CanFin> conntOut = canFinMapper.selectList(
+// new EntityWrapper<CanFin>()
+// .eq("out_no", orderPakout.getOrderNo())
+// );
+// if (!conntOut.isEmpty()) {
+// // 妫�鏌ユ槸鍚︽弧瓒崇户缁墽琛岀殑鏉′欢锛歛gv_type涓篴gv-in-out涓攖ask_type涓篶anout
+// boolean canContinue = false;
+// for (CanFin canFin : conntOut) {
+//// if ("agv-in-out".equals(canFin.getAgvType()) && "canout".equals(canFin.getTaskStatus())) {
+// if ("agv-out".equals(canFin.getAgvType()) && "canout".equals(canFin.getTaskStatus())) {
+// log.info("can_fin琛ㄦ湁婊¤冻鏉′欢鐨勮褰曪紝鎵ц鍑哄簱鍗曪細{}", orderPakout.getOrderNo());
+// canContinue = true;
+// break;
+// }
+// }
+// if (!canContinue) {
+// // 涓嶆弧瓒虫潯浠讹紝璺宠繃鍑哄簱鍗�
+// continue;
+// }
+// }
+ String sourceNo = orderPakout.getCstmrName();
+ List<Task> tasks = taskService.selectList(new EntityWrapper<Task>()
+ .eq("source_sta_no", sourceNo)
+ .in("wrk_sts", 301, 302, 303));
+ if (!tasks.isEmpty() && tasks != null){
+ continue;
+ }
+
+
+ List<LocDto> locDtos = new ArrayList<>();
+ Boolean boo = false;
+ Set<String> exist = new HashSet<>();
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderPakout.getOrderNo()));
+ for (OrderDetlPakout orderDetl : orderDetlPakouts) {
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
+ List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
+ orderDetl.getBrand(), orderPakout.getDocType() == 11 ? null : orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.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(orderDetl.getBrand());
+ locDto.setStandby1(orderDetl.getStandby1());
+ locDto.setStandby2(orderDetl.getStandby2());
+ locDto.setStandby3(orderDetl.getStandby3());
+ locDto.setBoxType1(orderDetl.getBoxType1());
+ locDto.setBoxType2(orderDetl.getBoxType2());
+ locDto.setBoxType3(orderDetl.getBoxType3());
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
+ }
+ if (issued > 0) {
+ boo = true;
+ continue;
+ }
+ }
+ if (boo){
+ continue;
+ }
+ R pakout = orderPakoutService.pakout(locDtos);
+ break;
+ }
+ }
+ }
}
--
Gitblit v1.9.1