为双机架完成轧辊，质量，模型等内容
This commit is contained in:
@@ -0,0 +1,106 @@
|
||||
<?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.ruoyi.mill.mapper.EqpEquipmentChecklistMapper">
|
||||
|
||||
<resultMap type="com.ruoyi.mill.domain.EqpEquipmentChecklist" id="EqpChecklistResult">
|
||||
<id property="checkId" column="check_id" />
|
||||
<result property="checkNo" column="check_no" />
|
||||
<result property="partId" column="part_id" />
|
||||
<result property="partName" column="part_name" />
|
||||
<result property="checkContent" column="check_content" />
|
||||
<result property="equipmentState" column="equipment_state" />
|
||||
<result property="checkStandard" column="check_standard" />
|
||||
<result property="responsiblePerson" column="responsible_person" />
|
||||
<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>
|
||||
|
||||
<sql id="selectEqpChecklistVo">
|
||||
select check_id, check_no, part_id, part_name, check_content, equipment_state,
|
||||
check_standard, responsible_person, remark, del_flag,
|
||||
create_by, create_time, update_by, update_time
|
||||
from eqp_equipment_checklist
|
||||
</sql>
|
||||
|
||||
<select id="selectEqpChecklistList" parameterType="com.ruoyi.mill.domain.EqpEquipmentChecklist" resultMap="EqpChecklistResult">
|
||||
<include refid="selectEqpChecklistVo"/>
|
||||
<where>
|
||||
and del_flag = '0'
|
||||
<if test="checkNo != null and checkNo != ''"> and check_no like concat('%', #{checkNo}, '%')</if>
|
||||
<if test="partId != null"> and part_id = #{partId}</if>
|
||||
<if test="partName != null and partName != ''"> and part_name like concat('%', #{partName}, '%')</if>
|
||||
<if test="equipmentState != null and equipmentState != ''"> and equipment_state = #{equipmentState}</if>
|
||||
<if test="checkStandard != null and checkStandard != ''"> and check_standard like concat('%', #{checkStandard}, '%')</if>
|
||||
<if test="responsiblePerson != null and responsiblePerson != ''"> and responsible_person like concat('%', #{responsiblePerson}, '%')</if>
|
||||
</where>
|
||||
order by check_id asc
|
||||
</select>
|
||||
|
||||
<select id="selectEqpChecklistByCheckId" parameterType="Long" resultMap="EqpChecklistResult">
|
||||
<include refid="selectEqpChecklistVo"/>
|
||||
where check_id = #{checkId} and del_flag = '0'
|
||||
</select>
|
||||
|
||||
<insert id="insertEqpChecklist" parameterType="com.ruoyi.mill.domain.EqpEquipmentChecklist" useGeneratedKeys="true" keyProperty="checkId">
|
||||
insert into eqp_equipment_checklist
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="checkNo != null">check_no,</if>
|
||||
<if test="partId != null">part_id,</if>
|
||||
<if test="partName != null">part_name,</if>
|
||||
<if test="checkContent != null">check_content,</if>
|
||||
<if test="equipmentState != null">equipment_state,</if>
|
||||
<if test="checkStandard != null">check_standard,</if>
|
||||
<if test="responsiblePerson != null">responsible_person,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
del_flag,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="checkNo != null">#{checkNo},</if>
|
||||
<if test="partId != null">#{partId},</if>
|
||||
<if test="partName != null">#{partName},</if>
|
||||
<if test="checkContent != null">#{checkContent},</if>
|
||||
<if test="equipmentState != null">#{equipmentState},</if>
|
||||
<if test="checkStandard != null">#{checkStandard},</if>
|
||||
<if test="responsiblePerson != null">#{responsiblePerson},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
'0',
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateEqpChecklist" parameterType="com.ruoyi.mill.domain.EqpEquipmentChecklist">
|
||||
update eqp_equipment_checklist
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="checkNo != null">check_no = #{checkNo},</if>
|
||||
<if test="partId != null">part_id = #{partId},</if>
|
||||
<if test="partName != null">part_name = #{partName},</if>
|
||||
<if test="checkContent != null">check_content = #{checkContent},</if>
|
||||
<if test="equipmentState != null">equipment_state = #{equipmentState},</if>
|
||||
<if test="checkStandard != null">check_standard = #{checkStandard},</if>
|
||||
<if test="responsiblePerson != null">responsible_person = #{responsiblePerson},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where check_id = #{checkId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteEqpChecklistByCheckId" parameterType="Long">
|
||||
update eqp_equipment_checklist set del_flag = '2' where check_id = #{checkId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteEqpChecklistByCheckIds" parameterType="String">
|
||||
update eqp_equipment_checklist set del_flag = '2' where check_id in
|
||||
<foreach item="checkId" collection="array" open="(" separator="," close=")">
|
||||
#{checkId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,115 @@
|
||||
<?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.ruoyi.mill.mapper.EqpEquipmentInspectionRecordMapper">
|
||||
|
||||
<resultMap type="com.ruoyi.mill.domain.EqpEquipmentInspectionRecord" id="EqpInspectionRecordResult">
|
||||
<id property="recordId" column="record_id" />
|
||||
<result property="checkId" column="check_id" />
|
||||
<result property="shift" column="shift" />
|
||||
<result property="inspectTime" column="inspect_time" />
|
||||
<result property="runStatus" column="run_status" />
|
||||
<result property="inspector" column="inspector" />
|
||||
<result property="abnormalDesc" column="abnormal_desc" />
|
||||
<result property="photo" column="photo" />
|
||||
<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" />
|
||||
<result property="checkContent" column="check_content" />
|
||||
<result property="checkStandard" column="check_standard" />
|
||||
<result property="partName" column="part_name" />
|
||||
<result property="partId" column="part_id" />
|
||||
</resultMap>
|
||||
|
||||
<select id="selectEqpInspectionRecordList" parameterType="com.ruoyi.mill.domain.EqpEquipmentInspectionRecord" resultMap="EqpInspectionRecordResult">
|
||||
select r.record_id, r.check_id, r.shift, r.inspect_time, r.run_status,
|
||||
r.inspector, r.abnormal_desc, r.photo, r.remark, r.del_flag,
|
||||
r.create_by, r.create_time, r.update_by, r.update_time,
|
||||
c.check_content, c.check_standard, c.part_name, c.part_id
|
||||
from eqp_equipment_inspection_record r
|
||||
left join eqp_equipment_checklist c on r.check_id = c.check_id and c.del_flag = '0'
|
||||
<where>
|
||||
and r.del_flag = '0'
|
||||
<if test="checkId != null"> and r.check_id = #{checkId}</if>
|
||||
<if test="partId != null"> and c.part_id = #{partId}</if>
|
||||
<if test="shift != null"> and r.shift = #{shift}</if>
|
||||
<if test="runStatus != null"> and r.run_status = #{runStatus}</if>
|
||||
<if test="inspector != null and inspector != ''"> and r.inspector like concat('%', #{inspector}, '%')</if>
|
||||
<if test="abnormalDesc != null and abnormalDesc != ''"> and r.abnormal_desc like concat('%', #{abnormalDesc}, '%')</if>
|
||||
<if test="startInspectTime != null and startInspectTime != ''"> and r.inspect_time >= #{startInspectTime}</if>
|
||||
<if test="endInspectTime != null and endInspectTime != ''"> and r.inspect_time <= concat(#{endInspectTime}, ' 23:59:59')</if>
|
||||
</where>
|
||||
order by r.inspect_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectEqpInspectionRecordByRecordId" parameterType="Long" resultMap="EqpInspectionRecordResult">
|
||||
select r.record_id, r.check_id, r.shift, r.inspect_time, r.run_status,
|
||||
r.inspector, r.abnormal_desc, r.photo, r.remark, r.del_flag,
|
||||
r.create_by, r.create_time, r.update_by, r.update_time,
|
||||
c.check_content, c.check_standard, c.part_name, c.part_id
|
||||
from eqp_equipment_inspection_record r
|
||||
left join eqp_equipment_checklist c on r.check_id = c.check_id and c.del_flag = '0'
|
||||
where r.record_id = #{recordId} and r.del_flag = '0'
|
||||
</select>
|
||||
|
||||
<insert id="insertEqpInspectionRecord" parameterType="com.ruoyi.mill.domain.EqpEquipmentInspectionRecord" useGeneratedKeys="true" keyProperty="recordId">
|
||||
insert into eqp_equipment_inspection_record
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="checkId != null">check_id,</if>
|
||||
<if test="shift != null">shift,</if>
|
||||
<if test="inspectTime != null">inspect_time,</if>
|
||||
<if test="runStatus != null">run_status,</if>
|
||||
<if test="inspector != null">inspector,</if>
|
||||
<if test="abnormalDesc != null">abnormal_desc,</if>
|
||||
<if test="photo != null">photo,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
del_flag,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="checkId != null">#{checkId},</if>
|
||||
<if test="shift != null">#{shift},</if>
|
||||
<if test="inspectTime != null">#{inspectTime},</if>
|
||||
<if test="runStatus != null">#{runStatus},</if>
|
||||
<if test="inspector != null">#{inspector},</if>
|
||||
<if test="abnormalDesc != null">#{abnormalDesc},</if>
|
||||
<if test="photo != null">#{photo},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
'0',
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateEqpInspectionRecord" parameterType="com.ruoyi.mill.domain.EqpEquipmentInspectionRecord">
|
||||
update eqp_equipment_inspection_record
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="checkId != null">check_id = #{checkId},</if>
|
||||
<if test="shift != null">shift = #{shift},</if>
|
||||
<if test="inspectTime != null">inspect_time = #{inspectTime},</if>
|
||||
<if test="runStatus != null">run_status = #{runStatus},</if>
|
||||
<if test="inspector != null">inspector = #{inspector},</if>
|
||||
<if test="abnormalDesc != null">abnormal_desc = #{abnormalDesc},</if>
|
||||
<if test="photo != null">photo = #{photo},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where record_id = #{recordId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteEqpInspectionRecordByRecordId" parameterType="Long">
|
||||
update eqp_equipment_inspection_record set del_flag = '2' where record_id = #{recordId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteEqpInspectionRecordByRecordIds" parameterType="String">
|
||||
update eqp_equipment_inspection_record set del_flag = '2' where record_id in
|
||||
<foreach item="recordId" collection="array" open="(" separator="," close=")">
|
||||
#{recordId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,86 @@
|
||||
<?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.ruoyi.mill.mapper.EqpEquipmentPartMapper">
|
||||
|
||||
<resultMap type="com.ruoyi.mill.domain.EqpEquipmentPart" id="EqpPartResult">
|
||||
<id property="partId" column="part_id" />
|
||||
<result property="inspectPart" column="inspect_part" />
|
||||
<result property="productionLine" column="production_line" />
|
||||
<result property="lineSection" column="line_section" />
|
||||
<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>
|
||||
|
||||
<sql id="selectEqpPartVo">
|
||||
select part_id, inspect_part, production_line, line_section, remark,
|
||||
del_flag, create_by, create_time, update_by, update_time
|
||||
from eqp_equipment_part
|
||||
</sql>
|
||||
|
||||
<select id="selectEqpPartList" parameterType="com.ruoyi.mill.domain.EqpEquipmentPart" resultMap="EqpPartResult">
|
||||
<include refid="selectEqpPartVo"/>
|
||||
<where>
|
||||
and del_flag = '0'
|
||||
<if test="inspectPart != null and inspectPart != ''"> and inspect_part like concat('%', #{inspectPart}, '%')</if>
|
||||
<if test="productionLine != null and productionLine != ''"> and production_line = #{productionLine}</if>
|
||||
<if test="lineSection != null and lineSection != ''"> and line_section like concat('%', #{lineSection}, '%')</if>
|
||||
</where>
|
||||
order by part_id asc
|
||||
</select>
|
||||
|
||||
<select id="selectEqpPartByPartId" parameterType="Long" resultMap="EqpPartResult">
|
||||
<include refid="selectEqpPartVo"/>
|
||||
where part_id = #{partId} and del_flag = '0'
|
||||
</select>
|
||||
|
||||
<insert id="insertEqpPart" parameterType="com.ruoyi.mill.domain.EqpEquipmentPart" useGeneratedKeys="true" keyProperty="partId">
|
||||
insert into eqp_equipment_part
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="inspectPart != null and inspectPart != ''">inspect_part,</if>
|
||||
<if test="productionLine != null">production_line,</if>
|
||||
<if test="lineSection != null">line_section,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
del_flag,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="inspectPart != null and inspectPart != ''">#{inspectPart},</if>
|
||||
<if test="productionLine != null">#{productionLine},</if>
|
||||
<if test="lineSection != null">#{lineSection},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
'0',
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateEqpPart" parameterType="com.ruoyi.mill.domain.EqpEquipmentPart">
|
||||
update eqp_equipment_part
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="inspectPart != null and inspectPart != ''">inspect_part = #{inspectPart},</if>
|
||||
<if test="productionLine != null">production_line = #{productionLine},</if>
|
||||
<if test="lineSection != null">line_section = #{lineSection},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where part_id = #{partId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteEqpPartByPartId" parameterType="Long">
|
||||
update eqp_equipment_part set del_flag = '2' where part_id = #{partId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteEqpPartByPartIds" parameterType="String">
|
||||
update eqp_equipment_part set del_flag = '2' where part_id in
|
||||
<foreach item="partId" collection="array" open="(" separator="," close=")">
|
||||
#{partId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
30
ruoyi-mill/src/main/resources/mapper/mill/KlpCoilMapper.xml
Normal file
30
ruoyi-mill/src/main/resources/mapper/mill/KlpCoilMapper.xml
Normal file
@@ -0,0 +1,30 @@
|
||||
<?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.ruoyi.mill.mapper.KlpCoilMapper">
|
||||
|
||||
<resultMap id="KlpCoilInfoResult" type="com.ruoyi.mill.domain.KlpCoilInfo">
|
||||
<id property="coilId" column="coil_id"/>
|
||||
<result property="enterCoilNo" column="enter_coil_no"/>
|
||||
<result property="currentCoilNo" column="current_coil_no"/>
|
||||
<result property="supplierCoilNo" column="supplier_coil_no"/>
|
||||
<result property="actualThickness" column="actual_thickness"/>
|
||||
<result property="actualWidth" column="actual_width"/>
|
||||
<result property="netWeight" column="net_weight"/>
|
||||
<result property="grossWeight" column="gross_weight"/>
|
||||
<result property="length" column="length"/>
|
||||
<result property="qualityStatus" column="quality_status"/>
|
||||
<result property="materialType" column="material_type"/>
|
||||
<result property="temperGrade" column="temper_grade"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="selectByCoilNo" resultMap="KlpCoilInfoResult">
|
||||
SELECT coil_id, enter_coil_no, current_coil_no, supplier_coil_no,
|
||||
actual_thickness, actual_width, net_weight, gross_weight, length,
|
||||
quality_status, material_type, temper_grade
|
||||
FROM wms_material_coil
|
||||
WHERE enter_coil_no = #{coilNo}
|
||||
OR current_coil_no = #{coilNo}
|
||||
LIMIT 1
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
133
ruoyi-mill/src/main/resources/mapper/mill/MesRollGrindMapper.xml
Normal file
133
ruoyi-mill/src/main/resources/mapper/mill/MesRollGrindMapper.xml
Normal file
@@ -0,0 +1,133 @@
|
||||
<?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.ruoyi.mill.mapper.MesRollGrindMapper">
|
||||
|
||||
<resultMap type="com.ruoyi.mill.domain.MesRollGrind" id="MesRollGrindResult">
|
||||
<id property="grindId" column="grind_id" />
|
||||
<result property="lineId" column="line_id" />
|
||||
<result property="rollId" column="roll_id" />
|
||||
<result property="rollNo" column="roll_no" />
|
||||
<result property="grindTime" column="grind_time" />
|
||||
<result property="team" column="team" />
|
||||
<result property="diaBefore" column="dia_before" />
|
||||
<result property="diaAfter" column="dia_after" />
|
||||
<result property="grindAmount" column="grind_amount" />
|
||||
<result property="rollShape" column="roll_shape" />
|
||||
<result property="flawResult" column="flaw_result" />
|
||||
<result property="hardness" column="hardness" />
|
||||
<result property="operator" column="operator" />
|
||||
<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="selectMesRollGrindList" parameterType="com.ruoyi.mill.domain.MesRollGrind" resultMap="MesRollGrindResult">
|
||||
SELECT grind_id, line_id, roll_id, roll_no, grind_time, team, dia_before, dia_after,
|
||||
grind_amount, roll_shape, flaw_result,
|
||||
CASE WHEN hardness = '未倒角' THEN 0 ELSE CAST(hardness AS DECIMAL(10,1)) END AS hardness,
|
||||
operator, remark, del_flag, create_by, create_time
|
||||
FROM mes_roll_grind
|
||||
<where>
|
||||
and del_flag = 0
|
||||
<if test="rollId != null"> and roll_id = #{rollId}</if>
|
||||
<if test="lineId != null"> and line_id = #{lineId}</if>
|
||||
<if test="beginTime != null and beginTime != ''"> and grind_time >= #{beginTime}</if>
|
||||
<if test="endTime != null and endTime != ''"> and grind_time <= #{endTime}</if>
|
||||
</where>
|
||||
ORDER BY grind_time ASC, grind_id ASC
|
||||
</select>
|
||||
|
||||
<select id="selectMesRollGrindByRollId" resultMap="MesRollGrindResult">
|
||||
SELECT grind_id, line_id, roll_id, roll_no, grind_time, team, dia_before, dia_after,
|
||||
grind_amount, roll_shape, flaw_result,
|
||||
CASE WHEN hardness = '未倒角' THEN 0 ELSE CAST(hardness AS DECIMAL(10,1)) END AS hardness,
|
||||
operator, remark, del_flag, create_by, create_time
|
||||
FROM mes_roll_grind
|
||||
WHERE del_flag = 0 AND roll_id = #{rollId}
|
||||
ORDER BY grind_time ASC, grind_id ASC
|
||||
</select>
|
||||
|
||||
<select id="selectMesRollGrindById" parameterType="Long" resultMap="MesRollGrindResult">
|
||||
SELECT * FROM mes_roll_grind WHERE grind_id = #{grindId} AND del_flag = 0
|
||||
</select>
|
||||
|
||||
<select id="selectMonthlyStats" resultType="map">
|
||||
SELECT
|
||||
DATE_FORMAT(grind_time, '%Y-%m') AS month,
|
||||
COUNT(*) AS grindCount,
|
||||
IFNULL(SUM(grind_amount), 0) AS totalGrindAmount
|
||||
FROM mes_roll_grind
|
||||
WHERE del_flag = 0
|
||||
AND roll_id = #{rollId}
|
||||
AND YEAR(grind_time) = #{year}
|
||||
GROUP BY DATE_FORMAT(grind_time, '%Y-%m')
|
||||
ORDER BY month ASC
|
||||
</select>
|
||||
|
||||
<insert id="insertMesRollGrind" parameterType="com.ruoyi.mill.domain.MesRollGrind" useGeneratedKeys="true" keyProperty="grindId">
|
||||
insert into mes_roll_grind
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="lineId != null">line_id,</if>
|
||||
<if test="rollId != null">roll_id,</if>
|
||||
<if test="rollNo != null">roll_no,</if>
|
||||
<if test="grindTime != null">grind_time,</if>
|
||||
<if test="team != null">team,</if>
|
||||
<if test="diaBefore != null">dia_before,</if>
|
||||
<if test="diaAfter != null">dia_after,</if>
|
||||
<if test="grindAmount != null">grind_amount,</if>
|
||||
<if test="rollShape != null">roll_shape,</if>
|
||||
<if test="flawResult != null">flaw_result,</if>
|
||||
<if test="hardness != null">hardness,</if>
|
||||
<if test="operator != null">operator,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
del_flag,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="lineId != null">#{lineId},</if>
|
||||
<if test="rollId != null">#{rollId},</if>
|
||||
<if test="rollNo != null">#{rollNo},</if>
|
||||
<if test="grindTime != null">#{grindTime},</if>
|
||||
<if test="team != null">#{team},</if>
|
||||
<if test="diaBefore != null">#{diaBefore},</if>
|
||||
<if test="diaAfter != null">#{diaAfter},</if>
|
||||
<if test="grindAmount != null">#{grindAmount},</if>
|
||||
<if test="rollShape != null">#{rollShape},</if>
|
||||
<if test="flawResult != null">#{flawResult},</if>
|
||||
<if test="hardness != null">#{hardness},</if>
|
||||
<if test="operator != null">#{operator},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
0,
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateMesRollGrind" parameterType="com.ruoyi.mill.domain.MesRollGrind">
|
||||
update mes_roll_grind
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="grindTime != null">grind_time = #{grindTime},</if>
|
||||
<if test="team != null">team = #{team},</if>
|
||||
<if test="diaBefore != null">dia_before = #{diaBefore},</if>
|
||||
<if test="diaAfter != null">dia_after = #{diaAfter},</if>
|
||||
<if test="grindAmount != null">grind_amount = #{grindAmount},</if>
|
||||
<if test="rollShape != null">roll_shape = #{rollShape},</if>
|
||||
<if test="flawResult != null">flaw_result = #{flawResult},</if>
|
||||
<if test="hardness != null">hardness = #{hardness},</if>
|
||||
<if test="operator != null">operator = #{operator},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where grind_id = #{grindId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteMesRollGrindById" parameterType="Long">
|
||||
update mes_roll_grind set del_flag = 1 where grind_id = #{grindId}
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
174
ruoyi-mill/src/main/resources/mapper/mill/MesRollInfoMapper.xml
Normal file
174
ruoyi-mill/src/main/resources/mapper/mill/MesRollInfoMapper.xml
Normal file
@@ -0,0 +1,174 @@
|
||||
<?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.ruoyi.mill.mapper.MesRollInfoMapper">
|
||||
|
||||
<resultMap type="com.ruoyi.mill.domain.MesRollInfo" id="MesRollInfoResult">
|
||||
<id property="rollId" column="roll_id" />
|
||||
<result property="lineId" column="line_id" />
|
||||
<result property="rollNo" column="roll_no" />
|
||||
<result property="rollType" column="roll_type" />
|
||||
<result property="status" column="status" />
|
||||
<result property="initialDia" column="initial_dia" />
|
||||
<result property="currentDia" column="current_dia" />
|
||||
<result property="minDia" column="min_dia" />
|
||||
<result property="roughness" column="roughness" />
|
||||
<result property="crown" column="crown" />
|
||||
<result property="material" column="material" />
|
||||
<result property="grindCount" column="grind_count" />
|
||||
<result property="totalRolledWeight" column="total_rolled_weight" />
|
||||
<result property="totalRolledLength" column="total_rolled_length" />
|
||||
<result property="totalRolledCount" column="total_rolled_count" />
|
||||
<result property="manufactureDate" column="manufacture_date" />
|
||||
<result property="manufacturer" column="manufacturer" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
<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="selectMesRollInfoList" parameterType="com.ruoyi.mill.domain.MesRollInfo" resultMap="MesRollInfoResult">
|
||||
select roll_id, line_id, roll_no, roll_type, status, initial_dia, current_dia, min_dia,
|
||||
roughness, crown, material, grind_count, total_rolled_weight, total_rolled_length,
|
||||
total_rolled_count, manufacture_date, manufacturer, remark, del_flag,
|
||||
create_by, create_time, update_by, update_time
|
||||
from mes_roll_info
|
||||
<where>
|
||||
and del_flag = 0
|
||||
<if test="lineId != null"> and line_id = #{lineId}</if>
|
||||
<if test="rollNo != null and rollNo != ''"> and roll_no like concat('%', #{rollNo}, '%')</if>
|
||||
<if test="rollType != null and rollType != ''"> and roll_type = #{rollType}</if>
|
||||
<if test="status != null and status != ''"> and status = #{status}</if>
|
||||
<if test="manufacturer != null and manufacturer != ''"> and manufacturer like concat('%', #{manufacturer}, '%')</if>
|
||||
</where>
|
||||
order by roll_type asc, roll_id asc
|
||||
</select>
|
||||
|
||||
<select id="selectMesRollInfoById" parameterType="Long" resultMap="MesRollInfoResult">
|
||||
select roll_id, line_id, roll_no, roll_type, status, initial_dia, current_dia, min_dia,
|
||||
roughness, crown, material, grind_count, total_rolled_weight, total_rolled_length,
|
||||
total_rolled_count, manufacture_date, manufacturer, remark, del_flag,
|
||||
create_by, create_time, update_by, update_time
|
||||
from mes_roll_info
|
||||
where del_flag = 0 and roll_id = #{rollId}
|
||||
</select>
|
||||
|
||||
<select id="selectMesRollInfoByRollNo" resultMap="MesRollInfoResult">
|
||||
select * from mes_roll_info where del_flag = 0 and roll_no = #{rollNo} limit 1
|
||||
</select>
|
||||
|
||||
<select id="selectStatusStats" resultType="map">
|
||||
SELECT status, COUNT(*) AS cnt
|
||||
FROM mes_roll_info
|
||||
WHERE del_flag = 0
|
||||
<if test="lineId != null">AND line_id = #{lineId}</if>
|
||||
GROUP BY status
|
||||
</select>
|
||||
|
||||
<select id="selectRollNoList" resultType="string">
|
||||
SELECT roll_no FROM mes_roll_info
|
||||
WHERE del_flag = 0 AND status != 'Scrapped'
|
||||
<if test="lineId != null">AND line_id = #{lineId}</if>
|
||||
<if test="rollType != null and rollType != ''">AND roll_type = #{rollType}</if>
|
||||
<if test="status != null and status != ''">AND status = #{status}</if>
|
||||
ORDER BY roll_no ASC
|
||||
</select>
|
||||
|
||||
<insert id="insertMesRollInfo" parameterType="com.ruoyi.mill.domain.MesRollInfo" useGeneratedKeys="true" keyProperty="rollId">
|
||||
insert into mes_roll_info
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="lineId != null">line_id,</if>
|
||||
<if test="rollNo != null">roll_no,</if>
|
||||
<if test="rollType != null">roll_type,</if>
|
||||
<if test="status != null">status,</if>
|
||||
<if test="initialDia != null">initial_dia,</if>
|
||||
<if test="currentDia != null">current_dia,</if>
|
||||
<if test="minDia != null">min_dia,</if>
|
||||
<if test="roughness != null">roughness,</if>
|
||||
<if test="crown != null">crown,</if>
|
||||
<if test="material != null">material,</if>
|
||||
<if test="grindCount != null">grind_count,</if>
|
||||
<if test="manufactureDate != null">manufacture_date,</if>
|
||||
<if test="manufacturer != null">manufacturer,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
del_flag,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="lineId != null">#{lineId},</if>
|
||||
<if test="rollNo != null">#{rollNo},</if>
|
||||
<if test="rollType != null">#{rollType},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
<if test="initialDia != null">#{initialDia},</if>
|
||||
<if test="currentDia != null">#{currentDia},</if>
|
||||
<if test="minDia != null">#{minDia},</if>
|
||||
<if test="roughness != null">#{roughness},</if>
|
||||
<if test="crown != null">#{crown},</if>
|
||||
<if test="material != null">#{material},</if>
|
||||
<if test="grindCount != null">#{grindCount},</if>
|
||||
<if test="manufactureDate != null">#{manufactureDate},</if>
|
||||
<if test="manufacturer != null">#{manufacturer},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
0,
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateMesRollInfo" parameterType="com.ruoyi.mill.domain.MesRollInfo">
|
||||
update mes_roll_info
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="rollNo != null">roll_no = #{rollNo},</if>
|
||||
<if test="rollType != null">roll_type = #{rollType},</if>
|
||||
<if test="status != null">status = #{status},</if>
|
||||
<if test="initialDia != null">initial_dia = #{initialDia},</if>
|
||||
<if test="currentDia != null">current_dia = #{currentDia},</if>
|
||||
<if test="minDia != null">min_dia = #{minDia},</if>
|
||||
<if test="roughness != null">roughness = #{roughness},</if>
|
||||
<if test="crown != null">crown = #{crown},</if>
|
||||
<if test="material != null">material = #{material},</if>
|
||||
<if test="grindCount != null">grind_count = #{grindCount},</if>
|
||||
<if test="totalRolledWeight != null">total_rolled_weight = #{totalRolledWeight},</if>
|
||||
<if test="totalRolledLength != null">total_rolled_length = #{totalRolledLength},</if>
|
||||
<if test="totalRolledCount != null">total_rolled_count = #{totalRolledCount},</if>
|
||||
<if test="manufactureDate != null">manufacture_date = #{manufactureDate},</if>
|
||||
<if test="manufacturer != null">manufacturer = #{manufacturer},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where roll_id = #{rollId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteMesRollInfoById" parameterType="Long">
|
||||
update mes_roll_info set del_flag = 1 where roll_id = #{rollId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteMesRollInfoByIds" parameterType="Long">
|
||||
update mes_roll_info set del_flag = 1 where roll_id in
|
||||
<foreach item="rollId" collection="array" open="(" separator="," close=")">
|
||||
#{rollId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<update id="updateStatusByRollNo">
|
||||
UPDATE mes_roll_info SET status = #{status}, update_time = NOW()
|
||||
WHERE del_flag = 0 AND roll_no = #{rollNo}
|
||||
</update>
|
||||
|
||||
<update id="incrementGrindCount">
|
||||
UPDATE mes_roll_info
|
||||
SET grind_count = grind_count + 1,
|
||||
<if test="diaAfter != null">current_dia = #{diaAfter},</if>
|
||||
update_time = NOW()
|
||||
WHERE del_flag = 0 AND roll_id = #{rollId}
|
||||
</update>
|
||||
|
||||
<update id="updateCurrentDia">
|
||||
UPDATE mes_roll_info SET current_dia = #{currentDia}, update_time = NOW()
|
||||
WHERE del_flag = 0 AND roll_id = #{rollId}
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,121 @@
|
||||
<?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.ruoyi.mill.mapper.QcInspectionItemMapper">
|
||||
|
||||
<resultMap type="com.ruoyi.mill.domain.QcInspectionItem" id="QcInspectionItemResult">
|
||||
<id property="itemId" column="item_id" />
|
||||
<result property="taskId" column="task_id" />
|
||||
<result property="itemName" column="item_name" />
|
||||
<result property="standardValue" column="standard_value" />
|
||||
<result property="upperLimit" column="upper_limit" />
|
||||
<result property="lowerLimit" column="lower_limit" />
|
||||
<result property="unit" column="unit" />
|
||||
<result property="itemType" column="item_type" />
|
||||
<result property="inspectValue" column="inspect_value" />
|
||||
<result property="isQualified" column="is_qualified" />
|
||||
<result property="judgeResult" column="judge_result" />
|
||||
<result property="inspectUser" column="inspect_user" />
|
||||
<result property="inspectTime" column="inspect_time" />
|
||||
<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="selectQcInspectionItemList" parameterType="com.ruoyi.mill.domain.QcInspectionItem" resultMap="QcInspectionItemResult">
|
||||
SELECT item_id, task_id, item_name, standard_value, upper_limit, lower_limit, unit,
|
||||
item_type, inspect_value, is_qualified, judge_result, inspect_user, inspect_time,
|
||||
remark, del_flag, create_by, create_time
|
||||
FROM qc_inspection_item
|
||||
<where>
|
||||
AND del_flag = 0
|
||||
<if test="taskId != null"> AND task_id = #{taskId}</if>
|
||||
<if test="itemName != null and itemName != ''"> AND item_name LIKE concat('%', #{itemName}, '%')</if>
|
||||
</where>
|
||||
ORDER BY item_id ASC
|
||||
</select>
|
||||
|
||||
<select id="selectQcInspectionItemByTaskId" resultMap="QcInspectionItemResult">
|
||||
SELECT item_id, task_id, item_name, standard_value, upper_limit, lower_limit, unit,
|
||||
item_type, inspect_value, is_qualified, judge_result, inspect_user, inspect_time, remark
|
||||
FROM qc_inspection_item
|
||||
WHERE del_flag = 0 AND task_id = #{taskId}
|
||||
ORDER BY item_id ASC
|
||||
</select>
|
||||
|
||||
<select id="selectQcInspectionItemById" parameterType="Long" resultMap="QcInspectionItemResult">
|
||||
SELECT * FROM qc_inspection_item WHERE item_id = #{itemId} AND del_flag = 0
|
||||
</select>
|
||||
|
||||
<insert id="insertQcInspectionItem" parameterType="com.ruoyi.mill.domain.QcInspectionItem" useGeneratedKeys="true" keyProperty="itemId">
|
||||
INSERT INTO qc_inspection_item
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="taskId != null">task_id,</if>
|
||||
<if test="itemName != null">item_name,</if>
|
||||
<if test="standardValue != null">standard_value,</if>
|
||||
<if test="upperLimit != null">upper_limit,</if>
|
||||
<if test="lowerLimit != null">lower_limit,</if>
|
||||
<if test="unit != null">unit,</if>
|
||||
<if test="itemType != null">item_type,</if>
|
||||
<if test="inspectValue != null">inspect_value,</if>
|
||||
<if test="isQualified != null">is_qualified,</if>
|
||||
<if test="judgeResult != null">judge_result,</if>
|
||||
<if test="inspectUser != null">inspect_user,</if>
|
||||
<if test="inspectTime != null">inspect_time,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
del_flag,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="taskId != null">#{taskId},</if>
|
||||
<if test="itemName != null">#{itemName},</if>
|
||||
<if test="standardValue != null">#{standardValue},</if>
|
||||
<if test="upperLimit != null">#{upperLimit},</if>
|
||||
<if test="lowerLimit != null">#{lowerLimit},</if>
|
||||
<if test="unit != null">#{unit},</if>
|
||||
<if test="itemType != null">#{itemType},</if>
|
||||
<if test="inspectValue != null">#{inspectValue},</if>
|
||||
<if test="isQualified != null">#{isQualified},</if>
|
||||
<if test="judgeResult != null">#{judgeResult},</if>
|
||||
<if test="inspectUser != null">#{inspectUser},</if>
|
||||
<if test="inspectTime != null">#{inspectTime},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
0,
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateQcInspectionItem" parameterType="com.ruoyi.mill.domain.QcInspectionItem">
|
||||
UPDATE qc_inspection_item
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="itemName != null">item_name = #{itemName},</if>
|
||||
<if test="standardValue != null">standard_value = #{standardValue},</if>
|
||||
<if test="upperLimit != null">upper_limit = #{upperLimit},</if>
|
||||
<if test="lowerLimit != null">lower_limit = #{lowerLimit},</if>
|
||||
<if test="unit != null">unit = #{unit},</if>
|
||||
<if test="itemType != null">item_type = #{itemType},</if>
|
||||
<if test="inspectValue != null">inspect_value = #{inspectValue},</if>
|
||||
<if test="isQualified != null">is_qualified = #{isQualified},</if>
|
||||
<if test="judgeResult != null">judge_result = #{judgeResult},</if>
|
||||
<if test="inspectUser != null">inspect_user = #{inspectUser},</if>
|
||||
<if test="inspectTime != null">inspect_time = #{inspectTime},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
WHERE item_id = #{itemId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteQcInspectionItemById">
|
||||
UPDATE qc_inspection_item SET del_flag = 1 WHERE item_id = #{itemId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteQcInspectionItemByTaskId">
|
||||
UPDATE qc_inspection_item SET del_flag = 1 WHERE task_id = #{taskId}
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,182 @@
|
||||
<?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.ruoyi.mill.mapper.QcInspectionTaskMapper">
|
||||
|
||||
<resultMap type="com.ruoyi.mill.domain.QcInspectionTask" id="QcInspectionTaskResult">
|
||||
<id property="taskId" column="task_id" />
|
||||
<result property="taskCode" column="task_code" />
|
||||
<result property="taskType" column="task_type" />
|
||||
<result property="belongCompany" column="belong_company" />
|
||||
<result property="sourceType" column="source_type" />
|
||||
<result property="sourceId" column="source_id" />
|
||||
<result property="schemeId" column="scheme_id" />
|
||||
<result property="schemeName" column="scheme_name" />
|
||||
<result property="status" column="status" />
|
||||
<result property="inspectUser" column="inspect_user" />
|
||||
<result property="inspectTime" column="inspect_time" />
|
||||
<result property="auditUser" column="audit_user" />
|
||||
<result property="auditTime" column="audit_time" />
|
||||
<result property="result" column="result" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="coilIds" column="coil_ids" />
|
||||
<result property="enterCoilNos" column="enter_coil_nos" />
|
||||
<result property="attachmentFiles" column="attachment_files" />
|
||||
<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>
|
||||
|
||||
<sql id="selectTaskVo">
|
||||
SELECT task_id, task_code, task_type, belong_company, source_type, source_id,
|
||||
scheme_id, scheme_name, status, inspect_user, inspect_time, audit_user, audit_time,
|
||||
result, remark, coil_ids, enter_coil_nos, attachment_files, del_flag,
|
||||
create_by, create_time, update_by, update_time
|
||||
FROM qc_inspection_task
|
||||
</sql>
|
||||
|
||||
<select id="selectQcInspectionTaskList" parameterType="com.ruoyi.mill.domain.QcInspectionTask" resultMap="QcInspectionTaskResult">
|
||||
<include refid="selectTaskVo"/>
|
||||
<where>
|
||||
AND del_flag = 0
|
||||
<if test="taskCode != null and taskCode != ''"> AND task_code LIKE concat('%', #{taskCode}, '%')</if>
|
||||
<if test="taskType != null and taskType != ''"> AND task_type = #{taskType}</if>
|
||||
<if test="belongCompany != null and belongCompany != ''"> AND belong_company = #{belongCompany}</if>
|
||||
<if test="schemeName != null and schemeName != ''"> AND scheme_name = #{schemeName}</if>
|
||||
<if test="status != null"> AND status = #{status}</if>
|
||||
<if test="inspectUser != null and inspectUser != ''"> AND inspect_user LIKE concat('%', #{inspectUser}, '%')</if>
|
||||
<if test="result != null and result != ''"> AND result = #{result}</if>
|
||||
<if test="coilId != null"> AND FIND_IN_SET(#{coilId}, coil_ids)</if>
|
||||
<if test="beginTime != null and beginTime != ''"> AND create_time >= #{beginTime}</if>
|
||||
<if test="endTime != null and endTime != ''"> AND create_time <= concat(#{endTime}, ' 23:59:59')</if>
|
||||
</where>
|
||||
ORDER BY create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="selectQcInspectionTaskListByCoilIds" resultMap="QcInspectionTaskResult">
|
||||
<include refid="selectTaskVo"/>
|
||||
<where>
|
||||
AND del_flag = 0
|
||||
<if test="task.taskCode != null and task.taskCode != ''"> AND task_code LIKE concat('%', #{task.taskCode}, '%')</if>
|
||||
<if test="task.taskType != null and task.taskType != ''"> AND task_type = #{task.taskType}</if>
|
||||
<if test="task.status != null"> AND status = #{task.status}</if>
|
||||
<if test="task.inspectUser != null and task.inspectUser != ''"> AND inspect_user LIKE concat('%', #{task.inspectUser}, '%')</if>
|
||||
<if test="task.result != null and task.result != ''"> AND result = #{task.result}</if>
|
||||
<if test="task.coilId != null"> AND FIND_IN_SET(#{task.coilId}, coil_ids)</if>
|
||||
<if test="task.beginTime != null and task.beginTime != ''"> AND create_time >= #{task.beginTime}</if>
|
||||
<if test="task.endTime != null and task.endTime != ''"> AND create_time <= concat(#{task.endTime}, ' 23:59:59')</if>
|
||||
<if test="coilIds != null and coilIds.size() > 0">
|
||||
AND (
|
||||
<foreach item="cid" collection="coilIds" separator=" OR ">
|
||||
FIND_IN_SET(#{cid}, coil_ids)
|
||||
</foreach>
|
||||
)
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="selectQcInspectionTaskById" parameterType="Long" resultMap="QcInspectionTaskResult">
|
||||
<include refid="selectTaskVo"/>
|
||||
WHERE task_id = #{taskId} AND del_flag = 0
|
||||
</select>
|
||||
|
||||
<!-- 获取双机架 processed_coil_ids -->
|
||||
<select id="selectDoubleRackProcessedCoilIds" resultType="string">
|
||||
SELECT processed_coil_ids
|
||||
FROM wms_coil_pending_action
|
||||
WHERE del_flag = 0
|
||||
AND processed_coil_ids IS NOT NULL
|
||||
AND processed_coil_ids != ''
|
||||
AND action_type IN
|
||||
<foreach item="t" collection="actionTypes" open="(" separator="," close=")">
|
||||
#{t}
|
||||
</foreach>
|
||||
</select>
|
||||
|
||||
<!-- 按 coilId 列表获取钢卷信息（coilId + 卷号） -->
|
||||
<select id="selectCoilInfoByIds" resultType="map">
|
||||
SELECT coil_id AS coilId, current_coil_no AS coilNo, enter_coil_no AS enterCoilNo
|
||||
FROM wms_material_coil
|
||||
WHERE del_flag = 0
|
||||
AND coil_id IN
|
||||
<foreach item="id" collection="coilIds" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
ORDER BY create_time DESC
|
||||
</select>
|
||||
|
||||
<insert id="insertQcInspectionTask" parameterType="com.ruoyi.mill.domain.QcInspectionTask" useGeneratedKeys="true" keyProperty="taskId">
|
||||
INSERT INTO qc_inspection_task
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="taskCode != null">task_code,</if>
|
||||
<if test="taskType != null">task_type,</if>
|
||||
<if test="belongCompany != null">belong_company,</if>
|
||||
<if test="sourceType != null">source_type,</if>
|
||||
<if test="schemeId != null">scheme_id,</if>
|
||||
<if test="schemeName != null">scheme_name,</if>
|
||||
<if test="status != null">status,</if>
|
||||
<if test="inspectUser != null">inspect_user,</if>
|
||||
<if test="inspectTime != null">inspect_time,</if>
|
||||
<if test="result != null">result,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="coilIds != null">coil_ids,</if>
|
||||
<if test="enterCoilNos != null">enter_coil_nos,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
del_flag,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="taskCode != null">#{taskCode},</if>
|
||||
<if test="taskType != null">#{taskType},</if>
|
||||
<if test="belongCompany != null">#{belongCompany},</if>
|
||||
<if test="sourceType != null">#{sourceType},</if>
|
||||
<if test="schemeId != null">#{schemeId},</if>
|
||||
<if test="schemeName != null">#{schemeName},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
<if test="inspectUser != null">#{inspectUser},</if>
|
||||
<if test="inspectTime != null">#{inspectTime},</if>
|
||||
<if test="result != null">#{result},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="coilIds != null">#{coilIds},</if>
|
||||
<if test="enterCoilNos != null">#{enterCoilNos},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
0,
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateQcInspectionTask" parameterType="com.ruoyi.mill.domain.QcInspectionTask">
|
||||
UPDATE qc_inspection_task
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="taskType != null">task_type = #{taskType},</if>
|
||||
<if test="belongCompany != null">belong_company = #{belongCompany},</if>
|
||||
<if test="schemeName != null">scheme_name = #{schemeName},</if>
|
||||
<if test="status != null">status = #{status},</if>
|
||||
<if test="inspectUser != null">inspect_user = #{inspectUser},</if>
|
||||
<if test="inspectTime != null">inspect_time = #{inspectTime},</if>
|
||||
<if test="auditUser != null">audit_user = #{auditUser},</if>
|
||||
<if test="auditTime != null">audit_time = #{auditTime},</if>
|
||||
<if test="result != null">result = #{result},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="coilIds != null">coil_ids = #{coilIds},</if>
|
||||
<if test="enterCoilNos != null">enter_coil_nos = #{enterCoilNos},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
WHERE task_id = #{taskId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteQcInspectionTaskById">
|
||||
UPDATE qc_inspection_task SET del_flag = 1 WHERE task_id = #{taskId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteQcInspectionTaskByIds">
|
||||
UPDATE qc_inspection_task SET del_flag = 1 WHERE task_id IN
|
||||
<foreach item="taskId" collection="array" open="(" separator="," close=")">
|
||||
#{taskId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,168 @@
|
||||
<?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.ruoyi.mill.mapper.WmsCoilAbnormalMapper">
|
||||
|
||||
<resultMap type="com.ruoyi.mill.domain.WmsCoilAbnormal" id="WmsCoilAbnormalResult">
|
||||
<id property="abnormalId" column="abnormal_id" />
|
||||
<result property="coilId" column="coil_id" />
|
||||
<result property="productionLine" column="production_line" />
|
||||
<result property="position" column="position" />
|
||||
<result property="plateSurface" column="plate_surface" />
|
||||
<result property="length" column="length" />
|
||||
<result property="startPosition" column="start_position" />
|
||||
<result property="endPosition" column="end_position" />
|
||||
<result property="defectCode" column="defect_code" />
|
||||
<result property="defectType" column="defect_type" />
|
||||
<result property="defectRate" column="defect_rate" />
|
||||
<result property="defectWeight" column="defect_weight" />
|
||||
<result property="degree" column="degree" />
|
||||
<result property="judgeLevel" column="judge_level" />
|
||||
<result property="judgeBy" column="judge_by" />
|
||||
<result property="judgeTime" column="judge_time" />
|
||||
<result property="mainMark" column="main_mark" />
|
||||
<result property="wholeCoilMark" column="whole_coil_mark" />
|
||||
<result property="attachmentFiles" column="attachment_files" />
|
||||
<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" />
|
||||
<result property="coilNo" column="current_coil_no" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectAbnormalVo">
|
||||
SELECT a.abnormal_id, a.coil_id, a.production_line, a.position, a.plate_surface,
|
||||
a.length, a.start_position, a.end_position, a.defect_code, a.defect_type,
|
||||
a.defect_rate, a.defect_weight, a.degree, a.judge_level, a.judge_by, a.judge_time,
|
||||
a.main_mark, a.whole_coil_mark, a.attachment_files, a.remark, a.del_flag,
|
||||
a.create_by, a.create_time, a.update_by, a.update_time,
|
||||
mc.current_coil_no
|
||||
FROM wms_coil_abnormal a
|
||||
LEFT JOIN wms_material_coil mc ON a.coil_id = mc.coil_id AND mc.del_flag = 0
|
||||
</sql>
|
||||
|
||||
<select id="selectWmsCoilAbnormalList" parameterType="com.ruoyi.mill.domain.WmsCoilAbnormal" resultMap="WmsCoilAbnormalResult">
|
||||
<include refid="selectAbnormalVo"/>
|
||||
<where>
|
||||
AND a.del_flag = 0
|
||||
<if test="coilId != null"> AND a.coil_id = #{coilId}</if>
|
||||
<if test="coilNo != null and coilNo != ''"> AND mc.current_coil_no LIKE concat('%', #{coilNo}, '%')</if>
|
||||
<if test="productionLine != null and productionLine != ''"> AND a.production_line LIKE concat('%', #{productionLine}, '%')</if>
|
||||
<if test="defectType != null and defectType != ''"> AND a.defect_type LIKE concat('%', #{defectType}, '%')</if>
|
||||
<if test="degree != null and degree != ''"> AND a.degree = #{degree}</if>
|
||||
<if test="judgeLevel != null and judgeLevel != ''"> AND a.judge_level = #{judgeLevel}</if>
|
||||
<if test="beginTime != null and beginTime != ''"> AND a.judge_time >= #{beginTime}</if>
|
||||
<if test="endTime != null and endTime != ''"> AND a.judge_time <= concat(#{endTime}, ' 23:59:59')</if>
|
||||
</where>
|
||||
ORDER BY a.create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="selectWmsCoilAbnormalListByCoilIds" resultMap="WmsCoilAbnormalResult">
|
||||
<include refid="selectAbnormalVo"/>
|
||||
<where>
|
||||
AND a.del_flag = 0
|
||||
<if test="abnormal.coilId != null"> AND a.coil_id = #{abnormal.coilId}</if>
|
||||
<if test="abnormal.coilNo != null and abnormal.coilNo != ''"> AND mc.current_coil_no LIKE concat('%', #{abnormal.coilNo}, '%')</if>
|
||||
<if test="abnormal.productionLine != null and abnormal.productionLine != ''"> AND a.production_line LIKE concat('%', #{abnormal.productionLine}, '%')</if>
|
||||
<if test="abnormal.defectType != null and abnormal.defectType != ''"> AND a.defect_type LIKE concat('%', #{abnormal.defectType}, '%')</if>
|
||||
<if test="abnormal.degree != null and abnormal.degree != ''"> AND a.degree = #{abnormal.degree}</if>
|
||||
<if test="abnormal.beginTime != null and abnormal.beginTime != ''"> AND a.judge_time >= #{abnormal.beginTime}</if>
|
||||
<if test="abnormal.endTime != null and abnormal.endTime != ''"> AND a.judge_time <= concat(#{abnormal.endTime}, ' 23:59:59')</if>
|
||||
<if test="coilIds != null and coilIds.size() > 0">
|
||||
AND a.coil_id IN
|
||||
<foreach item="cid" collection="coilIds" open="(" separator="," close=")">
|
||||
#{cid}
|
||||
</foreach>
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY a.create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="selectWmsCoilAbnormalById" parameterType="Long" resultMap="WmsCoilAbnormalResult">
|
||||
<include refid="selectAbnormalVo"/>
|
||||
WHERE a.abnormal_id = #{abnormalId} AND a.del_flag = 0
|
||||
</select>
|
||||
|
||||
<insert id="insertWmsCoilAbnormal" parameterType="com.ruoyi.mill.domain.WmsCoilAbnormal" useGeneratedKeys="true" keyProperty="abnormalId">
|
||||
INSERT INTO wms_coil_abnormal
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="coilId != null">coil_id,</if>
|
||||
<if test="productionLine != null">production_line,</if>
|
||||
<if test="position != null">position,</if>
|
||||
<if test="plateSurface != null">plate_surface,</if>
|
||||
<if test="length != null">length,</if>
|
||||
<if test="startPosition != null">start_position,</if>
|
||||
<if test="endPosition != null">end_position,</if>
|
||||
<if test="defectCode != null">defect_code,</if>
|
||||
<if test="defectType != null">defect_type,</if>
|
||||
<if test="defectRate != null">defect_rate,</if>
|
||||
<if test="defectWeight != null">defect_weight,</if>
|
||||
<if test="degree != null">degree,</if>
|
||||
<if test="judgeLevel != null">judge_level,</if>
|
||||
<if test="judgeBy != null">judge_by,</if>
|
||||
<if test="judgeTime != null">judge_time,</if>
|
||||
<if test="mainMark != null">main_mark,</if>
|
||||
<if test="wholeCoilMark != null">whole_coil_mark,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
del_flag,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="coilId != null">#{coilId},</if>
|
||||
<if test="productionLine != null">#{productionLine},</if>
|
||||
<if test="position != null">#{position},</if>
|
||||
<if test="plateSurface != null">#{plateSurface},</if>
|
||||
<if test="length != null">#{length},</if>
|
||||
<if test="startPosition != null">#{startPosition},</if>
|
||||
<if test="endPosition != null">#{endPosition},</if>
|
||||
<if test="defectCode != null">#{defectCode},</if>
|
||||
<if test="defectType != null">#{defectType},</if>
|
||||
<if test="defectRate != null">#{defectRate},</if>
|
||||
<if test="defectWeight != null">#{defectWeight},</if>
|
||||
<if test="degree != null">#{degree},</if>
|
||||
<if test="judgeLevel != null">#{judgeLevel},</if>
|
||||
<if test="judgeBy != null">#{judgeBy},</if>
|
||||
<if test="judgeTime != null">#{judgeTime},</if>
|
||||
<if test="mainMark != null">#{mainMark},</if>
|
||||
<if test="wholeCoilMark != null">#{wholeCoilMark},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
0,
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateWmsCoilAbnormal" parameterType="com.ruoyi.mill.domain.WmsCoilAbnormal">
|
||||
UPDATE wms_coil_abnormal
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="productionLine != null">production_line = #{productionLine},</if>
|
||||
<if test="position != null">position = #{position},</if>
|
||||
<if test="plateSurface != null">plate_surface = #{plateSurface},</if>
|
||||
<if test="defectType != null">defect_type = #{defectType},</if>
|
||||
<if test="defectRate != null">defect_rate = #{defectRate},</if>
|
||||
<if test="defectWeight != null">defect_weight = #{defectWeight},</if>
|
||||
<if test="degree != null">degree = #{degree},</if>
|
||||
<if test="judgeLevel != null">judge_level = #{judgeLevel},</if>
|
||||
<if test="judgeBy != null">judge_by = #{judgeBy},</if>
|
||||
<if test="judgeTime != null">judge_time = #{judgeTime},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
WHERE abnormal_id = #{abnormalId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteWmsCoilAbnormalById">
|
||||
UPDATE wms_coil_abnormal SET del_flag = 1 WHERE abnormal_id = #{abnormalId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteWmsCoilAbnormalByIds">
|
||||
UPDATE wms_coil_abnormal SET del_flag = 1 WHERE abnormal_id IN
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user