From bbf11a79fce0131aa95905c09b00f25e7696d20b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 21 十月 2025 16:53:13 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index 3fae3ca..8786ba7 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -5,13 +5,10 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderToLine;
import com.zy.asrs.service.*;
-import com.zy.asrs.service.impl.OrderDetlServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderToLineHandler;
-import com.zy.asrs.utils.GroupedLockerOptimizerUtils;
-import com.zy.asrs.utils.OptimizedLockerPackingUtils;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.ToSortLineUtils;
+import com.zy.asrs.utils.param.ItemUtilParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -48,12 +45,10 @@
for (String orderNo : orderNos) {
try{
List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",orderNo));
-// List<GroupedLockerOptimizerUtils.Item> items = new ArrayList<>();
if (orderDetlPakinList.size()<1){
continue;
}
-
- List<OptimizedLockerPackingUtils.Item> items = new ArrayList<>();
+ List<ItemUtilParam.Item> items = new ArrayList<>();
for (OrderDetlPakin orderDetl:orderDetlPakinList){
Integer number = basArmRulesService.getNumber(orderDetl.getWeight(),orderDetl.getVolume(),orderDetl.getManLength(),orderDetl.getWidth(),orderDetl.getHeight());
if (number == null) {
@@ -70,20 +65,18 @@
String name = ToSortLineUtils.MergerParameter(orderDetl.getMatnr(),orderDetl.getStandby1(),orderDetl.getStandby2());
int maxCapacity = number;
int stock = orderDetl.getAnfme().intValue();
-// items.add(new GroupedLockerOptimizerUtils.Item(name, maxCapacity, stock));
- items.add(new OptimizedLockerPackingUtils.Item(name, maxCapacity, stock));
+ items.add(new ItemUtilParam.Item(name, maxCapacity, stock));
}
OrderToLine orderToLine = new OrderToLine();
orderToLine.setOrderNo(orderNo); //鍗曟嵁缂栧彿
orderToLine.setCreateTime(System.currentTimeMillis()); //鍒涘缓鏃堕棿
-// OrderToLine orderToLineR = ToSortLineUtils.GetOrderToLineGro(items, orderToLine);
- OrderToLine orderToLineR = ToSortLineUtils.GetOrderToLineOpt(items, orderToLine);
+ OrderToLine orderToLineR = ToSortLineUtils.GetOrderToLine(items, orderToLine,"Opt3");
try{
ReturnT<String> returnT = orderToLineHandler.start(orderToLineR);
if (!returnT.isSuccess()) {
- log.error("涓嬪彂鍗曟嵁澶辫触===>"+ JSON.toJSON(orderToLineR));
+// log.error("涓嬪彂鍗曟嵁澶辫触===>"+ JSON.toJSON(orderToLineR));
} else {
try{
for (OrderToLine.MatList matList:orderToLineR.getMatList()){
--
Gitblit v1.9.1