From 40d4c3e4b6988c4db6944b9209307f49ad2fe687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Fri, 12 Dec 2025 11:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/api/domain/RequestEnter.java     | 2 ++
 .../java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java    | 5 ++++-
 .../src/main/java/com/ruoyi/pda/service/PdaServiceImp.java   | 1 +
 ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml  | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
index 38bd56e..044d7dd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
@@ -18,4 +18,6 @@ public class RequestEnter {
     private String floor;
 
     private  String type;
+
+    private String flag;
 }
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 e2e4de3..fce5b39 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
@@ -188,7 +188,8 @@ public class ToWmsServiceImpl implements IToWmsService {
         mydoJob.setStatus("1");
         mydoJob.setInOrOut(inOrOutType);
         mydoJob.setExecutionPhase("1");
-        mydoJob.setTrayCode(basJobIdService.getJobId("TP"));
+        mydoJob.setWorkshopId(requestEnter.getFlag());
+        mydoJob.setTrayCode(serial);
         mydoJob.setWarehouseId("01");
         mydoJob.setRoadwayId(getRoadway(size));
         mydoJob.setLineId(erpBill);
@@ -263,6 +264,8 @@ public class ToWmsServiceImpl implements IToWmsService {
         result.put("jobId", mydoJob.getJobId());
         result.put("taskNo", mydoJob.getTaskNo());
         result.put("cargoSpaceId", mydoJob.getCargoSpaceId());
+        result.put("trayCode", mydoJob.getTrayCode());
+        result.put("flag",requestEnter.getFlag());
         result.put("roadwayId", mydoJob.getRoadwayId());
         result.put("entranceId", mydoJob.getEntranceId());
         result.put("inOrOut", mydoJob.getInOrOut());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
index e1c55c8..3e99e18 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
@@ -64,6 +64,7 @@ public class PdaServiceImp implements PdaService {
        }else{
            return AjaxResult.error("请选择出口");
        }
+       requestEnter.setFlag("1");
         AjaxResult ajaxResult = iToWmsService.requestEnterByTrayCode(requestEnter);
         return ajaxResult;
 
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index 2a1a76a..8939262 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
@@ -233,6 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where in_or_out&lt;20 and mj.entrance_id = #{entranceId}
           and mj.status = #{status}
         <if test="lineId != null  and lineId != ''"> and mj.line_id = #{lineId}</if>
+        <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>
         order by mj.create_time
     </select>
 </mapper>