diff --git a/src/main/java/com/yem/wm/es/encasement/from/EncaseMentStuffingEdit.java b/src/main/java/com/yem/wm/es/encasement/from/EncaseMentStuffingEdit.java
index 0ece79fb..399b6443 100644
--- a/src/main/java/com/yem/wm/es/encasement/from/EncaseMentStuffingEdit.java
+++ b/src/main/java/com/yem/wm/es/encasement/from/EncaseMentStuffingEdit.java
@@ -125,48 +125,17 @@ public class EncaseMentStuffingEdit extends AbstractBillPlugIn {
             }
         }
 //        DynamicObjectCollection yem_sumpartspackss = yem_sumpartspack.getDynamicObjectCollection("yem_sumpartspack");
-        int[] indexs = this.getModel().batchCreateNewEntryRow("yem_im_detaweight_dw", yem_sumpartspack.size());
+//        int[] indexs = this.getModel().batchCreateNewEntryRow("yem_im_detaweight_dw", yem_sumpartspack.size());
 
-//        for (DynamicObject yem_sumpartspacks : yem_sumpartspack) {
-//            int index = this.getModel().createNewEntryRow("yem_im_detaweight_dw");
-//            if (index != -1) {
-//                this.getModel().setValue("yem_businesssort_dw", "P", index);
-//                this.getModel().setValue("yem_picnoz_det", yem_sumpartspacks.getString("yem_packname"), index);
-//                this.getModel().setValue("yem_traynumber_det", yem_sumpartspacks.getString("yem_trayno"), index);
-//                this.getModel().setValue("yem_boxnumber_det", yem_sumpartspacks.getString("yem_boxno"), index);
-//        DynamicObject yemPacktype = yem_sumpartspacks.getDynamicObject("yem_packtype");
-//        if (yemPacktype!=null){
-//            this.getModel().setValue("yem_packstyle_det", yemPacktype.getLong("id"), index);
-//        }
-//                this.getModel().setValue("yem_pieces_det", yem_sumpartspacks.getBigDecimal("yem_piecenum"), index);
-//                this.getModel().setValue("yem_grossweightsumd", yem_sumpartspacks.getBigDecimal("yem_sumroughweight"), index);
-//                this.getModel().setValue("yem_volsum_det", yem_sumpartspacks.getBigDecimal("yem_sumvolume"), index);
-//                this.getModel().setValue("yem_partsid", yem_sumpartspacks.getString("yem_partsid"), index);
-//                this.getModel().setValue("yem_grossweightsumd", yem_sumpartspacks.getBigDecimal("yem_sumroughweight"), index);
-//                this.getModel().setValue("yem_volsum_det", yem_sumpartspacks.getString("yem_sumvolume"), index);
-//
-//                BigDecimal stuffingpiece = (BigDecimal) this.getModel().getValue("yem_stuffingpiece", yem_sumpartspacks.getInt("seq") - 1);
-//                this.getModel().setValue("yem_stuffingpiece", stuffingpiece.add(yem_sumpartspacks.getBigDecimal("yem_piecenum"))
-//                        , yem_sumpartspacks.getInt("seq") - 1);
-//
-//                BigDecimal quantity = (BigDecimal) this.getModel().getValue("yem_piecenum", yem_sumpartspacks.getInt("seq") - 1);
-//                this.getModel().setValue("yem_residuepiece",
-//                        quantity.subtract(stuffingpiece.add(yem_sumpartspacks.getBigDecimal("yem_piecenum")))
-//                        , yem_sumpartspacks.getInt("seq") - 1);
-//            }
-//            if (index == -1) {
-//                this.getView().showMessage("请先录入装柜信息");
-//            }
-//        }
-        if (indexs.length > 0) {
-            for (int index : indexs) {
-                DynamicObject yem_sumpartspacks = yem_sumpartspack.get(index);
+        for (DynamicObject yem_sumpartspacks : yem_sumpartspack) {
+            int index = this.getModel().createNewEntryRow("yem_im_detaweight_dw");
+            if (index != -1) {
                 this.getModel().setValue("yem_businesssort_dw", "P", index);
                 this.getModel().setValue("yem_picnoz_det", yem_sumpartspacks.getString("yem_packname"), index);
                 this.getModel().setValue("yem_traynumber_det", yem_sumpartspacks.getString("yem_trayno"), index);
                 this.getModel().setValue("yem_boxnumber_det", yem_sumpartspacks.getString("yem_boxno"), index);
                 DynamicObject yemPacktype = yem_sumpartspacks.getDynamicObject("yem_packtype");
-                if (yemPacktype!=null){
+                if (yemPacktype != null) {
                     this.getModel().setValue("yem_packstyle_det", yemPacktype.getLong("id"), index);
                 }
                 this.getModel().setValue("yem_pieces_det", yem_sumpartspacks.getBigDecimal("yem_piecenum"), index);
@@ -185,7 +154,44 @@ public class EncaseMentStuffingEdit extends AbstractBillPlugIn {
                         quantity.subtract(stuffingpiece.add(yem_sumpartspacks.getBigDecimal("yem_piecenum")))
                         , yem_sumpartspacks.getInt("seq") - 1);
             }
+            if (index == -1) {
+                this.getView().showMessage("请先录入装柜信息");
+            }
         }
+//        if (indexs.length > 0) {
+//            for (int index : indexs) {
+//                if (index==0){
+//
+//                }
+//                DynamicObject yem_sumpartspacks = yem_sumpartspack.get(index);
+//                this.getModel().setValue("yem_businesssort_dw", "P", index);
+//                this.getModel().setValue("yem_picnoz_det", yem_sumpartspacks.getString("yem_packname"), index);
+//                this.getModel().setValue("yem_traynumber_det", yem_sumpartspacks.getString("yem_trayno"), index);
+//                this.getModel().setValue("yem_boxnumber_det", yem_sumpartspacks.getString("yem_boxno"), index);
+//                DynamicObject yemPacktype = yem_sumpartspacks.getDynamicObject("yem_packtype");
+//                if (yemPacktype!=null){
+//                    this.getModel().setValue("yem_packstyle_det", yemPacktype.getLong("id"), index);
+//                }
+//                this.getModel().setValue("yem_pieces_det", yem_sumpartspacks.getBigDecimal("yem_piecenum"), index);
+//                this.getModel().setValue("yem_grossweightsumd", yem_sumpartspacks.getBigDecimal("yem_sumroughweight"), index);
+//                this.getModel().setValue("yem_volsum_det", yem_sumpartspacks.getBigDecimal("yem_sumvolume"), index);
+//                this.getModel().setValue("yem_partsid", yem_sumpartspacks.getString("yem_partsid"), index);
+//                this.getModel().setValue("yem_grossweightsumd", yem_sumpartspacks.getBigDecimal("yem_sumroughweight"), index);
+//                this.getModel().setValue("yem_volsum_det", yem_sumpartspacks.getString("yem_sumvolume"), index);
+//
+//                BigDecimal stuffingpiece = (BigDecimal) this.getModel().getValue("yem_stuffingpiece", yem_sumpartspacks.getInt("seq") - 1);
+//                this.getModel().setValue("yem_stuffingpiece", stuffingpiece.add(yem_sumpartspacks.getBigDecimal("yem_piecenum"))
+//                        , yem_sumpartspacks.getInt("seq") - 1);
+//
+//                BigDecimal quantity = (BigDecimal) this.getModel().getValue("yem_piecenum", yem_sumpartspacks.getInt("seq") - 1);
+//                this.getModel().setValue("yem_residuepiece",
+//                        quantity.subtract(stuffingpiece.add(yem_sumpartspacks.getBigDecimal("yem_piecenum")))
+//                        , yem_sumpartspacks.getInt("seq") - 1);
+//                if (index == -1) {
+//                this.getView().showMessage("请先录入装柜信息");
+//            }
+//            }
+//        }
     }
 
     @Override
diff --git a/src/main/java/com/yem/wm/es/exportpresent/op/ExportPresentSubmitOp.java b/src/main/java/com/yem/wm/es/exportpresent/op/ExportPresentSubmitOp.java
index cb26f348..a4f94be2 100644
--- a/src/main/java/com/yem/wm/es/exportpresent/op/ExportPresentSubmitOp.java
+++ b/src/main/java/com/yem/wm/es/exportpresent/op/ExportPresentSubmitOp.java
@@ -7,6 +7,7 @@ import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
 import kd.bos.entity.plugin.AddValidatorsEventArgs;
+import kd.bos.entity.plugin.PreparePropertysEventArgs;
 import kd.bos.entity.plugin.args.EndOperationTransactionArgs;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
@@ -25,6 +26,10 @@ import static com.yem.wm.es.contractamtlist.util.FunUtil.getShipBills;
 
 public class ExportPresentSubmitOp extends AbstractOperationServicePlugIn
 {
+    public void onPreparePropertys(PreparePropertysEventArgs e) {
+        super.onPreparePropertys(e);
+        e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet());
+    }
     @Override
     public void onAddValidators(AddValidatorsEventArgs e)
     {
@@ -55,8 +60,7 @@ public class ExportPresentSubmitOp extends AbstractOperationServicePlugIn
                     BigDecimal thisRealityAmt = PaymentControlUtil.getThisRealityAmt(saleOrder, shipBills, payBills, shipDetail);
                     dynamicObject.set("yem_debtamt", thisRealityAmt.setScale(2, RoundingMode.HALF_UP));
                 }
-                String yemDetailordernumber = dataEntity.getString("yem_detailordernumber");
-                dataEntity.set("yem_cloudhousetitle","寄单放单申请-"+yemDetailordernumber);
+                dataEntity.set("yem_cloudhousetitle","标准出口交单-"+dataEntity.getString("number") + dataEntity.getString("yem_salarcontractnum") );
             }
             SaveServiceHelper.save(eDataEntities);
         }