修改

src/main/java/com/steerinfo/dil/mapper/AmsshipDeliveryAttorneyMapper.java

@@ -65,4 +65,7 @@ public interface AmsshipDeliveryAttorneyMapper extends IBaseMapper<AmsshipDelive
 
     //为港口入库查询信息
     Map<String, Object> getDetailsForInbound(Map<String, Object> map);
+
+    //查询是否已经发送过提货委托
+    int isAttorny(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/AmsshipDeliveryAttorneyServiceImpl.java

@@ -79,9 +79,11 @@ public class AmsshipDeliveryAttorneyServiceImpl implements IAmsshipDeliveryAttor
         amsshipDeliveryAttorney.setDeleted((short) 0);
         amsshipDeliveryAttorney.setRealForeignShipName(map.get("realForeignShipName")+"");
         //下游港口入库
-        Map<String,Object> inbound=amsshipDeliveryAttorneyMapper.getDetailsForInbound(map);
-        inbound.put("portId",amsshipDeliveryAttorney.getDownSwimPortId());
-        wmshboundFeign.addWarehousingResult(inbound);
+        if(amsshipDeliveryAttorneyMapper.isAttorny(map)<=0){
+            Map<String,Object> inbound=amsshipDeliveryAttorneyMapper.getDetailsForInbound(map);
+            inbound.put("portId",amsshipDeliveryAttorney.getDownSwimPortId());
+            wmshboundFeign.addWarehousingResult(inbound);
+        }
         return amsshipDeliveryAttorneyMapper.insertSelective(amsshipDeliveryAttorney);
     }
 

src/main/resources/com/steerinfo/dil/mapper/AmsshipDeliveryAttorneyMapper.xml

@@ -791,4 +791,9 @@
       WHERE DBI.BATCH_INFACOTRY_ID=#{batchId} AND ADN.DELETED=0
         FETCH NEXT 1 ROWS ONLY
     </select>
+    <select id="isAttorny" resultType="java.lang.Integer">
+      SELECT count(ATTORNEY_ID)
+      FROM AMSSHIP_DELIVERY_ATTORNEY
+      WHERE BATCH_ID=#{batchId}
+    </select>
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml

@@ -3,7 +3,9 @@
 <mapper namespace="com.steerinfo.dil.mapper.ShipDynamicsMapper">
 <!-- 获取船舶动态表数据  -->
     <select id="selectAll" resultType="java.util.Map" parameterType="java.util.Map">
-        select db.BATCH_ID "batchId",
+    SELECT * FROM (
+        select DISTINCT
+               db.BATCH_ID "batchId",
                DBI2.BATCH_INFACOTRY_ID  "batchInfacoryId",
                db.result_foreign_ship_name "shipName",
                rm.material_name "materialName",
@@ -57,7 +59,8 @@
         <if test="con!=null and con!=''.toString()">
          and (instr(RMT.MATERIAL_TYPE_NAME,#{con}) > 0 or instr(rc.capacity_number,#{con}) > 0 or instr(rm.material_name,#{con}) > 0 or instr(db.result_foreign_ship_name,#{con}) >0 )
         </if>
-        Order By ADN.INSERT_TIME DESC
+        )
+        Order By "batchInfacoryId" DESC
     </select>
     <select id="selectByshipName" resultType="java.util.Map" parameterType="java.util.Map">
         select sd.GM_TONNAGE as "tonnage",