出入库bug修改

warewms-ams/src/main/java/com/ruoyi/ams/business/BusinessServiceImpl.java

@@ -856,21 +856,20 @@ public class BusinessServiceImpl implements IBusinessService {
                             log.info("同列有阻挡=========={}", inStockByLocs);
                             continue;
                         }
-
-                        sendTask(wcsTask);
-                        wcsTask.setState(10L);
-                        wcsTaskService.updateWcsTask(wcsTask);
-                        break;
-                    }
-
-                    try {
-                        //任务下发判断
-                        businessService.taskDispatchStack(wcsTask);
-                        Thread.sleep(500);
-                    } catch (Exception e) {
-                        e.printStackTrace();
                     }
+                    sendTask(wcsTask);
+                    wcsTask.setState(10L);
+                    wcsTaskService.updateWcsTask(wcsTask);
+                    break;
                 }
+                try {
+                    //任务下发判断
+                    businessService.taskDispatchStack(wcsTask);
+                    Thread.sleep(500);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
             }
         }
     }

warewms-base/src/main/resources/mapper/base/BaseLocationInfoMapper.xml

@@ -649,7 +649,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="laneCheck" resultMap="BaseLocationInfoResult">
-        select b.* from wcs_task w left join bas_location_info b
+        select b.* from wcs_task w left join base_location_info b
         <if test="laneType == 'LANE_FROM'">
            on w.location_from = b.id where w.state in (0,1,3,10,13)
         </if>