383修改

@@ -95,7 +95,7 @@ public class Mawb implements Serializable {
     @Column(name = "EDIID")
     @Column(name = "EDIID")
     private String ediId;
     private String ediId;
 
 
-    @ApiModelProperty(value = "海关编号", name = "EntryId", example = "001")
+    @ApiModelProperty(value = "报关单编号", name = "EntryId", example = "001")
     @Column(name = "ENTRYID")
     @Column(name = "ENTRYID")
     private String entryId;
     private String entryId;
 
 

@@ -287,7 +287,7 @@ public class ChmConsignment implements Serializable {
     private String tradeAreaCode;
     private String tradeAreaCode;
 
 
     /**
     /**
-     * 海关编号
+     * 报关单编号
      */
      */
     @Column(name = "CUSTOMS_NO")
     @Column(name = "CUSTOMS_NO")
     private String customsNo;
     private String customsNo;

@@ -16,7 +16,7 @@ public interface DeclearTaskRepository extends JpaSpecificationExecutor<DeclearT
      * 根据运单号集合+创建时间 运单
      * 根据运单号集合+创建时间 运单
      * @return
      * @return
      */
      */
-    @Query( nativeQuery = true,value ="SELECT TOP 10 * FROM T_DECLEAR_TASK WHERE FILE_TYPE = 1 AND PUSH_NUMBER < 3 AND (RESPONSE_RESULTS IS NULL OR RESPONSE_RESULTS <> '0') ORDER BY OPERATION_TIME ASC" )
+    @Query( nativeQuery = true,value ="select TOP 10 DT.* from T_DECLEAR_TASK DT INNER JOIN T_RECEIPT_MESSAGE RM ON (DT.CHMSIGNMENT_ID = RM.ID) where DT.FILE_TYPE = 2 AND DT.PUSH_NUMBER < 3 AND (DT.RESPONSE_RESULTS IS NULL OR DT.RESPONSE_RESULTS = '0') AND RM.ENTRY_ID IS NOT NULL AND ENTRY_ID != '' ORDER BY OPERATION_TIME ASC" )
     public List<DeclearTask> findDeclearTask();
     public List<DeclearTask> findDeclearTask();
 
 
     /**
     /**

@@ -326,7 +326,7 @@ public class ChmConsignmentService {
                 Integer ediid = Integer.parseInt(consignment.getDeclaredDocTypeDic().getExt2());
                 Integer ediid = Integer.parseInt(consignment.getDeclaredDocTypeDic().getExt2());
                 result.setEdiId(ediid.toString());
                 result.setEdiId(ediid.toString());
             }
             }
-            //海关编号
+            //报关单编号
             result.setEntryId(consignment.getCustomsNo());
             result.setEntryId(consignment.getCustomsNo());
             //运费币制 英文三字码
             //运费币制 英文三字码
             if(!Objects.equals(consignment.getTransCurrencyDic(),null)){
             if(!Objects.equals(consignment.getTransCurrencyDic(),null)){