From 245a2e36f6b5b8006b3cd44600f5e7baa200bb94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Thu, 25 Sep 2025 16:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/api/domain/RequestEnter.java    |  2 ++
 .../api/service/impl/ToWmsServiceImpl.java    |  9 +++++++-
 .../com/ruoyi/pda/service/PdaServiceImp.java  | 22 ++++++++-----------
 3 files changed, 19 insertions(+), 14 deletions(-)

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 da9996c..38bd56e 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
@@ -16,4 +16,6 @@ public class RequestEnter {
     private String entranceId;
     //入库楼层 1-一楼 2-二楼
     private String floor;
+
+    private  String type;
 }
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 315ff0f..5c162d9 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
@@ -92,6 +92,7 @@ public class ToWmsServiceImpl implements IToWmsService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult requestEnterByTrayCode(RequestEnter requestEnter) {
+
         if (StrUtil.isEmpty(requestEnter.getTrayCode())) {
             return AjaxResult.error("托盘条码不能为空");
         }
@@ -147,7 +148,8 @@ public class ToWmsServiceImpl implements IToWmsService {
             return new AjaxResult(3, "超大托盘");
         }
         //托盘大小与电气返回不匹配
-        if (size != Integer.parseInt(requestEnter.getSize())) {
+
+        if (StrUtil.isNotBlank(requestEnter.getSize()) && !"1".equals(requestEnter.getType()) && size != Integer.parseInt(requestEnter.getSize())) {
             return new AjaxResult(4, "托盘大小不匹配");
         }
 
@@ -244,6 +246,11 @@ public class ToWmsServiceImpl implements IToWmsService {
         //修改货位状态
         basCargoSpace.setStatus("3");
         basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
+        //type=1是手持机调用
+        if(!"1".equals(requestEnter.getType())){
+            mydoJob.setStatus("3");
+            mydoJobService.updateMydoJob(mydoJob);
+        }
 
         if ("1".equals(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 b1a058d..7499122 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
@@ -49,6 +49,15 @@ public class PdaServiceImp implements PdaService {
 
     @Override
     public AjaxResult addInJob(RequestEnter requestEnter) {
+       if(requestEnter.getEntranceId()!=null && "G1005".equals(requestEnter.getEntranceId())){
+           MydoJob mydoJob = new MydoJob();
+           mydoJob.setEntranceId(requestEnter.getEntranceId());
+           mydoJob.setStatus("1");
+           MydoJob mydoJob1 = mydoJobService.selectMydoJobByEntranceId(mydoJob);
+           if(mydoJob1!=null){
+               return AjaxResult.error("该入口已有补码作业");
+           }
+       }
         AjaxResult ajaxResult = iToWmsService.requestEnterByTrayCode(requestEnter);
         return ajaxResult;
 
@@ -98,19 +107,6 @@ public class PdaServiceImp implements PdaService {
     //@Transactional(rollbackFor = Exception.class)
     public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
 
-        String trayCode = trayCodeMakeSure.getTrayCode();
-        String[] split = trayCode.split(" ");
-        String productId = split[8].substring(10);
-        MydoJob mydoJob = new MydoJob();
-        mydoJob.setExitId(trayCodeMakeSure.getExitId());
-        mydoJob.setProductId(productId);
-        mydoJob.setStatus("3");
-        List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJob);
-
-//        MydoJob mydoJob = mydoJobService.selectMydoJobByTrayCode(trayCodeMakeSure.getTrayCode());
-        if (mydoJob == null) {
-            return AjaxResult.warn(MessageUtils.message("warn.message"));
-        }
         List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMaterials();
         if (CollUtil.isNotEmpty(mydoJobDetailList)) {
             boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity()));