一楼单向出库口-生成堆垛机队列 到达出口完成mydojob任务，并通知wms

ruoyi-admin/src/main/resources/mapper/bas/BasCargoSpaceMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.bas.cargospace.mapper.BasCargoSpaceMapper">
-    
+
     <resultMap type="BasCargoSpace" id="BasCargoSpaceResult">
         <result property="cargoSpaceId"    column="cargo_space_id"    />
         <result property="warehouseId"    column="warehouse_id"    />
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBasCargoSpaceList" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
         <include refid="selectBasCargoSpaceVo"/>
-        <where>  
+        <where>
             <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
             <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
             <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id = #{cargoAreaId}</if>
@@ -55,11 +55,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wmsCargoSpaceId != null  and wmsCargoSpaceId != ''"> and wms_cargo_space_id = #{wmsCargoSpaceId}</if>
         </where>
     </select>
-    
+
     <select id="selectBasCargoSpaceByCargoSpaceId" parameterType="String" resultMap="BasCargoSpaceResult">
         <include refid="selectBasCargoSpaceVo"/>
         where cargo_space_id = #{cargoSpaceId}
     </select>
+    <select id="selectBasCargoSpaceByWmsCargoSpaceId"
+            resultMap="BasCargoSpaceResult">
+        <include refid="selectBasCargoSpaceVo"/>
+        where wms_cargo_space_id = #{wmsCargoSpaceId}
+    </select>
 
     <insert id="insertBasCargoSpace" parameterType="BasCargoSpace">
         insert into bas_cargo_space
@@ -140,9 +145,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteBasCargoSpaceByCargoSpaceIds" parameterType="String">
-        delete from bas_cargo_space where cargo_space_id in 
+        delete from bas_cargo_space where cargo_space_id in
         <foreach item="cargoSpaceId" collection="array" open="(" separator="," close=")">
             #{cargoSpaceId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -120,6 +120,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultFlag != null">#{faultFlag},</if>
          </trim>
     </insert>
+    <insert id="insertHistory">
+        insert into mydo_job_wcs_history
+        select * from mydo_job_wcs where job_id = #{jobId}
+    </insert>
 
     <update id="updateMydoJob" parameterType="MydoJob">
         update mydo_job_wcs

ruoyi-admin/src/main/resources/mapper/queue/DdjDeviceExecutionQueueMapper.xml

@@ -61,6 +61,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDdjDeviceExecutionQueueVo"/>
         where uuid = #{uuid}
     </select>
+    <select id="selectDdjDeviceExecutionQueueListByRwlx"
+            resultMap="DdjDeviceExecutionQueueResult">
+        <include refid="selectDdjDeviceExecutionQueueVo"/>
+        where rwlx = #{rwlx}
+
+    </select>
+
 
     <insert id="insertDdjDeviceExecutionQueue" parameterType="DdjDeviceExecutionQueue">
         insert into ddj_device_execution_queue