Merge branch 'uat-temp-nht-2504090000-46216' into uat-temp-wj-chongqingdaqu-prod-temp-merge

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java

@@ -663,10 +663,12 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                 orderManagement.setOrderCode(loadingList.getOrderCode());
                 orderManagement.setLoadingListId(loadingList.getId());
             }
-            //更新装车单明细对应的发运单状态=发运
-            listDetail.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
-            ConvertBean.serviceModelUpdate(listDetail, userInfo);
-            listDetailRepository.update(listDetail);
+            if(!Objects.isNull(listDetail)){
+                //更新装车单明细对应的发运单状态=发运
+                listDetail.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
+                ConvertBean.serviceModelUpdate(listDetail, userInfo);
+                listDetailRepository.update(listDetail);
+            }
         }
         //发运单状态修改为校验完成
         orderManagement.setSystemSyncStatus(CommonEnumUtil.FALSE);