API002未传物料信息

src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronApi.java

@@ -245,31 +245,11 @@ public class MicronApi  {
                 }
                 AMaterialBean bean = AMaterialBean.toBean(barcode);
                 materialBeans.add(bean);
+                resultMapList.add(objMap);
             }
             paramsMap.put("loadedMaterials", resultMapList);
 
-//            Http Status code:
-//            200 - Success
-//            {
-//                "trasactionId": <TransactionId>,
-//                    "tag":
-//	[
-//		<tagKey1> : <tagValue1>,
-//		<tagKey2> : <tagValue2>,
-//		...
-//	],
-//                "materialStatusList":
-//	[
-//                {
-//                    "serialNum": <SerialNum>,
-//                        "partNumber": <PartNumber>,
-//                        "materialStatus": <MaterialStaus>
-//                },
-//		...
-//
-//	]
-//                "status": "Success"
-//            }
+
             Map<String, Boolean> resultMap = new HashMap<>();
             String paramStr = JsonUtil.toJsonStr(paramsMap);
             log.info("调用MES接口 API002: url=" + url + ",body=" + paramStr + "");

src/main/java/com/neotel/smfcore/custom/micron1053/loading/util/LoadingUtil.java

@@ -250,40 +250,42 @@ public class LoadingUtil {
 
         List<InListItem> inListItems = new ArrayList<>();
         boolean isEnd = true;
-        if (inList.getRfidList().size() <= inList.getShelfNum()) {
+        if (inList.getRfidList().size() < inList.getShelfNum()) {
             isEnd = false;
         }
         for (InListItem item :
-                inListItems) {
-
-            if (resultMap.containsKey(item.getRi())) {
-                Boolean result = resultMap.get(item.getRi());
-                if (result == null) {
-                    result = false;
-                }
-                int newS;
-                if (result) {
-                    newS = INITEM_STATUS.Fail;
+                inList.getInListItems()) {
+            if (item.getRfid().equals(rfid)) {
+                if (item.getState() == INITEM_STATUS.Success) {
                 } else {
-                    newS = INITEM_STATUS.Success;
-                }
-
-
-                log.info("更新 入库单["+inList.getName()+"] rfid[" + item.getRfid() + "] ：条码 [" + item.getRi() + "]库位[" + item.getPosName() + "]的状态=" + newS);
-                if (item.getState() != newS) {
-                    item.setState(newS);
-                    item = inListItemManager.save(item);
+                    int newS = INITEM_STATUS.Fail;
+                    if (resultMap.containsKey(item.getRi())) {
+                        Boolean result = resultMap.get(item.getRi());
+                        if (result == null) {
+                            result = false;
+                        }
+                        if (result) {
+                            newS = INITEM_STATUS.Success;
+                        }
+                    }
+                    log.info("更新 入库单[" + inList.getName() + "] rfid[" + item.getRfid() + "] ：条码 [" + item.getRi() + "]库位[" + item.getPosName() + "]的状态=" + newS);
+                    if (item.getState() != newS) {
+                        item.setState(newS);
+                        item = inListItemManager.save(item);
+                    }
                 }
-                inListItems.add(item);
             }
             if (!item.isEnd()) {
                 isEnd = false;
             }
+            inListItems.add(item);
         }
         inList.setInListItems(inListItems);
         if (isEnd) {
+            log.info("更新 入库单[" + inList.getName() + "]  状态改为 OK");
             inList.setStatus(INLIST_STATUS.OK);
         } else {
+            log.info("更新 入库单[" + inList.getName() + "]  状态改为 ABNORMAL");
             inList.setStatus(INLIST_STATUS.ABNORMAL);
         }
         inList = inListManager.save(inList);
@@ -291,16 +293,9 @@ public class LoadingUtil {
 
         //判断是否全部完成
 
-        List<InListItem> notEndList = inListItems.stream()
-                .filter(item -> (!item.isEnd()))
-                .collect(Collectors.toList());
-
-
-        if (notEndList==null||notEndList.size()<=0) {
-
+        if (isEnd) {
             log.info("  入库单[" + inList.getName() + "]：任务已全部完成，清空当前loadinginfo");
             dataCache.updateCache(Constants.CACHE_LOADING, new LoadingInfo());
-
         }
         return true;
     }