|
|
@@ -279,7 +279,7 @@ public class ProductAttachServiceImpl implements ProductAttachService {
|
|
|
return ResultMap.success(auditSubmit(exsitedSubmit));
|
|
|
// 标准物料有规格书,返回两规格书
|
|
|
} else {
|
|
|
- return ResultMap.success(componentAttachNotNull(exsitedSubmit, component.getAttach()));
|
|
|
+ return new ResultMap(CodeType.SAVED.code(), "匹配的标准物料已存在规格书", componentAttachNotNull(exsitedSubmit, component.getAttach()));
|
|
|
}
|
|
|
// 非标型号
|
|
|
} else {
|
|
|
@@ -291,7 +291,7 @@ public class ProductAttachServiceImpl implements ProductAttachService {
|
|
|
productAttachSubmitDao.save(exsitedSubmit);
|
|
|
|
|
|
if (component.getAttach() != null) {
|
|
|
- return ResultMap.success(componentAttachNotNull(exsitedSubmit, component.getAttach()));
|
|
|
+ return new ResultMap(CodeType.SAVED.code(), "匹配的标准物料已存在规格书", componentAttachNotNull(exsitedSubmit, component.getAttach()));
|
|
|
} else {
|
|
|
component = addComponent(exsitedSubmit, component.getId());
|
|
|
return ResultMap.success(auditSubmit(exsitedSubmit));
|
|
|
@@ -359,7 +359,7 @@ public class ProductAttachServiceImpl implements ProductAttachService {
|
|
|
* @param attach
|
|
|
* @return
|
|
|
*/
|
|
|
- private Map<String, String> componentAttachNotNull(ProductAttachSubmit submit, String attach) {
|
|
|
+ private Object componentAttachNotNull(ProductAttachSubmit submit, String attach) {
|
|
|
submit.setMallAttach(attach);
|
|
|
productAttachSubmitDao.save(submit);
|
|
|
|