bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

This commit is contained in:
jiang 2025-11-16 19:41:39 +08:00
parent 9a59617c3a
commit a9f0ef277b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java
View File

@ -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
*/

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java
View File

@ -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);