2025年2月13日17:08:45

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

@@ -184,8 +184,13 @@ public class GoodsDescController extends BladeController {
 				goodsDescLambdaQueryWrapper.in(GoodsDesc::getCorpId, "''");
 			}
 		}
-
-		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cname), GoodsDesc::getCname, cname);
+//		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cname), GoodsDesc::getCname, cname);
+		if (ObjectUtils.isNotNull(cname)) {
+			String[] arr = cname.split(" ");
+			for (String item : arr) {
+				goodsDescLambdaQueryWrapper.like(GoodsDesc::getCname, item);
+			}
+		}
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cnameInt), GoodsDesc::getCnameInt, cnameInt);
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(ename), GoodsDesc::getEname, ename);
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(code), GoodsDesc::getCode, code);
@@ -299,7 +304,13 @@ public class GoodsDescController extends BladeController {
 
 			goodsDescLambdaQueryWrapper.in(GoodsDesc::getGoodsTypeId, goodsIdList);
 		}
-		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cname), GoodsDesc::getCname, cname);
+//		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cname), GoodsDesc::getCname, cname);
+		if (ObjectUtils.isNotNull(cname)) {
+			String[] arr = cname.split(" ");
+			for (String item : arr) {
+				goodsDescLambdaQueryWrapper.like(GoodsDesc::getCname, item);
+			}
+		}
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cnameInt), GoodsDesc::getCnameInt, cnameInt);
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(ename), GoodsDesc::getEname, ename);
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(code), GoodsDesc::getCode, code);
@@ -390,7 +401,13 @@ public class GoodsDescController extends BladeController {
 			}
 		}
 
-		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cname), GoodsDesc::getCname, cname);
+//		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cname), GoodsDesc::getCname, cname);
+		if (ObjectUtils.isNotNull(cname)) {
+			String[] arr = cname.split(" ");
+			for (String item : arr) {
+				goodsDescLambdaQueryWrapper.like(GoodsDesc::getCname, item);
+			}
+		}
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cnameInt), GoodsDesc::getCnameInt, cnameInt);
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(ename), GoodsDesc::getEname, ename);
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(code), GoodsDesc::getCode, code);

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -110,7 +110,7 @@ public class BillsController extends BladeController {
 			Bills::getCreateDeptName, Bills::getLineCnName, Bills::getCarrierCnName, Bills::getCyCnName, Bills::getSrcType,
 			Bills::getSrcCnName, Bills::getBookingAgentCnName, Bills::getPodCnName, Bills::getPolCnName,Bills::getCorpSource,
 			Bills::getVesselEnName,Bills::getCarrierEnName,Bills::getCyEnName,Bills::getMpaymode,Bills::getHpaymode,
-			Bills::getShortName);
+			Bills::getShortName,Bills::getPlaceDeliveryName,Bills::getDestinationName);
 		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.and(i -> i.isNull(Bills::getMasterId).or()
@@ -132,6 +132,8 @@ public class BillsController extends BladeController {
 				.like(Bills::getCarrierEnName, bills.getCarrierCnName()).or().like(Bills::getCarrierArgreementNo, bills.getCarrierCnName()))
 			.and(ObjectUtils.isNotNull(bills.getPodCnName()), i -> i.like(Bills::getPodCnName, bills.getPodCnName()).or()
 				.like(Bills::getPodEnName, bills.getPodCnName()).or().like(Bills::getPodCode, bills.getPodCnName()))
+			.and(ObjectUtils.isNotNull(bills.getDestinationName()), i -> i.like(Bills::getDestinationName, bills.getDestinationName()).or()
+				.like(Bills::getDestinationCode, bills.getDestinationName()))
 			.and(ObjectUtils.isNotNull(bills.getLineCnName()), i -> i.like(Bills::getLineCnName, bills.getLineCnName()).or()
 				.like(Bills::getLineEnName, bills.getLineCnName()))
 			.and(ObjectUtils.isNotNull(bills.getCyCnName()), i -> i.like(Bills::getCyCode, bills.getCyCnName()).or()
@@ -586,7 +588,7 @@ public class BillsController extends BladeController {
 			Bills::getCreateDeptName, Bills::getLineCnName, Bills::getCarrierCnName, Bills::getCyCnName, Bills::getSrcType,
 			Bills::getSrcCnName, Bills::getBookingAgentCnName, Bills::getPodCnName, Bills::getPolCnName,Bills::getCorpSource,
 			Bills::getVesselEnName,Bills::getCarrierEnName,Bills::getCyEnName,Bills::getMpaymode,Bills::getHpaymode,
-			Bills::getShortName);
+			Bills::getShortName,Bills::getPlaceDeliveryName,Bills::getDestinationName);
 		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.and(i -> i.isNull(Bills::getMasterId).or()

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -299,6 +299,87 @@ public class PriceBankController extends BladeController {
 	}
 
 	/**
+	 * 福达查询产品
+	 */
+	@GetMapping("/pageListAllV1")
+	public R<List<PriceBank>> pageListAllV1(PriceBankVO priceBank) {
+		LambdaQueryWrapper<PriceBank> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		if (priceBank.getGoodTypeId() != null) {
+			List<Long> goodTypeMessage = corpsDescClient.getGoodTypeMessage(priceBank.getGoodTypeId());
+			if (CollectionUtils.isNotEmpty(goodTypeMessage)) {
+				lambdaQueryWrapper.in(PriceBank::getGoodTypeId, goodTypeMessage);
+			}
+		}
+		lambdaQueryWrapper.eq(PriceBank::getIsDeleted, 0);
+		lambdaQueryWrapper.eq(PriceBank::getStatus, 0);
+		lambdaQueryWrapper.eq(PriceBank::getTenantId, SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(PriceBank::getTradeType, "CK");
+		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getItemId()), PriceBank::getItemId, priceBank.getItemId());
+		if (ObjectUtils.isNotNull(priceBank.getCname())) {
+			String[] arr = priceBank.getCname().split(" ");
+			for (String item : arr) {
+				lambdaQueryWrapper.like(PriceBank::getCname, item);
+			}
+		}
+		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getCode()), PriceBank::getCode, priceBank.getCode());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getCorpId()), PriceBank::getCorpId, priceBank.getCorpId());
+		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getSpecs()), PriceBank::getSpecs, priceBank.getSpecs());
+		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getGoodsTypeName()), PriceBank::getGoodsTypeName, priceBank.getGoodsTypeName());
+		lambdaQueryWrapper.ge(Func.isNotEmpty(priceBank.getStatusTime()), PriceBank::getEndTime, priceBank.getStatusTime());
+		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getEname()), PriceBank::getEname, priceBank.getEname());
+		lambdaQueryWrapper.ge(Func.isNotEmpty(priceBank.getDateValidityStart()), PriceBank::getEndTime, priceBank.getDateValidityStart());
+		lambdaQueryWrapper.le(Func.isNotEmpty(priceBank.getDateValidityEnd()), PriceBank::getEndTime, priceBank.getDateValidityEnd());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()), PriceBank::getBillType, priceBank.getBillType());
+		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
+		List<PriceBank> pages = priceBankService.list(lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(pages)) {
+			String corpIds = "";
+			String goodsIds = "";
+			List<Long> goodsSpecification = new ArrayList<>();
+			for (PriceBank item : pages) {
+				corpIds = corpIds + item.getCorpId() + ",";
+				goodsIds = goodsIds + item.getItemId() + ",";
+				goodsSpecification.add(item.getItemId());
+			}
+			List<CorpsDesc> corpsDescList = new ArrayList<>();
+			if (ObjectUtils.isNotNull(corpIds)) {
+				corpsDescList =  corpsDescClient.selectByCorpIds(corpIds.substring(0, corpIds.length() - 1));
+			}
+			List<GoodsDesc> goodsList = new ArrayList<>();
+			if (ObjectUtils.isNotNull(goodsIds)) {
+				goodsList = goodsDescClient.selectItemsIdGoods(goodsIds.substring(0, corpIds.length() - 1));
+			}
+			List<GoodsSpecification> goodsSpecificationList = new ArrayList<>();
+			if (!goodsSpecification.isEmpty()){
+				goodsSpecificationList = goodsDescClient.goodsSpecificationLists(goodsSpecification);
+			}
+			for (PriceBank item : pages) {
+				if (ObjectUtils.isNotNull(item.getItemId()) && !goodsList.isEmpty()) {
+					//商品
+					GoodsDesc goodsDesc = goodsList.stream().filter(goods -> goods.getId().equals(item.getItemId())).findFirst().orElse(null);
+					if (goodsDesc != null) {
+						item.setCnameDescription(goodsDesc.getCnameDescription());
+					}
+				}
+				if (ObjectUtils.isNotNull(item.getItemId()) && !goodsSpecificationList.isEmpty()) {
+					List<GoodsSpecification> goodsSpecifications = goodsSpecificationList.stream().filter(e -> e.getPid().equals(item.getItemId())).collect(Collectors.toList());
+					List<GoodsSpecificationDto> goodsSpecificationDtoList = BeanUtil.copy(goodsSpecifications, GoodsSpecificationDto.class);
+					item.setGoodsSpecificationList(goodsSpecificationDtoList);
+				}
+				if (item.getCorpId() != null && !corpsDescList.isEmpty()) {
+					//客户
+					CorpsDesc corpsDesc = corpsDescList.stream().filter(corps -> corps.getId().equals(item.getCorpId())).findFirst().orElse(null);
+					if (corpsDesc != null) {
+						item.setCorpCode(corpsDesc.getCode());
+					}
+
+				}
+			}
+		}
+		return R.data(pages);
+	}
+
+	/**
 	 * 新增 出口价格库
 	 */
 	@PostMapping("/save")

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shopping/controller/ShoppingMallDetailController.java

@@ -282,8 +282,8 @@ public class ShoppingMallDetailController extends BladeController {
 					if (shoppingMallDetail != null) {
 						BeanUtil.copyProperties(shoppingMallDetail, item);
 						if (!shoppingMallDetailShareList.isEmpty()) {
-							BigDecimal inventory = shoppingMallDetailShareList.stream().map(ShoppingMallDetail::getInventory)
-								.reduce(BigDecimal.ZERO, BigDecimal::add);
+							BigDecimal inventory = shoppingMallDetailShareList.stream().filter(e -> e.getGoodsCode().equals(item.getGoodsCode()))
+								.map(ShoppingMallDetail::getInventory).reduce(BigDecimal.ZERO, BigDecimal::add);
 							item.setInventory(item.getInventory().add(inventory));
 						}
 					} else {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -339,16 +339,16 @@ public class StockDescController extends BladeController {
 		stockDesc.setSalesCompanyIds(AuthUtil.getDeptId());
 		if ("0".equals(stockDesc.getWhether())) {
 			IPage<PjStockDesc> pages = stockDescService.selectStockDescPage(Condition.getPage(query), stockDesc);
-			for (PjStockDesc item : pages.getRecords()){
-				if (ObjectUtils.isNotNull(item.getIntegral()) && new BigDecimal("0.00").compareTo(item.getIntegral()) == 0){
+			for (PjStockDesc item : pages.getRecords()) {
+				if (ObjectUtils.isNotNull(item.getIntegral()) && new BigDecimal("0.00").compareTo(item.getIntegral()) == 0) {
 					item.setIntegral(null);
 				}
 			}
 			return R.data(pages);
 		} else {
 			IPage<PjStockDesc> pages = stockDescService.selectStockDescPageZero(Condition.getPage(query), stockDesc);
-			for (PjStockDesc item : pages.getRecords()){
-				if (ObjectUtils.isNotNull(item.getIntegral()) && new BigDecimal("0.00").compareTo(item.getIntegral()) == 0){
+			for (PjStockDesc item : pages.getRecords()) {
+				if (ObjectUtils.isNotNull(item.getIntegral()) && new BigDecimal("0.00").compareTo(item.getIntegral()) == 0) {
 					item.setIntegral(null);
 				}
 			}
@@ -809,7 +809,9 @@ public class StockDescController extends BladeController {
 			.eq(ObjectUtils.isNotNull(stockDesc.getStorageId()), PjStockDesc::getStorageId, stockDesc.getStorageId())
 			.eq(PjStockDesc::getGoodsId, stockDesc.getGoodsId())
 			.eq(ObjectUtils.isNotNull(stockDesc.getDot()), PjStockDesc::getDot, stockDesc.getDot());
-
+		if ("1".equals(stockDesc.getWhether())) {
+			lambdaQueryWrapper.ne(PjStockDesc::getBalanceQuantity, 0);
+		}
 		List<PjStockDesc> list = stockDescService.list(lambdaQueryWrapper);
 		return R.data(list);
 	}
@@ -827,7 +829,9 @@ public class StockDescController extends BladeController {
 			.eq(PjStockDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
 			.eq(ObjectUtils.isNotNull(stockDesc.getStorageId()), PjStockDesc::getStorageId, stockDesc.getStorageId())
 			.eq(PjStockDesc::getGoodsId, stockDesc.getGoodsId());
-
+		if ("1".equals(stockDesc.getWhether())) {
+			lambdaQueryWrapper.ne(PjStockDesc::getBalanceQuantity, 0);
+		}
 		List<PjStockDesc> list = stockDescService.list(lambdaQueryWrapper);
 		return R.data(list);
 	}