设置点位

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/AGVNodeServiceImpl.java

@@ -10,6 +10,7 @@ import com.github.zuihou.business.edgeLibrary.service.StorgeService;
 import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.business.operationManagementCenter.entity.TaskNode;
 import com.github.zuihou.business.operationManagementCenter.service.TaskNodeService;
+import com.github.zuihou.business.operationManagementCenter.service.WorkpieceService;
 import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourcePositionMapper;
 import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.entity.ResourceAutoCode;
@@ -42,6 +43,9 @@ public class AGVNodeServiceImpl implements NodeOperationService {
     @Autowired
     private StorgeService storgeService;
 
+    @Autowired
+    private WorkpieceService workpieceService;
+
     @Autowired
     private ProductionresourcePositionService productionresourcePositionService;
 
@@ -88,8 +92,12 @@ public class AGVNodeServiceImpl implements NodeOperationService {
         Storge targetStore = storgeService.getById(targetId);
 
         //开始位置
-        Long startId = resourceAutoCode.getStartId();
-        Storge startStore = storgeService.getById(startId);
+//        Long startId = resourceAutoCode.getStartId();
+//        Storge startStore = storgeService.getById(startId);
+        Storge startStore = workpieceService.getWorkPieceStock(taskNode.getId(),true);
+
+
+
 
         jbwarr = new String[] {targetStore.getNo()};
         List<ProductionresourcePosition> jbwList = productionresourcePositionService.getFreeProductionresourcePositionByNos(jbwarr);