更新

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 + "'");
+            }
         }
 
     }

hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java

@@ -144,8 +144,12 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
 
             if (mode != last_mode) {
                 if (mode == 5){
+                    if (move != last_move){
+                        if (move == 0){
                             this.setEmptyrequireSucess(false);
                         }
+                    }
+                }
                 if (mode == 6){
                     this.setInrequireSucess(false);
                 }

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 = "未联机";
+                            mode = "脱机";
-                        } else if (standardInspectSiteDevicedriver.getMode() == 1) {
-                            mode = "单机";
                         }  else if (standardInspectSiteDevicedriver.getMode() == 2) {
-                            mode = "联机";
+                            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 = "未联机";
+                            mode = "脱机";
-                        } else if (standardEmptyPalletSiteDeviceDriver.getMode() == 1) {
-                            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 = "有货";
+                            move = "有托盘";
-                        } else if (standardEmptyPalletSiteDeviceDriver.getMove() == 2) {
-                            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());

qd/src/views/acs/monitor/device/index.vue

@@ -164,6 +164,13 @@
         <el-form-item label="条码" label-width="80px">
           <el-input v-model="form.barcode" :disabled="false" />
         </el-form-item>
+
+        <el-form-item label="是否锁定" label-width="80px">
+          <el-radio-group v-model="form.islock">
+            <el-radio-button :label="0">否</el-radio-button>
+            <el-radio-button :label="true">是</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible1 = false">取 消</el-button>
@@ -245,6 +252,7 @@ export default {
         barcode: '',
         suspended: null,
         agvTaskType: null,
+        islock: '',
         is_lock: null,
         lock_name: null,
         agvTaskTypeName: null,
@@ -291,6 +299,7 @@ export default {
       this.form.suspended = clickObj.data.suspended
       this.form.agvTaskType = clickObj.data.agvTaskType
       this.form.is_lock = clickObj.data.is_lock
+      this.form.islock = clickObj.data.is_lock
       this.form.lock_name = clickObj.data.lock_name
       this.form.agvTaskTypeName = clickObj.data.agvTaskTypeName
       this.form.is_unlock = clickObj.data.is_unlock