Merge remote-tracking branch 'orinin/test' into test

1.出口发票,出口报关  提交提示换算方式为空问题处理

src/main/java/com/yem/wm/es/declaredocx/op/DeclareDocxSubmitOp.java

@@ -1,14 +1,38 @@
 package com.yem.wm.es.declaredocx.op;
 
 import com.yem.wm.es.declaredocx.validator.DeclareDocxSubmitValidator;
+import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
 import kd.bos.entity.plugin.AddValidatorsEventArgs;
+import kd.bos.entity.plugin.PreparePropertysEventArgs;
+import kd.bos.entity.plugin.args.AfterOperationArgs;
+import kd.bos.servicehelper.operation.SaveServiceHelper;
 
 public class DeclareDocxSubmitOp extends AbstractOperationServicePlugIn {
 
+    @Override
+    public void onPreparePropertys(PreparePropertysEventArgs e) {
+        super.onPreparePropertys(e);
+        e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet());
+    }
+
+
     @Override
     public void onAddValidators(AddValidatorsEventArgs e) {
         super.onAddValidators(e);
         e.addValidator(new DeclareDocxSubmitValidator());
     }
+
+    @Override
+    public void afterExecuteOperationTransaction(AfterOperationArgs e) {
+        super.afterExecuteOperationTransaction(e);
+        DynamicObject[] eDataEntities = e.getDataEntities();
+        for (DynamicObject eDataEntity : eDataEntities) {
+            String yemQuotation = eDataEntity.getString("yem_quotation");
+            if ("".equals(yemQuotation)) {
+                eDataEntity.set("yem_quotation", "0");
+            }
+        }
+        SaveServiceHelper.save(eDataEntities);
+    }
 }

src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSubmitOp.java

@@ -1,11 +1,12 @@
 package com.yem.wm.es.exportinvoice.op;
 
 import com.yem.wm.es.exportinvoice.validator.ExportInvoiceSubmitValidator;
+import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
 import kd.bos.entity.plugin.AddValidatorsEventArgs;
 import kd.bos.entity.plugin.PreparePropertysEventArgs;
-
-import java.util.List;
+import kd.bos.entity.plugin.args.AfterOperationArgs;
+import kd.bos.servicehelper.operation.SaveServiceHelper;
 
 /**
  * @author xwudd
@@ -24,5 +25,16 @@ public class ExportInvoiceSubmitOp extends AbstractOperationServicePlugIn {
         super.onAddValidators(e);
         e.addValidator(new ExportInvoiceSubmitValidator());
     }
-
+    @Override
+    public void afterExecuteOperationTransaction(AfterOperationArgs e) {
+        super.afterExecuteOperationTransaction(e);
+        DynamicObject[] eDataEntities = e.getDataEntities();
+        for (DynamicObject eDataEntity : eDataEntities) {
+            String yemQuotation = eDataEntity.getString("yem_quotation");
+            if ("".equals(yemQuotation)) {
+                eDataEntity.set("yem_quotation", "0");
+            }
+        }
+        SaveServiceHelper.save(eDataEntities);
+    }
 }