diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index 1041b1d..2a4185b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -493,6 +493,16 @@ public class ApiServiceImpl implements IApiService { requestLogService.insertRequestLog(requestLog); // -------------------------检查推送的任务参数------------------------- + log.info( + "【wms推送出库】请求码:{},wms任务号:{},推送出库货位:{},推送类型:{}",stockoutReceive.getReqCode(), stockoutReceive.getTaskCode(), stockoutReceive.getSiteCode(), stockoutReceive.getTaskTypeCode() + ); + + // 0.检查货位参数空 + if(stockoutReceive.getSiteCode() == null || stockoutReceive.getSiteCode() == ""){ + log.info("【请求错误】wms推送出库任务失败,参数错误,推送任务号:{},推送出库货位:{}", stockoutReceive.getTaskCode(), stockoutReceive.getSiteCode()); + return AjaxResult.error("【请求错误】wms推送出库任务失败,参数错误,推送任务号:{}" + stockoutReceive.getTaskCode() + ",推送出库货位:" + stockoutReceive.getSiteCode()); + } + // 1.wms推送的任务号是否重复 MydoJob job = new MydoJob().builder().wmsTaskNo(stockoutReceive.getTaskCode()).build(); List tasks = mydoJobService.selectMydoJobList(job); @@ -509,16 +519,14 @@ public class ApiServiceImpl implements IApiService { return AjaxResult.error("【请求错误】wms下发出库任务失败,已经存在该货位的出库任务,推送任务号:{}" + stockoutReceive.getTaskCode() + ",推送出库货位:" + stockoutReceive.getSiteCode()); } - - //生成出库作业 MydoJob mydoJob = new MydoJob(); mydoJob.setJobId(mydoJobService.getJobId("CK")); mydoJob.setTaskNo(mydoJobService.getTaskNo("3")); mydoJob.setWmsTaskNo(stockoutReceive.getTaskCode()); mydoJob.setCargoSpaceId(stockoutReceive.getSiteCode()); - mydoJob.setRoadwayId( - basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(stockoutReceive.getSiteCode()).getRoadwayId() + mydoJob.setRoadwayId(basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(stockoutReceive.getSiteCode()).getRoadwayId() + ); mydoJob.setTraySize(GoodsType.TYPE_DEFAULT);//默认 mydoJob.setExitId(CONV_STOCKOUT);