diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
index 90679f3..13c3ee7 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
@@ -285,16 +285,24 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
      * @return
      */
     public static String getCodeRule(DynamicObject data,String number) {
+        String archivebillno = null;
         //查找编码规则
         DynamicObject coderule = BusinessDataServiceHelper.loadSingle("bos_coderule", "id", new QFilter[]{new QFilter("number", QCP.equals, number)});
         //编码对象
         if (coderule != null) {
             CodeRuleInfo codeRule = CodeRuleCache.reloadCodeRuleById(coderule.getString("id"));
             //生成箱号编码
-            String archivebillno = CodeRuleServiceHelper.getNumber(codeRule, data);
-            return archivebillno;
+            archivebillno = CodeRuleServiceHelper.getNumber(codeRule, data);
         }
-        return null;
+        if(archivebillno.isEmpty() && archivebillno==null){
+            DynamicObject dynamicObject = BusinessDataServiceHelper.newDynamicObject("eceq_equipment_card");
+            // 调用自动编码规则
+            CodeRuleInfo codeRule = CodeRuleServiceHelper.getCodeRule(dynamicObject.getDataEntityType().getName(), dynamicObject, null);
+            // 获取单据编码
+            archivebillno = CodeRuleServiceHelper.getNumber(codeRule, dynamicObject);
+        }
+        log.info("生成的设备编号为"+archivebillno);
+        return archivebillno;
     }
 
 
diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java
index e2cb711..1790af5 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java
@@ -289,16 +289,24 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
      * @return
      */
     public static String getCodeRule(DynamicObject data,String number) {
+        String archivebillno = null;
         //查找编码规则
         DynamicObject coderule = BusinessDataServiceHelper.loadSingle("bos_coderule", "id", new QFilter[]{new QFilter("number", QCP.equals, number)});
         //编码对象
         if (coderule != null) {
             CodeRuleInfo codeRule = CodeRuleCache.reloadCodeRuleById(coderule.getString("id"));
             //生成箱号编码
-            String archivebillno = CodeRuleServiceHelper.getNumber(codeRule, data);
-            return archivebillno;
+            archivebillno = CodeRuleServiceHelper.getNumber(codeRule, data);
         }
-        return null;
+        if(archivebillno.isEmpty() && archivebillno==null){
+            DynamicObject dynamicObject = BusinessDataServiceHelper.newDynamicObject("eceq_equipment_card");
+            // 调用自动编码规则
+            CodeRuleInfo codeRule = CodeRuleServiceHelper.getCodeRule(dynamicObject.getDataEntityType().getName(), dynamicObject, null);
+            // 获取单据编码
+            archivebillno = CodeRuleServiceHelper.getNumber(codeRule, dynamicObject);
+        }
+        log.info("生成的设备编号为"+archivebillno);
+        return archivebillno;
     }