From e44294aa33c286d60553565f42605cc634bd1f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com> Date: Mon, 29 Sep 2025 15:20:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E8=BE=93=E9=80=81?= =?UTF-8?q?=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java index a796cb7e..39058fa5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java +++ b/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(); From a1d339c1f038d9f443a8885663e197b8a57ad496 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Mon, 29 Sep 2025 15:30:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=80=E6=A5=BC=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E8=B0=83=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 e4705379..a8d968a8 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 83496998..edb97132 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 3ffcbd36..5535aedb 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 ca690404..51f4b116 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" - insert into mydo_job_wcs_history + insert into mydo_job_wcs_finish select * from mydo_job_wcs where job_id = #{jobId} 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 00000000..506bdc22 --- /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 {}; +}