diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java index 27da9a0f6..94132ba19 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java @@ -107,10 +107,10 @@ public class IoOrderMutiController { ew1.eq("mark",ioOrderMutiEntity.getMark()); long count = ioOrderMutiService.count(ew1); if(count>0){ - return ResultVOUtils.error(999, "标志位已存在!"); + return ResultVOUtils.error(999, "标记已存在!"); } }else{ - return ResultVOUtils.error(999, "标志位不能为空!"); + return ResultVOUtils.error(999, "标记不能为空!"); } ioOrderMutiEntityOne = new IoOrderMutiEntity(); @@ -185,10 +185,10 @@ public class IoOrderMutiController { ew.eq("mark",ioOrderMutiEntity.getMark()); long count = ioOrderMutiService.count(ew); if(count>0){ - return ResultVOUtils.error(999, "标志位已存在!"); + return ResultVOUtils.error(999, "标记已存在!"); } }else{ - return ResultVOUtils.error(999, "标志位不能为空!"); + return ResultVOUtils.error(999, "标记不能为空!"); } @@ -220,6 +220,17 @@ public class IoOrderMutiController { @PostMapping("/udiwms/inout/order/muti/updateOrderMuti") public BaseResponse updateOrderMuti(@RequestBody IoOrderMutiEntity ioOrderMutiEntity) { + if(StrUtil.isNotBlank(ioOrderMutiEntity.getMark())){ + QueryWrapper ew1=new QueryWrapper<>(); + ew1.eq("mark",ioOrderMutiEntity.getMark()); + IoOrderMutiEntity ioOrderMutiEntityOne= ioOrderMutiService.getOne(ew1); + if(!ioOrderMutiEntityOne.getId().equals(ioOrderMutiEntity.getId())){ + return ResultVOUtils.error(999, "标记已存在!"); + } + }else{ + return ResultVOUtils.error(999, "标记不能为空!"); + } + String orderNo = ioOrderMutiEntity.getOrderIdFk(); //如果是第一次的话就插入