diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index 8360120..a0d0126 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -204,6 +204,7 @@ public class ToWmsServiceImpl implements IToWmsService { mydoJob.setWarehouseId("01"); mydoJob.setRoadwayId(getRoadway(size)); mydoJob.setLineId(erpBill); + mydoJob.setDepartmentId(String.valueOf(size)); BasRoadway basRoadway = basRoadwayService.selectBasRoadwayById(mydoJob.getRoadwayId()); if ("1".equals(requestEnter.getFloor())) { if ("Y".equals(basRoadway.getInLocked())) { @@ -279,6 +280,7 @@ public class ToWmsServiceImpl implements IToWmsService { result.put("roadwayId", mydoJob.getRoadwayId()); result.put("entranceId", mydoJob.getEntranceId()); result.put("inOrOut", mydoJob.getInOrOut()); + result.put("traySize", mydoJob.getDepartmentId()); return AjaxResult.success(result); } @@ -455,7 +457,6 @@ public class ToWmsServiceImpl implements IToWmsService { } } - MydoJob param = new MydoJob(); param.setStatus("1"); param.setEntranceId(requestEnter.getEntranceId()); 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 d5ee8ca..23d78e9 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 @@ -491,7 +491,7 @@ public class MydoJobServiceImpl implements IMydoJobService { } iToWcsService.pushOutMydoJob(); if (!StrUtil.isEmpty(builder)) { - return AjaxResult.warn(builder.toString()); + return AjaxResult.success(builder.toString()); } return AjaxResult.success(); }