From c600760225c8ef2b5e37dc232ac32659b255eae6 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Wed, 20 Jul 2022 11:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../em/service/impl/EquipmentfileServiceImpl.java    |  7 ++++++-
 .../views/wms/basedata/em/equipmentfile/index.vue    | 12 ++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java
index fbcb60d4..011805dd 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java
@@ -172,6 +172,9 @@ public class EquipmentfileServiceImpl implements EquipmentfileService {
             String nowStatus = jsonMst.getString("status");
             HashMap<String, String> map = new HashMap<>();
             if ("10".equals(status)) {//启用
+                if (!"11,00".contains(nowStatus)) {
+                    throw new BadRequestException("只有停用、生成状态才可启用！");
+                }
                 if (StrUtil.isEmpty(jsonMst.getString("device_bom_id"))) {
                     throw new BadRequestException("设备BOM不能为空！");
                 }
@@ -200,7 +203,9 @@ public class EquipmentfileServiceImpl implements EquipmentfileService {
                 EM_BI_DeviceLifeCycle.insert(jo2);
             } else if ("11".equals(status)) {//禁用
                 map.put("status", "11");
-
+                if (!"10".contains(nowStatus)) {
+                    throw new BadRequestException("只有启用状态才可停用！");
+                }
                 JSONObject jo2 = new JSONObject();
                 jo2.put("devicechangedtl_id",  IdUtil.getSnowflake(1, 1).nextId());
                 jo2.put("devicerecord_id", jsonMst.getString("devicerecord_id"));
diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
index 41fefff2..001f6715 100644
--- a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
+++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
@@ -407,7 +407,7 @@ export default {
           if (!'00,11'.includes(rows[i].status)) {
             this.sub_flag = true
           }
-          if (!'00,10'.includes(rows[i].status)) {
+          if (!'10'.includes(rows[i].status)) {
             this.dissub_flag = true
           }
           if (rows.length !== 1) {
@@ -477,12 +477,12 @@ export default {
       LODOP.PRINT_INIT('')
       LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
       LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
-      LODOP.SET_PRINT_STYLE('FontSize', 9)
+      LODOP.SET_PRINT_STYLE('FontSize', 12)
       LODOP.SET_PRINT_STYLE('Bold', 1)
-      LODOP.ADD_PRINT_BARCODE('10mm', '15mm', '60mm', '20mm', '128A', data.device_code)
-      LODOP.ADD_PRINT_TEXT('35mm', '15mm', '80mm', '15mm', '设备编码：' + data.device_code + '')
-      LODOP.ADD_PRINT_TEXT('40mm', '15mm', '80mm', '15mm', '设备名称：' + data.device_name + '')
-      LODOP.ADD_PRINT_TEXT('45mm', '15mm', '80mm', '15mm', '型号：' + data.device_model + '')
+      LODOP.ADD_PRINT_BARCODE('10mm', '12mm', '60mm', '20mm', '128A', data.device_code)
+      LODOP.ADD_PRINT_TEXT('34mm', '12mm', '80mm', '15mm', '设备编码：' + data.device_code + '')
+      LODOP.ADD_PRINT_TEXT('42mm', '12mm', '80mm', '15mm', '设备名称：' + data.device_name + '')
+      LODOP.ADD_PRINT_TEXT('49mm', '12mm', '80mm', '15mm', '设备型号：' + data.device_model + '')
       LODOP.PRINT()// 打印
       this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       this.crud.toQuery()