|
|
@@ -6,7 +6,6 @@ import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
|
|
|
import com.uas.platform.b2c.core.utils.StringUtilB2C;
|
|
|
import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
|
|
|
-import com.uas.platform.b2c.prod.commodity.model.Goods;
|
|
|
import com.uas.platform.b2c.prod.product.brand.dao.BrandDao;
|
|
|
import com.uas.platform.b2c.prod.product.brand.modal.Brand;
|
|
|
import com.uas.platform.b2c.prod.product.component.dao.ComponentDao;
|
|
|
@@ -792,12 +791,9 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
|
|
|
}
|
|
|
PurcInquiry inquiry = new PurcInquiry();
|
|
|
User user = SystemSession.getUser();
|
|
|
- // 商城现货的数量
|
|
|
- int haveGoodsCount = 0;
|
|
|
Set<PurcInquiryItem> inquiryItems = new HashSet<>();
|
|
|
Date endDate = new Date(endTime);
|
|
|
for (SeekPurchaseByBatch batch : seekPurchaseByBatchList) {
|
|
|
- SeekPurchase seekPurchase = new SeekPurchase();
|
|
|
if (!StringUtils.isEmpty(batch.getCode()) && !StringUtils.isEmpty(batch.getBrand())) {
|
|
|
PurcInquiryItem inquiryItem = new PurcInquiryItem();
|
|
|
inquiryItem.setProdTitle(batch.getCode());
|
|
|
@@ -819,12 +815,6 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
|
|
|
inquiryItem.setProdTitle(batch.getKind());
|
|
|
inquiryItem.setSpec(batch.getSpec());
|
|
|
inquiryItem.setEncapsulation(batch.getEncapsulation());
|
|
|
- // 商城现货搜索
|
|
|
- List<Goods> goods = goodsDao.getGoodsByCodeAndName(seekPurchase.getCode(), seekPurchase.getBrand());
|
|
|
- if (goods != null && goods.size() > 0) {
|
|
|
- haveGoodsCount++;
|
|
|
- }
|
|
|
-// deleteBatchList.add(batch);
|
|
|
inquiryItems.add(inquiryItem);
|
|
|
}
|
|
|
}
|
|
|
@@ -839,6 +829,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
|
|
|
inquiry.setDate(new Date(System.currentTimeMillis()));
|
|
|
inquiry.setEndDate(endDate);
|
|
|
inquiry.setCount(count);
|
|
|
+ inquiry.setSpec(seekPurchaseBom.getSpec());
|
|
|
inquiry.setInquiryItems(inquiryItems);
|
|
|
if (!StringUtils.isEmpty(user.getEnterprise())) {
|
|
|
inquiry.setEnUU(user.getEnterprise().getUu());
|
|
|
@@ -858,7 +849,6 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
|
|
|
}
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
result.put("successAmount", inquiryItems.size());
|
|
|
- result.put("goodsAmount", haveGoodsCount);
|
|
|
return ResultMap.success(result);
|
|
|
}
|
|
|
|