手动打印标签,缓存多条数据

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/InnerBoxRestController.java

@@ -42,6 +42,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -85,7 +86,7 @@ public class InnerBoxRestController {
     private static String labelOrderItemId;
     private static String labelOrderItemId;
 
 
     //人工发料id
     //人工发料id
-    private static String manualOrderItemId;
+    private static List<String> manualOrderItemIdList = new CopyOnWriteArrayList<>();
 
 
     @ApiOperation("IA 出库更新任务状态")
     @ApiOperation("IA 出库更新任务状态")
     @RequestMapping("/updateLocInfo")
     @RequestMapping("/updateLocInfo")
@@ -536,7 +537,7 @@ public class InnerBoxRestController {
         }
         }
         taskService.updateFinishedTask(dataLog);
         taskService.updateFinishedTask(dataLog);
         taskService.removeFinishedTask(dataLog);
         taskService.removeFinishedTask(dataLog);
-        setManualOrderItemId(orderItemId);
+        setManualOrderItemIdList(orderItemId);
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 
@@ -544,9 +545,17 @@ public class InnerBoxRestController {
     @RequestMapping("/manual/getPrintInfo")
     @RequestMapping("/manual/getPrintInfo")
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean manualPrintLabel(HttpServletRequest request) {
     public ResultBean manualPrintLabel(HttpServletRequest request) {
-        Map<String, String> resultMap = getPrintLabel(manualOrderItemId);
+        String manualOrderItemId = "";
+        if (manualOrderItemIdList != null && !manualOrderItemIdList.isEmpty()) {
+            manualOrderItemId = manualOrderItemIdList.get(0);
+            manualOrderItemIdList.remove(0);
+        }
+        Map<String, String> resultMap = new HashMap<>();
+        if (StringUtils.isNotBlank(manualOrderItemId)) {
+            resultMap = getPrintLabel(manualOrderItemId);
+        }
         if (resultMap.isEmpty()) {
         if (resultMap.isEmpty()) {
-            return ResultBean.newErrorResult(-1, "", "未找到需要打印的标签信息",null,false);
+            return ResultBean.newErrorResult(-1, "", "未找到需要打印的标签信息", null, false);
         }
         }
         return ResultBean.newOkResult(resultMap);
         return ResultBean.newOkResult(resultMap);
     }
     }
@@ -556,7 +565,7 @@ public class InnerBoxRestController {
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean finishManualPrintLabel(HttpServletRequest request) {
     public ResultBean finishManualPrintLabel(HttpServletRequest request) {
         log.info("移除打印标签");
         log.info("移除打印标签");
-        setManualOrderItemId(null);
+        //setManualOrderItemId(null);
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 
@@ -614,7 +623,7 @@ public class InnerBoxRestController {
                 }
                 }
                 taskService.updateFinishedTask(dataLog);
                 taskService.updateFinishedTask(dataLog);
                 taskService.removeFinishedTask(dataLog);
                 taskService.removeFinishedTask(dataLog);
-                setManualOrderItemId(orderItem.getId());
+                setManualOrderItemIdList(orderItem.getId());
                 break;
                 break;
             }
             }
         }
         }
@@ -768,12 +777,8 @@ public class InnerBoxRestController {
         return resultMap;
         return resultMap;
     }
     }
 
 
-    public static String getManualOrderItemId() {
-        return manualOrderItemId;
-    }
-
-    public static void setManualOrderItemId(String orderItemId) {
-        manualOrderItemId = orderItemId;
+    public static void setManualOrderItemIdList(String orderItemId) {
+        manualOrderItemIdList.add(orderItemId);
     }
     }
 
 
     public Map<String,String> getPrintLabel(String orderItemId){
     public Map<String,String> getPrintLabel(String orderItemId){