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/MesPartShippingGroupService.java

@@ -115,11 +115,13 @@ public class MesPartShippingGroupService implements IMesPartShippingGroupService
 
     @Override
     public boolean isFirstInstall(MesPartShippingGroup shippingGroup, MesLoadingList loadingList) {
-        DdlPackBean packBean = DdlPackBean.getDdlPackBean(loadingList.getOrganizeCode());
+        if (loadingList != null) {
-        DdlPreparedPack.getStringEqualPack(loadingList.getLoadingGroupNo(), "loadingGroupNo", packBean);
+            DdlPackBean packBean = DdlPackBean.getDdlPackBean(loadingList.getOrganizeCode());
-        MesLoadingGroup loadingGroup = loadingGroupRDao.getByProperty(packBean);
+            DdlPreparedPack.getStringEqualPack(loadingList.getLoadingGroupNo(), "loadingGroupNo", packBean);
-        if (loadingGroup != null && loadingGroup.getIsFirstInstall() != null) {
+            MesLoadingGroup loadingGroup = loadingGroupRDao.getByProperty(packBean);
-            return Objects.equals(loadingGroup.getIsFirstInstall(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+            if (loadingGroup != null && loadingGroup.getIsFirstInstall() != null) {
+                return Objects.equals(loadingGroup.getIsFirstInstall(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+            }
         }
         return Objects.equals(shippingGroup.getIsFirstInstall(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
     }