Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/ReceiveJob.java

@@ -15,5 +15,6 @@ public class ReceiveJob {
     private String entranceId;
     private String inOrOut;
     private String jobId;
+    private String roadwayId;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java

@@ -355,7 +355,9 @@ public class ApiServiceImpl implements IApiService {
         mydoJob.setInOrOut(receiveOutJob.getInOrOut());
         mydoJob.setStatus("1");
         mydoJob.setTrayCode(receiveOutJob.getTrayCode());
+        mydoJob.setRoadwayId(receiveOutJob.getRoadwayId());
         mydoJob.setCreateTime(DateUtils.getNowDate());
+        mydoJob.setExecutionPhase("0");
         int i = mydoJobService.insertMydoJob(mydoJob);
         if (i > 0) {
             return AjaxResult.success();

ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java

@@ -143,7 +143,7 @@ public class ScheduleThread {
         monitoringCustomThread.thread.start();
         //floor1BothWayInSsjCustomThread.thread.start();
         //floor1BothWayOutSsjCustomThread.thread.start();
-        //floor1SingleSsjCustomThread.thread.start();
+        floor1SingleSsjCustomThread.thread.start();
         floor2InSsjCustomThread.thread.start();
         lineSsjCustomThread.thread.start();
         floor2OutSsjCustomThread.thread.start();

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java

@@ -198,9 +198,9 @@ public class LineSsjThread implements Runnable {
             String deviceCode = "";
             if (mydoJob != null) {
                 if ("1".equals(mydoJob.getRoadwayId())) {
-                    deviceCode = "L1012";
-                } else {
                     deviceCode = "L1011";
+                } else {
+                    deviceCode = "L1012";
                 }
                 int kx = deviceSsjMap.get(deviceCode).getKx();
                 MydoJob mydoJob1 = new MydoJob();

ruoyi-admin/src/main/resources/mapper/job/IDynamicMonitoringService.xml

@@ -130,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
     <insert id="insertHistory">
-        insert into mydo_job_wcs_history
+        insert into mydo_job_wcs_finish
         select * from mydo_job_wcs where job_id = #{jobId}
     </insert>
 

ruoyi-common/src/main/java/com/ruoyi/common/annotation/RequestLog.java

@@ -0,0 +1,42 @@
+package com.ruoyi.common.annotation;
+
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.OperatorType;
+
+import java.lang.annotation.*;
+
+@Target({ ElementType.PARAMETER, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RequestLog {
+
+    /**
+     * 模块
+     */
+    public String title() default "";
+
+    /**
+     * 功能
+     */
+    public BusinessType businessType() default BusinessType.OTHER;
+
+    /**
+     * 操作人类别
+     */
+    public OperatorType operatorType() default OperatorType.MANAGE;
+
+    /**
+     * 是否保存请求的参数
+     */
+    public boolean isSaveRequestData() default true;
+
+    /**
+     * 是否保存响应的参数
+     */
+    public boolean isSaveResponseData() default true;
+
+    /**
+     * 排除指定的请求参数
+     */
+    public String[] excludeParamNames() default {};
+}