diff --git a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java
index f4f1d291..39c4806c 100644
--- a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java
+++ b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java
@@ -44,11 +44,11 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
                 .finish();
         dataSet = dataSet.where("yem_salesorderno IS NOT NULL AND yem_salesorderno != ''");
 
-        DataSet declaredocx = queryDeclareDocx(param);
-        dataSet = dataSet.leftJoin(declaredocx)
-                .on("yem_dnbillno", "main_detail_id_declaredocx_fk")
-                .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(declaredocx))
-                .finish();
+//        DataSet declaredocx = queryDeclareDocx(param);
+//        dataSet = dataSet.leftJoin(declaredocx)
+//                .on("main_detail_id", "main_detail_id_decl-aredocx_fk")
+//                .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(declaredocx))
+//                .finish();
 
         DataSet storagetrans = queryStorageTrans(param);
         dataSet = dataSet.leftJoin(storagetrans)
@@ -577,13 +577,10 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
     private DataSet queryDeclareDocx(ReportQueryParam param) {
         QFilter qFilter = getBaseQFilter(new String[]{"B", "C"});
         ArrayList<String> selectfields = Lists.newArrayList();
-//        selectfields.add("yem_es_materialinfo.yem_coreentryid main_detail_id_declaredocx_fk");
-        selectfields.add("yem_es_materialinfo.yem_sgnenumber main_detail_id_declaredocx_fk");
+        selectfields.add("yem_es_materialinfo.yem_coreentryid main_detail_id_declaredocx_fk");
         selectfields.add("TO_CHAR(yem_invoicedate, 'yyyy-MM-dd') yem_invoicedate");//开票日期
 
-        DataSet yemEsDeclaredocx = ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray());
-        yemEsDeclaredocx = yemEsDeclaredocx.distinct();
-        return yemEsDeclaredocx;
+        return ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray());
     }
 
     /**
diff --git a/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java b/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java
index 150b681e..81a8c4fd 100644
--- a/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java
+++ b/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java
@@ -119,10 +119,4 @@ public class XSalesOrderFromEdit extends AbstractBillPlugIn {
             }
         }
     }
-
-//    @Override
-//    public void afterCreateNewData(EventObject e) {
-//        super.afterCreateNewData(e);
-//        this.getModel().setValue("yem_signdate",new Date());
-//    }
 }