修改

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

@@ -119,7 +119,7 @@ public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipRes
             tmsshipUnloadShipResult.setDeleted(new BigDecimal(0));
             //锁定船只
             OmsshipInstructionsCapacity omsshipInstructionsCapacity=new OmsshipInstructionsCapacity();
-            omsshipInstructionsCapacity.setInstructionsCapacityId(DataChange.dataToBigDecimal(unloadMap.get("instructionsCapacityId")));
+            omsshipInstructionsCapacity.setInstructionsCapacityId(orderId);
             //锁定
             omsshipInstructionsCapacity.setDeleted(new BigDecimal(3));
             omsshipInstructionsCapacityMapper.updateByPrimaryKeySelective(omsshipInstructionsCapacity);

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

@@ -608,12 +608,14 @@
                 LEFT JOIN RMS_CAPACITY rc ON rc.CAPACITY_ID = oic.CAPACITY_ID
                 LEFT JOIN TMSSHIP_TOTAL_RESULT TTR ON TTR.ORDER_ID = OIC.INSTRUCTIONS_CAPACITY_ID
                 LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT TLSR ON TLSR.TOTAL_RESULT_ID = TTR.RESULT_ID
+                LEFT JOIN TMSSHIP_UNLOAD_SHIP_RESULT TUSR ON TUSR.TOTAL_RESULT_ID = TTR.RESULT_ID
         WHERE OSI.DELETED = 0
           AND OIC.DELETED = 0
           AND ADA.DELETED = 0
           AND OSI.INSTRUCTION_ISSUE_STATUS='已下发'
           AND ADN.DELETED = 0
           AND TLSR .DELETED = 0
+          AND TUSR .RESULT_ID IS NULL
           AND RC.CAPACITY_NUMBER=#{capacityNumber}
     </select>
 </mapper>