From c1ef2d1fc4c0dae2bc8452924dcd77a0ff3a1ef5 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 15:02:52 +0800
Subject: [PATCH] #改造
---
src/main/resources/mapper/TaskWrkMapper.xml | 191 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 152 insertions(+), 39 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index f798daa..1793962 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -4,64 +4,177 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.TaskWrk">
- <result column="task_no" property="taskNo" />
- <result column="status" property="status" />
- <result column="wrk_no" property="wrkNo" />
- <result column="create_time" property="createTime" />
- <result column="io_type" property="ioType" />
- <result column="io_pri" property="ioPri" />
- <result column="start_point" property="startPoint" />
- <result column="target_point" property="targetPoint" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="memo" property="memo" />
- <result column="barcode" property="barcode" />
- <result column="assign_time" property="assignTime" />
- <result column="execute_time" property="executeTime" />
- <result column="complete_time" property="completeTime" />
- <result column="cancel_time" property="cancelTime" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="crn_no" property="crnNo" />
+ <result column="TASK_NO" property="taskNo" />
+ <result column="STATUS" property="status" />
+ <result column="WRK_NO" property="wrkNo" />
+ <result column="CREATE_TIME" property="createTime" />
+ <result column="IO_TYPE" property="ioType" />
+ <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" />
+ <result column="BARCODE" property="barcode" />
+ <result column="ASSIGN_TIME" property="assignTime" />
+ <result column="EXECUTE_TIME" property="executeTime" />
+ <result column="COMPLETE_TIME" property="completeTime" />
+ <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_oint=#{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 "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>
+
+ <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 "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.asr_wrk_mast
- 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 "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","WRK_NO" ASC
</select>
<select id="selectCrnWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast
+ 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="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
+ </select>
+
+ <select id="selectToBeHistoryData" resultMap="BaseResultMap">
+ select * from "SOURCE"."wcs_task_wrk"
+ where 1=1
+ 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 "SOURCE"."wcs_task_wrk_log"
+ select * from "SOURCE"."wcs_task_wrk"
+ where "TASK_NO" = #{taskNo}
+ and ("STATUS"=5 or "STATUS"=4 or "STATUS"=7)
+ </insert>
+
+ <insert id="saveToHistoryD">
+ insert into "SOURCE"."wcs_task_wrk_log" select * from "SOURCE"."wcs_task_wrk" where TASK_NO = #{taskNo}
+ </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>
+
+ <sql id="batchSeq">
+ <if test="wrkNo != null">
+ and WRK_NO = #{wrkNo}
+ </if>
+ <if test="taskNo != null">
+ and TASK_NO = #{taskNo}
+ </if>
+ <if test="status != null">
+ and STATUS = #{status}
+ </if>
+ <if test="modiTimeStart != null ">
+ <if test="modiTimeEnd != null ">
+ and MODI_TIME between #{modiTimeStart} and #{modiTimeEnd}
+ </if>
+ </if>
+ </sql>
+
+
+ <select id="selectTaskWrkList" resultMap="BaseResultMap">
+ SELECT * FROM "SOURCE"."wcs_task_wrk"
+ WHERE 1=1
+ <include refid="batchSeq"></include>
+ ORDER BY CREATE_TIME DESC
+ LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize});
+ </select>
+
+ <select id="selectTaskWrkListTotal" resultType="Long">
+ SELECT count(1) FROM "SOURCE"."wcs_task_wrk"
+ WHERE 1=1
+ <include refid="batchSeq"></include>
</select>
</mapper>
--
Gitblit v1.9.1