修改查询

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

@@ -500,7 +500,9 @@
                      ON ada.PORT_ID = rpe.PORT_ID
            LEFT JOIN RMS_CAPACITY rc
                      ON rc.CAPACITY_ID = oic.CAPACITY_ID
-    WHERE tsl.DELETED = 0 and tlsr.DELETED = 0 and ada.DELETED=0 and oic.DELETED=0 and osi.DELETED=0
+           LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
+                     ON ADN.BATCH_ID=dbi.BATCH_INFACOTRY_ID
+    WHERE tsl.DELETED = 0 and tlsr.DELETED = 0 and ada.DELETED=0 and oic.DELETED=0 and osi.DELETED=0 and adn.DELETED=0
   <if test="con!=null">
     and  (instr(rc.CAPACITY_NUMBER,#{con}) > 0 or instr(rm.MATERIAL_NAME,#{con}) > 0 or   instr(db.RESULT_FOREIGN_SHIP_NAME,#{con}) > 0  )
   </if>

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

@@ -581,6 +581,7 @@
         AND ADA.DELETED = 0
         AND OIC.DELETED != 3
         AND OSI.INSTRUCTION_ISSUE_STATUS='已下发'
+        AND ADN.DELETED = 0
         <if test="con!=null">
             AND (DB.RESULT_FOREIGN_SHIP_NAME like concat('%', concat(#{con},'%'))
             or RM.MATERIAL_NAME like concat('%', concat(#{con}, '%'))

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

@@ -505,7 +505,7 @@
         LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
         ON tlsr.TOTAL_RESULT_ID = ttr.RESULT_ID
         WHERE tusr.DELETED = 0 and tlsr.DELETED=0 and ada.DELETED=0
-        and osi.DELETED=0 and oic.DELETED!=1
+        and osi.DELETED=0 and oic.DELETED!=1 and adn.DELETED=0
         )
         <where>
             <if test="con!=null">