1.增加差异料接口查询

src/main/java/com/neotel/smfcore/custom/lizhen/wcs/DifferenceReelController.java

@@ -72,8 +72,24 @@ public class DifferenceReelController {
             Map<String, List<LiteOrderItem>> itemMap = itemList.stream().collect(Collectors.groupingBy(LiteOrderItem::getLine));
             Map<String, List<LiteOrderItem>> itemMap = itemList.stream().collect(Collectors.groupingBy(LiteOrderItem::getLine));
             for (String line : itemMap.keySet()) {
             for (String line : itemMap.keySet()) {
                 List<LiteOrderItem> item = itemMap.get(line);
                 List<LiteOrderItem> item = itemMap.get(line);
+
+                String orderNo ="";
+                for (LiteOrderItem liteOrderItem : item) {
+                    if (StringUtils.isNotEmpty(liteOrderItem.getMo())){
+                        orderNo = liteOrderItem.getMo();
+                        break;
+                    }
+                }
+
+                //判断工单是否存在
+                LiteOrder dbLiteOrder = liteOrderCache.getOrderByOrderNo(orderNo);
+                if (dbLiteOrder != null){
+                    log.info(orderNo+"已经在数据库中存在,忽略不接收");
+                    continue;
+                }
+
                 LiteOrder liteOrder = new LiteOrder();
                 LiteOrder liteOrder = new LiteOrder();
-                liteOrder.setOrderNo(System.currentTimeMillis()+"差异料");
+                liteOrder.setOrderNo(orderNo);
                 liteOrder.setLine(line);
                 liteOrder.setLine(line);
                 liteOrder.setTotalTaskReelCount(item.size());
                 liteOrder.setTotalTaskReelCount(item.size());
                 liteOrder.setOrderItems(item);
                 liteOrder.setOrderItems(item);

src/main/java/com/neotel/smfcore/custom/lizhen/wcs/LizhenController.java

@@ -442,56 +442,33 @@ public class LizhenController {
         }
         }
         return resultMap;
         return resultMap;
     }
     }
-    /*private String createManualOrder(List<ManualTower> itemList) {
-
-        Map<String, LiteOrder> orderMap = new HashMap<>();
-        for (ManualTower manualTower : itemList) {
-            String orderNo = manualTower.getPICKING_ID();
-            LiteOrder order = orderMap.get(orderNo);
-            if(order == null){
-                order = new LiteOrder();
-                order.setOrderNo(manualTower.getPICKING_ID());
-                order.setLine(manualTower.getLINE());
-            }
-
-            LiteOrderItem orderItem = new LiteOrderItem();
-            orderItem.setPickingId(orderNo);
-            orderItem.setPlantCode(manualTower.getPLANT_CODE());
-            orderItem.setPn(manualTower.getMATERIAL_CODE());
-            orderItem.setLine(manualTower.getLINE());
-            orderItem.setMachineName(manualTower.getMACHINE_NAME());
-            orderItem.setSide(manualTower.getFACE());
-            orderItem.setSlot(manualTower.getSLOT());
-            orderItem.setSubSlot(manualTower.getSUBSLOT());
-            orderItem.setMo(manualTower.getMO());
-            orderItem.setBrand(manualTower.getBRAND());
-            orderItem.setBatchCode(manualTower.getBATCH_CODE());
-            orderItem.setPriority(manualTower.getPRIORITY());
-            orderItem.setNeedReelCount(manualTower.getREQ_REEL());
-            orderItem.setNeedNum(manualTower.getREQ_QTY());
-
-            List<LiteOrderItem> orderItems = order.getOrderItems();
-            if (orderItems == null){
-                orderItems = new ArrayList<>();
-            }
-            orderItems.add(orderItem);
-            order.setOrderItems(orderItems);
-            orderMap.put(orderNo,order);
-        }
-
-        for (LiteOrder liteOrder : orderMap.values()) {
-            LiteOrder dbOrder = liteOrderManager.findByOrderNo(liteOrder.getOrderNo());
-            if (dbOrder != null){
-                continue;
+
+
+
+    //查询工单状态信息
+    @PostMapping("/queryOrderStatus")
+    @AnonymousAccess
+    public ResultBean queryOrderStatus(@RequestBody Map<String, List<String>> paramMap) {
+        Map<String,Integer> resultMap = new HashMap<>();
+        List<String> orderNoList = paramMap.get("orderNoList");
+        if (orderNoList != null && !orderNoList.isEmpty()) {
+            for (String ordrNo : orderNoList) {
+                LiteOrder order = liteOrderCache.getOrderByOrderNo(ordrNo);
+                if (order != null) {
+                    if (order.isNew()) {
+                        resultMap.put(ordrNo, 1);
+                    } else if (order.isOutTails()) {
+                        resultMap.put(ordrNo, 2);
+                    } else if (order.isTaskFinished()) {
+                        resultMap.put(ordrNo, 3);
+                    } else if (order.isClosed()){
+                        resultMap.put(ordrNo, 3);
                     }
                     }
-            LiteOrder newOrder = liteOrderManager.createWithItems(liteOrder);
-            liteOrderManager.save(newOrder);
-            liteOrderCache.addOrderToMap(newOrder);
-            log.info("工单["+newOrder.getOrderNo()+"]已创建完成");
                 }
                 }
-        return "OK";
-    }*/
-
+            }
+        }
+        return ResultBean.newOkResult(resultMap);
+    }