验货

hx-sale/src/main/java/com/fjhx/sale/controller/quality/EhsdQualityMarkingDetailController.java

@@ -0,0 +1,68 @@
+package com.fjhx.sale.controller.quality;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.quality.vo.EhsdQualityMarkingDetailVo;
+import com.fjhx.sale.entity.quality.dto.EhsdQualityMarkingDetailSelectDto;
+import com.fjhx.sale.entity.quality.dto.EhsdQualityMarkingDetailDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.service.quality.EhsdQualityMarkingDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 质检打标明细表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-25
+ */
+@RestController
+@RequestMapping("/ehsdQualityMarkingDetail")
+public class EhsdQualityMarkingDetailController {
+
+    @Autowired
+    private EhsdQualityMarkingDetailService ehsdQualityMarkingDetailService;
+
+    /**
+     * 质检打标明细表分页
+     */
+    @PostMapping("/page")
+    public Page<EhsdQualityMarkingDetailVo> page(@RequestBody EhsdQualityMarkingDetailSelectDto dto) {
+        return ehsdQualityMarkingDetailService.getPage(dto);
+    }
+
+    /**
+     * 质检打标明细表明细
+     */
+    @PostMapping("/detail")
+    public EhsdQualityMarkingDetailVo detail(@RequestBody BaseSelectDto dto) {
+        return ehsdQualityMarkingDetailService.detail(dto.getId());
+    }
+
+    /**
+     * 质检打标明细表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody EhsdQualityMarkingDetailDto ehsdQualityMarkingDetailDto) {
+        ehsdQualityMarkingDetailService.add(ehsdQualityMarkingDetailDto);
+    }
+
+    /**
+     * 质检打标明细表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody EhsdQualityMarkingDetailDto ehsdQualityMarkingDetailDto) {
+        ehsdQualityMarkingDetailService.edit(ehsdQualityMarkingDetailDto);
+    }
+
+    /**
+     * 质检打标明细表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        ehsdQualityMarkingDetailService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/quality/dto/EhsdQualityMarkingDetailDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.quality.dto;
+
+import com.fjhx.sale.entity.quality.po.EhsdQualityMarkingDetail;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 质检打标明细表新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-25
+ */
+@Getter
+@Setter
+public class EhsdQualityMarkingDetailDto extends EhsdQualityMarkingDetail {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/quality/dto/EhsdQualityMarkingDetailSelectDto.java

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

hx-sale/src/main/java/com/fjhx/sale/entity/quality/po/EhsdQuality.java

@@ -117,6 +117,16 @@ public class EhsdQuality extends BasePo {
     private String shippingMarks;
 
     /**
+     * 产品规格结果
+     */
+    private String productSpecificationResult;
+
+    /**
+     * 产品规格备注
+     */
+    private String productSpecificationRemark;
+
+    /**
      * 步骤节点
      */
     private String step;
@@ -132,6 +142,11 @@ public class EhsdQuality extends BasePo {
     @TableField(exist = false)
     private List<EhsdQualityAql> ehsdQualityAqlList;
 
+    /**
+     * 打标明细列表
+     */
+    @TableField(exist = false)
+    private List<EhsdQualityMarkingDetail> ehsdQualityMarkingDetails;
 
     /**
      * 商品包装列表

hx-sale/src/main/java/com/fjhx/sale/entity/quality/po/EhsdQualityMarkingDetail.java

@@ -0,0 +1,37 @@
+package com.fjhx.sale.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-05-25
+ */
+@Getter
+@Setter
+@TableName("ehsd_quality_marking_detail")
+public class EhsdQualityMarkingDetail extends BasePo {
+
+    /**
+     * 质检单ID
+     */
+    private Long qualityId;
+
+    /**
+     * 打标名称
+     */
+    private String name;
+
+    /**
+     * 打表结果
+     */
+    private String result;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/quality/po/EhsdQualityPack.java

@@ -38,7 +38,7 @@ public class EhsdQualityPack extends BasePo {
     /**
      * 箱子-实际
      */
-    private BigDecimal catonActual;
+    private BigDecimal cartonActual;
 
     /**
      * 箱子大小规格

hx-sale/src/main/java/com/fjhx/sale/entity/quality/vo/EhsdQualityMarkingDetailVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.quality.vo;
+
+import com.fjhx.sale.entity.quality.po.EhsdQualityMarkingDetail;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 质检打标明细表列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-25
+ */
+@Getter
+@Setter
+public class EhsdQualityMarkingDetailVo extends EhsdQualityMarkingDetail {
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/quality/EhsdQualityMarkingDetailMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.quality;
+
+import com.fjhx.sale.entity.quality.po.EhsdQualityMarkingDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.quality.vo.EhsdQualityMarkingDetailVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 质检打标明细表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-25
+ */
+public interface EhsdQualityMarkingDetailMapper extends BaseMapper<EhsdQualityMarkingDetail> {
+
+    /**
+     * 质检打标明细表分页
+     */
+    Page<EhsdQualityMarkingDetailVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<EhsdQualityMarkingDetail> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductServiceImpl.java

@@ -3,6 +3,7 @@ package com.fjhx.sale.service.contract.impl;
 import cn.hutool.http.HttpRequest;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.FlowStatusEnum;
 import com.fjhx.common.service.corporation.CorporationService;
@@ -195,6 +196,10 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
         }
         Page<ContractProductVo> page = this.baseMapper.getEHSDPage(dto.getPage(), wrapper);
         List<ContractProductVo> list = page.getRecords();
+        //查出所有质检状态
+        List<Long> contractProductIds = list.stream().map(ContractProductVo::getId).collect(Collectors.toList());
+        List<EhsdQuality> qualityList = ehsdQualityService.list(Wrappers.<EhsdQuality>query().lambda().in(EhsdQuality::getBusinessId,contractProductIds));
+        Map<Long,Integer> qualityMap = qualityList.stream().distinct().collect(Collectors.toMap(EhsdQuality::getBusinessId,EhsdQuality::getStatus));
         if(CollectionUtils.isNotEmpty(list)){
             // 赋值产品属性
             productInfoService.attributeAssign(list, ContractProductVo::getProductId, (item, product) -> {
@@ -217,9 +222,9 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
             corporationService.attributeAssign(list, ContractProductVo::getSellCorporationId, (item, supplier) -> {
                 item.setSupplyName(supplier.getName());
             });
-            ehsdQualityService.attributeAssign(list, ContractProductVo::getId, (item, ehsdQuality) -> {
-                item.setQualityStatus(ehsdQuality.getStatus());
-            });
+            if(CollectionUtils.isNotEmpty(qualityMap)){
+                list.forEach(i -> i.setQualityStatus(qualityMap.getOrDefault(i.getId(),null)));
+            }
         }
         return page;
     }

hx-sale/src/main/java/com/fjhx/sale/service/quality/EhsdQualityMarkingDetailService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.quality;
+
+import com.fjhx.sale.entity.quality.po.EhsdQualityMarkingDetail;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.quality.vo.EhsdQualityMarkingDetailVo;
+import com.fjhx.sale.entity.quality.dto.EhsdQualityMarkingDetailSelectDto;
+import com.fjhx.sale.entity.quality.dto.EhsdQualityMarkingDetailDto;
+
+
+/**
+ * <p>
+ * 质检打标明细表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-25
+ */
+public interface EhsdQualityMarkingDetailService extends BaseService<EhsdQualityMarkingDetail> {
+
+    /**
+     * 质检打标明细表分页
+     */
+    Page<EhsdQualityMarkingDetailVo> getPage(EhsdQualityMarkingDetailSelectDto dto);
+
+    /**
+     * 质检打标明细表明细
+     */
+    EhsdQualityMarkingDetailVo detail(Long id);
+
+    /**
+     * 质检打标明细表新增
+     */
+    void add(EhsdQualityMarkingDetailDto ehsdQualityMarkingDetailDto);
+
+    /**
+     * 质检打标明细表编辑
+     */
+    void edit(EhsdQualityMarkingDetailDto ehsdQualityMarkingDetailDto);
+
+    /**
+     * 质检打标明细表删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/quality/impl/EhsdQualityMarkingDetailServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.quality.impl;
+
+import com.fjhx.sale.entity.quality.po.EhsdQualityMarkingDetail;
+import com.fjhx.sale.mapper.quality.EhsdQualityMarkingDetailMapper;
+import com.fjhx.sale.service.quality.EhsdQualityMarkingDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.quality.vo.EhsdQualityMarkingDetailVo;
+import com.fjhx.sale.entity.quality.dto.EhsdQualityMarkingDetailSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.sale.entity.quality.dto.EhsdQualityMarkingDetailDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 质检打标明细表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-25
+ */
+@Service
+public class EhsdQualityMarkingDetailServiceImpl extends ServiceImpl<EhsdQualityMarkingDetailMapper, EhsdQualityMarkingDetail> implements EhsdQualityMarkingDetailService {
+
+    @Override
+    public Page<EhsdQualityMarkingDetailVo> getPage(EhsdQualityMarkingDetailSelectDto dto) {
+        IWrapper<EhsdQualityMarkingDetail> wrapper = getWrapper();
+        wrapper.orderByDesc("eqmd", EhsdQualityMarkingDetail::getId);
+        Page<EhsdQualityMarkingDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public EhsdQualityMarkingDetailVo detail(Long id) {
+        EhsdQualityMarkingDetail EhsdQualityMarkingDetail = this.getById(id);
+        EhsdQualityMarkingDetailVo result = BeanUtil.toBean(EhsdQualityMarkingDetail, EhsdQualityMarkingDetailVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(EhsdQualityMarkingDetailDto ehsdQualityMarkingDetailDto) {
+        this.save(ehsdQualityMarkingDetailDto);
+    }
+
+    @Override
+    public void edit(EhsdQualityMarkingDetailDto ehsdQualityMarkingDetailDto) {
+        this.updateById(ehsdQualityMarkingDetailDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/quality/impl/EhsdQualityServiceImpl.java

@@ -41,6 +41,9 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
     private EhsdQualityAqlService ehsdQualityAqlService;
 
     @Autowired
+    private EhsdQualityMarkingDetailService ehsdQualityMarkingDetailService;
+
+    @Autowired
     private EhsdQualityProblemService ehsdQualityProblemService;
 
     @Autowired
@@ -82,6 +85,7 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
             throw new ServiceException("质检单不存在");
         }
         quality.setEhsdQualityAqlList(ehsdQualityAqlService.list(Wrappers.<EhsdQualityAql>query().lambda()));
+        quality.setEhsdQualityMarkingDetails(ehsdQualityMarkingDetailService.list(Wrappers.<EhsdQualityMarkingDetail>query().lambda()));
         quality.setEhsdQualityProblemList(ehsdQualityProblemService.list(Wrappers.<EhsdQualityProblem>query().lambda().eq(EhsdQualityProblem::getQualityId,id)));
         quality.setEhsdQualitySiteTestList(ehsdQualitySiteTestService.list(Wrappers.<EhsdQualitySiteTest>query().lambda().eq(EhsdQualitySiteTest::getQualityId,id)));
         quality.setEhsdQualityPackList(ehsdQualityPackService.list(Wrappers.<EhsdQualityPack>query().lambda().eq(EhsdQualityPack::getQualityId,id)));
@@ -110,6 +114,7 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
             this.updateById(ehsdQualityDto);
             //清空数据
             ehsdQualityAqlService.remove(Wrappers.<EhsdQualityAql>query().lambda().eq(EhsdQualityAql::getQualityId,ehsdQualityDto.getId()));
+            ehsdQualityMarkingDetailService.remove(Wrappers.<EhsdQualityMarkingDetail>query().lambda().eq(EhsdQualityMarkingDetail::getQualityId,ehsdQualityDto.getId()));
             ehsdQualityProductService.remove(Wrappers.<EhsdQualityProduct>query().lambda().eq(EhsdQualityProduct::getQualityId,ehsdQualityDto.getId()));
             ehsdQualityWorkshipService.remove(Wrappers.<EhsdQualityWorkship>query().lambda().eq(EhsdQualityWorkship::getQualityId,ehsdQualityDto.getId()));
             ehsdQualityCartonsService.remove(Wrappers.<EhsdQualityCartons>query().lambda().eq(EhsdQualityCartons::getQualityId,ehsdQualityDto.getId()));
@@ -152,6 +157,10 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
             ehsdQualityDto.getEhsdQualitySiteTestList().forEach(object -> object.setQualityId(ehsdQualityDto.getId()));
             ehsdQualitySiteTestService.saveBatch(ehsdQualityDto.getEhsdQualitySiteTestList());
         }
+        if(CollectionUtils.isNotEmpty(ehsdQualityDto.getEhsdQualityMarkingDetails())){
+            ehsdQualityDto.getEhsdQualityMarkingDetails().forEach(object -> object.setQualityId(ehsdQualityDto.getId()));
+            ehsdQualityMarkingDetailService.saveBatch(ehsdQualityDto.getEhsdQualityMarkingDetails());
+        }
         //样品采集记录文件列表
         if(CollectionUtils.isNotEmpty(ehsdQualityDto.getSampleCollectionRecordFileList())){
             ObsFileUtil.saveFile(ehsdQualityDto.getSampleCollectionRecordFileList(), ehsdQualityDto.getId(),FileTypeEnums.FILE_TYPE_10.getKey());

hx-sale/src/main/resources/mapper/quality/EhsdQualityMarkingDetailMapper.xml

@@ -0,0 +1,18 @@
+<?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.sale.mapper.quality.EhsdQualityMarkingDetailMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.quality.vo.EhsdQualityMarkingDetailVo">
+        select
+            eqmd.id,
+            eqmd.quality_id,
+            eqmd.name,
+            eqmd.result,
+            eqmd.create_user,
+            eqmd.create_time,
+            eqmd.update_user,
+            eqmd.update_time
+        from ehsd_quality_marking_detail eqmd
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>