Browse Source

[feat]

品质管理 制程检验
修改制程检验不合格分类实体类,新增不合格报告字段;
修改不合格分类mapper,新增不合格报告字段相关新增、查询、更新语句;
修改制程检验物料service接口,去除列表查询方法参数;
修改制程检验物料mapper,去除列表查询参数;
dev
王晓迪 1 month ago
parent
commit
cfe90ba946
  1. 18
      ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingUnqualifiedClass.java
  2. 4
      ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMaterialMapper.java
  3. 3
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutMaterialServiceImpl.java
  4. 6
      ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingUnqualifiedClassMapper.xml

18
ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingUnqualifiedClass.java

@ -43,7 +43,11 @@ public class QualityManufacturingUnqualifiedClass extends BaseEntity
/** 制程工序不良数量 */ /** 制程工序不良数量 */
@Excel(name = "制程工序不良数量") @Excel(name = "制程工序不良数量")
private String processBadNum; private int processBadNum;
/** 制程工序不良报告 */
@Excel(name = "制程工序不良报告")
private String processBadPhotourl;
public void setManufacturingUnqualifiedClassId(Long manufacturingUnqualifiedClassId) public void setManufacturingUnqualifiedClassId(Long manufacturingUnqualifiedClassId)
{ {
@ -90,12 +94,12 @@ public class QualityManufacturingUnqualifiedClass extends BaseEntity
{ {
return processBadGrade; return processBadGrade;
} }
public void setProcessBadNum(String processBadNum) public void setProcessBadNum(int processBadNum)
{ {
this.processBadNum = processBadNum; this.processBadNum = processBadNum;
} }
public String getProcessBadNum() public int getProcessBadNum()
{ {
return processBadNum; return processBadNum;
} }
@ -116,6 +120,14 @@ public class QualityManufacturingUnqualifiedClass extends BaseEntity
this.materialNo = materialNo; this.materialNo = materialNo;
} }
public String getProcessBadPhotourl() {
return processBadPhotourl;
}
public void setProcessBadPhotourl(String processBadPhotourl) {
this.processBadPhotourl = processBadPhotourl;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

4
ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMaterialMapper.java

@ -25,10 +25,10 @@ public interface QualityManufacturingCheckoutMaterialMapper
/** /**
* 查询品质管理制程检验物料列表 * 查询品质管理制程检验物料列表
* *
* @param qualityManufacturingCheckoutMaterial 品质管理制程检验物料 * @param
* @return 品质管理制程检验物料集合 * @return 品质管理制程检验物料集合
*/ */
public List<QualityManufacturingCheckoutMaterial> selectQualityManufacturingCheckoutMaterialList(QualityManufacturingCheckoutMaterial qualityManufacturingCheckoutMaterial); public List<QualityManufacturingCheckoutMaterial> selectQualityManufacturingCheckoutMaterialList();
/** /**
* 新增品质管理制程检验物料 * 新增品质管理制程检验物料

3
ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutMaterialServiceImpl.java

@ -43,7 +43,8 @@ public class QualityManufacturingCheckoutMaterialServiceImpl implements IQuality
@Override @Override
public List<QualityManufacturingCheckoutMaterial> selectQualityManufacturingCheckoutMaterialList(QualityManufacturingCheckoutMaterial qualityManufacturingCheckoutMaterial) public List<QualityManufacturingCheckoutMaterial> selectQualityManufacturingCheckoutMaterialList(QualityManufacturingCheckoutMaterial qualityManufacturingCheckoutMaterial)
{ {
return qualityManufacturingCheckoutMaterialMapper.selectQualityManufacturingCheckoutMaterialList(qualityManufacturingCheckoutMaterial); // return qualityManufacturingCheckoutMaterialMapper.selectQualityManufacturingCheckoutMaterialList(qualityManufacturingCheckoutMaterial);
return null;
} }
/** /**

6
ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingUnqualifiedClassMapper.xml

@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="processBadClassification" column="process_bad_classification" /> <result property="processBadClassification" column="process_bad_classification" />
<result property="processBadGrade" column="process_bad_grade" /> <result property="processBadGrade" column="process_bad_grade" />
<result property="processBadNum" column="process_bad_num" /> <result property="processBadNum" column="process_bad_num" />
<result property="processBadPhotourl" column="process_bad_photourl" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectQualityManufacturingUnqualifiedClassVo"> <sql id="selectQualityManufacturingUnqualifiedClassVo">
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
</sql> </sql>
<select id="selectQualityManufacturingUnqualifiedClassList" parameterType="QualityManufacturingUnqualifiedClass" resultMap="QualityManufacturingUnqualifiedClassResult"> <select id="selectQualityManufacturingUnqualifiedClassList" parameterType="QualityManufacturingUnqualifiedClass" resultMap="QualityManufacturingUnqualifiedClassResult">
@ -45,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="processBadClassification != null">process_bad_classification,</if> <if test="processBadClassification != null">process_bad_classification,</if>
<if test="processBadGrade != null">process_bad_grade,</if> <if test="processBadGrade != null">process_bad_grade,</if>
<if test="processBadNum != null">process_bad_num,</if> <if test="processBadNum != null">process_bad_num,</if>
<if test="processBadPhotourl != null">process_bad_photourl,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="processBadClassification != null">#{processBadClassification},</if> <if test="processBadClassification != null">#{processBadClassification},</if>
<if test="processBadGrade != null">#{processBadGrade},</if> <if test="processBadGrade != null">#{processBadGrade},</if>
<if test="processBadNum != null">#{processBadNum},</if> <if test="processBadNum != null">#{processBadNum},</if>
<if test="processBadPhotourl != null">#{processBadPhotourl},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@ -77,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="processBadClassification != null">process_bad_classification = #{processBadClassification},</if> <if test="processBadClassification != null">process_bad_classification = #{processBadClassification},</if>
<if test="processBadGrade != null">process_bad_grade = #{processBadGrade},</if> <if test="processBadGrade != null">process_bad_grade = #{processBadGrade},</if>
<if test="processBadNum != null">process_bad_num = #{processBadNum},</if> <if test="processBadNum != null">process_bad_num = #{processBadNum},</if>
<if test="processBadPhotourl != null">process_bad_photourl = #{processBadPhotourl},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>

Loading…
Cancel
Save