diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java index db4b439..0c7d498 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java @@ -164,7 +164,6 @@ public class CheckStockinServiceImpl implements ICheckStockinService { @Transactional(rollbackFor = Exception.class) public AjaxResult saveBill(CheckStockVo checkStockVo) { CheckStockin checkStockin = checkStockVo.getCheckStockin(); - List detailList = checkStockVo.getDetailList(); String stockCheckId = basJobIdService.getJobId("PDD"); checkStockin.setStockCheckId(stockCheckId); 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 79062fa..3e76a4a 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 @@ -193,6 +193,16 @@ public class PdaController extends BaseController { return iToWcsService.insertAgvMoveJob(agvMoveParam); } + @RequestMapping("/hcoutMakesure") + @ResponseBody + @Log(title = "手持机缓存出库确认",businessType = BusinessType.OTHER) + public AjaxResult hcoutMakesure(String trayCode ){ + + return pdaService.hcoutMakesure(trayCode); + } + + + } 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 64290a8..7109924 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 @@ -38,4 +38,6 @@ public interface PdaMapper { void pkOut(HashMap map); void outMakeSureException(HashMap map); + + void hcoutMakesure(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 ba0c6b1..75bf975 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 @@ -58,4 +58,5 @@ public interface PdaService { List selectAgvPointByType(String type); + AjaxResult hcoutMakesure(String trayCode); } 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 9688366..d078c15 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 @@ -300,4 +300,18 @@ public class PdaServiceImp implements PdaService { agvPoint.setType(type); return agvPointService.selectAgvPointList(agvPoint); } + + @Override + public AjaxResult hcoutMakesure(String trayCode) { + HashMap map = new HashMap<>(); + map.put("v_tray_code", trayCode); + pdaMapper.hcoutMakesure(map); + String result = map.get("v_result").toString(); + if ("10".equals(result)) { + return AjaxResult.success(); + } else { + return AjaxResult.error(map.get("v_resultmsg").toString()); + } + + } } diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml index 76b8f4b..e0ca517 100644 --- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml @@ -144,4 +144,15 @@ #{v_resultmsg,mode=OUT,jdbcType=VARCHAR} )} + + +