后端修改

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

@@ -188,7 +188,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 throw new MarkerMetException(500, "只有已匹配委托的数据才能进行发布数据操作");
             }
             check(model);
-            model.setValueFlag("2"); // 状态改为发布
+            model.setValueFlag("1"); // 状态改为发布
             model.setUploadFlag("1");
             int num = meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
             return num;
@@ -2095,7 +2095,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
                 String ActualNo = PublicMethod.IdCreate(3);
                 model.setActualNo(ActualNo);
-                model.setValueFlag("2");
+                model.setValueFlag("1");
                 model.setActualFirst1No(actualFirstNo);
                 model.setGrossManNo(userId);
                 model.setGrossManName(userName);
@@ -2172,7 +2172,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 BeanUtils.copyProperties(preTrackScale, model);
                 model.setActualNo(ActualNo);
                 model.setIsPreScale("1");
-                model.setValueFlag("2");
+                model.setValueFlag("1");
                 model.setActualFirst1No(actualFirstNo);
                 model.setGrossManNo(userId);
                 model.setGrossManName(userName);
@@ -2257,7 +2257,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             mwcaf1.setBaseSpotNo(model.getBaseSpot1No());
             mwcaf1.setBaseSpotName(model.getBaseSpot1Name());
             mwcaf1.setValueFlag("2");
-            mwcaf2.setCheckFlag("0");
+            mwcaf1.setCheckFlag("0");
             mwcaf1.setDataSource("4");
             mwcaf1.setMeterMode("3");
             mwcaf1.setIsPreScale("0");

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -524,16 +524,13 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 MeterWorkCarActualFirst modelTemp = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
                 if(modelTemp != null) {
                     if(modelTemp.getValueFlag().equals("0") || modelTemp.getValueFlag().equals("2")) {
-                        throw new MarkerMetException(500, "当前一次数据已结净或者已作废，不允许匹配委托!!");
+                        throw new MarkerMetException(500, "当前一次数据已结净或者已作废，不允许解除托!!");
                     }
                 }
                 PreTrackScale pls = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 if(pls.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 (MeterWorkCarActualFirst model : models) {