lsy/FT577-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整wms接口增加的字段

Browse Source
This commit is contained in:
lsymicc
2026-04-03 08:57:32 +08:00
parent b0372a0fea
commit 3be86abb94
15 changed files with 257 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ruoyi-admin/src/main/resources/mapper/job/JobCallBackMapper.xml
View File

@@ -11,13 +11,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="mydojobId" column="mydojob_id" />
<result property="status" column="status" />
<result property="createTime" column="create_time" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<!-- <result property="spare1" column="spare1" />-->
<!-- <result property="spare2" column="spare2" />-->
<!-- <result property="spare3" column="spare3" />-->
</resultMap>
<sql id="selectJobCallBackVo">
select id, type, task_no, mydojob_id, status, create_time, spare1, spare2, spare3 from job_call_back
select id, type, task_no, mydojob_id, status, create_time from job_call_back
</sql>
<select id="selectJobCallBackList" parameterType="JobCallBack" resultMap="JobCallBackResult">
@@ -50,9 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mydojobId != null">mydojob_id,</if>
<if test="status != null">status,</if>
<if test="createTime != null">create_time,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<!-- <if test="spare1 != null">spare1,</if>-->
<!-- <if test="spare2 != null">spare2,</if>-->
<!-- <if test="spare3 != null">spare3,</if>-->
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="type != null">#{type},</if>
@@ -60,9 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mydojobId != null">#{mydojobId},</if>
<if test="status != null">#{status},</if>
<if test="createTime != null">#{createTime},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<!-- <if test="spare1 != null">#{spare1},</if>-->
<!-- <if test="spare2 != null">#{spare2},</if>-->
<!-- <if test="spare3 != null">#{spare3},</if>-->
</trim>
</insert>
@@ -74,9 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mydojobId != null">mydojob_id = #{mydojobId},</if>
<if test="status != null">status = #{status},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<!-- <if test="spare1 != null">spare1 = #{spare1},</if>-->
<!-- <if test="spare2 != null">spare2 = #{spare2},</if>-->
<!-- <if test="spare3 != null">spare3 = #{spare3},</if>-->
</trim>
where id = #{id}
</update>
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<select id="getTopJobCallBack" resultMap="JobCallBackResult">
select top(1) id, type, task_no, mydojob_id, status, create_time, spare1, spare2, spare3 from job_call_back
select top(1) id, type, task_no, mydojob_id, status, create_timefrom job_call_back
where status = '0' and spare1 in ('0','1','2')
order by create_time asc
</select>