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 | 85 ++++++++----------------------------------
1 files changed, 16 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index c01130e..8786ba7 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -1,20 +1,14 @@
package com.zy.asrs.task;
import com.alibaba.fastjson.JSON;
-import com.zy.asrs.entity.BasArmMastSign;
-import com.zy.asrs.entity.BasArmRules;
-import com.zy.asrs.entity.OrderDetl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderToLine;
-import com.zy.asrs.service.BasArmMastSignService;
-import com.zy.asrs.service.BasArmRulesService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.service.impl.OrderDetlServiceImpl;
+import com.zy.asrs.service.*;
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 com.zy.asrs.utils.param.ItemUtilParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -28,9 +22,9 @@
//璁㈠崟涓嬪彂鑷冲垎鎷ｇ嚎
public class OrderToSortLineScheduler {
@Autowired
- private OrderService orderService;
+ private OrderPakinService orderPakinService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakinService orderDetlPakinService;
@Autowired
private BasArmRulesService basArmRulesService;
@Autowired
@@ -41,7 +35,7 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void orderToSortLine() {
//鑾峰彇鏈笅鍙戝崟鎹�
- List<String> orderNos = orderService.AllStatusSatisfyOrder(0);
+ List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);
if(orderNos == null || orderNos.isEmpty()) {
// log.info("鏈湁鏂拌鍗�");
return;
@@ -50,10 +44,12 @@
//閬嶅巻鍗曟嵁
for (String orderNo : orderNos) {
try{
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderNo(orderNo);
-// List<GroupedLockerOptimizerUtils.Item> items = new ArrayList<>();
- List<OptimizedLockerPackingUtils.Item> items = new ArrayList<>();
- for (OrderDetl orderDetl:orderDetls){
+ List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",orderNo));
+ if (orderDetlPakinList.size()<1){
+ continue;
+ }
+ 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) {
BasArmRules basArmRules = new BasArmRules();
@@ -69,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()){
@@ -107,53 +101,6 @@
log.error("涓嬪彂鍗曟嵁寮傚父,璺宠浆涓嬩竴涓鍗�===>"+e.getMessage());
}
}
- }
-
-
- private void groupRemainders(List<OrderDetl> sameMaterialList, double totalRemainder,
- int number, List<OrderToLine.MatList> matLists) {
- // 绛栫暐1: 濡傛灉浣欐枡鎬婚噺杈冨ぇ锛屽皾璇曞垎鎴愬涓悎鐞嗗ぇ灏忕殑缁�
- if (totalRemainder > number * 0.6) {
- // 鍙互鍒嗘垚2缁勬垨鏇村缁�
- int suggestedGroups = (int) Math.ceil(totalRemainder / (number * 0.8));
- distributeRemainders(sameMaterialList, totalRemainder, suggestedGroups, matLists);
- } else {
- // 灏忎綑鏂欏崟缁勫鐞�
- Long bindingTag = System.currentTimeMillis();
- matLists.add(createMatListItem(sameMaterialList.get(0), totalRemainder, bindingTag, true));
- }
- }
-
-
- private void distributeRemainders(List<OrderDetl> sameMaterialList, double totalRemainder,
- int groupCount, List<OrderToLine.MatList> matLists) {
- double average = totalRemainder / groupCount;
-
- for (int i = 0; i < groupCount; i++) {
- double groupQuantity;
- if (i == groupCount - 1) {
- // 鏈�鍚庝竴缁勫彇鍓╀綑鎵�鏈�
- groupQuantity = totalRemainder - (average * (groupCount - 1));
- } else {
- groupQuantity = average;
- }
-
- // 涓烘瘡缁勭敓鎴愬敮涓�鏍囪
- Long groupTag = System.currentTimeMillis() + i;
- matLists.add(createMatListItem(sameMaterialList.get(0), groupQuantity, groupTag, true));
- }
- }
-
- private OrderToLine.MatList createMatListItem(OrderDetl orderDetl, Double quantity, Long bindingTag, boolean isRemainder) {
- return new OrderToLine.MatList(
- orderDetl.getMatnr(),
- orderDetl.getSupp(),
- quantity,
- orderDetl.getBarcode(),
- 1,
- isRemainder ? null : orderDetl.getOrigin(),
- isRemainder ? bindingTag : System.currentTimeMillis()
- );
}
}
--
Gitblit v1.9.1