feat: 新增质量评审流程全量功能
- 新增质量评审相关的实体、Mapper、Service、Controller接口与实现 - 新增前端页面与API接口,支持评审单增删改查、提交送审、审批驳回、改判执行 - 新增数据库初始化脚本与字典数据 - 修复vue.config热加载监视系统文件导致的EBUSY错误 - 清理HRM模块API导出注释
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
<?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.klp.mes.qc.mapper.QcQualityReviewCoilMapper">
|
||||
|
||||
<resultMap type="com.klp.mes.qc.domain.vo.QcQualityReviewCoilVo" id="QcQualityReviewCoilVo">
|
||||
<id property="detailId" column="detail_id"/>
|
||||
<result property="reviewId" column="review_id"/>
|
||||
<result property="groupSeq" column="group_seq"/>
|
||||
<result property="groupRemark" column="group_remark"/>
|
||||
<result property="coilId" column="coil_id"/>
|
||||
<result property="currentCoilNo" column="current_coil_no"/>
|
||||
<result property="supplierCoilNo" column="supplier_coil_no"/>
|
||||
<result property="spec" column="spec"/>
|
||||
<result property="netWeight" column="net_weight"/>
|
||||
<result property="defectDesc" column="defect_desc"/>
|
||||
<result property="beforeQuality" column="before_quality"/>
|
||||
<result property="regradeQuality" column="regrade_quality"/>
|
||||
<result property="executeStatus" column="execute_status"/>
|
||||
<result property="executeTime" column="execute_time"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="selectVoListByReviewId" resultMap="QcQualityReviewCoilVo">
|
||||
SELECT * FROM qc_quality_review_coil
|
||||
WHERE review_id = #{reviewId} AND del_flag = 0
|
||||
ORDER BY group_seq ASC, detail_id ASC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,23 @@
|
||||
<?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.klp.mes.qc.mapper.QcQualityReviewLogMapper">
|
||||
|
||||
<resultMap type="com.klp.mes.qc.domain.vo.QcQualityReviewLogVo" id="QcQualityReviewLogVo">
|
||||
<id property="logId" column="log_id"/>
|
||||
<result property="reviewId" column="review_id"/>
|
||||
<result property="action" column="action"/>
|
||||
<result property="operator" column="operator"/>
|
||||
<result property="opinion" column="opinion"/>
|
||||
<result property="operateTime" column="operate_time"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="selectVoListByReviewId" resultMap="QcQualityReviewLogVo">
|
||||
SELECT * FROM qc_quality_review_log
|
||||
WHERE review_id = #{reviewId}
|
||||
ORDER BY operate_time ASC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,75 @@
|
||||
<?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.klp.mes.qc.mapper.QcQualityReviewMapper">
|
||||
|
||||
<resultMap type="com.klp.mes.qc.domain.vo.QcQualityReviewVo" id="QcQualityReviewVo">
|
||||
<id property="reviewId" column="review_id"/>
|
||||
<result property="reviewNo" column="review_no"/>
|
||||
<result property="productName" column="product_name"/>
|
||||
<result property="transmitDept" column="transmit_dept"/>
|
||||
<result property="transmitUser" column="transmit_user"/>
|
||||
<result property="transmitDate" column="transmit_date"/>
|
||||
<result property="prodDateRange" column="prod_date_range"/>
|
||||
<result property="flowStatus" column="flow_status"/>
|
||||
<result property="deptOpinion" column="dept_opinion"/>
|
||||
<result property="deptSign" column="dept_sign"/>
|
||||
<result property="deptSignDate" column="dept_sign_date"/>
|
||||
<result property="leaderOpinion" column="leader_opinion"/>
|
||||
<result property="leaderSign" column="leader_sign"/>
|
||||
<result property="leaderSignDate" column="leader_sign_date"/>
|
||||
<result property="rejectReason" column="reject_reason"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="selectVoPage" resultMap="QcQualityReviewVo">
|
||||
SELECT * FROM qc_quality_review
|
||||
<where>
|
||||
del_flag = 0
|
||||
<if test="vo.reviewNo != null and vo.reviewNo != ''">
|
||||
AND review_no LIKE CONCAT('%', #{vo.reviewNo}, '%')
|
||||
</if>
|
||||
<if test="vo.productName != null and vo.productName != ''">
|
||||
AND product_name LIKE CONCAT('%', #{vo.productName}, '%')
|
||||
</if>
|
||||
<if test="vo.flowStatus != null">
|
||||
AND flow_status = #{vo.flowStatus}
|
||||
</if>
|
||||
<if test="vo.transmitUser != null and vo.transmitUser != ''">
|
||||
AND transmit_user LIKE CONCAT('%', #{vo.transmitUser}, '%')
|
||||
</if>
|
||||
<if test="vo.params != null and vo.params.beginTime != null and vo.params.beginTime != ''">
|
||||
AND create_time >= #{vo.params.beginTime}
|
||||
</if>
|
||||
<if test="vo.params != null and vo.params.endTime != null and vo.params.endTime != ''">
|
||||
AND create_time <= #{vo.params.endTime}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="selectVoById" resultMap="QcQualityReviewVo">
|
||||
SELECT * FROM qc_quality_review WHERE review_id = #{reviewId} AND del_flag = 0
|
||||
</select>
|
||||
|
||||
<select id="selectVoList" resultMap="QcQualityReviewVo">
|
||||
SELECT * FROM qc_quality_review
|
||||
<where>
|
||||
del_flag = 0
|
||||
<if test="vo.reviewNo != null and vo.reviewNo != ''">
|
||||
AND review_no LIKE CONCAT('%', #{vo.reviewNo}, '%')
|
||||
</if>
|
||||
<if test="vo.flowStatus != null">
|
||||
AND flow_status = #{vo.flowStatus}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY create_time DESC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user