PanaCIM对接修改

src/main/java/com/neotel/smfcore/custom/panacim/PanaApiController.java

@@ -48,6 +48,8 @@ public class PanaApiController extends BaseSmfApiListener {
 
     protected static DataCache dataCache;
 
+    private static String PanaTowerID = "SMDBOX";
+
 
     @Autowired
     protected CodeResolve codeResolve;
@@ -154,7 +156,7 @@ public class PanaApiController extends BaseSmfApiListener {
             result.put("TransactionID",TransactionID);
             result.put("ErrorCode","0");
             result.put("JobID",JobID);
-            result.put("TowerID",TowerID);
+            result.put("TowerID",PanaTowerID);
             result.put("ReelBarcodesDelivered",ReelBarcodesDelivered);
             result.put("ReelBarcodesNonExisting", ReelBarcodesNonExisting);
 
@@ -187,24 +189,24 @@ public class PanaApiController extends BaseSmfApiListener {
              }
              */
             Collection<Storage> allStorage = dataCache.getAllStorage().values();
-            List<Storage> storageList = Lists.newArrayList();
-            if(Strings.isNullOrEmpty(TowerID)){
-                storageList.addAll(allStorage);
-            }else{
-                for (Storage storage : allStorage) {
-                    if(storage.getName().equals(TowerID)){
-                        storageList.add(storage);
-                        break;
-                    }
-                }
-            }
+            Collection<Storage> storageList = allStorage;
+//            if(Strings.isNullOrEmpty(TowerID)){
+//                storageList.addAll(allStorage);
+//            }else{
+//                for (Storage storage : allStorage) {
+//                    if(storage.getName().equals(TowerID)){
+//                        storageList.add(storage);
+//                        break;
+//                    }
+//                }
+//            }
             List ReelBarCodes = Lists.newArrayList();
             for (Storage storage : storageList) {
                 List<StoragePos> poses = storagePosManager.findNotEmptyByStorageId(storage.getId());
                 for (StoragePos pos : poses){
                     Barcode barcode = pos.getBarcode();
                     Map<String,Object> item = Maps.newHashMap();
-                    item.put("TowerID",TowerID);
+                    item.put("TowerID",PanaTowerID);
                     item.put("JobID",barcode.getLockName());
                     item.put("ReelBarcode",barcode.getBarcode());
                     item.put("PartNo",barcode.getPartNumber());
@@ -363,7 +365,7 @@ public class PanaApiController extends BaseSmfApiListener {
                     result.put("TransactionID",TransactionID);
                     result.put("ErrorCode","0");
                     result.put("JobID",JobID);
-                    result.put("TowerID",TowerID);
+                    result.put("TowerID",PanaTowerID);
                     result.put("ReelBarcodesFailed",ReelBarcodesFailed);
                 }
 
@@ -571,7 +573,7 @@ public class PanaApiController extends BaseSmfApiListener {
                 params.put("Msd",false);
                 params.put("MsdLevel","1");
                 params.put("Location","0");
-                params.put("TowerID",task.getStorageName());
+                params.put("TowerID",PanaTowerID);
                 log.info("向 PanaCIM["+inNotifyApi+"] 通知料盘【"+task.getBarcode()+"】的入库信息:" + params);
                 String result = HttpHelper.postJson(inNotifyApi,params);
                 log.info("Response Of checkInNotification From PanaCIM:"+result);
@@ -599,7 +601,7 @@ public class PanaApiController extends BaseSmfApiListener {
                 params.put("Quantity",task.getNum());
                 SimpleDateFormat dataformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 params.put("Timestamp",dataformat.format(new Date()));
-                params.put("TowerID",task.getStorageName());
+                params.put("TowerID",PanaTowerID);
                 params.put("JobID",task.getSourceId());
                 params.put("Msd",false);
                 params.put("MsdLevel","1");