Browse Source

新增物料时自动匹配标准信息

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9833 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 8 years ago
parent
commit
2db9b922a1

+ 1 - 1
src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -452,6 +452,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 			map.put("error", "物料已存在");
 			map.put("error", "物料已存在");
 			map.put("id", products.get(0).getId());
 			map.put("id", products.get(0).getId());
 		} else {
 		} else {
+			prodInfo.setStandard(Constant.NO);
 			if (prodInfo.getCmpCode() != null && prodInfo.getBrand() != null && prodInfo.getTitle() != null) {
 			if (prodInfo.getCmpCode() != null && prodInfo.getBrand() != null && prodInfo.getTitle() != null) {
 				List<Component> cmps = componentDao.findByCode(prodInfo.getCmpCode());
 				List<Component> cmps = componentDao.findByCode(prodInfo.getCmpCode());
 				if (!CollectionUtils.isEmpty(cmps)) {
 				if (!CollectionUtils.isEmpty(cmps)) {
@@ -479,7 +480,6 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				prodInfo.setStandard(Constant.NO);
 				prodInfo.setStandard(Constant.NO);
 			}
 			}
 			prodInfo.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 			prodInfo.setEnUU(SystemSession.getUser().getEnterprise().getUu());
-			prodInfo.setStandard(Constant.NO);
 			prodInfo = productDao.save(prodInfo);
 			prodInfo = productDao.save(prodInfo);
 			map.put("id", prodInfo.getId());
 			map.put("id", prodInfo.getId());
 			map.put("success", "物料添加成功");
 			map.put("success", "物料添加成功");