毛皮分解修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -487,13 +487,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 throw new MarkerMetException(500, "参数为空！！！");
             }
             for(MeterWorkCarActual modelTemp: models) {
-                PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
-                if(scaleTemp.getValueFlag().equals("9")) {
-                    throw new MarkerMetException(500, "洁净数据中包含已结算的委托!!!");
-                }
-                if(modelTemp.getPredictionType().equals("5") || modelTemp.getPredictionType().equals("6") || modelTemp.getPredictionType().equals("7")){
-                    throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())){
+                    PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
+                    if(scaleTemp.getValueFlag().equals("9")) {
+                        throw new MarkerMetException(500, "洁净数据中包含已结算的委托!!!");
+                    }
+                    if(modelTemp.getPredictionType().equals("5") || modelTemp.getPredictionType().equals("6") || modelTemp.getPredictionType().equals("7")){
+                        throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                    }
                 }
+
             }
 
             for (MeterWorkCarActual model : models) {
@@ -789,14 +792,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             models.add(actualModel);
 
             for(MeterWorkCarActual modelTemp: models) {
-                PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
-                if(scaleTemp.getValueFlag().equals("9")) {
-                    rm.setMessage("洁净数据中包含已结算的委托!!!");
-                    return rm;
-                }
-                if(modelTemp.getPredictionType().equals("5") || modelTemp.getPredictionType().equals("6") || modelTemp.getPredictionType().equals("7")){
-                    rm.setMessage("洁净数据中包含特殊委托匹配结净的数据!!!");
-                    return rm;
+                if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())){
+                    PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
+                    if(scaleTemp.getValueFlag().equals("9")) {
+                        rm.setMessage("洁净数据中包含已结算的委托!!!");
+                        return rm;
+                    }
+                    if(modelTemp.getPredictionType().equals("5") || modelTemp.getPredictionType().equals("6") || modelTemp.getPredictionType().equals("7")){
+                        rm.setMessage("洁净数据中包含特殊委托匹配结净的数据!!!");
+                        return rm;
+                    }
                 }
             }
             for (MeterWorkCarActual model: models) {

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

@@ -617,9 +617,14 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             throw new MarkerMetException(500, "不存在对应的洁净数据");
         }
 
-        PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-        if(scaleTemp.getValueFlag().equals("9")) {
-            throw new MarkerMetException(500, "两个洁净数据中包含已结算的委托");
+        if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())){
+            PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+            if(scaleTemp.getValueFlag().equals("9")) {
+                throw new MarkerMetException(500, "洁净数据中包含已结算的委托");
+            }
+            if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
+                throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+            }
         }
 
         UserPayload payload = UserPayload.getCurrUser();
@@ -685,7 +690,11 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     if(scaleTemp.getValueFlag().equals("9")) {
                         throw new MarkerMetException(500,"洁净数据中包含已结算的委托！！！");
                     }
+                    if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
+                        throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                    }
                 }
+
             }
 
             for (MeterWorkRailwayActual model : models) {
@@ -782,6 +791,16 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 userName = "admins";
             }
 
+            if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())){
+                PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+                if(scaleTemp.getValueFlag().equals("9")) {
+                    throw new MarkerMetException(500, "洁净数据中包含已结算的委托!!!");
+                }
+                if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
+                    throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                }
+            }
+
             Assert.isTrue(Objects.nonNull(model.getActualNo()), "洁净数据为空");
             if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                 PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());