更新

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java

@@ -15,6 +15,7 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.device_driver.special_ordinary_site.SpecialOrdinarySiteDeviceDriver;
 import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.instruction.service.dto.Instruction;
+import org.nl.acs.monitor.DeviceStageMonitor;
 import org.nl.acs.opc.Device;
 import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.opc.DeviceAppServiceImpl;
@@ -38,7 +39,7 @@ import java.util.Date;
 @Slf4j
 @Data
 @RequiredArgsConstructor
-public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver {
+public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
     @Autowired
     RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl");
     @Autowired
@@ -385,5 +386,36 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
         }
     }
 
+    @Override
+    public JSONObject getDeviceStatusName() {
+        String move = "";
+        JSONObject jo = new JSONObject();
+        if (this.getHasGoods() == 0) {
+            move = "无货";
+        } else if (this.getHasGoods() == 1) {
+            move = "有货";
+        } else if (this.getHasGoods() == 2) {
+            move = "有托盘有货";
+        }
+        jo.put("device_name", this.getDevice().getDevice_name());
+        jo.put("move", move);
+        jo.put("container", this.getContainer());
+        jo.put("hasGoods", this.getHasGoods());
+        jo.put("isOnline", true);
+        //点击弹出
+        jo.put("is_click", true);
+        jo.put("device_type", device.getDevice_type());
+        jo.put("error", this.getError());
+        jo.put("isError", this.getIserror());
+        jo.put("message", this.getMessage());
+        jo.put("material", this.getMaterial());
+        jo.put("batch", this.getBatch());
+        return jo;
+    }
+
+    @Override
+    public void setDeviceStatus(JSONObject data) {
+
+    }
 }
 

acs/hd/nladmin-system/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java

@@ -44,6 +44,7 @@ public class DeviceStageMonitorServiceImpl implements DeviceStageMonitorService
             }
 
             obj.put("data", json);
+            obj.put("device_name",json.get("device_name"));
             obj.put("device_code", js.get("device_code"));
             obj.put("id", js.getString("id")); // 设备不存在就只保留id，方便前端查看
             arr.add(obj);

acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue

@@ -61,6 +61,8 @@
             <el-select
               v-model="form.get_device_code1"
               multiple
+              filterable
+              reserveKeyword
               placeholder="请选择"
             >
               <el-option
@@ -89,6 +91,7 @@
             <el-select
               v-model="form.put_device_code1"
               filterable
+              reserveKeyword
               multiple
               placeholder="请选择"
             >
@@ -105,6 +108,8 @@
           <el-form-item label="后工位取货点" prop="device_code" label-width="200">
             <el-select
               v-model="form.get_device_code2"
+              filterable
+              reserveKeyword
               multiple
               placeholder="请选择"
             >
@@ -134,6 +139,7 @@
             <el-select
               v-model="form.put_device_code2"
               filterable
+              reserveKeyword
               multiple
               placeholder="请选择"
             >

acs/qd/src/views/system/logicflow/monitor/index.vue

@@ -496,7 +496,7 @@ export default {
     },
     dialogSave() {
       deviceCrud.changeDeviceStatus(this.form).then(res => {
-        this.notify('操作成功', 'success')
+        this.$notify({ title: '操作成功', message: '', type: 'success' });
         this.dialogFormVisible = false
         this.dialogFormVisible3 = false
         this.dialogFormVisible4 = false