no message

youchain-system/src/main/java/com/youchain/appupdate/service/impl/BydAppServiceImpl.java

@@ -3,6 +3,7 @@ package com.youchain.appupdate.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.youchain.appupdate.ReturnJson.ReturnTaskVo;
 import com.youchain.appupdate.service.BydAppService;
+import com.youchain.basicdata.domain.Area;
 import com.youchain.basicdata.domain.Item;
 import com.youchain.basicdata.domain.Point;
 import com.youchain.basicdata.domain.Stock;
@@ -151,8 +152,11 @@ public class BydAppServiceImpl implements BydAppService {
         //刷新出库单状态
         pickService.refreshPickStatus(task.getPickDetail().getPick());
 
-        //Agv中所有料箱任务拣货完成；原托盘回库内
+        //成品原托盘返库；单品不回库
+        if (BaseStatus.GD_TYPE_CT.equals(pick.getOrderType())) {
             this.returnFBAgvTask(task);
+        }
+
 
     }
 
@@ -388,8 +392,22 @@ public class BydAppServiceImpl implements BydAppService {
             moveQty += task1.getMoveQty();
         }
         if (planQty == moveQty) {
+            //成品当前托盘没有库存则不需要回库;
+            List<Inventory> inventoryList = inventoryService.findByStockCode(task.getSrcStock().getCode());
+            List<Inventory> smallAreaInventories = inventoryList.stream()
+                    .filter(inv -> {
+                        if (inv.getPoint() != null && inv.getPoint().getArea() != null) {
+                            String areaName = inv.getPoint().getArea().getName();
+                            return AreaNameDic.XJQ.equals(areaName) || AreaNameDic.XJFBQ.equals(areaName);
+                        }
+                        return false;
+                    })
+                    .collect(Collectors.toList());
+            if (!smallAreaInventories.isEmpty()) {
                 kmReService.returnFBAgvTask(task.getDstPoint(), task.getSrcStock(), task.getItem());
             }
+
+        }
     }