From 1e874438b4baf12c2668d04a59b0bd5098ef7fd6 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 13 十二月 2025 18:17:02 +0800
Subject: [PATCH] #pda

---
 src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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..62bf69c 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -31,6 +31,8 @@
     @Autowired
     private OrderToLineHandler orderToLineHandler;
     @Autowired
+    private MatService matService;
+    @Autowired
     private BasArmMastSignService basArmMastSignService;
 
     @Scheduled(cron = "0/3 * * * * ? ")
@@ -63,16 +65,18 @@
                     }
                     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());
-                            basArmRules.setMaterialWeight(orderDetl.getWeight());
-                            basArmRules.setMaterialLength(orderDetl.getManLength());
-                            basArmRules.setMaterialWidth(orderDetl.getWidth());
+                            basArmRules.setMaterialHeight(mat.getHeight());
+                            basArmRules.setMaterialWeight(mat.getWeight());
+                            basArmRules.setMaterialLength(mat.getManLength());
+                            basArmRules.setMaterialWidth(mat.getWidth());
                             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