立库取货

src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoTaskServiceImpl.java

@@ -787,8 +787,8 @@ public class AutoTaskServiceImpl implements AutoTaskService {
             wmsTransportTask.getPalletId(),
             wmsTransportTask.getToLocation()
         );
-        
-        if(readyPallet != null){
+        //其他地方  站点状态必须是1 有货 才能被下达取货任务     如果是Z103  立库口 不管控 因为多个系统交互 会有接口的时间差导致货位失效 而且立库会卡控小车的进入
+        if(readyPallet != null&&("Z103".equals(readyPallet.getAreaId())||readyPallet.getStatusDb()==1)){
             // 3.2 托盘就绪，更新任务和托盘状态 - rqrq
             System.out.println("托盘已就绪 - rqrq：palletId=" + readyPallet.getPalletId());
             
@@ -924,6 +924,7 @@ public class AutoTaskServiceImpl implements AutoTaskService {
             // 最多重试3次，防止死循环 - rqrq
             int maxRetries = 3;
             for(int i = 0; i < maxRetries; i++){
+                //如果区域不是Z103 那么查询空闲站点  如果区域是Z103 只要管控同时有几个入库任务就行
                 // 查询该区域下的空闲站点（status_db=0）- rqrq
                 String idleStation = wcsIntegrationMapper.findFirstFreeStationByAreaId(wmsTransportTask.getToArea());
                 

src/main/java/com/gaotao/modules/warehouse/entity/Pallet.java

@@ -148,7 +148,11 @@ public class Pallet {
      */
     @TableField(exist = false)
     private Integer size = 20;
+    @TableField(exist = false)
+    private Integer statusDb ;
 
+    @TableField(exist = false)
+    private String areaId ;
     /**
      * 栈板在立库时的仓库ID常量
      */

src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml

@@ -1546,7 +1546,9 @@
             p.pallet_family AS palletFamily,
             p.sore_type AS soreType,
             p.auto_sort AS autoSort,
-            p.empty_flag AS emptyFlag
+            p.empty_flag AS emptyFlag,
+            s.status_db as statusDb,
+        s.area_type as areaId
         FROM pallet p
         INNER JOIN agv_station s ON p.location_code = s.station_code
         WHERE p.site = #{site}
@@ -1554,7 +1556,6 @@
           AND p.calling_flag = 'N'
           AND p.is_deleted = '0'
           AND s.area_type IN ('Z101', 'Z103', 'Z104')
-          AND s.status_db = 1
           AND s.active = 'Y'
     </select>