From 77e5d140aed5041f75ec1cd0d7e2eae8ef4941bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com> Date: Sat, 11 Oct 2025 15:13:00 +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/pda/controller/PdaController.java | 7 +++++++ .../main/java/com/ruoyi/pda/service/PdaService.java | 1 + .../java/com/ruoyi/pda/service/PdaServiceImp.java | 13 ++++++++++++- .../resources/mapper/job/MydoJobDetailMapper.xml | 2 +- .../mapper/out/OutStockoutDetailFinishMapper.xml | 1 + ruoyi-ui/src/views/stock/pointOut.vue | 11 ++++++----- 6 files changed, 28 insertions(+), 7 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 535b5c9..8ca3c5a 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 @@ -65,6 +65,13 @@ public class PdaController extends BaseController { return pdaService.selectDetailByTray(trayCodeMakeSure); } + @RequestMapping("/selectDetailByPDTray") + @ResponseBody + public AjaxResult selectDetailByPDTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) { + return pdaService.selectDetailByPDTray(trayCodeMakeSure); + } + + /** * 出库确认 * 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 5cd7d21..fafcd3b 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 @@ -15,6 +15,7 @@ public interface PdaService { public AjaxResult addInJob(RequestEnter requestEnter); public AjaxResult selectDetailByTray(TrayCodeMakeSure trayCodeMakeSure); + public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure); AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure); 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 34fcecb..20a3f2f 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 @@ -72,11 +72,21 @@ public class PdaServiceImp implements PdaService { mydoJob.setExitId(trayCodeMakeSure.getExitId()); mydoJob.setProductId(productId); mydoJob.setStatus("3"); - + mydoJob.setInOrOut("21"); List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJob); return AjaxResult.success(mydoJobDetails); } + @Override + public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure) { + MydoJob mydoJob = new MydoJob(); + mydoJob.setExitId(trayCodeMakeSure.getExitId()); + mydoJob.setStatus("3"); + mydoJob.setInOrOut("26"); + List mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob); + return AjaxResult.success(mydoJobDetails); + } + @Override public AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure) { String trayCode = trayCodeMakeSure.getTrayCode(); @@ -86,6 +96,7 @@ public class PdaServiceImp implements PdaService { mydoJob.setExitId(trayCodeMakeSure.getExitId()); mydoJob.setProductId(productId); mydoJob.setStatus("3"); + mydoJob.setInOrOut("21"); List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJob); if(mydoJobDetails.size()==0){ return AjaxResult.error("该物料没有出库作业，请检查"); diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml index 5d41738..fbfb89e 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml @@ -372,7 +372,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mj.status='3' and mj.execution_phase=2 and mjd.product_id=#{productId} - and mj.in_or_out>=20 + and mj.in_or_out=#{inOrOut}