From a1d339c1f038d9f443a8885663e197b8a57ad496 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Mon, 29 Sep 2025 15:30:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=A5=BC=E5=87=BA=E5=BA=93=E8=B0=83?=
 =?UTF-8?q?=E5=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/api/domain/wcs2wms/ReceiveJob.java  |  1 +
 .../api/service/impl/ApiServiceImpl.java      |  2 +
 .../com/ruoyi/schedule/ScheduleThread.java    |  2 +-
 .../resources/mapper/job/MydoJobMapper.xml    |  2 +-
 .../ruoyi/common/annotation/RequestLog.java   | 42 +++++++++++++++++++
 5 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/annotation/RequestLog.java

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/ReceiveJob.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/ReceiveJob.java
index e470537..a8d968a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/ReceiveJob.java
+++ b/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;
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
index 8349699..edb9713 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
+++ b/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();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
index 3ffcbd3..5535aed 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
+++ b/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();
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index ca69040..51f4b11 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.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>
 
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RequestLog.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RequestLog.java
new file mode 100644
index 0000000..506bdc2
--- /dev/null
+++ b/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 {};
+}