2023年1月11日17:17:23

blade-service-api/blade-client-api/src/main/java/org/springblade/client/dto/GoodsDescDto.java

@@ -152,5 +152,10 @@ public class GoodsDescDto implements Serializable {
 	@TableField(exist = false)
 	private String goodsTypeName;
 
+	/**
+	 * 特价
+	 */
+	private BigDecimal specialOffer;
+
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -187,9 +187,9 @@ public class GoodsDescController extends BladeController {
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(remarks), GoodsDesc::getCode, remarks);
 		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId());
 		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getType, 0);
-		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(status),GoodsDesc::getStatus, status);
-		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(unit),GoodsDesc::getUnit, unit);
-		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(upperFrame),GoodsDesc::getUpperFrame, upperFrame);
+		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(status), GoodsDesc::getStatus, status);
+		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(unit), GoodsDesc::getUnit, unit);
+		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(upperFrame), GoodsDesc::getUpperFrame, upperFrame);
 		if (StringUtils.isNotEmpty(artsVision)) {
 			goodsDescLambdaQueryWrapper.and(i -> i.like(GoodsDesc::getArtsVision, artsVision).or().isNull(GoodsDesc::getArtsVision));
 		}
@@ -568,7 +568,8 @@ public class GoodsDescController extends BladeController {
 							 @RequestParam(name = "brandItem", required = false) String brandItem,
 							 @RequestParam(name = "brand", required = false) String brand,
 							 @RequestParam(name = "belongToCorpId", required = false) String belongToCorpId,
-							 @RequestParam(name = "storageId", required = false) Long storageId
+							 @RequestParam(name = "storageId", required = false) Long storageId,
+							 @RequestParam(name = "billType", required = false) String billType
 	) {
 		LambdaQueryWrapper<GoodsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		//指定分类为一级分类,查询此分类所有二级分类的商品
@@ -619,18 +620,23 @@ public class GoodsDescController extends BladeController {
 			List<StockGoods> stockGoodsList = stockGoodsClient.postListStockByCondition(stockGoods);
 			if (stockGoodsList.size() > 0) {
 				good.setStockGoodsList(stockGoodsList);
-			}else{
+			} else {
 				good.setStockGoodsList(new ArrayList<>());
 			}
-			if (ObjectUtils.isNotNull(storageId)){
+			if (ObjectUtils.isNotNull(storageId)) {
 				R<StockGoodsVO> r = stockGoodsClient.selectStockParts(null, storageId, good.getId(), null, null, null, null, null, null);
-				if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
-					good.setStockGoods(r.getData());
+				if ("XS".equals(billType)) {
+					if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
+						good.setStockGoods(r.getData());
+						goodsDescList.add(good);
+					}
+				} else {
 					goodsDescList.add(good);
 				}
+
 			}
 		});
-		if (ObjectUtils.isNotNull(storageId)){
+		if (ObjectUtils.isNotNull(storageId)) {
 			iPage.setRecords(goodsDescList);
 		}
 		return R.data(iPage);

blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsInfoPartsExcel.java

@@ -29,31 +29,33 @@ public class GoodsInfoPartsExcel implements Serializable {
 	private String unit;
 
 	/**
+	 * 零售价
+	 */
+	@ExcelProperty("零售价(必填)")
+	private BigDecimal standardPrice;
+
+	/**
 	 * 标准售价
 	 */
 	@ExcelProperty("售价1(必填)")
-	private BigDecimal standardPrice;
+	private BigDecimal wholesalePrice;
 
 	/**
 	 * 批发售价
 	 */
 	@ExcelProperty("售价2")
-	private BigDecimal wholesalePrice;
+	private BigDecimal repairDepotPrice;
 
 	/**
 	 * 汽修厂售价
 	 */
 	@ExcelProperty("售价3")
-	private BigDecimal repairDepotPrice;
+	private BigDecimal storePrice;
 
 	/**
 	 * 门店售价
 	 */
 	@ExcelProperty("售价4")
-	private BigDecimal storePrice;
-
-	//其他售价
-	@ExcelProperty("售价5(必填)")
 	private BigDecimal price;
 
 	/**
@@ -65,7 +67,7 @@ public class GoodsInfoPartsExcel implements Serializable {
 	/**
 	 * 采购价
 	 */
-	@ExcelProperty("采购价(必填)")
+	@ExcelProperty("进货价(必填)")
 	private BigDecimal purchasePrice;