1.增加差异料接口

2.fetchReel提示信息修改

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

@@ -584,14 +584,20 @@ public class LizhenApi extends DefaultSmfApiListener {
                 }
                 if (reelQty != 0){
                     barcode.setAmount(reelQty);
+                } else {
+
                 }
                 return barcode;
+            } else {
+                String msgtx = resultObj.getString("MSGTX");
+                throw new ValidateException("",msgtx);
             }
 
         } catch (Exception e) {
             log.info(barcode.getBarcode()+"fetchReel调用失败:"+e.getMessage());
+            throw new ValidateException("",barcode.getBarcode()+"接口请求失败:"+e.getMessage());
         }
-        return null;
+        //return null;
     }
 
     public List<String> batchCheckReel(List<Barcode> barcodeList,String pickingId,String model) {

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

+package com.neotel.smfcore.custom.lizhen.wcs;
+
+import com.alibaba.fastjson.JSONObject;
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.core.order.LiteOrderCache;
+import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
+import com.neotel.smfcore.core.order.service.po.LiteOrder;
+import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RestController
+public class DifferenceReelController {
+
+    @Autowired
+    private ILiteOrderManager liteOrderManager;
+
+    @Autowired
+    private LiteOrderCache liteOrderCache;
+
+    @ApiOperation("工单差异料上传")
+    @RequestMapping("/api/Mes/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.setTableNo(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("");
+    }
+
+
+}

src/main/resources/config/application-prod.yml

@@ -14,7 +14,7 @@ spring:
       #host: localhost  # 主机地址
       host: 10.68.27.88
       port: 27017           # 端口
-      database: 3fsmf        # 数据库
+      database: 3fsmf        # 数据库 3楼 BG数据库是3fsmf CG线数据库是3fsmf_cg
 
 #kafka配置
   kafka: