|
|
|
|
@ -1,6 +1,7 @@
|
|
|
|
|
package com.zhehekeji.web.service;
|
|
|
|
|
|
|
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
|
|
@ -19,6 +20,9 @@ import io.swagger.models.auth.In;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
|
|
import org.springframework.http.HttpEntity;
|
|
|
|
|
import org.springframework.http.HttpHeaders;
|
|
|
|
|
import org.springframework.http.MediaType;
|
|
|
|
|
import org.springframework.http.ResponseEntity;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
@ -407,17 +411,25 @@ public class StockService {
|
|
|
|
|
*/
|
|
|
|
|
public Stock stockInfo(StockCheck stockCheck) {
|
|
|
|
|
|
|
|
|
|
Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(stockCheck.getStreetId(), stockCheck.getDirection(), stockCheck.getSide(), stockCheck.getRow(), stockCheck.getColumn());
|
|
|
|
|
Street street = streetMapper.selectOne(new QueryWrapper<Street>()
|
|
|
|
|
.eq(stockCheck.getStreetPlc()!=null,"plc_Id", stockCheck.getStreetPlc())
|
|
|
|
|
.eq(stockCheck.getStreetId()!=null,"id", stockCheck.getStreetId()));
|
|
|
|
|
|
|
|
|
|
Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("`row`", stockCheck.getRow())
|
|
|
|
|
.eq("`column`", stockCheck.getColumn())
|
|
|
|
|
.eq("`direction`", stockCheck.getDirection())
|
|
|
|
|
.eq("`side`", stockCheck.getSide())
|
|
|
|
|
.eq(stockCheck.getStreetId()!=null,"`street_id`", stockCheck.getStreetId())
|
|
|
|
|
.eq(stockCheck.getStreetPlc()!=null,"`street_id`", stockCheck.getStreetPlc()));
|
|
|
|
|
if (stock == null) {
|
|
|
|
|
stock = new Stock();
|
|
|
|
|
stock.setColumn(stockCheck.getColumn());
|
|
|
|
|
stock.setRow(stockCheck.getRow());
|
|
|
|
|
//stock.setShelveId(stockCheck.getShelveId());
|
|
|
|
|
stock.setStatus(0);
|
|
|
|
|
Street street = streetMapper.selectById(stockCheck.getStreetId());
|
|
|
|
|
|
|
|
|
|
stock.setStreetName(street.getName());
|
|
|
|
|
} else {
|
|
|
|
|
Street street = streetMapper.selectById(stock.getStreetId());
|
|
|
|
|
stock.setStreetName(street.getName());
|
|
|
|
|
|
|
|
|
|
List<StockLog> stockLogs = stockLogMapper.selectList(new QueryWrapper<StockLog>().eq("`row`", stockCheck.getRow()).eq("`column`", stockCheck.getColumn()).eq("street_id", stockCheck.getStreetId()).eq("direction", stockCheck.getDirection()).eq("side", stockCheck.getSide()).orderByDesc("create_time").last(" limit 2"));
|
|
|
|
|
@ -495,6 +507,9 @@ public class StockService {
|
|
|
|
|
|
|
|
|
|
public void uploadResultsWMS(Stock stock, Integer stockStatus) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
HttpHeaders requestHeaders = new HttpHeaders();
|
|
|
|
|
requestHeaders.setContentType(MediaType.APPLICATION_JSON);
|
|
|
|
|
ResponseEntity<String> body = null;
|
|
|
|
|
RestTemplate restTemplate = new RestTemplate();
|
|
|
|
|
String url = configProperties.getUploadResultsApiUrl();
|
|
|
|
|
@ -507,14 +522,17 @@ public class StockService {
|
|
|
|
|
uploadCheckResults.setWcsTaskId(stock.getCheckNum().split("_")[1]);
|
|
|
|
|
uploadCheckResults.setWmsTaskId(stock.getTaskWMSId());
|
|
|
|
|
uploadCheckResults.setPalno(stock.getWmsCode());
|
|
|
|
|
uploadCheckResults.setFlag(stockStatus == 1 ? 1 : 0);
|
|
|
|
|
uploadCheckResults.setFlag(stockStatus == 1 ? "1" : "0");
|
|
|
|
|
uploadCheckResults.setAddre(stock.getAddre());
|
|
|
|
|
List<UploadCheckResults> list = new ArrayList<>();
|
|
|
|
|
list.add(uploadCheckResults);
|
|
|
|
|
HttpEntity<List<UploadCheckResults>> requestEntity = new HttpEntity<>(list, requestHeaders);
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
|
|
// String jsonString = gson.toJson(algorithmPojo);
|
|
|
|
|
body = restTemplate.postForEntity(url, uploadCheckResults, String.class);
|
|
|
|
|
JSONObject.parseObject(body.getBody(), UploadCheckResults.class);
|
|
|
|
|
System.out.println("上传信息："+ JSON.toJSONString(list));
|
|
|
|
|
body = restTemplate.postForEntity(url, list, String.class);
|
|
|
|
|
|
|
|
|
|
System.out.println(body);
|
|
|
|
|
} catch (RestClientException e) {
|
|
|
|
|
@ -523,6 +541,24 @@ public class StockService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static void main(String[] args) {
|
|
|
|
|
|
|
|
|
|
UploadCheckResults uploadCheckResults = new UploadCheckResults();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//String url = "http://127.0.0.1:8083"+"/visionCompute";
|
|
|
|
|
|
|
|
|
|
uploadCheckResults.setWcsTaskId("1111");
|
|
|
|
|
uploadCheckResults.setWmsTaskId("stock.getTaskWMSId()");
|
|
|
|
|
uploadCheckResults.setPalno("stock.getWmsCode()");
|
|
|
|
|
uploadCheckResults.setFlag(1 == 1 ? "1" : "0");
|
|
|
|
|
uploadCheckResults.setAddre("stock.getAddre()");
|
|
|
|
|
List<UploadCheckResults> list = new ArrayList<>();
|
|
|
|
|
list.add(uploadCheckResults);
|
|
|
|
|
System.out.println(JSON.toJSONString(list));
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private CheckLogMapper checkLogMapper;
|
|
|
|
|
|
|
|
|
|
|
LAPTOP-S9HJSOEB\昊天
2 years ago