Browse Source

添加mq启动配置

cxd 7 months ago
parent
commit
865f7aeba1

+ 12 - 0
module-erp/src/main/java/com/hys/app/mapper/goods/GoodsSnMapper.java

@@ -31,6 +31,18 @@ public interface GoodsSnMapper extends BaseMapperX<GoodsSnDO> {
 
 
 
+    /**
+     * 关联商品信息的分页查询
+     * by mzhu
+     */
+    List<GoodsSnDO> selectProductSnPage(@Param("request") GoodsSnQueryParams params);
+
+    /**
+     * 关联商品信息的分页总数
+     * by mzhu
+     */
+    Long selectProductSnPageCount(@Param("request") GoodsSnQueryParams params);
+
     /**
      * 查询商品关联的参数及参数值
      * @return

+ 2 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/GoodsSnQueryParams.java

@@ -26,6 +26,8 @@ public class GoodsSnQueryParams extends BaseQueryParam {
     @ApiModelProperty(name = "sku", value = "sku模糊查询")
     private String sku;
 
+    @ApiModelProperty(name = "name", value = "产品名称模糊查询")
+    private String name;
 
     private SnCodeStatusEnum status;
 

+ 28 - 7
module-erp/src/main/java/com/hys/app/service/erp/impl/GoodsSnManagerImpl.java

@@ -1,6 +1,7 @@
 package com.hys.app.service.erp.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -140,7 +141,10 @@ public class GoodsSnManagerImpl extends BaseServiceImpl<GoodsSnMapper, GoodsSnDO
     public Page<ProductVO> getSnProduct(GoodsSnQueryParams queryParams) {
         Page<ProductDO> page = productManager.page(new Page<>(queryParams.getPageNo(), queryParams.getPageSize()), new LambdaQueryWrapper<ProductDO>()
                 .eq(ProductDO::getHaveSn, true)
-                .like(StrUtil.isNotBlank(queryParams.getSku()), ProductDO::getSku, queryParams.getSku()));
+                .like(StrUtil.isNotBlank(queryParams.getSku()), ProductDO::getSku, queryParams.getSku())
+                //add by mzhu
+                .like(StrUtil.isNotBlank(queryParams.getName()), ProductDO::getName, queryParams.getName())
+        );
 
         Page<ProductVO> convert = productConverter.convert(page);
         for (ProductVO record : convert.getRecords()) {
@@ -189,13 +193,30 @@ public class GoodsSnManagerImpl extends BaseServiceImpl<GoodsSnMapper, GoodsSnDO
 
     @Override
     public WebPage<GoodsSnVO> list(GoodsSnQueryParams queryParams) {
-        WebPage<GoodsSnDO> webPage = baseMapper.selectPage(queryParams);
-        WebPage<GoodsSnVO> webPage1 = converter.convert(webPage);
-        for (GoodsSnVO goodsSnVO : webPage1.getData()) {
-            goodsSnVO.setGoodsVO(goodsManager.getById(goodsSnVO.getGoodsId()));
-            goodsSnVO.setProductVO(productManager.getById(goodsSnVO.getProductId()));
-        }
+//        WebPage<GoodsSnDO> webPage = baseMapper.selectPage(queryParams);
+//        WebPage<GoodsSnVO> webPage1 = converter.convert(webPage);
+//        for (GoodsSnVO goodsSnVO : webPage1.getData()) {
+//            goodsSnVO.setGoodsVO(goodsManager.getById(goodsSnVO.getGoodsId()));
+//            goodsSnVO.setProductVO(productManager.getById(goodsSnVO.getProductId()));
+//        }
+//
+//        return webPage1;
 
+        WebPage<GoodsSnVO> webPage1 = new WebPage<>();
+        List<GoodsSnDO> listGoodsSnDO = baseMapper.selectProductSnPage(queryParams);
+        if(CollectionUtil.isNotEmpty(listGoodsSnDO)) {
+            Long recordCount= baseMapper.selectProductSnPageCount(queryParams);
+            WebPage<GoodsSnDO> webPage=new WebPage<>();
+            webPage.setPageSize(queryParams.getPageSize());
+            webPage.setPageNo(queryParams.getPageNo());
+            webPage.setDataTotal(recordCount);
+            webPage.setData(listGoodsSnDO);
+            webPage1 = converter.convert(webPage);
+            for (GoodsSnVO goodsSnVO : webPage1.getData()) {
+                goodsSnVO.setGoodsVO(goodsManager.getById(goodsSnVO.getGoodsId()));
+                goodsSnVO.setProductVO(productManager.getById(goodsSnVO.getProductId()));
+            }
+        }
         return webPage1;
     }
 }

+ 58 - 1
module-erp/src/main/resources/mapper/goods/GoodsSnMapper.xml

@@ -33,5 +33,62 @@
 
     </select>
 
+    <select id="selectProductSnPage" resultType="com.hys.app.model.erp.dos.GoodsSnDO">
+        SELECT
+            gs.id,
+            gs.goods_id,
+            gs.product_id,
+            gs.sku,
+            gs.sn_code,
+            gs.STATUS,
+            gs.warehouse_id,
+            gs.entry_house_id,
+            gs.inventory_id,
+            gs.out_house_id
+        FROM
+            erp_goods_sn gs
+                INNER JOIN erp_product p ON gs.product_id = p.id
+        <where>
+            <if test="request.snCode != null and request.snCode != ''">
+                AND gs.sn_code LIKE CONCAT('%', #{request.snCode}, '%')
+            </if>
+            <if test="request.sku != null and request.sku != ''">
+                AND gs.sku LIKE CONCAT('%', #{request.sku}, '%')
+            </if>
+            <if test="request.name != null and request.name != ''">
+                AND p.name LIKE CONCAT('%', #{request.name}, '%')
+            </if>
+            <if test="request.status != null">
+                AND gs.status = #{request.status}
+            </if>
+        </where>
+        ORDER BY gs.id DESC
+        limit ${(request.pageNo- 1) * request.pageSize} , #{request.pageSize}
+    </select>
+
+
+    <select id="selectProductSnPageCount"   resultType="Long" useCache="false">
+        SELECT
+            count(1)
+        FROM
+        erp_goods_sn gs
+        INNER JOIN erp_product p ON gs.product_id = p.id
+        <where>
+            <if test="request.snCode != null and request.snCode != ''">
+                AND gs.sn_code LIKE CONCAT('%', #{request.snCode}, '%')
+            </if>
+            <if test="request.sku != null and request.sku != ''">
+                AND gs.sku LIKE CONCAT('%', #{request.sku}, '%')
+            </if>
+            <if test="request.name != null and request.name != ''">
+                AND p.name LIKE CONCAT('%', #{request.name}, '%')
+            </if>
+            <if test="request.status != null">
+                AND gs.status = #{request.status}
+            </if>
+        </where>
+    </select>
+
+
 
-</mapper>
+</mapper>