diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingUnqualifiedClass.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingUnqualifiedClass.java index eb09a093..51e71d2f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingUnqualifiedClass.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingUnqualifiedClass.java @@ -43,7 +43,11 @@ public class QualityManufacturingUnqualifiedClass extends BaseEntity /** 制程工序不良数量 */ @Excel(name = "制程工序不良数量") - private String processBadNum; + private int processBadNum; + + /** 制程工序不良报告 */ + @Excel(name = "制程工序不良报告") + private String processBadPhotourl; public void setManufacturingUnqualifiedClassId(Long manufacturingUnqualifiedClassId) { @@ -90,12 +94,12 @@ public class QualityManufacturingUnqualifiedClass extends BaseEntity { return processBadGrade; } - public void setProcessBadNum(String processBadNum) + public void setProcessBadNum(int processBadNum) { this.processBadNum = processBadNum; } - public String getProcessBadNum() + public int getProcessBadNum() { return processBadNum; } @@ -116,6 +120,14 @@ public class QualityManufacturingUnqualifiedClass extends BaseEntity this.materialNo = materialNo; } + public String getProcessBadPhotourl() { + return processBadPhotourl; + } + + public void setProcessBadPhotourl(String processBadPhotourl) { + this.processBadPhotourl = processBadPhotourl; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMaterialMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMaterialMapper.java index cf71d592..e90323ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMaterialMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMaterialMapper.java @@ -25,10 +25,10 @@ public interface QualityManufacturingCheckoutMaterialMapper /** * 查询品质管理制程检验物料列表 * - * @param qualityManufacturingCheckoutMaterial 品质管理制程检验物料 + * @param * @return 品质管理制程检验物料集合 */ - public List selectQualityManufacturingCheckoutMaterialList(QualityManufacturingCheckoutMaterial qualityManufacturingCheckoutMaterial); + public List selectQualityManufacturingCheckoutMaterialList(); /** * 新增品质管理制程检验物料 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutMaterialServiceImpl.java index 58505b14..867dc426 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutMaterialServiceImpl.java @@ -43,7 +43,8 @@ public class QualityManufacturingCheckoutMaterialServiceImpl implements IQuality @Override public List selectQualityManufacturingCheckoutMaterialList(QualityManufacturingCheckoutMaterial qualityManufacturingCheckoutMaterial) { - return qualityManufacturingCheckoutMaterialMapper.selectQualityManufacturingCheckoutMaterialList(qualityManufacturingCheckoutMaterial); +// return qualityManufacturingCheckoutMaterialMapper.selectQualityManufacturingCheckoutMaterialList(qualityManufacturingCheckoutMaterial); + return null; } /** diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingUnqualifiedClassMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingUnqualifiedClassMapper.xml index 833e65a6..14375cca 100644 --- a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingUnqualifiedClassMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingUnqualifiedClassMapper.xml @@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select manufacturing_unqualified_class_id, manufacturing_checkout_code, manufacturing_process_code, manufacturing_process_name, process_bad_classification, process_bad_grade, process_bad_num, remark, create_by, create_time, update_by, update_time, material_no from quality_manufacturing_unqualified_class + select manufacturing_unqualified_class_id, manufacturing_checkout_code, manufacturing_process_code, manufacturing_process_name, process_bad_classification, process_bad_grade, process_bad_num, remark, create_by, create_time, update_by, update_time, material_no, process_bad_photourl from quality_manufacturing_unqualified_class