From c6e32e5da5d30ce2f74f0e32c3290d421c0951f2 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 13 十二月 2025 17:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 10 +++++-----
1 files changed, 5 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 ae6c6a1..62bf69c 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);
@@ -69,10 +69,10 @@
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){
--
Gitblit v1.9.1