From e2e642848e9a75cd5915cf349453d71d31838b68 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 23 十一月 2025 13:40:53 +0800
Subject: [PATCH] *分拣流程orderNo由唯一降级为不唯一
---
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 108 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index f47d516..21c424b 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -1,17 +1,124 @@
package com.zy.asrs.task;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.OrderToLine;
+import com.zy.asrs.service.*;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.OrderToLineHandler;
+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;
import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
@Slf4j
@Component
//璁㈠崟涓嬪彂鑷冲垎鎷ｇ嚎
public class OrderToSortLineScheduler {
+ @Autowired
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
+ @Autowired
+ private BasArmRulesService basArmRulesService;
+ @Autowired
+ private OrderToLineHandler orderToLineHandler;
+ @Autowired
+ private BasArmMastSignService basArmMastSignService;
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
private void orderToSortLine() {
+ //鑾峰彇鏈笅鍙戝崟鎹�
+ List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);
+ if(orderNos == null || orderNos.isEmpty()) {
+// log.info("鏈湁鏂拌鍗�");
+ return;
+ }
+ //閬嶅巻鍗曟嵁
+ for (String orderNo : orderNos) {
+ try{
+ List<OrderDetlPakin> orderDetlPakinListAll = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",orderNo).eq("inspect",0));
+ if (orderDetlPakinListAll.size()<1){
+ orderPakinService.updateOrderStatus(orderNo); //鏇存柊璁㈠崟鐘舵�� 0 -> 1
+ continue;
+ }
+ List<String> boxType3List = new ArrayList<>();
+ for (OrderDetlPakin orderDetl:orderDetlPakinListAll){
+ if (!boxType3List.contains(orderDetl.getBoxType3())){
+ boxType3List.add(orderDetl.getBoxType3());
+ }
+ }
+ for (String boxType3 : boxType3List){
+ List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",orderNo).eq("box_type3",boxType3).eq("inspect",0));
+ 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();
+ basArmRules.setMaterialHeight(orderDetl.getHeight());
+ basArmRules.setMaterialWeight(orderDetl.getWeight());
+ basArmRules.setMaterialLength(orderDetl.getManLength());
+ basArmRules.setMaterialWidth(orderDetl.getWidth());
+ basArmRulesService.insert(basArmRules);
+ return;
+ } else if (number == 0){
+ return;
+ }
+ String name = ToSortLineUtils.MergerParameter(orderDetl.getMatnr(),orderDetl.getStandby3(),orderDetl.getStandby1(),orderDetl.getStandby2());
+ int maxCapacity = number;
+ int stock = orderDetl.getAnfme().intValue();
+ items.add(new ItemUtilParam.Item(name, maxCapacity, stock));
+ }
+
+ OrderToLine orderToLine = new OrderToLine();
+ orderToLine.setOrderNo(boxType3); //鍗曟嵁缂栧彿
+ orderToLine.setCreateTime(System.currentTimeMillis()); //鍒涘缓鏃堕棿
+ OrderToLine orderToLineR = ToSortLineUtils.GetOrderToLine(items, orderToLine,"Opt3");
+
+ try{
+ ReturnT<String> returnT = orderToLineHandler.start(orderToLineR);
+ if (!returnT.isSuccess()) {
+// log.error("涓嬪彂鍗曟嵁澶辫触===>"+ JSON.toJSON(orderToLineR));
+ } else {
+ try{
+ for (OrderToLine.MatList matList:orderToLineR.getMatList()){
+ BasArmMastSign basArmMastSign = new BasArmMastSign();
+ basArmMastSign.setMatnr(matList.getItem());
+ basArmMastSign.setOrderNo(boxType3);//b3
+ basArmMastSign.setSku(matList.getSku());//s3
+ basArmMastSign.setPo(matList.getPo());//s1
+ basArmMastSign.setUpc(matList.getUpc());//s2
+// basArmMastSign.setSupplier(matList.getSupplier());
+ basArmMastSign.setStatus(0);
+ basArmMastSign.setAnfme(matList.getCtns());
+ basArmMastSign.setCreateTime(matList.getBindingTags());
+ basArmMastSignService.insert(basArmMastSign);
+ }
+ for (OrderDetlPakin orderDetl:orderDetlPakinList){
+ orderDetl.setInspect(1);
+ orderDetlPakinService.updateById(orderDetl);
+ }
+ }catch (Exception e){}
+ }
+ } catch (Exception e){
+ log.error("涓嬪彂鍗曟嵁寮傚父===>"+e.getMessage());
+ }
+ }
+
+ } catch (Exception e){
+ log.error("涓嬪彂鍗曟嵁寮傚父,璺宠浆涓嬩竴涓鍗�===>"+e.getMessage());
+ }
+ }
}
}
--
Gitblit v1.9.1