From a75f28918407fbfd11364934007a6baa8ddd66f0 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, 4 Aug 2025 16:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/mydojob/controller/OutMydoJobController.java |  2 --
 .../java/com/ruoyi/pda/controller/PdaController.java | 12 ++++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java
index b5e4d6a..213956f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java
@@ -15,10 +15,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import static com.ruoyi.common.utils.PageUtils.startPage;
 
 @RestController
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
index 657b9ed..d39d2b0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
@@ -9,6 +9,7 @@ import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.in.stockin.domain.InStockin;
@@ -28,6 +29,7 @@ import com.ruoyi.pda.trayMsg.domain.TrayMsg;
 import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
 import com.ruoyi.stock.stock.domain.BasStock;
 import com.ruoyi.stock.stock.service.IBasStockService;
+import com.ruoyi.system.service.ISysDictTypeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -66,6 +68,8 @@ public class PdaController extends BaseController {
     private IInStockinService inStockinService;
     @Autowired
     private IOutStockoutService outStockoutService;
+    @Autowired
+    private ISysDictTypeService dictTypeService;
 
     /**
      * 空托盘入库
@@ -365,6 +369,7 @@ public class PdaController extends BaseController {
         MydoJob mydoJob = new MydoJob();
         mydoJob.setTrayCode(trayCodeMsg.getTrayCode());
         mydoJob.setStatus(trayCodeMsg.getStatus());
+        mydoJob.setInOut(trayCodeMsg.getInOut());
         List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(mydoJob);
         if(mydoJobs.isEmpty()){
             log.error("此托盘没有作业");
@@ -455,5 +460,12 @@ public class PdaController extends BaseController {
     public AjaxResult bindShelf(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
         return pdaService.bindShelf(trayCodeMakeSure);
     }
+
+    @RequestMapping("/selectDictData")
+    @ResponseBody
+    public List<SysDictData> selectDictData(@RequestParam("dictType") String dictType) {
+        List<SysDictData> list = dictTypeService.selectDictDataByType(dictType);
+        return list;
+    }
 }