From fa203c0094bd02bb062bbfec526379ee9502d800 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 03 七月 2023 14:55:25 +0800
Subject: [PATCH] 提升机、四向车手动任务分配任务号

---
 src/main/java/com/zy/asrs/controller/LiftController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 7768523..0436b11 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -11,6 +11,7 @@
 import com.zy.asrs.entity.BasLift;
 import com.zy.asrs.service.BasLiftService;
 import com.zy.asrs.service.WrkMastService;
+import com.zy.common.service.CommonService;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
 import com.zy.core.cache.SlaveConnection;
@@ -42,7 +43,7 @@
     @Autowired
     private BasLiftService basLiftService;
     @Autowired
-    private WrkMastService wrkMastService;
+    private CommonService commonService;
 
     @PostMapping("/table/lift/state")
     @ManagerAuth(memo = "鎻愬崌鏈轰俊鎭〃")
@@ -202,7 +203,7 @@
 
                 LiftAssignCommand assignCommand = new LiftAssignCommand();
                 assignCommand.setLiftNo(liftSlave.getId().shortValue()); // 鎻愬崌鏈虹紪鍙�
-                assignCommand.setTaskNo((short) 9999);
+                assignCommand.setTaskNo((short) commonService.getWorkNo(3));//鑾峰彇浠诲姟鍙�
                 assignCommand.setTaskMode(param.getLiftTaskMode().shortValue());
                 assignCommand.setAuto(false);//鎵嬪姩妯″紡
                 assignCommand.setLev(param.getLev());//绉诲姩妤煎眰

--
Gitblit v1.9.1