库存查询接口修改

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

@@ -46,8 +46,11 @@ public class AMaterialBean {
         bean.mfgName = barcode.getProvider();
         bean.qty = barcode.getAmount();
         bean.expirationDateStr = barcode.getExpireDateStr();
-        bean.expirationDate = barcode.getExpireDate().toInstant().atZone(ZoneId.systemDefault())
-                .toLocalDateTime();
+        if(barcode.getExpireDate()!=null){
+            bean.expirationDate = barcode.getExpireDate().toInstant().atZone(ZoneId.systemDefault())
+                    .toLocalDateTime();
+        }
+
         try {
 
             String msLevelStr = barcode.getMsl();

src/main/java/com/neotel/smfcore/custom/neotel/NeotelController.java

@@ -212,33 +212,17 @@ public class NeotelController {
                 Barcode barcode = storagePos.getBarcode();
 
                 if (barcode != null) {
+                    try {
 
-//                    resultMap.put("serialNum", barcode.getBarcode());
-//                    resultMap.put("partNumber", barcode.getPartNumber());
-//                    resultMap.put("sapItem", Boolean.TRUE);m
-//                    resultMap.put("mfgPartNum", barcode.getMpn());
-//                    resultMap.put("mfgLotNum", barcode.getMbatch());
-//                    resultMap.put("mfgName", barcode.getProvider());
-//                    resultMap.put("qty", barcode.getAmount());
-//                    resultMap.put("expirationDate", barcode.getExpireDateStr());
-//                    String msgLevel=barcode.getMsl();
-//
-//                    if(msgLevel.startsWith("E")){
-//                        msgLevel=msgLevel.substring(1);
-//                    }else if(msgLevel.startsWith("7E")){
-//                        msgLevel=msgLevel.substring(2);
-//                    }
-//                    resultMap.put("msLevel", msgLevel);
-//                    String reelType= MicronDataCache.GetReelType(barcode.getPlateSize(),barcode.getHeight());
-//                    resultMap.put("containerType", reelType);//类型
-//                    resultMap.put("arraySize", barcode.getQ1Item());//1Q
-//                    resultMap.put("panelNum", barcode.getQItem());//Q
-                    AMaterialBean bean=AMaterialBean.toBean(barcode);
-                    Map<String, Object> resultMap = bean.toMap();
-                    objMap.put("material", resultMap);
-                }
+                        AMaterialBean bean = AMaterialBean.toBean(barcode);
+                        Map<String, Object> resultMap = bean.toMap();
+                        objMap.put("material", resultMap);
 
-                resultMapList.add(objMap);
+                        resultMapList.add(objMap);
+                    } catch (Exception exception) {
+                        log.error("error :" + exception);
+                    }
+                }
             }
             return ResultBean.newOkResult(resultMapList);
         }