From d696816415ec2881ca3f0fa3b41ffd27c21127db Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Sat, 11 Oct 2025 13:14:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=B5=8B=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/ToWcsServiceImpl.java | 1 + .../CheckDifferenceRecordServiceImpl.java | 2 +- .../mapper/MydoJobDetailMapper.java | 2 + .../service/IMydoJobDetailService.java | 2 + .../impl/MydoJobDetailServiceImpl.java | 5 ++ .../com/ruoyi/pda/service/PdaServiceImp.java | 13 ++++- .../mapper/job/MydoJobDetailMapper.xml | 47 +++++++++++++++++++ 7 files changed, 69 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java index 0901389..4ffc9fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java @@ -47,6 +47,7 @@ public class ToWcsServiceImpl implements IToWcsService { mydoJobParam.setStatus("1"); List list = new ArrayList<>(); list.add("21"); + list.add("26"); mydoJobParam.setInOutIds(list); List outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); for (MydoJob outMydoJob : outMydoJobs) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java index ce4b686..c619c8e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java @@ -61,7 +61,7 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS * @return 盘点差异 */ @Override - @DataScope(warehouseAlias = "w") + //@DataScope(warehouseAlias = "w") public List selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord) { return checkDifferenceRecordMapper.selectCheckDifferenceRecordList(checkDifferenceRecord); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/mapper/MydoJobDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/mapper/MydoJobDetailMapper.java index 8720726..249522c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/mapper/MydoJobDetailMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/mapper/MydoJobDetailMapper.java @@ -68,4 +68,6 @@ public interface MydoJobDetailMapper List selectMydoJobDetailListByJobId(String jobId); List selectMydoJobDetailListByExit(MydoJob mydoJob); + + List selectPdMydoJobDetailListByExit(MydoJob mydoJob); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java index 3bdbd9e..ee8b867 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java @@ -69,4 +69,6 @@ public interface IMydoJobDetailService List selectMydoJobDetailListByJobId(String jobId); List selectMydoJobDetailListByExit(MydoJob mydoJob); + + List selectPdMydoJobDetailListByExit(MydoJob mydoJob); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java index 3c53230..a64dcba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java @@ -119,4 +119,9 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService public List selectMydoJobDetailListByExit(MydoJob mydoJob) { return mydoJobDetailMapper.selectMydoJobDetailListByExit(mydoJob); } + + @Override + public List selectPdMydoJobDetailListByExit(MydoJob mydoJob) { + return mydoJobDetailMapper.selectPdMydoJobDetailListByExit(mydoJob); + } } 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 2f05762..34fcecb 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 @@ -108,6 +108,15 @@ public class PdaServiceImp implements PdaService { //@Transactional(rollbackFor = Exception.class) public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) { + MydoJob mydoJob = new MydoJob(); + mydoJob.setExitId(trayCodeMakeSure.getExitId()); + mydoJob.setStatus("3"); + mydoJob.setInOrOut("26"); + List mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob); + if(mydoJobDetails.isEmpty()){ + return AjaxResult.error("该物料没有盘点出库作业，请检查"); + } + List mydoJobDetailList = trayCodeMakeSure.getMaterials(); if (CollUtil.isNotEmpty(mydoJobDetailList)) { boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity())); @@ -118,7 +127,7 @@ public class PdaServiceImp implements PdaService { //插入盘点提交表 CheckCommitRecord checkCommitRecord = new CheckCommitRecord(); checkCommitRecord.setQuantity(mydoJobDetail.getInQuantity()); - checkCommitRecord.setTrayCode(trayCodeMakeSure.getTrayCode()); + checkCommitRecord.setTrayCode(mydoJobDetails.get(0).getTrayCode()); checkCommitRecord.setStockId(mydoJobDetail.getStockId()); checkCommitRecord.setSpare1(mydoJobDetail.getInOrOutDId()); checkCommitRecord.setSpare2(mydoJobDetail.getProductId()); @@ -128,7 +137,7 @@ public class PdaServiceImp implements PdaService { } } HashMap map = new HashMap<>(); - map.put("v_tray_code", trayCodeMakeSure.getTrayCode()); + map.put("v_tray_code", mydoJobDetails.get(0).getTrayCode()); pdaMapper.checkMakeSure(map); //iToWcsService.pushInMydoJob(); String result = map.get("v_result").toString(); diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml index 69baa76..5d41738 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml @@ -375,4 +375,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mj.in_or_out>=20 +