|
|
@@ -24,6 +24,9 @@ import com.uas.platform.b2c.prod.commodity.service.ReleaseProductByBatchService;
|
|
|
import com.uas.platform.b2c.prod.commodity.type.ProductConstant;
|
|
|
import com.uas.platform.b2c.prod.commodity.util.SheetUtil;
|
|
|
import com.uas.platform.b2c.prod.product.common.service.CreateNumberService;
|
|
|
+import com.uas.platform.b2c.prod.store.model.StoreIn;
|
|
|
+import com.uas.platform.b2c.prod.store.model.StoreStatus;
|
|
|
+import com.uas.platform.b2c.prod.store.service.StoreInService;
|
|
|
import com.uas.platform.b2c.trade.order.service.PurchaseProductService;
|
|
|
import com.uas.platform.b2c.trade.support.ResultMap;
|
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
|
@@ -82,6 +85,9 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
|
|
|
@Autowired
|
|
|
private GoodsService goodsService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private StoreInService storeInService;
|
|
|
+
|
|
|
/**
|
|
|
* 物料服务访问路径
|
|
|
*/
|
|
|
@@ -388,6 +394,7 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
|
|
|
// 新增到物料库
|
|
|
productService.saveByJdbcTemplate(batchList);
|
|
|
List<com.uas.platform.b2c.prod.commodity.model.Product> productList = productService.findProductIdAndProdnumsByProdNums(productCodeList);
|
|
|
+ final StoreIn storeIn = storeInService.findByEnUU(SystemSession.getUser().getEnterprise().getUu());
|
|
|
List<ProductPrivate> privateList = new ArrayList<>();
|
|
|
List<Goods> finalGoodsList = new ArrayList<>();
|
|
|
productList.forEach(product -> {
|
|
|
@@ -395,6 +402,7 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
|
|
|
ProductConstant.DEFAULT_MAX_DELIVERY, ProductConstant.DEFAULT_MIN_DELIVERY, ProductConstant.DEFAULT_MIN_BUYQTY,
|
|
|
ProductConstant.DEFAULT_MIN_PACKQTY, Status.NO_SHELVE.value());
|
|
|
goods = productService.bindProductToGoods(goods, product);
|
|
|
+ goods.setSelfSale((storeIn != null && storeIn.getStatus() == StoreStatus.OPENED) ? "1" : "0");
|
|
|
goodsService.setGoodsDefault(goods);
|
|
|
finalGoodsList.add(goods);
|
|
|
ProductPrivate productPrivate;
|