From 2442152cd669b31eb5b118e1fdf2bfd016656a5f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 02 十二月 2025 16:05:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index 21c424b..ae6c6a1 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderToLine;
import com.zy.asrs.service.*;
@@ -30,9 +31,11 @@
@Autowired
private OrderToLineHandler orderToLineHandler;
@Autowired
+ private MatService matService;
+ @Autowired
private BasArmMastSignService basArmMastSignService;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void orderToSortLine() {
//鑾峰彇鏈笅鍙戝崟鎹�
List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);
@@ -62,7 +65,8 @@
}
List<ItemUtilParam.Item> items = new ArrayList<>();
for (OrderDetlPakin orderDetl:orderDetlPakinList){
- Integer number = basArmRulesService.getNumber(orderDetl.getWeight(),orderDetl.getVolume(),orderDetl.getManLength(),orderDetl.getWidth(),orderDetl.getHeight());
+ Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
+ Integer number = basArmRulesService.getNumber(mat.getWeight(),mat.getVolume(),mat.getManLength(),mat.getWidth(),mat.getHeight());
if (number == null) {
BasArmRules basArmRules = new BasArmRules();
basArmRules.setMaterialHeight(orderDetl.getHeight());
@@ -72,7 +76,13 @@
basArmRulesService.insert(basArmRules);
return;
} else if (number == 0){
- return;
+
+ Integer status = basArmRulesService.getStatus(orderDetl.getWeight(),orderDetl.getVolume(),orderDetl.getManLength(),orderDetl.getWidth(),orderDetl.getHeight());
+ if (!Cools.isEmpty(status) && status == 2){
+ continue;
+ } else {
+ return;
+ }
}
String name = ToSortLineUtils.MergerParameter(orderDetl.getMatnr(),orderDetl.getStandby3(),orderDetl.getStandby1(),orderDetl.getStandby2());
int maxCapacity = number;
--
Gitblit v1.9.1