修改

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

@@ -80,6 +80,8 @@ public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipRes
             userName = tmsshipLoadShipResultMapper.getUserNameByUserId(userId);
         }
         List<BigDecimal> orderIds=tmsshipTotalResultMapper.selectAllByCapacity(unloadMap);
+        List<Map<String,Object>> list=new ArrayList<>();
+        //新增卸船
         for(BigDecimal orderId:orderIds){
             TmsshipUnloadShipResult tmsshipUnloadShipResult = new TmsshipUnloadShipResult();
             BigDecimal resultId = selectMaxId();
@@ -131,9 +133,13 @@ public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipRes
             mapValue.put("portId",portId);
             mapValue.put("resultMaterialNumber",tmsshipLoadShipResult.get("resultMaterialNumber"));
             mapValue.put("resultStartTime",mapVal.get("resultStartTime"));
-            wmshboundFeign.addWarehousingResult(mapValue);
+            list.add(mapValue);
             tmsshipUnloadShipResultMapper.insert(tmsshipUnloadShipResult);
         }
+        //所有卸船作业都成功才进行入库作业
+        for(Map<String,Object> mapValue:list){
+            wmshboundFeign.addWarehousingResult(mapValue);
+        }
         return 0;
     }
 

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

@@ -606,11 +606,14 @@
                 LEFT JOIN RMS_PORT rp2 ON ada.PORT_ID = rp2.PORT_ID
                 LEFT JOIN RMS_MATERIAL rm ON rm.MATERIAL_ID = db.MATERIAL_ID
                 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
         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 RC.CAPACITY_NUMBER=#{capacityNumber}
     </select>
 </mapper>