1

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java

@@ -679,12 +679,12 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
                         applyEmptyIn();
                     }
                     break;
-//                case 7:
-//                    //码垛强制完成
-//                    if (!requireSucess) {
-//
-//                    }
-//                    break;
+                case 7:
+                    //获取托盘信息
+                    if (!requireSucess) {
+                        getVehicle();
+                    }
+                    break;
 //                case 8:
 //                    //申请空盘
 //                    if (!requireSucess) {
@@ -914,7 +914,11 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
         } else {
             this.instruction_require_time = date;
             JSONObject json = new JSONObject();
-            json.put("device_code",this.device_code);
+            String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code");
+            String demosub = linkobj.substring(1,linkobj.length()-1);
+            String demoArray[] = demosub.split(",");
+            List<String> demoList = Arrays.asList(demoArray);
+            json.put("device_code",demoList.get(getStation-1).replace("\"",""));
             json.put("vehicle_code",barcode);
             JSONObject jo = acsToWmsService.getVehicle(json);