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 de124fd..8a38e24 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,11 +85,13 @@ 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"));
-                equipmentcard.set("number",eceq_equipment_card.getString("number"));//设备编号
+            }
+            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");//
@@ -179,7 +181,7 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
                     DynamicObjectCollection assentry = loadSingle.getDynamicObjectCollection("assentry");
                     DynamicObject costcentrer = assentry.get(0).getDynamicObject("costcentrer");//成本中心
                     BigDecimal splitamount = assentry.get(0).getBigDecimal("splitamount");//分摊金额
-                    DynamicObject addNew = new DynamicObject(assentry.getDynamicObjectType());
+                    DynamicObject addNew = new DynamicObject(entrys.getDynamicObjectType());
                     addNew.set("zcgj_debillno", id);
                     addNew.set("zcgj_assperiod", period);
                     addNew.set("zcgj_headusedept", splitdept);