rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1449 MPM同步物料图片及钢构包管理的接口开发

This commit is contained in:
10001392 2026-05-19 10:12:09 +08:00
parent ce973f9d6d
commit 756e13ccd1
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java
View File

@ -276,10 +276,8 @@ public class StructuralPackageControllerService {
} }
if (StrUtil.isBlank(dto.getVersion())) { if (StrUtil.isBlank(dto.getVersion())) {
sb.append("图纸版本不能为空;"); sb.append("图纸版本不能为空;");
} else if (!NumberUtils.isCreatable(dto.getVersion())) {
sb.append("图纸版本无效;");
} else { } else {
materialDTO.setVersion(Integer.valueOf(dto.getVersion())); materialDTO.setVersion(dto.getVersion());
} }
dto.setError(sb.toString()); dto.setError(sb.toString());
materialDTO.setCreateBy(UserUtil.getUserName()); materialDTO.setCreateBy(UserUtil.getUserName());
@ -374,7 +372,7 @@ public class StructuralPackageControllerService {
dto.setImage(material1.getImage()); dto.setImage(material1.getImage());
String v = row.getString(6); String v = row.getString(6);
if (StrUtil.isNotBlank(v)) { if (StrUtil.isNotBlank(v)) {
dto.setVersion(Integer.valueOf(v)); dto.setVersion(v);
} else { } else {
dto.setVersion(material1.getVersion()); dto.setVersion(material1.getVersion());
} }

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageMaterialDTO.java
View File

@ -59,7 +59,7 @@ public class PackageMaterialDTO {
* 版本 * 版本
*/ */
@NotNull @NotNull
private Integer version; private String version;
/** /**
* 图片 * 图片

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java
View File

@ -33,7 +33,7 @@ public class TrayItemVO {
/** /**
* 版本 * 版本
*/ */
private Integer version; private String version;
/** /**
* 单重 * 单重

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java
View File

@ -32,7 +32,7 @@ public class WmsMaterialServiceImpl extends ServiceImpl<WmsMaterialMapper, WmsMa
@Override @Override
public void add(WmsMaterial wmsMaterial) { public void add(WmsMaterial wmsMaterial) {
VUtil.trueThrowBusinessError(wmsMaterial.getVersion()==1 VUtil.trueThrowBusinessError("1".equals(wmsMaterial.getVersion())
&& lambdaQuery().eq(WmsMaterial::getNo, wmsMaterial.getNo()).exists()) && lambdaQuery().eq(WmsMaterial::getNo, wmsMaterial.getNo()).exists())
.throwMessage("SAP料号已存在"); .throwMessage("SAP料号已存在");
save(wmsMaterial); save(wmsMaterial);