增加差异料接口

src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrderItem.java

@@ -242,6 +242,9 @@ public class LiteOrderItem extends BasePo implements Serializable ,Comparable<Li
 
 
     private List<String> positionList;
     private List<String> positionList;
 
 
+    //差异请求
+    private boolean differenceReq = false;
+
 
 
     public void setOutReelList(String reel) {
     public void setOutReelList(String reel) {
         if (outReelList == null){
         if (outReelList == null){

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

@@ -39,6 +39,7 @@ import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 
 @Slf4j
 @Slf4j
 @RestController
 @RestController
@@ -331,6 +332,53 @@ public class LizhenController {
     }
     }
 
 
 
 
+    @ApiOperation("工单差异料上传")
+    @RequestMapping("/differenceReel")
+    @AnonymousAccess
+    public ResultBean differenceReel(@RequestBody List<Map<String, String>> paramList) {
+        log.info("收到mes的差异料数据为:" + JSONObject.toJSONString(paramList));
+
+        List<LiteOrderItem> itemList = new ArrayList<>();
+
+        for (Map<String, String> paramMap : paramList) {
+            String mo = paramMap.get("mo");
+            String mc = paramMap.get("mc");
+            String ipn = paramMap.get("ipn");
+            String zone = paramMap.get("zone");
+            String gidLineSide = paramMap.get("gidLineSide");
+            String[] gidLineSideS = gidLineSide.split("_");
+            String line = gidLineSideS[0];
+            String side = gidLineSideS[2];
+
+            LiteOrderItem item = new LiteOrderItem();
+            item.setMo(mo);
+            item.setMachineName(mc);
+            item.setPn(ipn);
+            item.setStation(zone);
+            item.setLine(line);
+            item.setSide(side);
+            item.setNeedNum(1);
+            item.setNeedReelCount(1);
+            item.setDifferenceReq(true);
+            itemList.add(item);
+        }
+
+        if (itemList != null && !itemList.isEmpty()){
+            Map<String, List<LiteOrderItem>> itemMap = itemList.stream().collect(Collectors.groupingBy(LiteOrderItem::getLine));
+            for (String line : itemMap.keySet()) {
+                List<LiteOrderItem> item = itemMap.get(line);
+                LiteOrder liteOrder = new LiteOrder();
+                liteOrder.setOrderNo(System.currentTimeMillis()+"差异料");
+                liteOrder.setLine(line);
+                liteOrder.setTotalTaskReelCount(item.size());
+                liteOrder.setOrderItems(item);
+                liteOrder = liteOrderManager.createWithItems(liteOrder);
+                liteOrderCache.addOrderToMap(liteOrder);
+            }
+        }
+
+        return ResultBean.newOkResult("");
+    }
 
 
 
 
     private String getForwardUrl(String line) {
     private String getForwardUrl(String line) {

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

@@ -233,7 +233,7 @@ public class InnerBoxRestController {
     @RequestMapping("/getFeederInfo")
     @RequestMapping("/getFeederInfo")
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean getFeederInfo(HttpServletRequest request) {
     public ResultBean getFeederInfo(HttpServletRequest request) {
-        Map<String, String> resultMap = new HashMap<>();
+        Map<String, Object> resultMap = new HashMap<>();
 
 
         String barcode = request.getParameter("barcode");
         String barcode = request.getParameter("barcode");
         CodeBean codeBean = codeResolve.resolveSingleCode(barcode);
         CodeBean codeBean = codeResolve.resolveSingleCode(barcode);
@@ -254,6 +254,8 @@ public class InnerBoxRestController {
                             resultMap.put("line", liteOrder.getLine());
                             resultMap.put("line", liteOrder.getLine());
                             resultMap.put("slot", liteOrderItem.getSlot());
                             resultMap.put("slot", liteOrderItem.getSlot());
                             resultMap.put("subSlot", liteOrderItem.getSubSlot());
                             resultMap.put("subSlot", liteOrderItem.getSubSlot());
+                            resultMap.put("subSlot", liteOrderItem.getSubSlot());
+                            resultMap.put("differenceReq", liteOrderItem.isDifferenceReq());
                         }
                         }
                         break;
                         break;
                     }
                     }