From 7854ae23200087e362bbe3eb08cda0f96a73e177 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 13 十二月 2025 13:34:47 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java            |    2 +-
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java             |    2 +-
 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 031a7b4..0ae85bc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -774,7 +774,7 @@
         if (Cools.isEmpty(basArmMast)){
             throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
         }
-        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
+//        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
         basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3);
     }
 
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index ae6c6a1..50cd969 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -35,7 +35,7 @@
     @Autowired
     private BasArmMastSignService basArmMastSignService;
 
-//    @Scheduled(cron = "0/3 * * * * ? ")
+    @Scheduled(cron = "0/3 * * * * ? ")
     private void orderToSortLine() {
         //鑾峰彇鏈笅鍙戝崟鎹�
         List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index 1eb192a..072e36d 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -236,9 +236,9 @@
                                     // 鏇存柊瀛楁
                                     if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
                                     if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);
-                                    if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length);
-                                    if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height);
-                                    if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width);
+                                    if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length1);
+                                    if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height1);
+                                    if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width1);
                                     if (mat.getCreateTime().compareTo(sdf1.parse(createTime)) != 0)
                                         mat.setCreateTime(sdf1.parse(createTime));
                                     mat.setUpdateTime(modifyTime);

--
Gitblit v1.9.1