From a33998553e819325f665f956ba3fb6f699ee2559 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Thu, 26 Feb 2026 09:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=B0=83=E5=BA=A6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java    | 3 ++-
 .../java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java    | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
index 967dda8..2fc42fa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
@@ -43,7 +43,7 @@ public class ToWcsServiceImpl implements IToWcsService {
 
 
     @Override
-//    @Scheduled(fixedDelay=1500)
+    @Scheduled(fixedDelay=1500)
     public void pushOutMydoJob() {
         //查询所有未推送的料箱出库作业
         MydoJob mydoJobParam = new MydoJob();
@@ -52,6 +52,7 @@ public class ToWcsServiceImpl implements IToWcsService {
         list.add("21");
         list.add("26");
         mydoJobParam.setInOutIds(list);
+        mydoJobParam.setInOut("2");
         List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
         for (MydoJob outMydoJob : outMydoJobs) {
             RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB, JSONUtil.toJsonStr(outMydoJob), "推送出库任务","wms","wcs");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
index faa09e5..914c79e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
@@ -93,14 +93,13 @@ public class ToWmsServiceImpl implements IToWmsService {
 
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public AjaxResult requestEnterByTrayCode(RequestEnter requestEnter) {
 
         String trayCode = requestEnter.getTrayCode();
         MydoJob inJob = mydoJobMapper.selectInJobByTrayCode(trayCode);
         if(inJob != null && Integer.parseInt(inJob.getInOrOut()) < 20){
             if(inJob.getCargoSpaceId() != null && !"".equals(inJob.getCargoSpaceId())){
-                return AjaxResult.success(JSONUtil.toJsonStr(inJob));
+                return AjaxResult.success(inJob);
             }else{
                 //分配货位
                 HashMap<String, Object> map = new HashMap<>();
@@ -111,7 +110,7 @@ public class ToWmsServiceImpl implements IToWmsService {
                     return AjaxResult.error(map.get("v_resultmsg").toString());
                 }else{
                     MydoJob inJob2 = mydoJobMapper.selectInJobByTrayCode(trayCode);
-                    return AjaxResult.success(JSONUtil.toJsonStr(inJob2));
+                    return AjaxResult.success(inJob2);
                 }
             }
         }else{