diff --git a/src/main/java/com/yem/wm/im/orderproreqbill/op/OrderProReqBillSubmitOp.java b/src/main/java/com/yem/wm/im/orderproreqbill/op/OrderProReqBillSubmitOp.java
index 0521ed1b..1cc29335 100644
--- a/src/main/java/com/yem/wm/im/orderproreqbill/op/OrderProReqBillSubmitOp.java
+++ b/src/main/java/com/yem/wm/im/orderproreqbill/op/OrderProReqBillSubmitOp.java
@@ -13,21 +13,7 @@ public class OrderProReqBillSubmitOp extends AbstractOperationServicePlugIn {
     public void onPreparePropertys(PreparePropertysEventArgs e) {
         super.onPreparePropertys(e);
         List<String> keys = e.getFieldKeys();
-
-        keys.add("yem_es_materialinfo");
-        keys.add("yem_warehouse");
-        keys.add("yem_outwhcode");
-        keys.add("yem_billtype");
-
-
-        keys.add("yem_isvmi");
-        keys.add("yem_companyorg");
-        keys.add("billstatus");
-        keys.add("yem_es_materialinfo");
-
-
-        keys.add("yem_es_materialinfo.yem_materiel");
-        keys.add("yem_es_materialinfo.seq");
+        keys.addAll(this.billEntityType.getAllFields().keySet());
 
     }
 
diff --git a/src/main/java/com/yem/wm/im/orderproreqbill/validator/OrderProReqBillValidator.java b/src/main/java/com/yem/wm/im/orderproreqbill/validator/OrderProReqBillValidator.java
index 18173d8b..b3ad0189 100644
--- a/src/main/java/com/yem/wm/im/orderproreqbill/validator/OrderProReqBillValidator.java
+++ b/src/main/java/com/yem/wm/im/orderproreqbill/validator/OrderProReqBillValidator.java
@@ -26,7 +26,7 @@ public class OrderProReqBillValidator extends AbstractValidator {
                             for (DynamicObject object : yemImEntryentity) {
                                 DynamicObject yemMaterialnum = object.getDynamicObject("yem_materiel");
                                 int seq = object.getInt("seq");
-                                if (yemMaterialnum != null) {
+                                if (yemMaterialnum != null && "A".equals(bill.getString("yem_attributesneed"))) {
                                     String yemMaterialnumnumber = yemMaterialnum.getString("number");
                                     DynamicObject dynamicObjec = BusinessDataServiceHelper.loadSingle("yem_material_procinfo", "id,number,createorg"
                                             , new QFilter[]{new QFilter("createorg.number", QCP.equals, number)