DeXun/double-rack
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

双机架完成全局样式替换，并且完成工艺管理和生产计划管理，以及完成udp电文数据贯通能力

Browse Source
This commit is contained in:
wangyu
2026-04-28 14:44:13 +08:00
parent 3e0484b55c
commit f1e0303645
20 changed files with 447 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-mill/src/main/resources/mapper/mill/MillProcessPassMapper.xml
View File

@@ -4,7 +4,7 @@
<mapper namespace="com.ruoyi.mill.mapper.MillProcessPassMapper">
<resultMap id="BaseRM" type="com.ruoyi.mill.domain.MillProcessPass">
<id property="id" column="id"/>
<id property="passId" column="pass_id"/>
<result property="recipeId" column="recipe_id"/>
<result property="passNo" column="pass_no"/>
<result property="inThick" column="in_thick"/>
@@ -27,7 +27,7 @@
</resultMap>
<select id="selectByRecipeId" resultMap="BaseRM">
SELECT id, recipe_id, pass_no, in_thick, out_thick, width,
SELECT pass_id, recipe_id, pass_no, in_thick, out_thick, width,
roll_force, in_tension, out_tension, max_speed,
in_unit_tension, out_unit_tension, reduction, total_reduction,
del_flag, create_by, create_time, update_by, update_time, remark

16
ruoyi-mill/src/main/resources/mapper/mill/MillProcessRecipeMapper.xml
View File

@@ -4,7 +4,7 @@
<mapper namespace="com.ruoyi.mill.mapper.MillProcessRecipeMapper">
<resultMap id="BaseRM" type="com.ruoyi.mill.domain.MillProcessRecipe">
<id property="id" column="id"/>
<id property="recipeId" column="recipe_id"/>
<result property="recipeNo" column="recipe_no"/>
<result property="alloyNo" column="alloy_no"/>
<result property="passCount" column="pass_count"/>
@@ -21,7 +21,7 @@
</resultMap>
<sql id="cols">
id, recipe_no, alloy_no, pass_count, in_thick, out_thick, out_width,
recipe_id, recipe_no, alloy_no, pass_count, in_thick, out_thick, out_width,
status, del_flag, create_by, create_time, update_by, update_time, remark
</sql>
@@ -38,12 +38,12 @@
<if test="status != null and status != ''">
AND status = #{status}
</if>
ORDER BY id ASC
ORDER BY recipe_id ASC
</select>
<select id="selectById" resultMap="BaseRM">
SELECT <include refid="cols"/> FROM mill_process_recipe
WHERE id = #{id} AND del_flag = '0'
WHERE recipe_id = #{recipeId} AND del_flag = '0'
</select>
<select id="selectByRecipeNo" resultMap="BaseRM">
@@ -73,17 +73,17 @@
update_by = #{updateBy},
update_time = NOW(),
remark = #{remark}
WHERE id = #{id}
WHERE recipe_id = #{recipeId}
</update>
<update id="deleteById">
UPDATE mill_process_recipe SET del_flag = '2', update_time = NOW() WHERE id = #{id}
UPDATE mill_process_recipe SET del_flag = '2', update_time = NOW() WHERE recipe_id = #{recipeId}
</update>
<update id="deleteBatchByIds">
UPDATE mill_process_recipe SET del_flag = '2', update_time = NOW()
WHERE id IN
<foreach collection="array" item="id" open="(" separator="," close=")">#{id}</foreach>
WHERE recipe_id IN
<foreach collection="array" item="recipeId" open="(" separator="," close=")">#{recipeId}</foreach>
</update>
</mapper>

12
ruoyi-mill/src/main/resources/mapper/mill/MillProductionPlanMapper.xml
View File

@@ -4,7 +4,7 @@
<mapper namespace="com.ruoyi.mill.mapper.MillProductionPlanMapper">
<resultMap id="BaseRM" type="com.ruoyi.mill.domain.MillProductionPlan">
<id property="id" column="id"/>
<id property="planId" column="plan_id"/>
<result property="planNo" column="plan_no"/>
<result property="matSeqNo" column="mat_seq_no"/>
<result property="unitCode" column="unit_code"/>
@@ -34,7 +34,7 @@
</resultMap>
<sql id="cols">
id, plan_no, mat_seq_no, unit_code, plan_type, plan_status, prod_status, sort_no,
plan_id, plan_no, mat_seq_no, unit_code, plan_type, plan_status, prod_status, sort_no,
in_mat_no, in_mat_thick, in_mat_width, in_mat_wt, in_mat_len, in_mat_in_dia, in_mat_dia,
pono, sg_sign, out_mat_no, out_thick, recipe_id, recipe_no,
del_flag, create_by, create_time, update_by, update_time, remark
@@ -63,7 +63,7 @@
<select id="selectById" resultMap="BaseRM">
SELECT <include refid="cols"/> FROM mill_production_plan
WHERE id = #{id} AND del_flag = '0'
WHERE plan_id = #{planId} AND del_flag = '0'
</select>
<select id="selectByPlanNo" resultMap="BaseRM">
@@ -106,11 +106,11 @@
update_by = #{updateBy},
update_time = NOW(),
remark = #{remark}
WHERE id = #{id}
WHERE plan_id = #{planId}
</update>
<update id="deleteById">
UPDATE mill_production_plan SET del_flag = '2', update_time = NOW() WHERE id = #{id}
UPDATE mill_production_plan SET del_flag = '2', update_time = NOW() WHERE plan_id = #{planId}
</update>
<update id="incrementSortFrom">
@@ -119,7 +119,7 @@
</update>
<update id="updateSortNo">
UPDATE mill_production_plan SET sort_no = #{sortNo} WHERE id = #{id}
UPDATE mill_production_plan SET sort_no = #{sortNo} WHERE plan_id = #{planId}
</update>
</mapper>