From 411c7bcfb64581060c459d6a124b58cafadd983a Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 11 四月 2024 20:35:37 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java |   38 +++++++++-----------------------------
 1 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
index 9e0b818..68d7a94 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
@@ -15,12 +15,10 @@
 import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
 import com.zy.asrs.wcs.core.entity.Motion;
 import com.zy.asrs.wcs.rcs.entity.Device;
-import com.zy.asrs.wcs.rcs.entity.DeviceType;
 import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
 import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
 import com.zy.asrs.wcs.core.service.MotionService;
 import com.zy.asrs.wcs.rcs.service.DeviceService;
-import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
 import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,12 +44,10 @@
     private ShuttleDispatcher shuttleDispatcher;
     @Autowired
     private LiftDispatcher liftDispatcher;
-    //    @Autowired
+//    @Autowired
 //    private ConveyorDispatcher conveyorDispatcher;
     @Autowired
     private DeviceService deviceService;
-    @Autowired
-    private DeviceTypeService deviceTypeService;
 
     public List<Motion> generateMotion(Task task) {
         List<Motion> motionList = new ArrayList<>();
@@ -934,17 +930,9 @@
         // locNo
         String locNo = task.getDestLoc();
 
-        //鑾峰彇绌挎杞︾被鍨�
-        DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
-                .eq(DeviceType::getFlag, String.valueOf(SlaveType.Shuttle))
-                .eq(DeviceType::getStatus, 1));
-        if (deviceType == null) {
-            return motionList;
-        }
-
         Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
                 .eq(Device::getDeviceNo, task.getShuttleNo())
-                .eq(Device::getDeviceType, deviceType.getId())
+                .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
                 .eq(Device::getHostId, task.getHostId())
                 .eq(Device::getStatus, 1));
         if (device == null) {
@@ -995,17 +983,9 @@
         String targetLoc = task.getDestLoc();//浠诲姟鐩爣(鍊熺敤瀛楁)
         String targetSite = task.getDestSite();//浠诲姟绫诲瀷(鍊熺敤瀛楁)
 
-        //鑾峰彇绌挎杞︾被鍨�
-        DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
-                .eq(DeviceType::getFlag, String.valueOf(SlaveType.Shuttle))
-                .eq(DeviceType::getStatus, 1));
-        if (deviceType == null) {
-            return motionList;
-        }
-
         Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
                 .eq(Device::getDeviceNo, task.getShuttleNo())
-                .eq(Device::getDeviceType, deviceType.getId())
+                .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
                 .eq(Device::getHostId, task.getHostId())
                 .eq(Device::getStatus, 1));
         if (device == null) {
@@ -1031,11 +1011,11 @@
                 // 绌挎杞﹁蛋琛岃嚦鐩爣搴撲綅
                 motionList.addAll(kernelService.shuttleMove(
                         MotionDto.build((dto -> {
-                            dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
+                            dto.setShuttleNo(device.getId().intValue());
                             dto.setLocNo(shuttleLocNo);
                         })),
                         MotionDto.build((dto -> {
-                            dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
+                            dto.setShuttleNo(device.getId().intValue());
                             dto.setLocNo(targetLoc);
                         })),
                         MotionCtgType.SHUTTLE_MOVE
@@ -1046,28 +1026,28 @@
             //鎵樼洏椤跺崌
             motionList.add(Motion.build(motion -> {
                 motion.setDeviceCtg(DeviceCtgType.SHUTTLE.val());
-                motion.setDevice(String.valueOf(task.getShuttleNo()));
+                motion.setDevice(String.valueOf(device.getId()));
                 motion.setMotionCtg(MotionCtgType.SHUTTLE_PALLET_LIFT.val());
             }));
         } else if (targetSite.equals("palletDown")) {
             //鎵樼洏涓嬮檷
             motionList.add(Motion.build(motion -> {
                 motion.setDeviceCtg(DeviceCtgType.SHUTTLE.val());
-                motion.setDevice(String.valueOf(task.getShuttleNo()));
+                motion.setDevice(String.valueOf(device.getId()));
                 motion.setMotionCtg(MotionCtgType.SHUTTLE_PALLET_DOWN.val());
             }));
         } else if (targetSite.equals("chargeOpen")) {
             //鍏呯數寮�
             motionList.add(Motion.build(motion -> {
                 motion.setDeviceCtg(DeviceCtgType.SHUTTLE.val());
-                motion.setDevice(String.valueOf(task.getShuttleNo()));
+                motion.setDevice(String.valueOf(device.getId()));
                 motion.setMotionCtg(MotionCtgType.SHUTTLE_CHARGE_ON.val());
             }));
         } else if (targetSite.equals("chargeClose")) {
             //鍏呯數鍏�
             motionList.add(Motion.build(motion -> {
                 motion.setDeviceCtg(DeviceCtgType.SHUTTLE.val());
-                motion.setDevice(String.valueOf(task.getShuttleNo()));
+                motion.setDevice(String.valueOf(device.getId()));
                 motion.setMotionCtg(MotionCtgType.SHUTTLE_CHARGE_OFF.val());
             }));
         } else if (targetSite.equals("reset")) {

--
Gitblit v1.9.1