From b3b5eb6bd7955afb4be48f0e34a18b92a38b102d Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 18 十二月 2025 15:15:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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..3b2e4ba 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,6 +31,8 @@
@Autowired
private OrderToLineHandler orderToLineHandler;
@Autowired
+ private MatService matService;
+ @Autowired
private BasArmMastSignService basArmMastSignService;
@Scheduled(cron = "0/3 * * * * ? ")
@@ -43,6 +46,13 @@
//閬嶅巻鍗曟嵁
for (String orderNo : orderNos) {
+ OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no",orderNo));
+ if(orderPakin.getDocType() == 16){
+ orderPakin.setMoveStatus(1);
+ orderPakinService.updateById(orderPakin);
+ continue;
+ }
+
try{
List<OrderDetlPakin> orderDetlPakinListAll = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",orderNo).eq("inspect",0));
if (orderDetlPakinListAll.size()<1){
@@ -62,17 +72,24 @@
}
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());
- basArmRules.setMaterialWeight(orderDetl.getWeight());
- basArmRules.setMaterialLength(orderDetl.getManLength());
- basArmRules.setMaterialWidth(orderDetl.getWidth());
+ basArmRules.setMaterialHeight(mat.getHeight());
+ basArmRules.setMaterialWeight(mat.getWeight());
+ basArmRules.setMaterialLength(mat.getManLength());
+ basArmRules.setMaterialWidth(mat.getWidth());
basArmRulesService.insert(basArmRules);
return;
} else if (number == 0){
- return;
+
+ Integer status = basArmRulesService.getStatus(mat.getWeight(),mat.getVolume(),mat.getManLength(),mat.getWidth(),mat.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