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 2c2cb57..c64afd0 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
@@ -91,7 +91,7 @@ public class PdaController extends BaseController {
     @RequestMapping("/tpIn")
     @ResponseBody
     public AjaxResult tpIn(@RequestBody TrayCodeMsg trayCodeMsg) {
-        return pdaService.tpIn(trayCodeMsg.getTrayCode());
+        return pdaService.tpIn(trayCodeMsg);
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java
index ef453f3..f4c9ccd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java
@@ -19,6 +19,16 @@ private String stockinDetailId;
 private String inOut;
 private String status;
 
+private String trayType;
+
+    public String getTrayType() {
+        return trayType;
+    }
+
+    public void setTrayType(String trayType) {
+        this.trayType = trayType;
+    }
+
     public String getStatus() {
         return status;
     }
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 767242a..fc9def6 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
@@ -28,7 +28,7 @@ public interface PdaService {
 
    AjaxResult bindTray(TrayCodeMakeSure trayCodeMakeSure);
 
-   AjaxResult tpIn(String trayCode);
+   AjaxResult tpIn(TrayCodeMsg trayCodeMsg);
 
    AjaxResult tpOut(TrayCodeMsg trayCodeMsg);
 
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 ba4607b..5426b08 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
@@ -139,9 +139,11 @@ public class PdaServiceImp implements PdaService {
     }
 
     @Override
-    public AjaxResult tpIn(String trayCode) {
+    public AjaxResult tpIn(TrayCodeMsg trayCodeMsg) {
         HashMap<String, Object> map = new HashMap<>();
-        map.put("v_tray_code", trayCode);
+        map.put("v_tray_code", trayCodeMsg.getTrayCode());
+        map.put("v_tray_type", trayCodeMsg.getTrayType());
+        map.put("v_quantity", Integer.valueOf(trayCodeMsg.getInQuantity()));
         pdaMapper.tpIn(map);
         if(!"10".equals(map.get("v_result").toString())){
             return AjaxResult.error(map.get("v_resultmsg").toString());
@@ -155,7 +157,7 @@ public class PdaServiceImp implements PdaService {
     public AjaxResult tpOut(TrayCodeMsg trayCodeMsg) {
 
         HashMap<String, Object> map = new HashMap<>();
-        map.put("v_exit_id", trayCodeMsg.getExitId());
+        map.put("v_tray_type", trayCodeMsg.getTrayType());
         pdaMapper.tpOut(map);
         if(!"10".equals(map.get("v_result").toString())){
             return AjaxResult.error(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 19d6112..76b8f4b 100644
--- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
@@ -17,6 +17,8 @@
     <select id="tpIn" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_tp_in(
                 #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_tray_type,mode=IN,jdbcType=VARCHAR},
+                #{v_quantity,mode=IN,jdbcType=INTEGER},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
               )}
@@ -25,7 +27,7 @@
     <select id="tpOut" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_tp_out(
 
-                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
+                #{v_tray_type,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
         )}