no message
							parent
							
								
									39913c5c6a
								
							
						
					
					
						commit
						81dd1f39fe
					
				| 
						 | 
					@ -53,10 +53,10 @@
 | 
				
			||||||
        </dependency>
 | 
					        </dependency>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <!-- Spring boot websocket -->
 | 
					        <!-- Spring boot websocket -->
 | 
				
			||||||
		<dependency>
 | 
					        <dependency>
 | 
				
			||||||
			<groupId>org.springframework.boot</groupId>
 | 
					            <groupId>org.springframework.boot</groupId>
 | 
				
			||||||
			<artifactId>spring-boot-starter-websocket</artifactId>
 | 
					            <artifactId>spring-boot-starter-websocket</artifactId>
 | 
				
			||||||
		</dependency>
 | 
					        </dependency>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <!-- quartz -->
 | 
					        <!-- quartz -->
 | 
				
			||||||
        <dependency>
 | 
					        <dependency>
 | 
				
			||||||
| 
						 | 
					@ -112,8 +112,16 @@
 | 
				
			||||||
            <version>4.1.42.Final</version>
 | 
					            <version>4.1.42.Final</version>
 | 
				
			||||||
        </dependency>
 | 
					        </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>
 | 
					    </dependencies>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -468,7 +468,7 @@ public class BydAppServiceImpl implements BydAppService {
 | 
				
			||||||
                    })
 | 
					                    })
 | 
				
			||||||
                    .collect(Collectors.toList());
 | 
					                    .collect(Collectors.toList());
 | 
				
			||||||
            if (!smallAreaInventories.isEmpty()) {
 | 
					            if (!smallAreaInventories.isEmpty()) {
 | 
				
			||||||
                kmReService.returnFBAgvTask(task.getDstPoint(), task.getSrcStock(), task.getItem());
 | 
					                kmReService.returnFBAgvTask(task.getSrcStock().getPoint(), task.getSrcStock(), task.getItem());
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -528,18 +528,21 @@ public class KMReServiceImpl implements KMReService {
 | 
				
			||||||
        //获取终点
 | 
					        //获取终点
 | 
				
			||||||
        List<Point> endPointList = pointService.queryPoints(null, BaseStatus.FREE, BaseStatus.STORAGE, areaCode);
 | 
					        List<Point> endPointList = pointService.queryPoints(null, BaseStatus.FREE, BaseStatus.STORAGE, areaCode);
 | 
				
			||||||
        if (endPointList.isEmpty()) {
 | 
					        if (endPointList.isEmpty()) {
 | 
				
			||||||
            throw new BadRequestException(areaCode + "没有空闲点位!");
 | 
					            return;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        Point endPoint = endPointList.get(0);
 | 
					        Point endPoint = endPointList.get(0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //创建任务
 | 
					        if (agvTaskService.isEndPointAvailable(endPoint.getCode(), BizStatus.FB_RETURN, "FORKLIFT_MOVE")) {
 | 
				
			||||||
        AgvTask agvTask = agvTaskService.createAgvTask(BizStatus.FB_RETURN, stock, srcPoint.getCode(), endPoint.getCode(), "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
 | 
					    @Override
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,9 @@ import com.youchain.basicdata.vo.BarCodeVo;
 | 
				
			||||||
import com.youchain.businessdata.domain.PickDetail;
 | 
					import com.youchain.businessdata.domain.PickDetail;
 | 
				
			||||||
import com.youchain.exception.BadRequestException;
 | 
					import com.youchain.exception.BadRequestException;
 | 
				
			||||||
import com.youchain.utils.BaseStatus;
 | 
					import com.youchain.utils.BaseStatus;
 | 
				
			||||||
 | 
					import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 | 
				
			||||||
import org.junit.jupiter.api.Test;
 | 
					import org.junit.jupiter.api.Test;
 | 
				
			||||||
 | 
					import org.springframework.beans.factory.annotation.Autowired;
 | 
				
			||||||
import org.springframework.boot.test.context.SpringBootTest;
 | 
					import org.springframework.boot.test.context.SpringBootTest;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.util.*;
 | 
					import java.util.*;
 | 
				
			||||||
| 
						 | 
					@ -17,13 +19,21 @@ import java.util.stream.Collectors;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 | 
					@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 | 
				
			||||||
public class EladminSystemApplicationTests {
 | 
					public class EladminSystemApplicationTests {
 | 
				
			||||||
 | 
					    @Autowired
 | 
				
			||||||
 | 
					    private static TestService testService;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Test
 | 
					    @Test
 | 
				
			||||||
    public void contextLoads() {
 | 
					    public void contextLoads() {
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public static void main(String[] args) {
 | 
					    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");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,10 @@
 | 
				
			||||||
 | 
					package com.youchain;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Service
 | 
				
			||||||
 | 
					public interface  TestService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    String pickAndPost(String param);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
		Loading…
	
		Reference in New Issue