From 5099dfcf8e015c35a2f81986101e08e93a7d7944 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期一, 13 十月 2025 17:09:01 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index 0be1ef1..c01130e 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -13,6 +13,7 @@
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.ToSortLineUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +51,8 @@
for (String orderNo : orderNos) {
try{
List<OrderDetl> orderDetls = orderDetlService.selectByOrderNo(orderNo);
- List<GroupedLockerOptimizerUtils.Item> items = new ArrayList<>();
+// List<GroupedLockerOptimizerUtils.Item> items = new ArrayList<>();
+ List<OptimizedLockerPackingUtils.Item> items = new ArrayList<>();
for (OrderDetl orderDetl:orderDetls){
Integer number = basArmRulesService.getNumber(orderDetl.getWeight(),orderDetl.getVolume(),orderDetl.getManLength(),orderDetl.getWidth(),orderDetl.getHeight());
if (number == null) {
@@ -67,13 +69,15 @@
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 GroupedLockerOptimizerUtils.Item(name, maxCapacity, stock));
+ items.add(new OptimizedLockerPackingUtils.Item(name, maxCapacity, stock));
}
OrderToLine orderToLine = new OrderToLine();
orderToLine.setOrderNo(orderNo); //鍗曟嵁缂栧彿
orderToLine.setCreateTime(System.currentTimeMillis()); //鍒涘缓鏃堕棿
- OrderToLine orderToLineR = ToSortLineUtils.GetOrderToLine(items, orderToLine);
+// OrderToLine orderToLineR = ToSortLineUtils.GetOrderToLineGro(items, orderToLine);
+ OrderToLine orderToLineR = ToSortLineUtils.GetOrderToLineOpt(items, orderToLine);
try{
ReturnT<String> returnT = orderToLineHandler.start(orderToLineR);
@@ -84,12 +88,13 @@
for (OrderToLine.MatList matList:orderToLineR.getMatList()){
BasArmMastSign basArmMastSign = new BasArmMastSign();
basArmMastSign.setMatnr(matList.getSku());
- basArmMastSign.setOrderNo(orderToLineR.getOrderNo());
+ basArmMastSign.setOrderNo(orderNo);
basArmMastSign.setSku(matList.getSku());
basArmMastSign.setPo(matList.getPo());
basArmMastSign.setUpc(matList.getUpc());
basArmMastSign.setSupplier(matList.getSupplier());
basArmMastSign.setStatus(0);
+ basArmMastSign.setAnfme(matList.getCtns());
basArmMastSign.setCreateTime(matList.getBindingTags());
basArmMastSignService.insert(basArmMastSign);
}
--
Gitblit v1.9.1