Merge branch 'v23.3_lmsweight_20240827' into release

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

@@ -2214,18 +2214,22 @@ public class OrderChildServiceImpl implements OrderChildService {
             }
 
         }
-        if(Objects.isNull(result.getUnloadTare())){//卸车皮重
-            result.setUnloadTare(weighingSignature.getTare());
-        }
-        if(Objects.isNull(result.getUnloadNet())){//卸车净重
-            result.setUnloadNet(weighingSignature.getNet());
-        }
-        if(Objects.isNull(result.getUnloadRough())){//卸车毛重
-            result.setUnloadRough(weighingSignature.getRough());
-        }
-        if(StringUtils.isBlank(result.getUnloadTime())){//卸车时间
-            result.setUnloadTime(weighingSignature.getOutTime() ==null?null:convertLocalDateTimeToDefaultString(weighingSignature.getOutTime()));
+
+        if(Objects.nonNull(weighingSignature)){
+            if(Objects.isNull(result.getUnloadTare())){//卸车皮重
+                result.setUnloadTare(weighingSignature.getTare());
+            }
+            if(Objects.isNull(result.getUnloadNet())){//卸车净重
+                result.setUnloadNet(weighingSignature.getNet());
+            }
+            if(Objects.isNull(result.getUnloadRough())){//卸车毛重
+                result.setUnloadRough(weighingSignature.getRough());
+            }
+            if(StringUtils.isBlank(result.getUnloadTime())){//卸车时间
+                result.setUnloadTime(weighingSignature.getOutTime() ==null?null:convertLocalDateTimeToDefaultString(weighingSignature.getOutTime()));
+            }
         }
+
         return result;
     }