Commit 9cae9885 zshaohui

半成品:1.任务状态修改更改 2.311转库修改提交

1 个父辈 0863fd24
......@@ -11,5 +11,4 @@ public class TicketPickPostData {
private String TICKET_CODE;
private String TICKET_ITEM;
private List<String> LABEL_LIST;
private String BIN_CODE;
}
......@@ -3,10 +3,13 @@ package com.neotel.smfcore.custom.luxsan.api.bean.request;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.util.List;
@Data
@AllArgsConstructor
public class TicketPickPostRequest {
private String PLANT_CODE;
private String TICKET_CODE;
private TicketPickPostData DATA;
private String BIN_CODE;
private List<TicketPickPostData> DATA;
}
......@@ -101,7 +101,9 @@ public class AgvDeviceController {
}
}
if (task == null) {
return ResultBean.newErrorResult(-1, "smfcore.task.notExist", "任务不存在");
log.info(boxStr+"任务未找到,可能处理过,返回ok");
return ResultBean.newOkResult("");
// return ResultBean.newErrorResult(-1, "smfcore.task.notExist", "任务不存在");
}
statusStr = statusStr.toUpperCase();
......@@ -146,8 +148,8 @@ public class AgvDeviceController {
taskService.updateFinishedTask(task);
String checkType = LiteorderCheckType.TICKET_TRANSFER_CHECKOUT + "";
if (checkType.equals(task.getSourceType())){
TicketPickPostData data = new TicketPickPostData(task.getTicketCode(),task.getTicketItem(),Arrays.asList(task.getCartonId()),"SWC");
LuxsanApi.ticketPickPost(new TicketPickPostRequest(CommonUtil.plantCode,task.getTicketCode(),data));
TicketPickPostData data = new TicketPickPostData(task.getTicketCode(),task.getTicketItem(),Arrays.asList(task.getCartonId()));
LuxsanApi.ticketPickPost(new TicketPickPostRequest(CommonUtil.plantCode, task.getTicketCode(), "SWC", Arrays.asList(data)));
Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
if (barcode != null){
barcode.setWarehouseCode(task.getWarehouseCode());
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!