diff --git a/youchain-system/pom.xml b/youchain-system/pom.xml index 8c0bb02..4eccae8 100644 --- a/youchain-system/pom.xml +++ b/youchain-system/pom.xml @@ -53,10 +53,10 @@ - - org.springframework.boot - spring-boot-starter-websocket - + + org.springframework.boot + spring-boot-starter-websocket + @@ -112,8 +112,16 @@ 4.1.42.Final - - + + org.apache.cxf + cxf-rt-frontend-jaxws + 3.4.5 + + + org.apache.cxf + cxf-rt-transports-http + 3.4.5 + diff --git a/youchain-system/src/main/java/com/youchain/appupdate/service/impl/BydAppServiceImpl.java b/youchain-system/src/main/java/com/youchain/appupdate/service/impl/BydAppServiceImpl.java index 5bf663c..6f392e0 100644 --- a/youchain-system/src/main/java/com/youchain/appupdate/service/impl/BydAppServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/appupdate/service/impl/BydAppServiceImpl.java @@ -468,7 +468,7 @@ public class BydAppServiceImpl implements BydAppService { }) .collect(Collectors.toList()); if (!smallAreaInventories.isEmpty()) { - kmReService.returnFBAgvTask(task.getDstPoint(), task.getSrcStock(), task.getItem()); + kmReService.returnFBAgvTask(task.getSrcStock().getPoint(), task.getSrcStock(), task.getItem()); } } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java index c3203fa..e0f9729 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java @@ -528,18 +528,21 @@ public class KMReServiceImpl implements KMReService { //获取终点 List endPointList = pointService.queryPoints(null, BaseStatus.FREE, BaseStatus.STORAGE, areaCode); if (endPointList.isEmpty()) { - throw new BadRequestException(areaCode + "没有空闲点位!"); + return; } Point endPoint = endPointList.get(0); - //创建任务 - AgvTask agvTask = agvTaskService.createAgvTask(BizStatus.FB_RETURN, stock, srcPoint.getCode(), endPoint.getCode(), "FORKLIFT_MOVE"); + if (agvTaskService.isEndPointAvailable(endPoint.getCode(), BizStatus.FB_RETURN, "FORKLIFT_MOVE")) { + //创建任务 + AgvTask agvTask = agvTaskService.createAgvTask(BizStatus.FB_RETURN, stock, srcPoint.getCode(), endPoint.getCode(), "FORKLIFT_MOVE"); + //点位占用 + pointService.usedPoint(endPoint); + + //下发任务 + this.sendAgvTask(agvTask, this.sendAgvTaskCcJson(agvTask)); + } - //点位占用 - pointService.usedPoint(endPoint); - //下发任务 - this.sendAgvTask(agvTask, this.sendAgvTaskCcJson(agvTask)); } @Override diff --git a/youchain-system/src/test/java/com/youchain/EladminSystemApplicationTests.java b/youchain-system/src/test/java/com/youchain/EladminSystemApplicationTests.java index 953f809..c1bbe98 100644 --- a/youchain-system/src/test/java/com/youchain/EladminSystemApplicationTests.java +++ b/youchain-system/src/test/java/com/youchain/EladminSystemApplicationTests.java @@ -6,7 +6,9 @@ import com.youchain.basicdata.vo.BarCodeVo; import com.youchain.businessdata.domain.PickDetail; import com.youchain.exception.BadRequestException; import com.youchain.utils.BaseStatus; +import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import java.util.*; @@ -17,13 +19,21 @@ import java.util.stream.Collectors; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class EladminSystemApplicationTests { + @Autowired + private static TestService testService; @Test public void contextLoads() { } public static void main(String[] args) { + JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean(); + // 设置服务接口 + factory.setServiceClass(TestService.class); + // 设置服务地址 + factory.setAddress("http://example.com/yourService"); + String result = testService.pickAndPost("123"); } diff --git a/youchain-system/src/test/java/com/youchain/TestService.java b/youchain-system/src/test/java/com/youchain/TestService.java new file mode 100644 index 0000000..584a8d3 --- /dev/null +++ b/youchain-system/src/test/java/com/youchain/TestService.java @@ -0,0 +1,10 @@ +package com.youchain; + +import org.springframework.stereotype.Service; + +@Service +public interface TestService { + + String pickAndPost(String param); + +}