From 43797aa35aa7aa799ec0e7f8c4ee1a87aa517f25 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Mon, 16 Jun 2025 16:04:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/pda/controller/PdaController.java   | 15 ++++++++++++---
 .../main/java/com/ruoyi/pda/mapper/PdaMapper.java |  2 ++
 .../java/com/ruoyi/pda/service/PdaService.java    |  4 +---
 .../java/com/ruoyi/pda/service/PdaServiceImp.java | 13 +++++++++++++
 .../src/main/resources/mapper/pda/PdaMapper.xml   | 10 ++++++++--
 5 files changed, 36 insertions(+), 8 deletions(-)

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 af4cedf..123eeed 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
@@ -17,11 +17,9 @@ 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 org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.HashMap;
 import java.util.List;
@@ -171,5 +169,16 @@ public class PdaController extends BaseController {
         }
         return pdaService.addInJob(trayCodeMsg);
     }
+
+    /**
+     * 出库确认
+     * @param trayCode 托盘码
+     * @return
+     */
+    @GetMapping("/outMakeSure")
+    @ResponseBody
+    public AjaxResult outMakeSure(String trayCode) {
+        return pdaService.outMakeSure(trayCode);
+    }
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
index 17d9ef4..cbd21c4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
@@ -15,4 +15,6 @@ public interface PdaMapper {
     void bindTrayMsg(HashMap<String, Object> map);
 
     void addInJob(HashMap<String, Object> map);
+
+    void outMakeSure(HashMap<String, Object> map);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
index 22d63b5..eb71323 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
@@ -22,7 +22,5 @@ public interface PdaService {
     public AjaxResult addInJob(TrayCodeMsg trayCodeMsg);
 
 
-
-
-
+    AjaxResult outMakeSure(String trayCode);
 }
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 607947a..18d94b5 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
@@ -124,4 +124,17 @@ public class PdaServiceImp implements PdaService{
         }
 
     }
+
+    @Override
+    public AjaxResult outMakeSure(String trayCode) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_tray_code", trayCode);
+        pdaMapper.outMakeSure(map);
+        String result = map.get("v_result").toString();
+        if("10".equals(result)){
+            return AjaxResult.success(map.get("v_resultmsg").toString());
+        }else{
+            return AjaxResult.warn(map.get("v_resultmsg").toString());
+        }
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
index 265bd46..31b4722 100644
--- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
@@ -3,7 +3,13 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.pda.mapper.PdaMapper">
-
+    <select id="outMakeSure" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_out_masksure(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
 
 
     <select id="emptyTrayIn" parameterType="java.util.Map" statementType="CALLABLE">
@@ -62,4 +68,4 @@
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
         )}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>