2024年6月6日17:30:02

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/excel/SalesItemExcel.java

@@ -23,8 +23,8 @@ public class SalesItemExcel implements Serializable {
 	@ExcelProperty("商品编码")
 	private String code;
 
-	@ExcelProperty(value = "采购价")
-	private String purchasePrice;
+	/*@ExcelProperty(value = "采购价")
+	private String purchasePrice;*/
 
 	@ExcelProperty(value = "销售价")
 	private String salesPrice;

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/SalesPolicyServiceImpl.java

@@ -36,11 +36,13 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.mocha.entity.PriceItem;
 import org.springblade.mocha.entity.SalesPolicy;
 import org.springblade.mocha.entity.SalesPolicyItem;
 import org.springblade.mocha.excel.SalesItemExcel;
 import org.springblade.mocha.mapper.SalesPolicyItemMapper;
 import org.springblade.mocha.mapper.SalesPolicyMapper;
+import org.springblade.mocha.service.IPriceItemService;
 import org.springblade.mocha.service.ISalesPolicyService;
 import org.springblade.mocha.vo.SalesPolicyItemVO;
 import org.springblade.mocha.vo.SalesPolicyVO;
@@ -78,6 +80,7 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
 	 */
 	private final IGoodsDescClient goodsDescClient;
 	private final ICheckClient iCheckClient;//审批
+	private final IPriceItemService priceItemService;
 
 	@Override
 	public IPage<SalesPolicy> selectSalesPolicyPage(IPage<SalesPolicy> page, SalesPolicy salesPolicy) {
@@ -254,12 +257,20 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
 			if (ObjectUtil.isEmpty(goodsExcel.getSalesPrice())){
 				throw new SecurityException("第" + (i + 1) + "行销售价格为空");
 			}
-			if (ObjectUtil.isEmpty(goodsExcel.getPurchasePrice())){
-				throw new SecurityException("第" + (i + 1) + "行采购价格为空");
+			PriceItem priceItem = priceItemService.getOne(new LambdaQueryWrapper<PriceItem>()
+				.eq(PriceItem::getTenantId,AuthUtil.getTenantId())
+				.eq(PriceItem::getIsDeleted,0)
+				.eq(PriceItem::getCode,salesPolicyItem.getCode()));
+			if (priceItem == null){
+				throw new SecurityException("第" + (i + 1) + "行商品编码未找到采购价格");
 			}
+			/*if (ObjectUtil.isEmpty(goodsExcel.getPurchasePrice())){
+				throw new SecurityException("第" + (i + 1) + "行采购价格为空");
+			}*/
 			//查询itemId
 			GoodsDesc goodsDesc = goodsDescR.getData();
-			salesPolicyItem.setPurchasePrice(new BigDecimal(goodsExcel.getPurchasePrice()));
+//			salesPolicyItem.setPurchasePrice(new BigDecimal(goodsExcel.getPurchasePrice()));
+			salesPolicyItem.setPurchasePrice(priceItem.getPurchasePrice());
 			salesPolicyItem.setSalesPrice(new BigDecimal(goodsExcel.getSalesPrice()));
 			salesPolicyItem.setSpecialOffer(new BigDecimal(goodsExcel.getSpecialOffer()));
 			salesPolicyItem.setBrandItem(goodsDesc.getBrandItem());