diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index 5a00636..bec227e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -343,14 +343,14 @@ public class InvoicingApi { @ApiOperation(value="拣货物料", notes="拣货物料") @AutoLog(value = "拣货物料") @PostMapping(value = "/pickingInfo") - public Result pickingInfo(@RequestBody CgdInfoEntity cgdInfoEntityDto) { - String result = invoicingApi.pickingInfo(cgdInfoEntityDto); - if(StringUtils.equals("2",result)){ + public Result> pickingInfo(@RequestBody CgdInfoEntity cgdInfoEntityDto) { + Map result = invoicingApi.pickingInfo(cgdInfoEntityDto); + if(StringUtils.equals("2",result.get("status").toString())){ return Result.error("入库数量错误,超过请购数量"); - }else if(StringUtils.equals("3",result)){ + }else if(StringUtils.equals("3",result.get("status").toString())){ return Result.error("销账数量错误,超过请购数量"); } - return Result.OK("操作成功!"); + return Result.OK(result); } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java index 4599fdc..313e17d 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -72,7 +72,7 @@ public interface IInvoicingApi { String addWaringAll(CgdInfoEntity cgdInfoEntityDto, Integer maxCount); - String pickingInfo(CgdInfoEntity cgdInfoEntityDto); + Map pickingInfo(CgdInfoEntity cgdInfoEntityDto); Map editPrice(CgdInfoEntity cgdInfoEntityDto); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index 596834a..af08322 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -911,8 +911,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl pickingInfo(CgdInfoEntity cgdInfoEntityDto) { + Map result = new HashMap<>(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("id",cgdInfoEntityDto.getJhId()); @@ -955,9 +956,11 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl cgsl - rksl - xzsl){ if(StringUtils.equals("0",jhType)) {//入库操作 - return "2";//入库数量错误,超过请购数量 + result.put("status","2"); + return result;//入库数量错误,超过请购数量 }else{ - return "3";//销账数量错误,超过请购数量 + result.put("status","3"); + return result;//销账数量错误,超过请购数量 } } @@ -1037,7 +1040,10 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl