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 b00296e..12cb7d5 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
@@ -99,13 +99,14 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
                 DynamicObject eceq_equipment_card = BusinessDataServiceHelper.loadSingle("eceq_equipment_card", new QFilter[]{new QFilter("zcgj_assetnumber", QCP.equals, number)});
                 if (eceq_equipment_card!=null){
                     equipmentcard.set("id",eceq_equipment_card.getLong("id"));
+                    String cardString = eceq_equipment_card.getString("number");
+                    if(!cardString.isEmpty() && cardString!=null){
+                        equipmentcard.set("number",cardString);//设备编号
+                    }else{
+                        equipmentcard.set("number",getCodeRule(equipmentcard,"53BT+ZJB86=L"));//设备编号
+                    }
                 }
-                String cardString = eceq_equipment_card.getString("number");
-                if(!cardString.isEmpty() && cardString!=null){
-                    equipmentcard.set("number",cardString);//设备编号
-                }else{
-                    equipmentcard.set("number",getCodeRule(equipmentcard,"53BT+ZJB86=L"));//设备编号
-                }
+
                 equipmentcard.set("billno",timeText);//单据编号
                 equipmentcard.set("status","C");//单据状态
                 equipmentcard.set("billstatus","C");//
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 8a38e24..2f18997 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
@@ -85,13 +85,14 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
             DynamicObject eceq_equipment_card = BusinessDataServiceHelper.loadSingle("eceq_equipment_card", new QFilter[]{new QFilter("zcgj_assetnumber", QCP.equals, number)});
             if (eceq_equipment_card!=null){
                 equipmentcard.set("id",eceq_equipment_card.getLong("id"));
+                String cardString = eceq_equipment_card.getString("number");
+                if(!cardString.isEmpty() && cardString!=null){
+                    equipmentcard.set("number",cardString);//设备编号
+                }else{
+                    equipmentcard.set("number",getCodeRule(equipmentcard,"53BT+ZJB86=L"));//设备编号
+                }
             }
-            String cardString = eceq_equipment_card.getString("number");
-            if(!cardString.isEmpty() && cardString!=null){
-                equipmentcard.set("number",cardString);//设备编号
-            }else{
-                equipmentcard.set("number",getCodeRule(equipmentcard,"53BT+ZJB86=L"));//设备编号
-            }
+
             equipmentcard.set("billno",timeText);//单据编号
             equipmentcard.set("status","C");//单据状态
             equipmentcard.set("billstatus","C");//