diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java index 130665e..b5e4d6a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java @@ -73,9 +73,9 @@ public class OutMydoJobController extends BaseController { @PreAuthorize("@ss.hasPermi('job:outmydoJob:pointOut')") @Log(title = "指定货位出库", businessType = BusinessType.INSERT) @RequestMapping("/pointOut") - public AjaxResult pointOut(@RequestParam("stockIds")String[] stockIds) + public AjaxResult pointOut(@RequestParam("stockIds")String[] stockIds,@RequestParam("exitId")String exitId) { - return mydoJobService.pointOut(stockIds); + return mydoJobService.pointOut(stockIds,exitId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java index 2ccbcfd..cce10fe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java @@ -85,7 +85,7 @@ public interface IMydoJobService */ AjaxResult OuthandInvalidation(String [] jobIds); - AjaxResult pointOut(String [] stockIds); + AjaxResult pointOut(String [] stockIds,String exitId); MydoJob selectMydoJobByTrayCode(String trayCode); } 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 8385190..c1bbe0e 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 @@ -480,14 +480,15 @@ public class MydoJobServiceImpl implements IMydoJobService { } @Override - public AjaxResult pointOut(String[] stockIds) { + public AjaxResult pointOut(String[] stockIds,String exitId) { HashMap map = new HashMap<>(); String msg = ""; String Stringbuilder = ""; for (String stockId : stockIds) { - map.put("stockId", stockId); + map.put("v_stock_id", stockId); + map.put("v_exit_id", exitId); mydoJobMapper.pointOut(map); - String result = map.get("result").toString(); + String result = map.get("v_result").toString(); if ("10".equals(result)) { msg = "操作成功!"; } else { diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index c85d3e4..a61d70a 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -217,8 +217,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"