From b424d6493efb60cb8d93a2e16526086da1fc2ea9 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 01 四月 2025 16:08:11 +0800
Subject: [PATCH] *
---
src/main/resources/mapper/TaskWrkMapper.xml | 117 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 75 insertions(+), 42 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index f855a7a..6b92fe3 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -12,6 +12,9 @@
<result column="io_pri" property="ioPri" />
<result column="start_point" property="startPoint" />
<result column="target_point" property="targetPoint" />
+ <result column="origin_start_point" property="originStartPoint" />
+ <result column="origin_target_point" property="originTargetPoint" />
+ <result column="sc_weight" property="scWeight" />
<result column="modi_user" property="modiUser" />
<result column="modi_time" property="modiTime" />
<result column="memo" property="memo" />
@@ -22,84 +25,114 @@
<result column="cancel_time" property="cancelTime" />
<result column="wrk_sts" property="wrkSts" />
<result column="crn_no" property="crnNo" />
- <result column="command_step" property="commandStep" />
<result column="transfer_mark" property="transferMark" />
</resultMap>
<select id="selectByTaskNo" resultMap="BaseResultMap">
- select top 1 * from wcs_task_wrk
+ select top 1 * from "SOURCE"."wcs_task_wrk"
where 1=1
- and task_no = #{taskNo}
+ and "task_no" = #{taskNo}
+ </select>
+
+ <select id="selectByStartPoint" resultMap="BaseResultMap">
+ select top 1 * from "SOURCE"."wcs_task_wrk"
+ where 1=1
+ and "io_type"=3
+ and "start_point" = #{startPoint}
</select>
<select id="selectByWrkNo" resultMap="BaseResultMap">
- select top 1 * from wcs_task_wrk
+ select top 1 * from "SOURCE"."wcs_task_wrk"
where 1=1
- and wrk_no = #{wrkNo}
+ and "wrk_no" = #{wrkNo}
</select>
<select id="selectPakIn" resultMap="BaseResultMap">
- select top 1 * from dbo.wcs_task_wrk
- where wrk_sts=2
- and crn_no=#{crnNo}
- and wrk_no=#{workNo}
- and start_point=#{startPoint}
- and io_type=1
- order by io_pri desc,create_time,wrk_no ASC
+ select top 1 * from "SOURCE"."wcs_task_wrk"
+ where "status"=1
+ and "crn_no"=#{crnNo}
+ and "wrk_no"=#{workNo}
+ and "start_point"=#{startPoint}
+ and "io_type"=1
+ order by "io_pri" desc,"create_time","wrk_no" ASC
+ </select>
+
+ <select id="selectReceive" resultMap="BaseResultMap">
+ select * from "SOURCE"."wcs_task_wrk"
+ where 1=1
+ and "status" = 1
</select>
<select id="selectPakOutIoType" resultMap="BaseResultMap">
- select * from dbo.wcs_task_wrk
- where crn_no=#{crnNo}
- and io_type = 3
- order by io_pri desc,create_time,wrk_no ASC
+ select * from "SOURCE"."wcs_task_wrk"
+ where "crn_no"=#{crnNo}
+ and "io_type" = 3
+ order by "io_pri" desc,"create_time","wrk_no" ASC
+ </select>
+
+ <select id="selectCrnStaWorking" resultMap="BaseResultMap">
+ select * from "SOURCE"."wcs_task_wrk"
+ where "crn_no"=#{crnNo}
+ and "target_point"=#{targetPoint}
+ and "wrk_sts"=13
+ and "io_type" = 2
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
<select id="selectPakOut" resultMap="BaseResultMap">
- select * from dbo.wcs_task_wrk
- where crn_no=#{crnNo}
- and target_point=#{targetPoint}
- and wrk_sts=11
- and io_type = 2
- order by io_pri desc,create_time,wrk_no ASC
+ select * from "SOURCE"."wcs_task_wrk"
+ where "crn_no"=#{crnNo}
+ <if test="targetPoint!=null and targetPoint!='' ">
+ and "target_point"=#{targetPoint}
+ </if>
+ and "wrk_sts"=11
+ and "io_type" = 2
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
<select id="selectPakOut3" resultMap="BaseResultMap">
- select * from dbo.wcs_task_wrk
- where crn_no=#{crnNo}
- and target_point=#{targetPoint}
- and wrk_sts=11
- and io_type = 3
- order by io_pri desc,create_time,wrk_no ASC
+ select * from "SOURCE"."wcs_task_wrk"
+ where "crn_no"=#{crnNo}
+-- and target_point=#{targetPoint}
+ and "wrk_sts"=11
+ and "io_type" = 3
+ order by "io_pri" desc,"create_time" ASC
</select>
<select id="selectCrnWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.wcs_task_wrk
+ select top 1 * from "SOURCE"."wcs_task_wrk"
where 1=1
- and (wrk_sts=3 or wrk_sts=12)
- and crn_no=#{crnNo}
- order by io_pri desc,create_time,wrk_no ASC
+ and ("wrk_sts"=3 or "wrk_sts"=12)
+ and "crn_no"=#{crnNo}
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
- <select id="selectCrnNoWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.wcs_task_wrk
+ <select id="selectCrnNoInWorking" resultMap="BaseResultMap">
+ select top 1 * from "SOURCE"."wcs_task_wrk"
where 1=1
- and (wrk_sts=3 or wrk_sts=12)
- and crn_no=#{crnNo}
- and wrk_no=#{workNo}
- order by io_pri desc,create_time,wrk_no ASC
+ and ("wrk_sts"=3 or "wrk_sts"=12)
+ and "crn_no"=#{crnNo}
+ and "wrk_no"=#{workNo}
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
- select * from dbo.wcs_task_wrk
+ select * from "SOURCE"."wcs_task_wrk"
where 1=1
- and (status=3 or status=4)
- order by io_pri desc,create_time,wrk_no ASC
+ and (("wrk_sts"=14 and "status"=5) or "status"=7 or "status"=4 or ("wrk_sts"=4 and "status"=5))
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
<insert id="saveToHistory">
- insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=3 or status=4)
+ insert into "SOURCE"."wcs_task_wrk_log" select * from "SOURCE"."wcs_task_wrk" where "task_no" = #{taskNo} and ("status"=5 or "status"=4 or "status"=6)
</insert>
+ <select id="selectWorkingTask" resultMap="BaseResultMap">
+ select * from "SOURCE"."wcs_task_wrk"
+ where ("wrk_sts"=3 and "io_type" = 1)
+ or ("wrk_sts"=12 and "io_type" = 2)
+ order by "io_pri" desc,"create_time","wrk_no" ASC
+ </select>
+
</mapper>
--
Gitblit v1.9.1