修改

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -4036,10 +4036,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 logModel.setCreateManName(userName);
                 logModel.setCreateTime(new Date());
                 logModel.setOperationPage("C#端-动轨净重数据维护");
-                if(!modelTemp.getRailwayNo().equals(model.getRailwayNo())) {
+                if(StringUtils.isEmpty(modelTemp.getRailwayNo()) || !modelTemp.getRailwayNo().equals(model.getRailwayNo())) {
                     logModel.setOperationFunction("车号修改");
                 }else{
-                    if(!(modelTemp.getTareWeight().compareTo(model.getTareWeight()) == 0)) {
+                    if(modelTemp.getTareWeight() == null || !(modelTemp.getTareWeight().compareTo(model.getTareWeight()) == 0)) {
                         logModel.setOperationFunction("Ai标识皮修改");
                     }
                 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -129,10 +129,10 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                     note.setCreateManName(model.getUpdateManName());
                     note.setCreateTime(new Date());
                     note.setOperationPage("终端-轨道衡从表数据维护");
-                    if(!received.getRailwayNo().equals(model.getRailwayWorkNo())) {
+                    if(StringUtils.isEmpty(received.getRailwayNo()) || !received.getRailwayNo().equals(model.getRailwayWorkNo())) {
                         note.setOperationFunction("车号修改");
                     }else {
-                        if(!(received.getMeterWeight().compareTo(model.getMeterWeight()) == 0)) {
+                        if(received.getMeterWeight() == null || !(received.getMeterWeight().compareTo(model.getMeterWeight()) == 0)) {
                             note.setOperationFunction("Ai标识皮修改");
                         }
                     }