兼容908

myproject/src/main/java/com/myproject/util/QisdaApi.java

@@ -319,10 +319,10 @@ public class QisdaApi {
      * 3. CIS入库判定接口 (没绑过料串的条码调用此接口)
      */
     public static Barcode VMILocationInCheck(Barcode barcode) throws ValidateException{
-//        if(DataCache.isProductionFor(DataCache.CUSTOMER.DEBUG)){
-//            log.info("程序调试阶段,暂不处理,调试完成后更改PRO");
-//            return barcode;
-//        }
+        if(DataCache.isProductionFor(DataCache.CUSTOMER.DEBUG)){
+            log.info("程序调试阶段,暂不处理,调试完成后更改PRO");
+            return barcode;
+        }
         String url = "http://172.74.1.175:1235/api/SMDBOXAPI";
         String reelid = barcode.getBarcode();
         String partNum = barcode.getPartNumber();

myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaCache.java

@@ -323,7 +323,9 @@ public class QisdaCache {
     public static DNInfo getDnInfo(String rfid){
         if(rfid == null || rfid.equals("000")){
             //rfid = "";
-            return null;
+            DNInfo dnInfo = new DNInfo();
+            dnInfo.setDnNo("");
+            return dnInfo;
         }
 
         DNInfo dnInfo = rfidDnMap.get(rfid);

myproject/src/main/java/com/myproject/webapp/controller/webService/StorageDataController.java

@@ -714,9 +714,14 @@ public class StorageDataController extends BaseController {
                         resultMap.put("msg",errorMsg);
 
                     }
+                } catch (ValidateException ve) {
+                    errorMsg = ve.getMessage();
+                    log.info("查找空库位失败:" + errorMsg);
+                    resultMap.put("result","105");
+                    resultMap.put("msg",errorMsg);
                 } catch (Exception e) {
                     errorMsg = e.getMessage();
-                    log.info("查找空库位失败:" + errorMsg);
+                    log.info("查找空库位失败,",e);
                     resultMap.put("result","105");
                     resultMap.put("msg",errorMsg);
                 }