|
|
@@ -3,7 +3,7 @@
|
|
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
|
<mapper namespace="com.ruoyi.ams.config.mapper.FlowConfigHeaderMapper">
|
|
|
-
|
|
|
+
|
|
|
<resultMap type="FlowConfigHeader" id="FlowConfigHeaderResult">
|
|
|
<result property="id" column="id" />
|
|
|
<result property="flowName" column="flow_name" />
|
|
|
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<where>
|
|
|
<if test="flowName != null and flowName != ''"> and flow_name like concat('%', #{flowName}, '%')</if>
|
|
|
</where>
|
|
|
- order by create_time desc
|
|
|
+ order by id
|
|
|
</select>
|
|
|
|
|
|
<select id="selectFlowConfigHeaderDict" parameterType="Long" resultMap="FlowConfigHeaderResult">
|
|
|
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="flowName != null and flowName != ''"> and flow_name = #{flowName}</if>
|
|
|
</where>
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<select id="selectFlowConfigHeaderById" parameterType="Long" resultMap="FlowConfigHeaderFlowConfigDetailsResult">
|
|
|
select a.id, a.flow_name,a.flow_type, a.sku_type, a.sku_type_flag, a.qty, a.qty_flag, a.weight, a.weight_flag, a.supplier, a.supplier_flag, a.location_from,a.location_from_flag, a.location_from_device, a.location_to,a.location_to_flag, a.location_to_device, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
|
|
|
a.qty_range,a.weight_range,a.supplier_range,b.id as sub_id, b.header_id as sub_header_id, b.lotatt_id as sub_lotatt_id,cf.lotatt_name as sub_lotatt_name, b.lotatt_flag as sub_lotatt_flag, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark,b.default_value as sub_default_value,
|
|
|
@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
left join lotatt_config cf on b.lotatt_id = cf.lotatt_id
|
|
|
where a.id = #{id}
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<insert id="insertFlowConfigHeader" parameterType="FlowConfigHeader" useGeneratedKeys="true" keyProperty="id">
|
|
|
insert into flow_config_header
|
|
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
|
|
@@ -230,14 +230,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</delete>
|
|
|
|
|
|
<delete id="deleteFlowConfigHeaderByIds" parameterType="String">
|
|
|
- delete from flow_config_header where id in
|
|
|
+ delete from flow_config_header where id in
|
|
|
<foreach item="id" collection="array" open="(" separator="," close=")">
|
|
|
#{id}
|
|
|
</foreach>
|
|
|
</delete>
|
|
|
-
|
|
|
+
|
|
|
<delete id="deleteFlowConfigDetailsByHeaderIds" parameterType="String">
|
|
|
- delete from flow_config_details where header_id in
|
|
|
+ delete from flow_config_details where header_id in
|
|
|
<foreach item="headerId" collection="array" open="(" separator="," close=")">
|
|
|
#{headerId}
|
|
|
</foreach>
|
|
|
@@ -265,4 +265,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<include refid="selectFlowConfigHeaderVo"/>
|
|
|
where root_flow = #{headerId}
|
|
|
</select>
|
|
|
-</mapper>
|
|
|
+</mapper>
|
