凯和单航次配船修改

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -5381,6 +5381,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Transactional
     public AjaxResult batchModifyingVesselVoyage(Long[] fIds, Long fVessel, Long fVoyage,Long fCargoPlanning) {
         //先查要改的多个订单的船名航次是否一直
+        Long fLoadportid = null;
+        Long fDestportid = null;
+        Integer fLaneid = null;
         if (fVessel != null && fVoyage != null){
             List<TWarehouseBills> tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsByIds(fIds);
             //循环判断是否存在已经离港出运或者到港卸货的船名航次
@@ -5443,9 +5446,15 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
         }
         //一致批量更改船名航次
-        TVoyage voyage = tVoyageMapper.selectTVoyageById(fVoyage);
-        int i = tWarehouseBillsMapper.updateTWarehousebillsByIds(fIds, fVessel, fVoyage,fCargoPlanning,voyage.getfPortofloadid(),voyage.getfDistinationid()
-        ,voyage.getfLaneid());
+        if (fVoyage != null){
+            TVoyage voyage = tVoyageMapper.selectTVoyageById(fVoyage);
+            fLoadportid = voyage.getfPortofloadid();
+            fDestportid = voyage.getfDistinationid();
+            fLaneid = voyage.getfLaneid();
+
+        }
+        int i = tWarehouseBillsMapper.updateTWarehousebillsByIds(fIds, fVessel, fVoyage,fCargoPlanning,
+                fLoadportid,fDestportid,fLaneid);
         if (i>= 1){
             return AjaxResult.success();
         }else {