From 28f2ef99da07d32c510ddc0b9c696ed779c9ee44 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 14 Feb 2025 12:48:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/erpspu/SmErpSpuSimpleVo.java           | 20 +++++++++++++++++++
 .../controller/SmErpSpuController.java        | 15 ++++++++++++++
 .../supermarket/service/SmErpSpuService.java  |  9 +++++++++
 .../service/impl/SmErpSpuServiceImpl.java     |  6 ++++++
 4 files changed, 50 insertions(+)
 create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erpspu/SmErpSpuSimpleVo.java

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erpspu/SmErpSpuSimpleVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erpspu/SmErpSpuSimpleVo.java
new file mode 100644
index 000000000..e32fa4075
--- /dev/null
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erpspu/SmErpSpuSimpleVo.java
@@ -0,0 +1,20 @@
+package com.bsd.pjcloud.supermarket.vo.erpspu;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class SmErpSpuSimpleVo {
+
+
+    @Schema(description = "id")
+    private Long id;
+
+
+    @Schema(description = "商品名称")
+    private String productName;
+
+    @Schema(description = "货号")
+    private String productCode;
+}
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java
index 17a5b11c5..baf1c2c08 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java
@@ -19,6 +19,7 @@ import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity;
 import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity;
 import com.bsd.pjcloud.supermarket.service.*;
 import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo;
+import com.bsd.pjcloud.supermarket.vo.erpspu.SmErpSpuSimpleVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
@@ -172,6 +173,20 @@ public class SmErpSpuController {
 
 
 
+    @Operation(summary = "简要查询" , description = "根据商品名称或者或者查询商品简要信息" )
+    @GetMapping("/SimpleAll" )
+    public R getSupermarketSpuSimpleAll(@RequestParam(value = "productName",required = false)String productName,
+                                        @RequestParam(value = "productCode",required = false)String productCode) {
+        LambdaQueryWrapper<SmErpSpuEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(StringUtils.isNotBlank(productCode), SmErpSpuEntity::getProductCode,productCode);
+        wrapper.eq(StringUtils.isNotBlank(productName), SmErpSpuEntity::getProductName,productName);
+        List<SmErpSpuEntity> smErpSpuEntities=smErpSpuService.ListScope(wrapper);
+        List<SmErpSpuSimpleVo> bean = BeanUtils.toBean(smErpSpuEntities, SmErpSpuSimpleVo.class);
+        return R.ok(bean);
+    }
+
+
+
 //    --------APP-----------------
 
 
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java
index 77696949a..286c7c893 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java
@@ -12,6 +12,7 @@ import com.bsd.pjcloud.supermarket.vo.cgplan.ErpSpuWithUnitPageVo;
 import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public interface SmErpSpuService extends IService<SmErpSpuEntity> {
 
@@ -76,4 +77,12 @@ public interface SmErpSpuService extends IService<SmErpSpuEntity> {
 
 
     Page<ErpSpuWithUnitPageVo> getErpSpuPage(Page page, ErpCgPlanDTO erpCgPlanDTO);
+
+
+    /**
+     * 条件查询
+     * @param wrapper
+     * @return
+     */
+    List<SmErpSpuEntity> ListScope(LambdaQueryWrapper<SmErpSpuEntity> wrapper);
 }
\ No newline at end of file
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
index 9fb96fb53..00edac29d 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
@@ -248,4 +248,10 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
         resultPage.setRecords(voList);
         return resultPage;
     }
+
+    @Override
+    public List<SmErpSpuEntity> ListScope(LambdaQueryWrapper<SmErpSpuEntity> wrapper) {
+        List<SmErpSpuEntity> smErpSpuEntities = baseMapper.selectListByScope(wrapper, DataScope.of());
+        return smErpSpuEntities;
+    }
 }
\ No newline at end of file