Merge branch 'master' of http://112.4.208.194:3000/FeiDaBaoKai/wms_serve_xugongteji

ruoyi-admin/pom.xml

@@ -50,10 +50,10 @@
         </dependency>
 
         <!-- 定时任务-->
-<!--        <dependency>-->
-<!--            <groupId>com.ruoyi</groupId>-->
-<!--            <artifactId>ruoyi-quartz</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-quartz</artifactId>
+        </dependency>
 
         <!-- 代码生成-->
         <dependency>

ruoyi-quartz/pom.xml

@@ -38,12 +38,6 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-system</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-admin</artifactId>
-            <version>3.8.9</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
 

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsCommonResponse.java

@@ -0,0 +1,43 @@
+package com.ruoyi.quartz.domain.app;
+
+/**
+ * Wcs通用响应信息
+ */
+public class WcsCommonResponse {
+    /**
+     * code
+     */
+    private Integer code;
+    /**
+     * message
+     */
+    private String message;
+    /**
+     * data
+     */
+    private Object data;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+}

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsStackerTaskRequest.java

@@ -0,0 +1,117 @@
+package com.ruoyi.quartz.domain.app;
+
+import java.math.BigDecimal;
+
+/**
+ * 向wcs发送堆垛机任务请求
+ */
+public class WcsStackerTaskRequest {
+    /**
+     * 任务id
+     */
+    private String taskId;
+    /**
+     * 任务类型
+     */
+    private Integer taskType;
+    /**
+     * 任务优先级
+     */
+    private Integer priority;
+    /**
+     * 任务起点
+     */
+    private String origin;
+    /**
+     * 任务中间点
+     */
+    private String midpoint;
+    /**
+     * 任务终点
+     */
+    private String destination;
+    /**
+     * 载具编号
+     */
+    private String vehicleNo;
+    /**
+     * 载具尺寸
+     */
+    private Integer vehicleSize = 0;
+    /**
+     * 总重量
+     */
+    private BigDecimal weight = BigDecimal.ZERO;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public Integer getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(Integer taskType) {
+        this.taskType = taskType;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public String getOrigin() {
+        return origin;
+    }
+
+    public void setOrigin(String origin) {
+        this.origin = origin;
+    }
+
+    public String getMidpoint() {
+        return midpoint;
+    }
+
+    public void setMidpoint(String midpoint) {
+        this.midpoint = midpoint;
+    }
+
+    public String getDestination() {
+        return destination;
+    }
+
+    public void setDestination(String destination) {
+        this.destination = destination;
+    }
+
+    public String getVehicleNo() {
+        return vehicleNo;
+    }
+
+    public void setVehicleNo(String vehicleNo) {
+        this.vehicleNo = vehicleNo;
+    }
+
+    public Integer getVehicleSize() {
+        return vehicleSize;
+    }
+
+    public void setVehicleSize(Integer vehicleSize) {
+        this.vehicleSize = vehicleSize;
+    }
+
+    public BigDecimal getWeight() {
+        return weight;
+    }
+
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
+    }
+}

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java

@@ -6,9 +6,9 @@ import com.ruoyi.app.service.*;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.quartz.domain.app.WcsCommonResponse;
+import com.ruoyi.quartz.domain.app.WcsStackerTaskRequest;
 import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.web.domain.WcsCommonResponse;
-import com.ruoyi.web.domain.WcsStackerTaskRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;