From a42ae1ffc20459dc46a88590bc4a94f9280f2d3d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 10 五月 2024 15:31:28 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java
index efef568..6bc68e0 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java
@@ -5,12 +5,12 @@
 import com.zy.asrs.framework.exception.CoolException;
 import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
 import com.zy.asrs.wcs.core.model.enums.MotionStsType;
-import com.zy.asrs.wcs.core.service.DeviceCtgService;
 import com.zy.asrs.wcs.core.mapper.MotionMapper;
 import com.zy.asrs.wcs.core.entity.Motion;
 import com.zy.asrs.wcs.core.service.MotionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zy.asrs.wcs.core.service.MotionStsService;
+import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,7 +21,7 @@
 public class MotionServiceImpl extends ServiceImpl<MotionMapper, Motion> implements MotionService {
 
     @Autowired
-    private DeviceCtgService deviceCtgService;
+    private DeviceTypeService deviceTypeService;
     @Autowired
     private MotionStsService motionStsService;
 
@@ -29,7 +29,7 @@
     public List<Motion> selectUnCompleteByUuidAndDeviceCtg(String uuid, DeviceCtgType deviceCtgType) {
         return this.list(new LambdaQueryWrapper<Motion>()
                 .eq(Motion::getUuid, uuid)
-                .eq(Motion::getDeviceCtg, deviceCtgService.selectByFlag(deviceCtgType.toString()).getId())
+                .eq(Motion::getDeviceCtg, deviceTypeService.selectByFlag(deviceCtgType.toString()).getId())
                 .lt(Motion::getMotionSts, motionStsService.selectByFlag(MotionStsType.COMPLETE.toString()).getId())
                 .orderByDesc(Motion::getPriority)
         );
@@ -77,12 +77,15 @@
     }
 
     @Override
-    public int batchInsert(List<Motion> motionList, String uuid, Integer taskNo) {
+    public int batchInsert(List<Motion> motionList, String uuid, Integer taskNo, Long hostId) {
         int i = motionList.size();
         for (Motion motion : motionList) {
             motion.setPriority(i);
-            motion.setWrkNo(taskNo);
+            motion.setTaskNo(taskNo);
             motion.setUuid(uuid);
+            if (hostId != null) {
+                motion.setHostId(hostId);
+            }
             if (!this.save(motion)) {
                 throw new CoolException(JSON.toJSONString(motion) + "鍔ㄤ綔淇濆瓨澶辫触");
             }
@@ -90,4 +93,9 @@
         }
         return motionList.size();
     }
+
+    @Override
+    public int batchInsert(List<Motion> motionList, String uuid, Integer taskNo) {
+        return batchInsert(motionList, uuid, taskNo, null);
+    }
 }

--
Gitblit v1.9.1