From 1b813598ff5ec7ed4f5f4ba39df337a22e7fafa0 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Thu, 28 Jul 2022 20:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/DeviceServiceImpl.java | 10 ++++++
.../StandardInspectSiteDeviceDriver.java | 6 +++-
.../service/impl/StageActorServiceImpl.java | 33 +++++++++++--------
qd/src/views/acs/monitor/device/index.vue | 9 +++++
4 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
index 3fd5f37..85f9562 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
@@ -1782,6 +1782,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
@Override
public void updateBarcode(JSONObject json) throws Exception {
String device_code = json.getString("device_code");
+ String islock = json.getString("islock");
String barcode = json.getString("barcode");
Device device = deviceAppService.findDeviceByCode(device_code);
StandardScannerDeviceDriver standardScannerDeviceDriver;
@@ -1792,7 +1793,16 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
}
if (device.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) {
standardEmptyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) device.getDeviceDriver();
+ device.setIslock(islock);
standardEmptyPalletSiteDeviceDriver.setContainer(barcode);
+ WQLObject runpointwo = WQLObject.getWQLObject("acs_device_runpoint");
+ JSONObject json1 = runpointwo.query("device_code ='" + device_code + "'").uniqueResult(0);
+ if (ObjectUtil.isNotEmpty(json1)) {
+ DeviceRunpointDto obj = (DeviceRunpointDto) JSONObject.toBean(json1, DeviceRunpointDto.class);
+ obj.setIslock(islock);
+ JSONObject updatejson = JSONObject.fromObject(obj);
+ runpointwo.update(updatejson, "device_code = '" + device_code + "'");
+ }
}
}
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
index 238dd43..9b74d3f 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
@@ -144,7 +144,11 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (mode != last_mode) {
if (mode == 5){
- this.setEmptyrequireSucess(false);
+ if (move != last_move){
+ if (move == 0){
+ this.setEmptyrequireSucess(false);
+ }
+ }
}
if (mode == 6){
this.setInrequireSucess(false);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java
index 73adeb0..e69f8cb 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java
@@ -511,18 +511,24 @@ public class StageActorServiceImpl implements StageActorService {
else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDevicedriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
if (standardInspectSiteDevicedriver.getMode() == 0) {
- mode = "未联机";
- } else if (standardInspectSiteDevicedriver.getMode() == 1) {
- mode = "单机";
- } else if (standardInspectSiteDevicedriver.getMode() == 2) {
- mode = "联机";
+ mode = "脱机";
+ } else if (standardInspectSiteDevicedriver.getMode() == 2) {
+ mode = "待机";
+ } else if (standardInspectSiteDevicedriver.getMode() == 3) {
+ mode = "运行中";
+ }else if (standardInspectSiteDevicedriver.getMode() == 4) {
+ mode = "叫料";
+ }else if (standardInspectSiteDevicedriver.getMode() == 5) {
+ mode = "申请空盘";
+ }else if (standardInspectSiteDevicedriver.getMode() == 6) {
+ mode = "申请入库";
}
if (standardInspectSiteDevicedriver.getMove() == 0) {
move = "无货";
} else if (standardInspectSiteDevicedriver.getMove() == 1) {
- move = "有货";
+ move = "有托盘";
} else if (standardInspectSiteDevicedriver.getMove() == 2) {
- move = "有托盘有货";
+ move = "有托盘有物料";
}
obj.put("device_name", standardInspectSiteDevicedriver.getDevice().getDevice_name());
jo.put("mode", mode);
@@ -663,24 +669,23 @@ public class StageActorServiceImpl implements StageActorService {
else if (device.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) {
standardEmptyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) device.getDeviceDriver();
if (standardEmptyPalletSiteDeviceDriver.getMode() == 0) {
- mode = "未联机";
- } else if (standardEmptyPalletSiteDeviceDriver.getMode() == 1) {
- mode = "单机";
+ mode = "脱机";
} else if (standardEmptyPalletSiteDeviceDriver.getMode() == 2) {
- mode = "联机";
+ mode = "待机";
+ } else if (standardEmptyPalletSiteDeviceDriver.getMode() == 3) {
+ mode = "申请空盘";
}
if (standardEmptyPalletSiteDeviceDriver.getMove() == 0) {
move = "无货";
} else if (standardEmptyPalletSiteDeviceDriver.getMove() == 1) {
- move = "有货";
- } else if (standardEmptyPalletSiteDeviceDriver.getMove() == 2) {
- move = "有托盘有货";
+ move = "有托盘";
}
obj.put("device_name", standardEmptyPalletSiteDeviceDriver.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("move", move);
//点击弹出
jo.put("is_click", true);
+ jo.put("is_lock",device.getIslock());
jo.put("number", standardEmptyPalletSiteDeviceDriver.getNumber());
jo.put("hasGoods", standardEmptyPalletSiteDeviceDriver.getHasGoods());
jo.put("isOnline", standardEmptyPalletSiteDeviceDriver.getIsonline());
diff --git a/qd/src/views/acs/monitor/device/index.vue b/qd/src/views/acs/monitor/device/index.vue
index 2c7edbd..cba5498 100644
--- a/qd/src/views/acs/monitor/device/index.vue
+++ b/qd/src/views/acs/monitor/device/index.vue
@@ -164,6 +164,13 @@
+
+
+
+ 否
+ 是
+
+