diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java index d1d7bf1..87b2cd1 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java @@ -25,6 +25,7 @@ import java.util.*; /** * 设备退库 + * * @author ma_sh */ @Service @@ -36,6 +37,7 @@ public class BackChangeServiceImpl implements BackChangeService { /** * 获取添加设备详情 + * * @param dto * @return */ @@ -56,6 +58,7 @@ public class BackChangeServiceImpl implements BackChangeService { /** * 新增退库申请 + * * @param csDeviceVo * @return */ @@ -76,7 +79,7 @@ public class BackChangeServiceImpl implements BackChangeService { } // 编码重复 String devCode = details.getDevCode(); - if (StringUtils.isNotBlank(devCode) && devCodeSet.contains(devCode)) { + if (!devCode.equals("/") && StringUtils.isNotBlank(devCode) && devCodeSet.contains(devCode)) { return AjaxResult.error("添加的列表中设备编号存在重复:" + devCode); } else if (StringUtils.isNotBlank(devCode)) { devCodeSet.add(devCode); @@ -122,6 +125,7 @@ public class BackChangeServiceImpl implements BackChangeService { /** * 生成申请编号 + * * @param thisMonthMaxOrder * @return */ @@ -135,6 +139,7 @@ public class BackChangeServiceImpl implements BackChangeService { /** * 修改退库申请 + * * @param csDeviceVo * @return */ @@ -203,6 +208,7 @@ public class BackChangeServiceImpl implements BackChangeService { /** * 删除退料申请 + * * @param csDeviceInfo * @return */ @@ -229,6 +235,7 @@ public class BackChangeServiceImpl implements BackChangeService { /** * 获取退料申请详情 + * * @param dto * @return */ @@ -273,6 +280,7 @@ public class BackChangeServiceImpl implements BackChangeService { /** * 获取退料申请列表 + * * @param dto * @return */ @@ -283,6 +291,7 @@ public class BackChangeServiceImpl implements BackChangeService { /** * 审核退料申请 + * * @param backCsDeviceDetails * @return */ diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java index 012124b..7ff71df 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java @@ -240,7 +240,7 @@ public class DevChangeServiceImpl implements DevChangeService { } // 编码重复 String devCode = details.getDevCode(); - if (StringUtils.isNotBlank(devCode) && devCodeSet.contains(devCode)) { + if (!devCode.equals("/") && StringUtils.isNotBlank(devCode) && devCodeSet.contains(devCode)) { return AjaxResult.error("添加的列表中设备编号存在重复:" + devCode); } else if (StringUtils.isNotBlank(devCode)) { devCodeSet.add(devCode);