Merge remote-tracking branch 'origin/master'

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/quality/QualityDetailsController.java

@@ -0,0 +1,19 @@
+package com.fjhx.victoriatourist.controller.quality;
+
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * <p>
+ * 质检明细 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@RestController
+@RequestMapping("/qualityDetails")
+public class QualityDetailsController {
+
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/quality/QualityInfoController.java

@@ -0,0 +1,68 @@
+package com.fjhx.victoriatourist.controller.quality;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.quality.vo.QualityInfoVo;
+import com.fjhx.victoriatourist.entity.quality.dto.QualityInfoSelectDto;
+import com.fjhx.victoriatourist.entity.quality.dto.QualityInfoDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.victoriatourist.service.quality.QualityInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 质检 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@RestController
+@RequestMapping("/qualityInfo")
+public class QualityInfoController {
+
+    @Autowired
+    private QualityInfoService qualityInfoService;
+
+    /**
+     * 质检分页
+     */
+    @PostMapping("/page")
+    public Page<QualityInfoVo> page(@RequestBody QualityInfoSelectDto dto) {
+        return qualityInfoService.getPage(dto);
+    }
+
+    /**
+     * 质检明细
+     */
+    @PostMapping("/detail")
+    public QualityInfoVo detail(@RequestBody BaseSelectDto dto) {
+        return qualityInfoService.detail(dto.getId());
+    }
+
+    /**
+     * 质检新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody QualityInfoDto qualityInfoDto) {
+        qualityInfoService.add(qualityInfoDto);
+    }
+
+    /**
+     * 质检编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody QualityInfoDto qualityInfoDto) {
+        qualityInfoService.edit(qualityInfoDto);
+    }
+
+    /**
+     * 质检删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        qualityInfoService.delete(dto.getId());
+    }
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/quality/dto/QualityDetailsDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.quality.dto;
+
+import com.fjhx.victoriatourist.entity.quality.po.QualityDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 质检明细新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@Getter
+@Setter
+public class QualityDetailsDto extends QualityDetails {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/quality/dto/QualityDetailsSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.quality.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 质检明细列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@Getter
+@Setter
+public class QualityDetailsSelectDto extends BaseSelectDto {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/quality/dto/QualityInfoDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.quality.dto;
+
+import com.fjhx.victoriatourist.entity.quality.po.QualityInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 质检新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@Getter
+@Setter
+public class QualityInfoDto extends QualityInfo {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/quality/dto/QualityInfoSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.quality.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 质检列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@Getter
+@Setter
+public class QualityInfoSelectDto extends BaseSelectDto {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/quality/po/QualityDetails.java

@@ -0,0 +1,48 @@
+package com.fjhx.victoriatourist.entity.quality.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-26
+ */
+@Getter
+@Setter
+@TableName("quality_details")
+public class QualityDetails extends BasePo {
+
+    /**
+     * 质检id
+     */
+    private Long qualityInfoId;
+
+    /**
+     * 产品id
+     */
+    private Long productInfoId;
+
+    /**
+     * 需要质检数量
+     */
+    private BigDecimal totalQuantity;
+
+    /**
+     * 合格数量
+     */
+    private BigDecimal qualifiedQuantity;
+
+    /**
+     * 不合格数量
+     */
+    private BigDecimal disqualificationQuantity;
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/quality/po/QualityInfo.java

@@ -0,0 +1,67 @@
+package com.fjhx.victoriatourist.entity.quality.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 质检
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@Getter
+@Setter
+@TableName("quality_info")
+public class QualityInfo extends BasePo {
+
+    /**
+     * 1采购到货质检 2京东退货质检
+     */
+    private Integer type;
+
+    /**
+     * 质检单号
+     */
+    private String code;
+
+    /**
+     * 业务id(采购待入库id)
+     */
+    private Long bussinessId;
+
+    /**
+     * 业务编码
+     */
+    private String bussinessCode;
+
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
+
+    /**
+     * 采购单id
+     */
+    private Long purchaseId;
+
+    /**
+     * 采购单号
+     */
+    private String purchaseCode;
+
+    /**
+     * 状态 1未质检 2部分质检 3已质检
+     */
+    private Integer status;
+
+    /**
+     * 质检结果 1合格 0不合格
+     */
+    private Integer resultType;
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/quality/vo/QualityDetailsVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.quality.vo;
+
+import com.fjhx.victoriatourist.entity.quality.po.QualityDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 质检明细列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@Getter
+@Setter
+public class QualityDetailsVo extends QualityDetails {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/quality/vo/QualityInfoVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.quality.vo;
+
+import com.fjhx.victoriatourist.entity.quality.po.QualityInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 质检列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@Getter
+@Setter
+public class QualityInfoVo extends QualityInfo {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/quality/QualityDetailsMapper.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.mapper.quality;
+
+import com.fjhx.victoriatourist.entity.quality.po.QualityDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * <p>
+ * 质检明细 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+public interface QualityDetailsMapper extends BaseMapper<QualityDetails> {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/quality/QualityInfoMapper.java

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

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

@@ -274,6 +274,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         //创建京东订单调仓
         StockTransfer stockTransfer = new StockTransfer();
         stockTransfer.setType(2);//京东订单出库
+        stockTransfer.setCode(CodeEnum.STOCK_TRANSFER.getCode());
         stockTransfer.setBusinessId(jdOrder.getId());
         stockTransfer.setBusinessCode(jdOrder.getCode());
         stockTransfer.setInWarehouseId(jdOrderDto.getInWarehouseId());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/QualityDetailsService.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.service.quality;
+
+import com.fjhx.victoriatourist.entity.quality.po.QualityDetails;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 质检明细 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+public interface QualityDetailsService extends BaseService<QualityDetails> {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/QualityInfoService.java

@@ -0,0 +1,46 @@
+package com.fjhx.victoriatourist.service.quality;
+
+import com.fjhx.victoriatourist.entity.quality.po.QualityInfo;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.quality.vo.QualityInfoVo;
+import com.fjhx.victoriatourist.entity.quality.dto.QualityInfoSelectDto;
+import com.fjhx.victoriatourist.entity.quality.dto.QualityInfoDto;
+
+
+/**
+ * <p>
+ * 质检 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+public interface QualityInfoService extends BaseService<QualityInfo> {
+
+    /**
+     * 质检分页
+     */
+    Page<QualityInfoVo> getPage(QualityInfoSelectDto dto);
+
+    /**
+     * 质检明细
+     */
+    QualityInfoVo detail(Long id);
+
+    /**
+     * 质检新增
+     */
+    void add(QualityInfoDto qualityInfoDto);
+
+    /**
+     * 质检编辑
+     */
+    void edit(QualityInfoDto qualityInfoDto);
+
+    /**
+     * 质检删除
+     */
+    void delete(Long id);
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityDetailsServiceImpl.java

@@ -0,0 +1,21 @@
+package com.fjhx.victoriatourist.service.quality.impl;
+
+import com.fjhx.victoriatourist.entity.quality.po.QualityDetails;
+import com.fjhx.victoriatourist.mapper.quality.QualityDetailsMapper;
+import com.fjhx.victoriatourist.service.quality.QualityDetailsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 质检明细 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@Service
+public class QualityDetailsServiceImpl extends ServiceImpl<QualityDetailsMapper, QualityDetails> implements QualityDetailsService {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityInfoServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.victoriatourist.service.quality.impl;
+
+import com.fjhx.victoriatourist.entity.quality.po.QualityInfo;
+import com.fjhx.victoriatourist.mapper.quality.QualityInfoMapper;
+import com.fjhx.victoriatourist.service.quality.QualityInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.quality.vo.QualityInfoVo;
+import com.fjhx.victoriatourist.entity.quality.dto.QualityInfoSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.victoriatourist.entity.quality.dto.QualityInfoDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 质检 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@Service
+public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, QualityInfo> implements QualityInfoService {
+
+    @Override
+    public Page<QualityInfoVo> getPage(QualityInfoSelectDto dto) {
+        IWrapper<QualityInfo> wrapper = getWrapper();
+        wrapper.orderByDesc("qi", QualityInfo::getId);
+        Page<QualityInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public QualityInfoVo detail(Long id) {
+        QualityInfo QualityInfo = this.getById(id);
+        QualityInfoVo result = BeanUtil.toBean(QualityInfo, QualityInfoVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(QualityInfoDto qualityInfoDto) {
+        this.save(qualityInfoDto);
+    }
+
+    @Override
+    public void edit(QualityInfoDto qualityInfoDto) {
+        this.updateById(qualityInfoDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-victoriatourist/src/main/resources/mapper/quality/QualityDetailsMapper.xml

@@ -0,0 +1,4 @@
+<?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.quality.QualityDetailsMapper">
+</mapper>

hx-victoriatourist/src/main/resources/mapper/quality/QualityInfoMapper.xml

@@ -0,0 +1,24 @@
+<?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.quality.QualityInfoMapper">
+    <select id="getPage" resultType="com.fjhx.victoriatourist.entity.quality.vo.QualityInfoVo">
+        select
+            qi.id,
+            qi.type,
+            qi.code,
+            qi.bussiness_id,
+            qi.bussiness_code,
+            qi.warehouse_id,
+            qi.purchase_id,
+            qi.purchase_code,
+            qi.status,
+            qi.result_type,
+            qi.create_user,
+            qi.create_time,
+            qi.update_user,
+            qi.update_time
+        from quality_info qi
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitDetailsVo.java

@@ -50,6 +50,11 @@ public class StockWaitDetailsVo extends StockWaitDetails {
     private String businessCode;
 
     /**
+     * 业务id
+     */
+    private Long businessId;
+
+    /**
      * 业务类型
      */
     private Integer businessType;

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

@@ -206,16 +206,22 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         wrapper.eq(Stock::getWarehouseId, dto.getId());
         wrapper.like(Stock::getQuantity, dto.getKeyword());
         wrapper.eq("pi.definition", dto.getDefinition());
+        wrapper.isNotNull("ps.id");
+        wrapper.groupBy("ps.id");
         wrapper.orderByDesc("s", Stock::getId);
         Page<StockVo> page = this.baseMapper.pageByProductSpu(dto.getPage(), wrapper);
         //赋值关联产品数
         List<StockVo> records = page.getRecords();
         List<Long> spuids = records.stream().map(StockVo::getProductSpuId).collect(Collectors.toList());
+        if(ObjectUtil.isEmpty(spuids)){
+            return page;
+        }
         List<ProductInfo> productInfoList = productInfoService.list(q -> q.in(ProductInfo::getProductSpuId, spuids));
         Map<Long, List<ProductInfo>> productInfoMap = productInfoList.stream().collect(Collectors.groupingBy(ProductInfo::getProductSpuId));
         for (StockVo record : records) {
             List<ProductInfo> productInfoList1 = productInfoMap.get(record.getProductSpuId());
             record.setLinkProductQuantity(BigDecimal.valueOf(productInfoList1.size()));
+            record.setCombinationQuantity(0l);
         }
         //赋值可组合数量
         List<Long> linkProductIds = new ArrayList<>();

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

@@ -21,6 +21,7 @@ import com.fjhx.wms.mapper.stock.StockWaitMapper;
 import com.fjhx.wms.service.stock.*;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.fjhx.wms.utils.CodeEnum;
+import com.mysql.cj.QueryInfo;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
@@ -269,7 +270,10 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         //保存出入库明细
         stockJournalDetailsService.saveBatch(stockJournalDetailsList);
 
-        //创建待质检记录
+        //如果是采购到货 创建待质检记录
+        if(stockWait.getBusinessType() == StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType()){
+
+        }
     }
 
     @Override

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

@@ -46,10 +46,6 @@
             stock s
                 LEFT JOIN bytesailing_item.product_info pi ON s.product_id = pi.id
                 LEFT JOIN bytesailing_item.product_spu ps ON pi.product_spu_id = ps.id
-        WHERE
-            NOT ps.id IS NULL
-        GROUP BY
-            ps.id
             ${ew.customSqlSegment}
     </select>
 

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

@@ -5,6 +5,7 @@
         SELECT
             swd.id,
             sw.business_code,
+            sw.business_id,
             sw.business_type,
             sw.`status`,
             swd.stock_wait_id,