修改

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

@@ -538,6 +538,8 @@
     ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
     LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
     ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+    LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT ACTR
+    ON ACTR.BATCH_ID=OSI.BATCH_ID
     LEFT JOIN DIL_BATCH db
     ON osi.BATCH_ID = db.BATCH_ID
     LEFT JOIN RMS_MATERIAL rm
@@ -549,7 +551,7 @@
     LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
     ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
     where tbo.DELETED = 0 and tlsr.DELETED=0 and osi.DELETED=0
-        and oic.DELETED=0 )
+        and oic.DELETED=0  AND ACTR.DELETED=0)
     <where>
       <if test="materialName != null">
         and

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

@@ -655,7 +655,8 @@
         ON ada.DOWN_SWIM_PORT_ID = rps.PORT_ID
         LEFT JOIN RMS_PORT rpe
         ON ada.PORT_ID = rpe.PORT_ID
-        WHERE tlsr.DELETED = 0)
+        WHERE tlsr.DELETED = 0 AND actr.DELETED=0 AND adn.DELETED=0
+            AND ADA.DELETED=0 )
         <where>
             <if test="noticePort != null">
                 and

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

@@ -541,6 +541,8 @@
         FROM OMSSHIP_INSTRUCTIONS_CAPACITY oic
         LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
         ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+        left join AMSSHIP_CARGO_TRANSFER_RESULT ACTR
+        ON ACTR.BATCH_ID=osi.BATCH_ID
         LEFT JOIN DIL_BATCH db
         ON db.BATCH_ID = osi.BATCH_ID
         LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
@@ -552,7 +554,10 @@
         LEFT JOIN RMS_MATERIAL rm
         ON rm.MATERIAL_ID = db.MATERIAL_ID
         LEFT JOIN RMS_CAPACITY rc
-        ON rc.CAPACITY_ID = oic.CAPACITY_ID）
+        ON rc.CAPACITY_ID = oic.CAPACITY_ID
+        where osi.DELETED=0  AND OIC.DELETED=0 AND ADA.DELETED=0
+            AND ACTR.DELETED=0
+            )
         <where>
             <if test="resultForeignShipName != null">
                 and

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

@@ -491,8 +491,10 @@
         ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
         LEFT JOIN DIL_BATCH db
         ON osi.BATCH_ID = db.BATCH_ID
-        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
+        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA
         ON ada.BATCH_ID=db.BATCH_ID
+        LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT ACTR
+        ON ACTR.BATCH_ID=ADA.BATCH_ID
         LEFT JOIN RMS_MATERIAL rm
         ON db.MATERIAL_ID = rm.MATERIAL_ID
         LEFT JOIN RMS_CAPACITY rc
@@ -500,7 +502,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=0
+            and osi.DELETED=0 and oic.DELETED=0 AND ACTR.DELETED=0
      )
         <where>
             <if test="con!=null">