From aad8c71466477efa49e4fd375fa0bbce58f9e6f4 Mon Sep 17 00:00:00 2001
From: "1009473166@qq.com" <草拟吗23>
Date: Tue, 28 Apr 2026 14:04:34 +0800
Subject: [PATCH] =?UTF-8?q?2026.4.28=20=E5=8D=88=2014:04=20=E7=AB=8B?=
 =?UTF-8?q?=E5=BA=93=E5=87=BA=E5=BA=93=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/pda/controller/PdaController.java   | 22 +++++++++++++++++++
 .../java/com/ruoyi/pda/mapper/PdaMapper.java  |  4 ++++
 .../com/ruoyi/pda/service/PdaService.java     |  2 ++
 .../com/ruoyi/pda/service/PdaServiceImp.java  |  5 +++++
 .../resources/mapper/mapper/pda/PdaMapper.xml |  6 +++++
 5 files changed, 39 insertions(+)

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 bc44e3c..7fcc1e8 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
@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
+import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
 import com.ruoyi.pda.domain.TrayCodeMakeSure;
 import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.pda.service.PdaService;
@@ -201,6 +202,27 @@ public class PdaController extends BaseController {
         return AjaxResult.success(pdaService.selectBasStockHc(trayCodeMakeSure.getTrayCode()));
     }
 
+    /**
+     * 立库出库信息校验
+     * @param trayCodeMakeSure
+     * @return
+     */
+    @RequestMapping("/verifyMaterial")
+    @ResponseBody
+    public AjaxResult verifyMaterial(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        String trayCode = trayCodeMakeSure.getTrayCode();
+        List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMydoJobDetailList();
+        for (MydoJobDetail m : mydoJobDetailList ) {
+            Integer count = pdaService.selectByTrayCodeAndProduct(trayCode, m.getProductId());
+            if (count == 0) {
+                return AjaxResult.error(m.getProductId() + ",物料不是出库wuliao");
+            }
+        }
+
+        return AjaxResult.success();
+    }
+
+
 
 }
 
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 34a5a9c..3782b73 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
@@ -1,5 +1,7 @@
 package com.ruoyi.pda.mapper;
 
+import org.apache.ibatis.annotations.Param;
+
 import java.util.HashMap;
 
 public interface PdaMapper {
@@ -42,4 +44,6 @@ public interface PdaMapper {
     void hcoutMakesure(HashMap<String, Object> map);
 
     void completeInPk(HashMap<String, Object> map);
+
+    Integer selectByTrayCodeAndProduct(@Param("trayCode") String trayCode, @Param("productId") String productId);
 }
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 515c1ec..6e4719c 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
@@ -61,4 +61,6 @@ public interface PdaService {
     AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure);
 
     AjaxResult selectBasStockHc(String trayCode);
+
+    Integer selectByTrayCodeAndProduct(String trayCode, String productId);
 }
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 c58b71a..9d88383 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
@@ -326,4 +326,9 @@ public class PdaServiceImp implements PdaService {
         List<BasStock> stocks=basStockMapper.selectBasStockListHc(basStock);
         return AjaxResult.success(stocks);
     }
+
+    @Override
+    public Integer selectByTrayCodeAndProduct(String trayCode, String productId) {
+        return pdaMapper.selectByTrayCodeAndProduct(trayCode,productId);
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml
index 58b2a9c..7621c7a 100644
--- a/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml
@@ -162,6 +162,12 @@
                                   #{v_result,mode=OUT,jdbcType=INTEGER},
                                   #{v_result_msg,mode=OUT,jdbcType=VARCHAR})}
     </select>
+    <select id="selectByTrayCodeAndProduct" parameterType="string" resultType="java.lang.Integer">
+        select count(1)
+        from mydo_job_detail
+        where job_id in (select job_id from mydo_job where tray_code = #{trayCode} and in_or_out > 20)
+          and product_id = #{productId}
+    </select>