京东退货质检维多利亚

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/jd/JdBackQualityDetailsController.java

@@ -0,0 +1,70 @@
+package com.fjhx.victoriatourist.controller.jd;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityDetailsVo;
+import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityDetailsSelectDto;
+import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityDetailsDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.victoriatourist.service.jd.JdBackQualityDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 京东退货质检明细 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+@RestController
+@RequestMapping("/jdBackQualityDetails")
+public class JdBackQualityDetailsController {
+
+    @Autowired
+    private JdBackQualityDetailsService jdBackQualityDetailsService;
+
+    /**
+     * 京东退货质检明细分页
+     */
+    @PostMapping("/page")
+    public Page<JdBackQualityDetailsVo> page(@RequestBody JdBackQualityDetailsSelectDto dto) {
+        return jdBackQualityDetailsService.getPage(dto);
+    }
+
+    /**
+     * 京东退货质检明细明细
+     */
+    @PostMapping("/detail")
+    public List<JdBackQualityDetailsVo> detail(@RequestBody JdBackQualityDetailsSelectDto dto) {
+        return jdBackQualityDetailsService.detail(dto.getCode());
+    }
+
+    /**
+     * 京东退货质检明细新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody List<JdBackQualityDetailsDto> jdBackQualityDetailsDtoList) {
+        jdBackQualityDetailsService.add(jdBackQualityDetailsDtoList);
+    }
+
+    /**
+     * 京东退货质检明细编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody JdBackQualityDetailsDto jdBackQualityDetailsDto) {
+        jdBackQualityDetailsService.edit(jdBackQualityDetailsDto);
+    }
+
+    /**
+     * 京东退货质检明细删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        jdBackQualityDetailsService.delete(dto.getId());
+    }
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/jd/JdBackQualityWaitController.java

@@ -1,6 +1,11 @@
 package com.fjhx.victoriatourist.controller.jd;
 
 import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
+import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityWaitSelectDto;
+import com.fjhx.victoriatourist.service.jd.JdBackQualityWaitService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 
 /**
@@ -9,11 +14,21 @@ import org.springframework.web.bind.annotation.*;
  * </p>
  *
  * @author 
- * @since 2023-04-18
+ * @since 2023-04-19
  */
 @RestController
 @RequestMapping("/jdBackQualityWait")
 public class JdBackQualityWaitController {
 
+    @Autowired
+    private JdBackQualityWaitService jdBackQualityWaitService;
+
+    /**
+     * 京东退货待质检分页
+     */
+    @PostMapping("/page")
+    public Page<JdBackQualityWaitVo> page(@RequestBody JdBackQualityWaitSelectDto dto) {
+        return jdBackQualityWaitService.getPage(dto);
+    }
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/dto/JdBackQualityDetailsDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.jd.dto;
+
+import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 京东退货质检明细新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+@Getter
+@Setter
+public class JdBackQualityDetailsDto extends JdBackQualityDetails {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/dto/JdBackQualityDetailsSelectDto.java

@@ -0,0 +1,22 @@
+package com.fjhx.victoriatourist.entity.jd.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 京东退货质检明细列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+@Getter
+@Setter
+public class JdBackQualityDetailsSelectDto extends BaseSelectDto {
+
+    /***
+     * 质检当号
+     */
+    private String code;
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/po/JdBackQualityDetails.java

@@ -0,0 +1,44 @@
+package com.fjhx.victoriatourist.entity.jd.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 京东退货质检明细
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+@Getter
+@Setter
+@TableName("jd_back_quality_details")
+public class JdBackQualityDetails extends BasePo {
+
+    /**
+     * 质检单号
+     */
+    private String code;
+
+    /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
+     * 质检合格数量
+     */
+    private BigDecimal qualifiedQuantity;
+
+    /**
+     * 不合格数量
+     */
+    private BigDecimal disqualificationQuantity;
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/vo/JdBackQualityDetailsVo.java

@@ -0,0 +1,41 @@
+package com.fjhx.victoriatourist.entity.jd.vo;
+
+import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 京东退货质检明细列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-19
+ */
+@Getter
+@Setter
+public class JdBackQualityDetailsVo extends JdBackQualityDetails {
+
+    /**
+     * 产品编号
+     */
+    private String productCode;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 产品规格
+     */
+    private String productSpec;
+
+    /**
+     * 产品单位
+     */
+    private String productUnit;
+
+    /**
+     * 质检人名称*/
+    private String qualityUserName;
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/vo/JdBackQualityWaitVo.java

@@ -14,4 +14,29 @@ import lombok.Setter;
 @Setter
 public class JdBackQualityWaitVo extends JdBackQualityWait {
 
+    /**
+     * 产品编号
+     */
+    private String productCode;
+
+    /**
+     * 产品类型
+     */
+    private Integer productType;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 产品规格
+     */
+    private String productSpec;
+
+    /**
+     * 产品单位
+     */
+    private String productUnit;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/jd/JdBackQualityDetailsMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.victoriatourist.mapper.jd;
+
+import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityDetailsVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 京东退货质检明细 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+public interface JdBackQualityDetailsMapper extends BaseMapper<JdBackQualityDetails> {
+
+    /**
+     * 京东退货质检明细分页
+     */
+    Page<JdBackQualityDetailsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<JdBackQualityDetails> wrapper);
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/jd/JdBackQualityWaitMapper.java

@@ -2,6 +2,10 @@ package com.fjhx.victoriatourist.mapper.jd;
 
 import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityWait;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -10,8 +14,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author 
- * @since 2023-04-18
+ * @since 2023-04-19
  */
 public interface JdBackQualityWaitMapper extends BaseMapper<JdBackQualityWait> {
 
+    /**
+     * 京东退货待质检分页
+     */
+    Page<JdBackQualityWaitVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<JdBackQualityWait> wrapper);
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/JdBackQualityDetailsService.java

@@ -0,0 +1,48 @@
+package com.fjhx.victoriatourist.service.jd;
+
+import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityDetails;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityDetailsVo;
+import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityDetailsSelectDto;
+import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityDetailsDto;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 京东退货质检明细 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+public interface JdBackQualityDetailsService extends BaseService<JdBackQualityDetails> {
+
+    /**
+     * 京东退货质检明细分页
+     */
+    Page<JdBackQualityDetailsVo> getPage(JdBackQualityDetailsSelectDto dto);
+
+    /**
+     * 京东退货质检明细明细
+     */
+    List<JdBackQualityDetailsVo> detail(String code);
+
+    /**
+     * 京东退货质检明细新增
+     */
+    void add(List<JdBackQualityDetailsDto> jdBackQualityDetailsDtoList);
+
+    /**
+     * 京东退货质检明细编辑
+     */
+    void edit(JdBackQualityDetailsDto jdBackQualityDetailsDto);
+
+    /**
+     * 京东退货质检明细删除
+     */
+    void delete(Long id);
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/JdBackQualityWaitService.java

@@ -2,6 +2,9 @@ package com.fjhx.victoriatourist.service.jd;
 
 import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityWait;
 import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
+import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityWaitSelectDto;
 
 
 /**
@@ -10,8 +13,13 @@ import com.ruoyi.common.core.service.BaseService;
  * </p>
  *
  * @author 
- * @since 2023-04-18
+ * @since 2023-04-19
  */
 public interface JdBackQualityWaitService extends BaseService<JdBackQualityWait> {
 
+    /**
+     * 京东退货待质检分页
+     */
+    Page<JdBackQualityWaitVo> getPage(JdBackQualityWaitSelectDto dto);
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdBackQualityDetailsServiceImpl.java

@@ -0,0 +1,117 @@
+package com.fjhx.victoriatourist.service.jd.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityDetailsDto;
+import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityDetailsSelectDto;
+import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityDetails;
+import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityWait;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityDetailsVo;
+import com.fjhx.victoriatourist.mapper.jd.JdBackQualityDetailsMapper;
+import com.fjhx.victoriatourist.service.jd.JdBackQualityDetailsService;
+import com.fjhx.victoriatourist.service.jd.JdBackQualityWaitService;
+import com.fjhx.victoriatourist.utils.CodeEnum;
+import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.utils.UserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 京东退货质检明细 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-19
+ */
+@Service
+public class JdBackQualityDetailsServiceImpl extends ServiceImpl<JdBackQualityDetailsMapper, JdBackQualityDetails> implements JdBackQualityDetailsService {
+    @Autowired
+    private ProductInfoService productInfoService;
+    @Autowired
+    private JdBackQualityWaitService jdBackQualityWaitService;
+
+    @Override
+    public Page<JdBackQualityDetailsVo> getPage(JdBackQualityDetailsSelectDto dto) {
+        IWrapper<JdBackQualityDetails> wrapper = getWrapper();
+        wrapper.orderByDesc("jbqd", JdBackQualityDetails::getId);
+        Page<JdBackQualityDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<JdBackQualityDetailsVo> records = page.getRecords();
+        //赋值产品信息
+        productInfoService.attributeAssign(records, JdBackQualityDetailsVo::getProductId, (item, productinfo) -> {
+            item.setProductCode(productinfo.getCode());
+            item.setProductName(productinfo.getName());
+            item.setProductSpec(productinfo.getSpec());
+            item.setProductUnit(productinfo.getUnit());
+        });
+        //赋值质检人名字
+        UserUtil.assignmentNickName(records, JdBackQualityDetailsVo::getCreateUser, JdBackQualityDetailsVo::setQualityUserName);
+        return page;
+    }
+
+    @Override
+    public List<JdBackQualityDetailsVo> detail(String code) {
+        List<JdBackQualityDetails> list = list(q -> q.eq(JdBackQualityDetails::getCode, code));
+        List<JdBackQualityDetailsVo> result = BeanUtil.copyToList(list, JdBackQualityDetailsVo.class);
+        //赋值产品信息
+        productInfoService.attributeAssign(result, JdBackQualityDetailsVo::getProductId, (item, productinfo) -> {
+            item.setProductCode(productinfo.getCode());
+            item.setProductName(productinfo.getName());
+            item.setProductSpec(productinfo.getSpec());
+            item.setProductUnit(productinfo.getUnit());
+        });
+        //赋值质检人名字
+        UserUtil.assignmentNickName(result, JdBackQualityDetailsVo::getCreateUser, JdBackQualityDetailsVo::setQualityUserName);
+        return result;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(List<JdBackQualityDetailsDto> jdBackQualityDetailsDtoList) {
+        if(ObjectUtil.isEmpty(jdBackQualityDetailsDtoList)){
+            throw new ServiceException("质检列表不能为空");
+        }
+        String code = CodeEnum.JD_BACK_QUALITY.getCode();
+        List<JdBackQualityDetails> jdBackQualityDetailsList = BeanUtil.copyToList(jdBackQualityDetailsDtoList, JdBackQualityDetails.class);
+        //获取质检产品id列表
+        List<Long> productIds = jdBackQualityDetailsList.stream().map(JdBackQualityDetails::getProductId).collect(Collectors.toList());
+        List<JdBackQualityWait> jdBackQualityWaitList = jdBackQualityWaitService.list(q -> q.in(JdBackQualityWait::getProductId, productIds));
+        Map<Long, JdBackQualityWait> jdBackQualityWaitMap = jdBackQualityWaitList.stream().collect(Collectors.toMap(JdBackQualityWait::getProductId, Function.identity()));
+
+        for (JdBackQualityDetails jdBackQualityDetailsDto : jdBackQualityDetailsList) {
+            jdBackQualityDetailsDto.setCode(code);
+            //减少待质检数量
+            BigDecimal quality = jdBackQualityDetailsDto.getQualifiedQuantity().add(jdBackQualityDetailsDto.getDisqualificationQuantity());
+            JdBackQualityWait jdBackQualityWait = jdBackQualityWaitMap.get(jdBackQualityDetailsDto.getProductId());
+//            BigDecimal oldQuantity = jdBackQualityWait.getQuantity();
+//            jdBackQualityWait.setQuantity(oldQuantity.subtract(quality));
+            jdBackQualityWaitService.update(q -> q
+                    .eq(JdBackQualityWait::getId, jdBackQualityWait.getId())
+                    .setSql("quantity = quantity - " + quality));
+        }
+        saveBatch(jdBackQualityDetailsList);
+    }
+
+    @Override
+    public void edit(JdBackQualityDetailsDto jdBackQualityDetailsDto) {
+        this.updateById(jdBackQualityDetailsDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdBackQualityWaitServiceImpl.java

@@ -1,10 +1,17 @@
 package com.fjhx.victoriatourist.service.jd.impl;
 
+import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityWait;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityDetailsVo;
 import com.fjhx.victoriatourist.mapper.jd.JdBackQualityWaitMapper;
 import com.fjhx.victoriatourist.service.jd.JdBackQualityWaitService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
+import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityWaitSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 
 
 /**
@@ -13,9 +20,27 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author 
- * @since 2023-04-18
+ * @since 2023-04-19
  */
 @Service
 public class JdBackQualityWaitServiceImpl extends ServiceImpl<JdBackQualityWaitMapper, JdBackQualityWait> implements JdBackQualityWaitService {
+    @Autowired
+    private ProductInfoService productInfoService;
+
+    @Override
+    public Page<JdBackQualityWaitVo> getPage(JdBackQualityWaitSelectDto dto) {
+        IWrapper<JdBackQualityWait> wrapper = getWrapper();
+        wrapper.orderByDesc("jbqw", JdBackQualityWait::getId);
+        Page<JdBackQualityWaitVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        //赋值产品信息
+        productInfoService.attributeAssign(page.getRecords(), JdBackQualityWaitVo::getProductId, (item, productinfo) -> {
+            item.setProductType(productinfo.getType());
+            item.setProductCode(productinfo.getCode());
+            item.setProductName(productinfo.getName());
+            item.setProductSpec(productinfo.getSpec());
+            item.setProductUnit(productinfo.getUnit());
+        });
+        return page;
+    }
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdBackServiceImpl.java

@@ -52,17 +52,17 @@ import java.util.stream.Collectors;
 @Service
 public class JdBackServiceImpl extends ServiceImpl<JdBackMapper, JdBack> implements JdBackService {
     @Autowired
-    WarehouseService warehouseService;
+    private WarehouseService warehouseService;
     @Autowired
-    CompanyInfoService companyInfoService;
+    private CompanyInfoService companyInfoService;
     @Autowired
-    LogisticsInfosService logisticsInfosService;
+    private LogisticsInfosService logisticsInfosService;
     @Autowired
-    JdBackDetailsService jdBackDetailsService;
+    private JdBackDetailsService jdBackDetailsService;
     @Autowired
-    ProductInfoService productInfoService;
+    private ProductInfoService productInfoService;
     @Autowired
-    JdBackQualityWaitService jdBackQualityWaitService;
+    private JdBackQualityWaitService jdBackQualityWaitService;
 
     @Override
     public Page<JdBackVo> getPage(JdBackSelectDto dto) {
@@ -141,7 +141,7 @@ public class JdBackServiceImpl extends ServiceImpl<JdBackMapper, JdBack> impleme
             jdBackDetailsService.saveBatch(jdBackDetailsList);
         }
         //创建待质检记录
-        createJdBackQualityWait(jdBackDetailsList);
+//        createJdBackQualityWait(jdBackDetailsList);
     }
 
     /**
@@ -210,7 +210,7 @@ public class JdBackServiceImpl extends ServiceImpl<JdBackMapper, JdBack> impleme
                 //处理更新部分
                 jdBackQualityWaitService.update(q -> q
                         .eq(JdBackQualityWait::getId, oldJdBackQualityWait.getId())
-                        .setSql("quantity = " + oldQuantity));
+                        .setSql("quantity = quantity + " + entry.getValue()));
             }
             //统一处理添加部分
             jdBackQualityWaitService.saveBatch(addJdBackQualityWaitList);

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/utils/CodeEnum.java

@@ -21,6 +21,8 @@ public enum CodeEnum {
     STOCK_TRANSFER("SM", "yyMM-", "code", 3, StockTransferService.class),
     // 销售订单
     ORDER_SALES("SO", null, "code", 5, OrderInfoService.class),
+    //京东退货质检
+    JD_BACK_QUALITY("PA", "yyMM-", "code", 3, StockTransferService.class),
     ;
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {

hx-victoriatourist/src/main/resources/mapper/jd/JdBackQualityDetailsMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.victoriatourist.mapper.jd.JdBackQualityDetailsMapper">
+    <select id="getPage" resultType="com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityDetailsVo">
+        select
+            jbqd.id,
+            jbqd.code,
+            jbqd.product_id,
+            jbqd.qualified_quantity,
+            jbqd.disqualification_quantity,
+            jbqd.create_user,
+            jbqd.create_time,
+            jbqd.update_user,
+            jbqd.update_time
+        from jd_back_quality_details jbqd
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-victoriatourist/src/main/resources/mapper/jd/JdBackQualityWaitMapper.xml

@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.victoriatourist.mapper.jd.JdBackQualityWaitMapper">
+    <select id="getPage" resultType="com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo">
+        select
+            jbqw.id,
+            jbqw.product_id,
+            jbqw.quantity,
+            jbqw.create_user,
+            jbqw.create_time,
+            jbqw.update_user,
+            jbqw.update_time
+        from jd_back_quality_wait jbqw
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockSelectDto.java

@@ -4,6 +4,8 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 库存列表查询入参实体
  *
@@ -14,4 +16,9 @@ import lombok.Setter;
 @Setter
 public class StockSelectDto extends BaseSelectDto {
 
+    /**
+     * 根据产品id列表过滤
+     */
+    private List<Long> productIds;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -62,6 +62,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         wrapper.orderByDesc("s", Stock::getId);
         wrapper.eq(Stock::getWarehouseId, dto.getId());
         wrapper.like(Stock::getQuantity, dto.getKeyword());
+        wrapper.in(Stock::getProductId,dto.getProductIds());
 
         Page<StockVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockVo> stockVos = page.getRecords();