From 7ff44acb10678d75366dbfa6fb5cd9a2564da69d Mon Sep 17 00:00:00 2001 From: Huluwa22 <2667400744@qq.com> Date: Thu, 13 Mar 2025 16:05:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9D=A1=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/app/AppPmsController.java | 6 +++--- .../ruoyi/web/controller/app/AppTaskController.java | 4 +++- .../com/ruoyi/app/mapper/AppPmsOrderInMapper.java | 3 ++- .../com/ruoyi/app/service/IAppPmsOrderInService.java | 2 +- .../app/service/impl/AppPmsOrderInServiceImpl.java | 8 ++++---- .../main/resources/mapper/app/AppPmsOrderInMapper.xml | 11 +++++++++-- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java index 93b95b6a..a43791b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java @@ -313,14 +313,14 @@ public class AppPmsController extends BaseController { /** * 模糊查询，查询入库单表 - * @param param 查询参数 + * @param goodsCode 查询参数 * @return 返回结果 */ @Anonymous @GetMapping(value = "/getInfoWithString") - public AjaxResult getInfoWithString(@RequestParam("param") String param) + public AjaxResult getInfoWithString(@RequestParam("goodsCode") String goodsCode) { - return success(appPmsOrderInService.getInfoWithString(param)); + return success(appPmsOrderInService.getInfoWithString(goodsCode)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java index 1551a38a..9f01fa14 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java @@ -322,7 +322,7 @@ public class AppTaskController extends BaseController updateLocation.setLocationId(location.getLocationId()); updateLocation.setLocationStatus(1); appLocationService.updateAppLocation(updateLocation); - logger.info("wcs入库请求创建成功"); + logger.info("wcs入库请求创建成功,载具号{},入库位置{}",wcsStackerTask.getVehicleNo(),location.getLocationId()); return success(wcsDate); } @@ -333,6 +333,7 @@ public class AppTaskController extends BaseController @Transactional public AjaxResult taskResult(@RequestBody TaskResultFeedRequest taskResultFeedRequest) { + logger.info("任务反馈"); if(ObjectUtil.isEmpty(taskResultFeedRequest.getTaskId()) || ObjectUtil.isEmpty(taskResultFeedRequest.getVehicleNo())){ return error("缺少请求数据"); @@ -491,6 +492,7 @@ public class AppTaskController extends BaseController } } + logger.info("反馈成功"); return AjaxResult.success("成功"); } @PostMapping("/kk") diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java index ba23dd9a..84135b82 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java @@ -54,7 +54,8 @@ public interface AppPmsOrderInMapper public int deleteAppPmsOrderInById(String id); - public List selectAppPmsOrderInListWithParam(@Param("param") String param); + public List selectAppPmsOrderInListWithParam(@Param("goodsCode") String goodsCode); + public List selectAppPmsOrderInListWithEmpty(@Param("goodsCode") String goodsCode); /** * 批量删除【请填写功能名称】 diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java index bcf2d5e1..25d26bae 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java @@ -61,7 +61,7 @@ public interface IAppPmsOrderInService */ public int deleteAppPmsOrderInById(String listId); - public List getInfoWithString(String param); + public List getInfoWithString(String goodsCode); public int pmsStockInComplete(PmsStockInCompleteReq request); diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java index da582a97..f73faa30 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java @@ -122,11 +122,11 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService } @Override - public List getInfoWithString(String param) { - if(StringUtils.isEmpty(param)) { - return appPmsOrderInMapper.selectAppPmsOrderInListWithParam(""); + public List getInfoWithString(String goodsCode) { + if(StringUtils.isEmpty(goodsCode)) { + return appPmsOrderInMapper.selectAppPmsOrderInListWithEmpty(""); } - return appPmsOrderInMapper.selectAppPmsOrderInListWithParam(param); + return appPmsOrderInMapper.selectAppPmsOrderInListWithParam(goodsCode); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml index 5e0cf5f7..4c3f7cad 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml @@ -77,10 +77,17 @@ where id = #{id} + + +