产品修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

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

@@ -198,28 +198,32 @@ public class GoodsDescController extends BladeController {
 	@GetMapping("/findById")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入goodsDesc")
-	public R list(@RequestParam(name = "id", required = true) String id) {
+	public R list(@RequestParam(name = "id") String id) {
 		GoodsDesc goodsDesc = goodsDescService.getById(id);
-		LambdaQueryWrapper<GoodsPrice> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(GoodsPrice::getPid, id);
-		List<GoodsPrice> priceList = goodsPriceService.list(lambdaQueryWrapper);
-
-		LambdaQueryWrapper<GoodsFiles> filesLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		filesLambdaQueryWrapper.eq(GoodsFiles::getPid, id);
-		List<GoodsFiles> filesList = goodsFilesService.list(filesLambdaQueryWrapper);
-		//查询商品规格明细
-		LambdaQueryWrapper<GoodsSpecification> specificationWrapper = new LambdaQueryWrapper<>();
-		specificationWrapper.eq(GoodsSpecification::getPid, id);
-		specificationWrapper.eq(GoodsSpecification::getIsDeleted, 0);
-		specificationWrapper.eq(GoodsSpecification::getTenantId, SecureUtil.getTenantId());
-		List<GoodsSpecification> goodsSpecificationList = goodsSpecificationService.list(specificationWrapper);
+
+		List<GoodsPrice> priceList = goodsPriceService.list(new LambdaQueryWrapper<GoodsPrice>()
+			.eq(GoodsPrice::getPid, id)
+			.eq(GoodsPrice::getIsDeleted, 0)
+		);
 		if (!CollectionUtils.isEmpty(priceList)) {
 			List<GoodsPrice> sale = priceList.stream().filter(e -> "0".equals(e.getBillType())).collect(Collectors.toList());
 			List<GoodsPrice> buy = priceList.stream().filter(e -> "1".equals(e.getBillType())).collect(Collectors.toList());
 			goodsDesc.setSaleGoodsPrice(sale);
 			goodsDesc.setBuyGoodsPrice(buy);
 		}
+
+		List<GoodsFiles> filesList = goodsFilesService.list(new LambdaQueryWrapper<GoodsFiles>()
+			.eq(GoodsFiles::getPid, id)
+			.eq(GoodsFiles::getIsDeleted, 0)
+		);
 		goodsDesc.setFilesList(filesList);
+
+		// 查询商品规格明细
+		List<GoodsSpecification> goodsSpecificationList = goodsSpecificationService.list(new LambdaQueryWrapper<GoodsSpecification>()
+			.eq(GoodsSpecification::getPid, id)
+			.eq(GoodsSpecification::getIsDeleted, 0)
+			.eq(GoodsSpecification::getTenantId, SecureUtil.getTenantId())
+		);
 		goodsDesc.setGoodsSpecificationList(goodsSpecificationList);
 		return R.data(goodsDesc);
 	}

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -498,15 +498,23 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	@Override
 	public List<ProductVO> getProductList(GoodsDesc goodsDesc) {
 		LambdaQueryWrapper<GoodsDesc> wrapper = new LambdaQueryWrapper<>();
-		wrapper.like(!org.apache.commons.lang3.StringUtils.isBlank(goodsDesc.getCname()), GoodsDesc::getCname, goodsDesc.getCname())
-			.like(!org.apache.commons.lang3.StringUtils.isBlank(goodsDesc.getCnameInt()), GoodsDesc::getCnameInt, goodsDesc.getCnameInt())
-			.like(!org.apache.commons.lang3.StringUtils.isBlank(goodsDesc.getEname()), GoodsDesc::getEname, goodsDesc.getEname())
-			.like(!org.apache.commons.lang3.StringUtils.isBlank(goodsDesc.getCode()), GoodsDesc::getCode, goodsDesc.getCode())
+		wrapper.like(StringUtil.isNotBlank(goodsDesc.getCname()), GoodsDesc::getCname, goodsDesc.getCname())
+			.like(StringUtil.isNotBlank(goodsDesc.getCnameInt()), GoodsDesc::getCnameInt, goodsDesc.getCnameInt())
+			.like(StringUtil.isNotBlank(goodsDesc.getEname()), GoodsDesc::getEname, goodsDesc.getEname())
+			.like(StringUtil.isNotBlank(goodsDesc.getCode()), GoodsDesc::getCode, goodsDesc.getCode())
 			.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(GoodsDesc::getType, 0)
 			.orderByDesc(GoodsDesc::getCreateTime);
 
 		List<GoodsDesc> goodsDescList = goodsDescMapper.selectList(wrapper);
+		goodsDescList.forEach(good -> {
+			List<GoodsFiles> filesList = goodsFilesMapper.selectList(new LambdaQueryWrapper<GoodsFiles>()
+				.eq(GoodsFiles::getPid, good.getId())
+				.eq(GoodsFiles::getIsDeleted, 0)
+			);
+			good.setFilesList(filesList);
+		});
+
 		Map<String, List<GoodsDesc>> group = goodsDescList.stream()
 			.collect(Collectors.groupingBy(e -> e.getGoodsTypeId().split(",")[0]));
 

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/SettlementController.java

@@ -459,14 +459,15 @@ public class SettlementController extends BladeController {
 	 */
 	@GetMapping("/getApplyAmount")
 	public R getApplyAmount(Settlement settlement) {
-		LambdaQueryWrapper<Settlement> wrapper = new LambdaQueryWrapper<>();
-		wrapper.select(Settlement::getAmount)
-			.eq(Settlement::getSrcBillId, settlement.getSrcBillId())
-			.eq(Settlement::getBillType, settlement.getBillType())
-			.eq(Settlement::getTenantId, AuthUtil.getTenantId())
-			.eq(Settlement::getIsDeleted, 0);
-		List<Settlement> settlementList = settlementService.list(wrapper);
-		BigDecimal allAmount = settlementList.stream().filter(e -> ObjectUtil.isNotEmpty(e.getAmount())).reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getAmount()), BigDecimal::add);
+		LambdaQueryWrapper<Items> wrapper = new LambdaQueryWrapper<>();
+		wrapper.select(Items::getAmount)
+			.eq(Items::getSrcParentId, settlement.getSrcBillId())
+			.eq(Items::getItemType, "采购")
+			.eq(Items::getTenantId, AuthUtil.getTenantId())
+			.eq(Items::getIsDeleted, 0);
+
+		List<Items> itemList = itemsService.list(wrapper);
+		BigDecimal allAmount = itemList.stream().filter(e -> ObjectUtil.isNotEmpty(e.getAmount())).reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getAmount()), BigDecimal::add);
 		return R.data(allAmount);
 	}