盘点自动分配测试

ruoyi-admin/src/main/resources/application-druid.yml

@@ -35,7 +35,7 @@ spring:
             # 配置一个连接在池中最大生存的时间，单位是毫秒
             maxEvictableIdleTimeMillis: 900000
             # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM sys_oper_log
+            validationQuery: SELECT 1 FROM sys_user
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false

ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml

@@ -65,9 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="autoAllot" parameterType="java.util.Map" statementType="CALLABLE">
         {
             call proc_check_auto_allocation(
-                #{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
+                #{v_stock_check_id,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=VARCHAR},
-                #{v_resultString,mode=OUT,jdbcType=VARCHAR}
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
                  )
             }
     </select>

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

@@ -86,6 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag = #{faultFlag}</if>
             <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20</if>
             <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20</if>
+            <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
+            <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
         </where>
     </select>