From 0b4221a457d7899809d3f733c2c64c977fb9553e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 09:46:52 +0800
Subject: [PATCH] 查询物料规格列表接口优化增加如果没有传参则查询所有产品的规格
---
src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java | 1 +
src/main/java/com/ruoyi/production/controller/ProductMaterialController.java | 3 +++
src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java | 18 ++++++++----------
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
index 2c27907..21eddbc 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
@@ -1,5 +1,8 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
index e29b78c..b3717ad 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
@@ -51,17 +51,15 @@
*/
@Override
public Page<ProductMaterialSkuDto> productMaterialSkuList(Page<ProductMaterialSku> page, ProductMaterialSkuDto dto) {
- if (dto == null || dto.getMaterialId() == null) {
- return new Page<>();
- }
LambdaQueryWrapper<ProductMaterialSku> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ProductMaterialSku::getMaterialId, dto.getMaterialId())
- .like(StringUtils.isNotBlank(dto.getSpecification()),
- ProductMaterialSku::getSpecification, dto.getSpecification())
- .like(StringUtils.isNotBlank(dto.getMaterialCode()),
- ProductMaterialSku::getMaterialCode, dto.getMaterialCode())
- .orderByAsc(ProductMaterialSku::getId);
-
+ if (dto != null && dto.getMaterialId() != null) {
+ queryWrapper.eq(ProductMaterialSku::getMaterialId, dto.getMaterialId())
+ .like(StringUtils.isNotBlank(dto.getSpecification()),
+ ProductMaterialSku::getSpecification, dto.getSpecification())
+ .like(StringUtils.isNotBlank(dto.getMaterialCode()),
+ ProductMaterialSku::getMaterialCode, dto.getMaterialCode())
+ .orderByAsc(ProductMaterialSku::getId);
+ }
Page<ProductMaterialSku> skuPage = this.page(page, queryWrapper);
List<ProductMaterialSku> skuList = skuPage.getRecords();
if (skuList == null || skuList.isEmpty()) {
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java
index 3b15f5d..af70f54 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java
@@ -32,6 +32,7 @@
private Integer id;
@ApiModelProperty("浜у搧ID")
+ //瀹佸-涓洓寤烘潗浣跨敤鏂扮殑浜у搧琛ㄥ叧鑱攑roduct_material_sku
private Long productId;
@ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
--
Gitblit v1.9.3