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

src/main/java/com/neotel/smfcore/custom/luxsan/api/bean/request/TicketPickPostData.java

@@ -11,5 +11,4 @@ public class TicketPickPostData {
     private String TICKET_CODE;
     private String TICKET_CODE;
     private String TICKET_ITEM;
     private String TICKET_ITEM;
     private List<String> LABEL_LIST;
     private List<String> LABEL_LIST;
-    private String BIN_CODE;
 }
 }

src/main/java/com/neotel/smfcore/custom/luxsan/api/bean/request/TicketPickPostRequest.java

@@ -3,10 +3,13 @@ package com.neotel.smfcore.custom.luxsan.api.bean.request;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.List;
+
 @Data
 @Data
 @AllArgsConstructor
 @AllArgsConstructor
 public class TicketPickPostRequest {
 public class TicketPickPostRequest {
     private String PLANT_CODE;
     private String PLANT_CODE;
     private String TICKET_CODE;
     private String TICKET_CODE;
-    private TicketPickPostData DATA;
+    private String BIN_CODE;
+    private List<TicketPickPostData> DATA;
 }
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AgvDeviceController.java

@@ -101,7 +101,9 @@ public class AgvDeviceController {
             }
             }
         }
         }
         if (task == null) {
         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();
         statusStr = statusStr.toUpperCase();
@@ -146,8 +148,8 @@ public class AgvDeviceController {
                         taskService.updateFinishedTask(task);
                         taskService.updateFinishedTask(task);
                         String checkType = LiteorderCheckType.TICKET_TRANSFER_CHECKOUT + "";
                         String checkType = LiteorderCheckType.TICKET_TRANSFER_CHECKOUT + "";
                         if (checkType.equals(task.getSourceType())){
                         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());
                             Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
                             if (barcode != null){
                             if (barcode != null){
                                 barcode.setWarehouseCode(task.getWarehouseCode());
                                 barcode.setWarehouseCode(task.getWarehouseCode());