Merge remote-tracking branch 'origin/master'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Station.java

@@ -32,6 +32,11 @@ public class Station extends BaseEntity {
      */
     public static final Integer STATUS_FREE = 1;
 
+    /**
+     * 状态常量：预占用
+     */
+    public static final Integer PRE_STATUS_OCCUPIED = 2;
+
 
     /**
      * 站点名称

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PipelineServiceImpl.java

@@ -98,9 +98,11 @@ public class PipelineServiceImpl implements IPipelineService {
 			throw new ServiceException("查询不到站点信息： "+boxBarcode);
 		}
 
-		//查询站点 判断站点是否为空
+		//查询站点 判断站点是否为空闲
 		Station station = stationService.getById(task.getStationId());
-		if(Station.STATUS_FREE.equals(station.getStationStatus())){
+
+		//证明预占用
+		if(Station.PRE_STATUS_OCCUPIED.equals(station.getStationStatus())){
 
 		}