|
|
@@ -12,9 +12,19 @@ import com.uas.platform.b2c.common.base.dao.CommonDao;
|
|
|
import com.uas.platform.b2c.common.search.rpc.service.SearchService;
|
|
|
import com.uas.platform.b2c.common.search.util.SPage;
|
|
|
import com.uas.platform.b2c.core.config.SysConf;
|
|
|
-import com.uas.platform.b2c.core.constant.*;
|
|
|
+import com.uas.platform.b2c.core.constant.ExcelConstant;
|
|
|
+import com.uas.platform.b2c.core.constant.IntegerConstant;
|
|
|
+import com.uas.platform.b2c.core.constant.ReleaseStatus;
|
|
|
+import com.uas.platform.b2c.core.constant.ShortConstant;
|
|
|
+import com.uas.platform.b2c.core.constant.SplitChar;
|
|
|
+import com.uas.platform.b2c.core.constant.Status;
|
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
-import com.uas.platform.b2c.core.utils.*;
|
|
|
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
|
|
|
+import com.uas.platform.b2c.core.utils.NumberUtil;
|
|
|
+import com.uas.platform.b2c.core.utils.PoiUtil;
|
|
|
+import com.uas.platform.b2c.core.utils.RegexConstant;
|
|
|
+import com.uas.platform.b2c.core.utils.StringUtilB2C;
|
|
|
+import com.uas.platform.b2c.core.utils.WriteExcelDataDelegated;
|
|
|
import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
|
|
|
import com.uas.platform.b2c.prod.commodity.constant.ErrorInfoConstant;
|
|
|
import com.uas.platform.b2c.prod.commodity.constant.PublicProductUrl;
|
|
|
@@ -2533,6 +2543,10 @@ public class ProductServiceImpl implements ProductService {
|
|
|
productInfo.setStandard(IntegerConstant.NO_SHORT);
|
|
|
} else {
|
|
|
productInfo.setStandard(IntegerConstant.YES_SHORT);
|
|
|
+ Component component = (Component) criterionResultMap.getData();
|
|
|
+ productInfo.setCmpUuId(component.getUuid());
|
|
|
+ productInfo.setKind(component.getKind().getNameCn());
|
|
|
+ productInfo.setKindid(component.getKindid());
|
|
|
}
|
|
|
}
|
|
|
if (StringUtilB2C.isEmpty(productInfo.getProdNum())) {
|
|
|
@@ -2675,7 +2689,7 @@ public class ProductServiceImpl implements ProductService {
|
|
|
// 判断标准器件信息
|
|
|
List<Component> components = componentDao.findByBrandidAndCode(brands.get(0).getId(), product.getCmpCode());
|
|
|
if (CollectionUtils.isNotEmpty(components)) {
|
|
|
- return ResultMap.success();
|
|
|
+ return ResultMap.success(components.get(0));
|
|
|
}
|
|
|
}
|
|
|
return ResultMap.error(new NotFoundException("非标准物料"));
|