From e8fea3433e641cba8348cdcdd29771634b69baa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com> Date: Tue, 28 Oct 2025 14:11:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MydoJobServiceImpl.java | 1 + .../ruoyi/pda/controller/PdaController.java | 42 +++++++++ .../java/com/ruoyi/pda/mapper/PdaMapper.java | 8 ++ .../com/ruoyi/pda/service/PdaService.java | 14 +++ .../com/ruoyi/pda/service/PdaServiceImp.java | 89 +++++++++++++++++-- .../mapper/job/MydoJobDetailMapper.xml | 15 ++-- .../main/resources/mapper/pda/PdaMapper.xml | 36 ++++++++ 7 files changed, 187 insertions(+), 18 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index da2397a..2cb4135 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -516,6 +516,7 @@ public class MydoJobServiceImpl implements IMydoJobService { mydoJobMapper.pointOut(map); iToWcsService.pushOutMydoJob(); String result = map.get("v_result").toString(); + msg=map.get("v_resultmsg").toString(); if (!"10".equals(result)) { Stringbuilder += stockId + msg + "
"; } 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 8ca3c5a..a560822 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 @@ -101,6 +101,48 @@ public class PdaController extends BaseController { return pdaService.checkMakeSure(trayCodeMakeSure); } + /** + * 入库绑盘 + */ + @RequestMapping("/bindTrayMsg") + @Log(title = "手持机物料绑定", businessType = BusinessType.INSERT) + @ResponseBody + public AjaxResult bindMsg(@RequestBody TrayCodeMsg trayCodeMsg) { + return pdaService.bindMsg(trayCodeMsg); + } + + @RequestMapping("/trayMsg") + @ResponseBody + public AjaxResult trayMsg(TrayMsg trayMsg) { + return pdaService.selectBindTrayMsg(trayMsg); + } + + @RequestMapping("/selectStockinDetail") + @ResponseBody + public AjaxResult selectStockinDetail(String stockinDetailId) { + return pdaService.selectStockinDetail(stockinDetailId); + } + /** + * 确认入库 + */ + @RequestMapping("/rkSure") + @ResponseBody + public AjaxResult rkSure(@RequestBody TrayCodeMsg trayCodeMsg) { + return pdaService.rkSure(trayCodeMsg); + } + + @RequestMapping("/ktpout") + @ResponseBody + public AjaxResult ktpout(@RequestBody TrayCodeMsg trayCodeMsg) { + return pdaService.ktpout(trayCodeMsg); + } + + + @RequestMapping("/ktpin") + @ResponseBody + public AjaxResult ktpin(@RequestBody TrayCodeMsg trayCodeMsg) { + return pdaService.ktpin(trayCodeMsg); + } } 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 11ea08d..1ca6eb2 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 @@ -25,4 +25,12 @@ public interface PdaMapper { void pkOut(HashMap map); void outMakeSureException(HashMap map); + + void bindMsg(HashMap map); + + void rkSure(HashMap map); + + void ktpout(HashMap map); + + void ktpin(HashMap map); } 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 fafcd3b..09b3d19 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 @@ -5,6 +5,8 @@ import com.ruoyi.bas.container.domain.BasContainer; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.pda.domain.TrayCodeMakeSure; import com.ruoyi.pda.domain.TrayCodeMsg; +import com.ruoyi.pda.trayMsg.domain.TrayMsg; +import org.aspectj.weaver.loadtime.Aj; import java.util.Map; @@ -15,11 +17,23 @@ public interface PdaService { public AjaxResult addInJob(RequestEnter requestEnter); public AjaxResult selectDetailByTray(TrayCodeMakeSure trayCodeMakeSure); + public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure); AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure); AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure); + AjaxResult bindMsg(TrayCodeMsg trayCodeMsg); + + AjaxResult selectBindTrayMsg(TrayMsg trayMsg); + + AjaxResult selectStockinDetail(String stockinDetailId); + + AjaxResult rkSure(TrayCodeMsg trayCodeMsg); + + AjaxResult ktpout(TrayCodeMsg trayCodeMsg); + + AjaxResult ktpin(TrayCodeMsg trayCodeMsg); } 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 6641ecd..f4d28c8 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,6 +9,7 @@ import com.ruoyi.check.commit.service.ICheckCommitRecordService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.MessageUtils; +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; @@ -16,7 +17,9 @@ import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService; import com.ruoyi.job.mydojobdetail.service.impl.MydoJobDetailServiceImpl; import com.ruoyi.pda.domain.TrayCodeMakeSure; +import com.ruoyi.pda.domain.TrayCodeMsg; import com.ruoyi.pda.mapper.PdaMapper; +import com.ruoyi.pda.trayMsg.domain.TrayMsg; import com.ruoyi.pda.trayMsg.service.ITrayMsgService; import com.ruoyi.system.service.ISysRoleService; import lombok.extern.slf4j.Slf4j; @@ -66,13 +69,9 @@ public class PdaServiceImp implements PdaService { @Override public AjaxResult selectDetailByTray(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"); - mydoJob.setInOrOut("21"); + mydoJob.setTrayCode(trayCode); List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJob); return AjaxResult.success(mydoJobDetails); } @@ -80,9 +79,8 @@ public class PdaServiceImp implements PdaService { @Override public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure) { MydoJob mydoJob = new MydoJob(); - mydoJob.setExitId(trayCodeMakeSure.getExitId()); - mydoJob.setStatus("3"); - mydoJob.setInOrOut("26"); + + mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode()); List mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob); return AjaxResult.success(mydoJobDetails); } @@ -93,7 +91,7 @@ public class PdaServiceImp implements PdaService { //mydoJobParam.setExitId(trayCodeMakeSure.getExitId()); mydoJobParam.setTrayCode(trayCodeMakeSure.getTrayCode()); mydoJobParam.setStatus("3"); - mydoJobParam.setInOrOut("21"); +// mydoJobParam.setInOrOut("21"); List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJobParam); if(mydoJobDetails.isEmpty()){ return AjaxResult.error("该物料没有出库作业，请检查"); @@ -158,4 +156,77 @@ public class PdaServiceImp implements PdaService { } + @Override + public AjaxResult bindMsg(TrayCodeMsg trayCodeMsg) { + HashMap map = new HashMap<>(); + map.put("v_tray_code", trayCodeMsg.getTrayCode()); + map.put("v_stockin_detail_id", trayCodeMsg.getStockinDetailId()); + map.put("v_quantity", Integer.parseInt(trayCodeMsg.getInQuantity())); + pdaMapper.bindMsg(map); + String result = map.get("v_result").toString(); + if ("10".equals(result)) { + return AjaxResult.success(map.get("v_resultmsg").toString()); + }else{ + return AjaxResult.error(map.get("v_resultmsg").toString()); + } + + } + + + @Override + public AjaxResult selectBindTrayMsg(TrayMsg trayMsg) { + trayMsg.setStockinDetailId(null); + trayMsg.setQuantity(null); + List trayMsgs = trayMsgService.selectTrayMsgList(trayMsg); + return AjaxResult.success(trayMsgs); + } + + @Override + public AjaxResult selectStockinDetail(String stockinDetailId) { + InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(stockinDetailId); + return AjaxResult.success(inStockinDetail); + + } + + @Override + public AjaxResult rkSure(TrayCodeMsg trayCodeMsg) { + HashMap map = new HashMap<>(); + map.put("v_tray_code", trayCodeMsg.getTrayCode()); + pdaMapper.rkSure(map); + String result = map.get("v_result").toString(); + if ("10".equals(result)){ + return AjaxResult.success(map.get("v_resultmsg").toString()); + }else{ + return AjaxResult.error(map.get("v_resultmsg").toString()); + } + + } + + @Override + public AjaxResult ktpout(TrayCodeMsg trayCodeMsg) { + HashMap map = new HashMap<>(); + map.put("v_warehouse_id", trayCodeMsg.getWarehouseId()); + map.put("v_exit_id", trayCodeMsg.getExitId()); + pdaMapper.ktpout(map); + String result = map.get("v_result").toString(); + if ("10".equals(result)){ + return AjaxResult.success(map.get("v_resultmsg").toString()); + }else{ + return AjaxResult.error(map.get("v_resultmsg").toString()); + } + } + + @Override + public AjaxResult ktpin(TrayCodeMsg trayCodeMsg) { + HashMap map = new HashMap<>(); + map.put("v_tray_code", trayCodeMsg.getTrayCode()); + map.put("v_warehouse_id", trayCodeMsg.getWarehouseId()); + pdaMapper.ktpin(map); + String result = map.get("v_result").toString(); + if ("10".equals(result)){ + return AjaxResult.success(map.get("v_resultmsg").toString()); + }else{ + return AjaxResult.error(map.get("v_resultmsg").toString()); + } + } } diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml index 36fdd1f..a0acd58 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml @@ -371,13 +371,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mj.tray_code from mydo_job_detail mjd - left join bas_product bp on mjd.product_id = bp.product_id + left join bas_product bp on mjd.product_id = bp.product_id left join mydo_job mj on mjd.job_id = mj.job_id - where mj.exit_id=#{exitId} - and mj.status='3' - and mj.execution_phase=2 - and mjd.product_id=#{productId} - and mj.in_or_out=#{inOrOut} + where mj.status='3' + and mj.tray_code = #{trayCode} + diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml index 5ccad39..9fbb877 100644 --- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml @@ -99,4 +99,40 @@ #{v_resultmsg,mode=OUT,jdbcType=VARCHAR} )} + + + + + + + +