|
|
@@ -6,6 +6,7 @@ import com.uas.platform.b2c.core.constant.ReleaseStatus;
|
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
import com.uas.platform.b2c.core.utils.StringUtilB2C;
|
|
|
import com.uas.platform.b2c.prod.commodity.constant.ErrorInfoConstant;
|
|
|
+import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
|
|
|
import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
|
|
|
import com.uas.platform.b2c.prod.commodity.dao.ReleaseProductByBatchDao;
|
|
|
import com.uas.platform.b2c.prod.commodity.model.ReleaseProductByBatch;
|
|
|
@@ -330,12 +331,15 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
|
|
|
uniqueBatchList.forEach(batch -> {
|
|
|
Product product = new Product();
|
|
|
product.setSpec(batch.getSpec());
|
|
|
- product.setBrand(batch.getBrandNameEn() != null ? batch.getBrandNameEn() : batch.getBrandNameCn());
|
|
|
+ String brand = batch.getBrandNameEn() != null ? batch.getBrandNameEn() : batch.getBrandNameCn();
|
|
|
+ product.setBrand(brand);
|
|
|
+ product.setpBrand(brand);
|
|
|
product.setUserUU(SystemSession.getUser().getUserUU());
|
|
|
product.setCmpCode(batch.getCode());
|
|
|
+ product.setpCmpCode(batch.getCode());
|
|
|
// 没有编号设置编号
|
|
|
if (null == product.getCode()) {
|
|
|
- String code = "B2CPR" + StringUtilB2C.getRandomNumber(6);
|
|
|
+ String code = "PNUM" + StringUtilB2C.getRandomNumber(6);
|
|
|
product.setCode(code);
|
|
|
}
|
|
|
// 交期默认赋值为0
|
|
|
@@ -348,6 +352,7 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
|
|
|
product.setUnit(batch.getUnit());
|
|
|
product.setTitle(batch.getKindName());
|
|
|
product.setId(batch.getProductid());
|
|
|
+ product.setSourceApp(StringConstant.SOURCE);
|
|
|
productList.add(product);
|
|
|
});
|
|
|
return productList;
|