huojin
/
Byd_Dg_Java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2025-03-05 14:26:52 +08:00
parent 39913c5c6a
commit 81dd1f39fe
5 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youchain-system/pom.xml
View File

@ -53,10 +53,10 @@
</dependency>
<!-- Spring boot websocket -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!-- quartz -->
<dependency>
@ -112,8 +112,16 @@
<version>4.1.42.Final</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>3.4.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>3.4.5</version>
</dependency>
</dependencies>

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

@ -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());
}
}

17
youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java
View File

@ -528,18 +528,21 @@ public class KMReServiceImpl implements KMReService {
//获取终点
List<Point> 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

10
youchain-system/src/test/java/com/youchain/EladminSystemApplicationTests.java
View File

@ -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");
}

10
youchain-system/src/test/java/com/youchain/TestService.java 100644
View File

@ -0,0 +1,10 @@
package com.youchain;
import org.springframework.stereotype.Service;
@Service
public interface TestService {
String pickAndPost(String param);
}