增加补打印按线体区分

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

@@ -258,8 +258,12 @@ public class InnerBoxRestController {
     @RequestMapping("/rack/getPrintInfo")
     @RequestMapping("/rack/getPrintInfo")
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean rackPrintLabel(HttpServletRequest request) {
     public ResultBean rackPrintLabel(HttpServletRequest request) {
+
         String cid = request.getParameter("cid");
         String cid = request.getParameter("cid");
-        String labelOrderItemId = "";
+        String line = request.getParameter("line");
+
+        Map<String, String> resultMap = new HashMap<>();
+                String labelOrderItemId = "";
         if (StringUtils.isBlank(cid)) {
         if (StringUtils.isBlank(cid)) {
             String cidKey = "";
             String cidKey = "";
             for (Map.Entry<String, String> entry : labelOrderItemMap.entrySet()) {
             for (Map.Entry<String, String> entry : labelOrderItemMap.entrySet()) {
@@ -274,13 +278,18 @@ public class InnerBoxRestController {
             if ("0000".equals(cid)) {
             if ("0000".equals(cid)) {
                 if (manualOrderItemIdList != null && !manualOrderItemIdList.isEmpty()) {
                 if (manualOrderItemIdList != null && !manualOrderItemIdList.isEmpty()) {
                     labelOrderItemId = manualOrderItemIdList.get(0);
                     labelOrderItemId = manualOrderItemIdList.get(0);
+                    resultMap = getPrintLabel(labelOrderItemId,line);
+                    if (resultMap == null || resultMap.isEmpty()) {
+                        return ResultBean.newErrorResult(-1, "", "未找到需要打印的标签信息", null, false);
+                    }
                     manualOrderItemIdList.remove(0);
                     manualOrderItemIdList.remove(0);
                 }
                 }
             } else {
             } else {
                 labelOrderItemId = labelOrderItemMap.get(cid);
                 labelOrderItemId = labelOrderItemMap.get(cid);
+                resultMap = getPrintLabel(labelOrderItemId,"");;
             }
             }
         }
         }
-        Map<String, String> resultMap = getPrintLabel(labelOrderItemId);
+
         if (resultMap == null || resultMap.isEmpty()) {
         if (resultMap == null || resultMap.isEmpty()) {
             labelOrderItemMap.remove(cid);
             labelOrderItemMap.remove(cid);
             return ResultBean.newErrorResult(-1, "", "未找到需要打印的标签信息", null, false);
             return ResultBean.newErrorResult(-1, "", "未找到需要打印的标签信息", null, false);
@@ -630,7 +639,7 @@ public class InnerBoxRestController {
         }
         }
         Map<String, String> resultMap = new HashMap<>();
         Map<String, String> resultMap = new HashMap<>();
         if (StringUtils.isNotBlank(manualOrderItemId)) {
         if (StringUtils.isNotBlank(manualOrderItemId)) {
-            resultMap = getPrintLabel(manualOrderItemId);
+            resultMap = getPrintLabel(manualOrderItemId,"");
         }
         }
         if (resultMap.isEmpty()) {
         if (resultMap.isEmpty()) {
             return ResultBean.newErrorResult(-1, "", "未找到需要打印的标签信息", null, false);
             return ResultBean.newErrorResult(-1, "", "未找到需要打印的标签信息", null, false);
@@ -872,7 +881,7 @@ public class InnerBoxRestController {
         manualOrderItemIdList.add(orderItemId);
         manualOrderItemIdList.add(orderItemId);
     }
     }
 
 
-    public Map<String,String> getPrintLabel(String orderItemId){
+    public Map<String,String> getPrintLabel(String orderItemId,String line){
         if (StringUtils.isBlank(orderItemId)){
         if (StringUtils.isBlank(orderItemId)){
             return null;
             return null;
         }
         }
@@ -882,12 +891,18 @@ public class InnerBoxRestController {
             String orderId = liteOrderItem.getOrderId();
             String orderId = liteOrderItem.getOrderId();
             LiteOrder liteOrder = liteOrderManager.get(orderId);
             LiteOrder liteOrder = liteOrderManager.get(orderId);
             if (liteOrder != null) {
             if (liteOrder != null) {
+                String orderLine = liteOrder.getLine();
+                if(StringUtils.isNotEmpty(line)){
+                    if (!line.contains(orderLine)){
+                        return null;
+                    }
+                }
                 //resultMap.put("barcode", dataLog.getBarcode());
                 //resultMap.put("barcode", dataLog.getBarcode());
                 resultMap.put("pn", liteOrderItem.getPn());
                 resultMap.put("pn", liteOrderItem.getPn());
                 resultMap.put("station", liteOrderItem.getTableNo());
                 resultMap.put("station", liteOrderItem.getTableNo());
                 resultMap.put("side", liteOrderItem.getSide());
                 resultMap.put("side", liteOrderItem.getSide());
                 resultMap.put("hSerial", liteOrder.getOrderNo());
                 resultMap.put("hSerial", liteOrder.getOrderNo());
-                resultMap.put("line", liteOrder.getLine());
+                resultMap.put("line", orderLine);
                 resultMap.put("slot", liteOrderItem.getSlot());
                 resultMap.put("slot", liteOrderItem.getSlot());
                 resultMap.put("subSlot", liteOrderItem.getSubSlot());
                 resultMap.put("subSlot", liteOrderItem.getSubSlot());
             }
             }