1449 MPM同步物料图片及钢构包管理的接口开发
This commit is contained in:
parent
ce973f9d6d
commit
756e13ccd1
|
|
@ -276,10 +276,8 @@ public class StructuralPackageControllerService {
|
|||
}
|
||||
if (StrUtil.isBlank(dto.getVersion())) {
|
||||
sb.append("图纸版本不能为空;");
|
||||
} else if (!NumberUtils.isCreatable(dto.getVersion())) {
|
||||
sb.append("图纸版本无效;");
|
||||
} else {
|
||||
materialDTO.setVersion(Integer.valueOf(dto.getVersion()));
|
||||
materialDTO.setVersion(dto.getVersion());
|
||||
}
|
||||
dto.setError(sb.toString());
|
||||
materialDTO.setCreateBy(UserUtil.getUserName());
|
||||
|
|
@ -374,7 +372,7 @@ public class StructuralPackageControllerService {
|
|||
dto.setImage(material1.getImage());
|
||||
String v = row.getString(6);
|
||||
if (StrUtil.isNotBlank(v)) {
|
||||
dto.setVersion(Integer.valueOf(v));
|
||||
dto.setVersion(v);
|
||||
} else {
|
||||
dto.setVersion(material1.getVersion());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public class PackageMaterialDTO {
|
|||
* 版本
|
||||
*/
|
||||
@NotNull
|
||||
private Integer version;
|
||||
private String version;
|
||||
|
||||
/**
|
||||
* 图片
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ public class TrayItemVO {
|
|||
/**
|
||||
* 版本
|
||||
*/
|
||||
private Integer version;
|
||||
private String version;
|
||||
|
||||
/**
|
||||
* 单重
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class WmsMaterialServiceImpl extends ServiceImpl<WmsMaterialMapper, WmsMa
|
|||
|
||||
@Override
|
||||
public void add(WmsMaterial wmsMaterial) {
|
||||
VUtil.trueThrowBusinessError(wmsMaterial.getVersion()==1
|
||||
VUtil.trueThrowBusinessError("1".equals(wmsMaterial.getVersion())
|
||||
&& lambdaQuery().eq(WmsMaterial::getNo, wmsMaterial.getNo()).exists())
|
||||
.throwMessage("SAP料号已存在");
|
||||
save(wmsMaterial);
|
||||
|
|
|
|||
Loading…
Reference in New Issue