Merge branch 'v23.3_lmsweight_20240827' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -2211,7 +2211,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         //首次回显过磅电子磅单，其他情况回显用户上传的图片
         WeightChildSignatureDto weighingSignature = getWeighingSignature(childNo,SaleBuyEnum.Type.BUY.getCode());//获取电子磅单图片  类型：1-销售，2-采购
         if(CollectionUtils.isEmpty(result.getUnloadImageList())){//卸车图片
-            if(CollectionUtils.isNotEmpty(weighingSignature.getWeighingSignatureList())){//有电子磅单
+            if(Objects.nonNull(weighingSignature) && CollectionUtils.isNotEmpty(weighingSignature.getWeighingSignatureList())){//有电子磅单
                 result.setUnloadImageList(weighingSignature.getWeighingSignatureList().stream().filter(
                         item -> Objects.equals(item.getType(), InputOutputEnum.Type.OUTPUT.getCode())).map(
                         item -> StringUtils.isNotBlank(item.getSignImg())? item.getSignImg():item.getOriginalImg())
@@ -3532,9 +3532,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         WeightChildSignatureDto weighingSignature = getWeighingSignature(param.getChildNo(),SaleBuyEnum.Type.BUY.getCode());//获取电子磅单图片
-        List<WeighingSignatureDto> weighingSignatureList = weighingSignature.getWeighingSignatureList();//图片集合
-        if(CollectionUtils.isNotEmpty(weighingSignatureList)){
-            List<String> images =  weighingSignatureList.stream().filter(
+        if(Objects.nonNull(weighingSignature) && CollectionUtils.isNotEmpty(weighingSignature.getWeighingSignatureList())){//出场图片
+            List<String> images =  weighingSignature.getWeighingSignatureList().stream().filter(
                             item -> Objects.equals(item.getType(), InputOutputEnum.Type.OUTPUT.getCode())).map(
                             item -> StringUtils.isNotBlank(item.getSignImg())? item.getSignImg():item.getOriginalImg())
                     .collect(Collectors.toList());

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildWeighPictureServiceImpl.java

@@ -32,7 +32,7 @@ public class OrderChildWeighPictureServiceImpl  implements OrderChildWeighPictur
         WeightChildSignatureDto unloadImages = orderChildService.getWeighingSignature(param.getChildNo(), SaleBuyEnum.Type.BUY.getCode());
         PictureVo vo = new PictureVo();
 
-        if (CollectionUtils.isNotEmpty(unloadImages.getWeighingSignatureList())){
+        if (Objects.nonNull(unloadImages) && CollectionUtils.isNotEmpty(unloadImages.getWeighingSignatureList())){
             vo.setUnloadImages(unloadImages.getWeighingSignatureList().stream().filter(
                     item -> Objects.equals(item.getType(), InputOutputEnum.Type.OUTPUT.getCode())).map(
                     item -> StringUtils.isNotBlank(item.getSignImg())? item.getSignImg():item.getOriginalImg()).collect(Collectors.toList()));