From 64affa79c6ac79ac5610bb1d2dd01e45bb2a50cd Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Fri, 7 Nov 2025 16:32:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=A1=AE=E8=AE=A4=20?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/pda/service/PdaServiceImp.java | 50 +++++++++++++++---- .../main/resources/mapper/pda/PdaMapper.xml | 1 + 2 files changed, 41 insertions(+), 10 deletions(-) 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 f4d7d51..00611de 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 @@ -9,7 +9,6 @@ import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.api.domain.AgvMoveParam; -import com.ruoyi.api.domain.SsjTaskNoParam; import com.ruoyi.api.service.IToWcsService; import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; @@ -29,16 +28,12 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.device.agv.domain.AgvContainerTask; import com.ruoyi.device.agv.service.IAgvContainerTaskService; +import com.ruoyi.in.stockindetail.domain.InStockinDetail; +import com.ruoyi.in.stockindetail.service.IInStockinDetailService; import com.ruoyi.job.mydojob.domain.MydoJob; import com.ruoyi.job.mydojob.service.IMydoJobService; import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.in.stockin.service.IInStockinService; -import com.ruoyi.in.stockindetail.domain.InStockinDetail; -import com.ruoyi.in.stockindetail.service.IInStockinDetailService; -import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish; import com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper; import com.ruoyi.out.outStockout.domain.OutStockout; import com.ruoyi.out.outStockout.service.IOutStockoutService; @@ -65,7 +60,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; -import java.util.stream.Collectors; @Service @Slf4j @@ -328,6 +322,7 @@ public class PdaServiceImp implements PdaService { if (flag) { HashMap map = new HashMap<>(); map.put("v_tray_code", trayCodeMakeSure.getTrayCode()); + map.put("v_entrance_id", getEntranceIdByExitId(mydoJob.getExitId())); map.put("v_type", "1"); pdaMapper.outMakeSure(map); //iToWcsService.pushInMydoJob(); @@ -388,7 +383,7 @@ public class PdaServiceImp implements PdaService { HashMap map = new HashMap<>(); map.put("v_tray_code", trayCodeMakeSure.getTrayCode()); - map.put("v_entrance_id",trayCodeMakeSure.getExitId()); + map.put("v_entrance_id", getEntranceIdByExitId(mydoJob.getExitId())); map.put("v_type", "1"); pdaMapper.outMakeSure(map); //iToWcsService.pushInMydoJob(); @@ -614,6 +609,7 @@ public class PdaServiceImp implements PdaService { HashMap map = new HashMap<>(); map.put("v_tray_code", trayCodeMakeSure.getTrayCode()); map.put("v_type", "1"); + map.put("v_entrance_id", getEntranceIdByExitId(mydoJob.getExitId())); pdaMapper.outMakeSureException(map); //iToWcsService.pushInMydoJob(); String result = map.get("v_result").toString(); @@ -893,7 +889,41 @@ public class PdaServiceImp implements PdaService { BasContainerDetails basContainer = basContainerDetails1.get(0); return agvRequest(basContainer.getContainerId(), startPoint, endPoint); + } - + private String getEntranceIdByExitId(String exitId) { + String entranceId = ""; + switch (exitId) { + case "G2001": + entranceId = "G2012"; + break; + case "G3001": + entranceId = "G3009"; + break; + case "G3010": + entranceId = "G3018"; + break; + case "G4001": + entranceId = "G4009"; + break; + case "G4010": + entranceId = "G4018"; + break; + case "G5001": + entranceId = "G5009"; + break; + case "G5010": + entranceId = "G5018"; + break; + case "G1004": + entranceId = "G1003"; + break; + case "G1010": + entranceId = "G1009"; + break; + default: + break; + } + return entranceId; } } diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml index 03239f2..f5a85ca 100644 --- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml @@ -81,6 +81,7 @@ {call proc_out_makesure_exception( #{v_tray_code,mode=IN,jdbcType=VARCHAR}, #{v_type,mode=IN,jdbcType=VARCHAR}, + #{v_entrance_id,mode=IN,jdbcType=VARCHAR}, #{v_result,mode=OUT,jdbcType=INTEGER}, #{v_resultmsg,mode=OUT,jdbcType=VARCHAR} )}