Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,6 @@
 package com.fjhx.victoriatourist.controller.jd;
 
+import com.ruoyi.common.annotation.NonInterception;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
@@ -7,6 +8,8 @@ import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityWaitSelectDto;
 import com.fjhx.victoriatourist.service.jd.JdBackQualityWaitService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import javax.servlet.http.HttpServletResponse;
+
 
 /**
  * <p>
@@ -31,4 +34,12 @@ public class JdBackQualityWaitController {
         return jdBackQualityWaitService.getPage(dto);
     }
 
+    /**
+     * 京东退货待质检分页
+     */
+    @GetMapping("/exportExcel")
+    public void exportExcel(HttpServletResponse httpServletResponse) {
+        jdBackQualityWaitService.exportExcel(httpServletResponse);
+    }
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/bo/JdBackQualityWaitExcelBo.java

@@ -0,0 +1,79 @@
+package com.fjhx.victoriatourist.entity.jd.bo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class JdBackQualityWaitExcelBo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 京东待质检id
+     */
+    @ColumnWidth(15)
+    @ExcelProperty("京东待质检id")
+    private Long id;
+
+    /**
+     * 产品id
+     */
+    @ExcelProperty("产品id")
+    private Long productId;
+
+    /**
+     * 待质检数量
+     */
+    @ExcelProperty("待质检数量")
+    private BigDecimal quantity;
+
+    /**
+     * 产品编号
+     */
+    @ExcelProperty("产品编号")
+    private String productCode;
+
+    /**
+     * 产品类型
+     */
+    @ExcelProperty("产品类型")
+    private String productType;
+
+    /**
+     * 产品名称
+     */
+    @ExcelProperty("产品名称")
+    private String productName;
+
+    /**
+     * 产品规格
+     */
+    @ExcelProperty("产品规格")
+    private String productSpec;
+
+    /**
+     * 产品单位
+     */
+    @ExcelProperty("产品单位")
+    private String productUnit;
+
+    @ExcelProperty("质检合格数量")
+    private BigDecimal qualifiedQuantity;
+
+    @ExcelProperty("质检不合格数量")
+    private BigDecimal disqualificationQuantity;
+
+}

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

@@ -1,10 +1,12 @@
 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;
+import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityWait;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
+import com.ruoyi.common.core.service.BaseService;
+
+import javax.servlet.http.HttpServletResponse;
 
 
 /**
@@ -12,7 +14,7 @@ import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityWaitSelectDto;
  * 京东退货待质检 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 public interface JdBackQualityWaitService extends BaseService<JdBackQualityWait> {
@@ -22,4 +24,8 @@ public interface JdBackQualityWaitService extends BaseService<JdBackQualityWait>
      */
     Page<JdBackQualityWaitVo> getPage(JdBackQualityWaitSelectDto dto);
 
+    /**
+     * 导出excel
+     */
+    void exportExcel(HttpServletResponse httpServletResponse);
 }

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

@@ -1,17 +1,25 @@
 package com.fjhx.victoriatourist.service.jd.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.EasyExcel;
+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.item.util.excel.util.ExcelUtil;
+import com.fjhx.victoriatourist.entity.jd.bo.JdBackQualityWaitExcelBo;
+import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityWaitSelectDto;
 import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityWait;
-import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityDetailsVo;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
 import com.fjhx.victoriatourist.mapper.jd.JdBackQualityWaitMapper;
 import com.fjhx.victoriatourist.service.jd.JdBackQualityWaitService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import lombok.SneakyThrows;
 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;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileOutputStream;
+import java.util.List;
 
 
 /**
@@ -43,4 +51,24 @@ public class JdBackQualityWaitServiceImpl extends ServiceImpl<JdBackQualityWaitM
         return page;
     }
 
+    @SneakyThrows
+    @Override
+    public void exportExcel(HttpServletResponse httpServletResponse){
+        List<JdBackQualityWait> list = list();
+        List<JdBackQualityWaitExcelBo> jdBackQualityWaitVos = BeanUtil.copyToList(list, JdBackQualityWaitExcelBo.class);
+        //赋值产品信息
+        productInfoService.attributeAssign(jdBackQualityWaitVos, JdBackQualityWaitExcelBo::getProductId, (item, productinfo) -> {
+            item.setProductType(productinfo.getType());
+            item.setProductCode(productinfo.getCode());
+            item.setProductName(productinfo.getName());
+            item.setProductSpec(productinfo.getSpec());
+            item.setProductUnit(productinfo.getUnit());
+        });
+        //导出Excel
+        ExcelUtil.export(httpServletResponse, "aaaaa","sheet1",jdBackQualityWaitVos, JdBackQualityWaitExcelBo.class);
+
+
+//        EasyExcel.write(new FileOutputStream("C:\\Users\\ASUS\\Downloads\\sdsd.xlsx"),  JdBackQualityWaitExcelBo.class).sheet("sheetName").doWrite(jdBackQualityWaitVos);
+    }
+
 }

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

@@ -51,6 +51,7 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
             String[] split = dto.getType().split(",");
             wrapper.in("sj", StockJournal::getType, split);
         }
+        wrapper.eq("sj", StockJournal::getOpType, dto.getOpType());
         wrapper.like("w", WarehouseVo::getName, dto.getKeyword());
         Page<StockJournalVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockJournalVo> records = page.getRecords();

hx-wms/src/main/resources/mapper/stock/StockJournalMapper.xml

@@ -5,6 +5,7 @@
         SELECT
             sj.id,
             sj.type,
+            sj.op_type,
             sj.code,
             sj.warehouse_id,
             w.NAME warehouseName,