|
|
@@ -231,10 +231,13 @@ public class BaseInfoServiceImpl implements BaseInfoService {
|
|
|
prodInfo.setBrand(component.getBrand().getNameEn());
|
|
|
prodInfo.setPbrand(component.getBrand().getNameEn());
|
|
|
prodInfo.setCmpCode(component.getCode());
|
|
|
+ prodInfo.setKind(component.getKind().getNameEn());
|
|
|
+ prodInfo.setPcmpcode(component.getCode());
|
|
|
productDao.save(prodInfo);
|
|
|
map.put("success", "更新成功");
|
|
|
}
|
|
|
}
|
|
|
+ map.put("success", "更新成功");
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
@@ -254,6 +257,23 @@ public class BaseInfoServiceImpl implements BaseInfoService {
|
|
|
}
|
|
|
List<Product> products = productDao.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(),
|
|
|
prodInfo.getCode());
|
|
|
+ List<Component> components = componentDao.findByCode(prodInfo.getCode());
|
|
|
+ if (components.size() == 1) { // 存在一个，全部赋值成标准数据
|
|
|
+ Component comp = components.get(0);
|
|
|
+ prodInfo.setKind(comp.getKind().getNameEn());
|
|
|
+ prodInfo.setPbrand(comp.getBrand().getNameEn());
|
|
|
+ prodInfo.setPcmpcode(comp.getCode());
|
|
|
+ }
|
|
|
+ if (prodInfo.getCmpUuId() != null) {
|
|
|
+ Component component = componentDao.findByUuid(prodInfo.getCmpUuId());
|
|
|
+ if (component != null) {
|
|
|
+ prodInfo.setBrand(component.getBrand().getNameEn());
|
|
|
+ prodInfo.setPbrand(component.getBrand().getNameEn());
|
|
|
+ prodInfo.setCmpCode(component.getCode());
|
|
|
+ prodInfo.setKind(component.getKind().getNameEn());
|
|
|
+ prodInfo.setPcmpcode(component.getCode());
|
|
|
+ }
|
|
|
+ }
|
|
|
Product product = new Product();
|
|
|
if (prodInfo.getCmpUuId() != null) {
|
|
|
product = productDao.findByEnUUAndCmpUuId(SystemSession.getUser().getEnterprise().getUu(),
|
hejq