From 2442152cd669b31eb5b118e1fdf2bfd016656a5f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 02 十二月 2025 16:05:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index d7a607c..ae6c6a1 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -31,9 +31,11 @@
     @Autowired
     private OrderToLineHandler orderToLineHandler;
     @Autowired
+    private MatService matService;
+    @Autowired
     private BasArmMastSignService basArmMastSignService;
 
-    @Scheduled(cron = "0/3 * * * * ? ")
+//    @Scheduled(cron = "0/3 * * * * ? ")
     private void orderToSortLine() {
         //鑾峰彇鏈笅鍙戝崟鎹�
         List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);
@@ -63,7 +65,8 @@
                     }
                     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());
@@ -73,6 +76,7 @@
                             basArmRulesService.insert(basArmRules);
                             return;
                         } else if (number == 0){
+
                             Integer status =  basArmRulesService.getStatus(orderDetl.getWeight(),orderDetl.getVolume(),orderDetl.getManLength(),orderDetl.getWidth(),orderDetl.getHeight());
                             if (!Cools.isEmpty(status) && status == 2){
                                 continue;

--
Gitblit v1.9.1