add 混料区条码判断

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java

@@ -605,9 +605,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             if (resp.getCode() == 200) {
                 this.writing(200);
                 this.setRequireSucess(true);
+                message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求成功" + resp.getMessage();
+                lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage();;
+                message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage();
+                lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
             }
             return true;
         } else {
@@ -656,7 +659,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
      * @param
      */
     public synchronized boolean apply_take_full_vehicle() {
-        if(move > 0) {
+        if(move > 0&& barcode>0) {
             ApplyTaskRequest request = new ApplyTaskRequest();
             request.setDevice_code(this.getDevice_code());
             request.setRequest_medthod_code(Thread.currentThread().getStackTrace()[1].getMethodName());
@@ -689,11 +692,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
                 lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
             }
             return true;
-        } else {
+        } else if(move==0) {
             message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 设备无货未请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
-            return false;
+        }else if(barcode<=0){
+            message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 设备条码不正确未请求LMS...";
+            lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
         }
+        return false;
     }
 
     /**