后端提交

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

@@ -36,6 +36,7 @@ import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkcaractualfirst.service.IMeterWorkCarActualFirstService;
+import com.steerinfo.meterwork.meterworkcaractualfirstbak.model.MeterWorkCarActualFirstBak;
 import com.steerinfo.meterwork.meterworkcraneactual.mapper.MeterWorkCraneActualMapper;
 import com.steerinfo.meterwork.meterworkimage.mapper.MeterWorkImageMapper;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
@@ -520,11 +521,17 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             }
 
             for(MeterWorkCarActualFirst model: models) {
+                MeterWorkCarActualFirst modelTemp = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
+                if(modelTemp != null) {
+                    if(modelTemp.getValueFlag().equals("0") || modelTemp.getValueFlag().equals("2")) {
+                        throw new MarkerMetException(500, "当前一次数据已结净或者已作废，不允许匹配委托!!");
+                    }
+                }
                 PreTrackScale pls = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 if(pls.getValueFlag().equals("9")) {
                     throw new MarkerMetException(500, "一次数据中包含已结算的委托!!");
                 }
-                if(model.getPredictionType().equals("5") || model.getPredictionType().equals("6") || model.getPredictionType().equals("7")){
+                if(modelTemp.getPredictionType().equals("5") || modelTemp.getPredictionType().equals("6") || modelTemp.getPredictionType().equals("7")){
                     throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
                 }
             }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/service/impl/MeterWorkCarActualFirstBakServiceImpl.java

@@ -528,11 +528,17 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             }
 
             for(MeterWorkCarActualFirstBak model: models) {
+                MeterWorkCarActualFirstBak modelTemp = meterWorkCarActualFirstBakMapper.selectByPrimaryKey(model.getActualFirstNo());
+                if(modelTemp != null) {
+                    if(modelTemp.getValueFlag().equals("0") || modelTemp.getValueFlag().equals("2")) {
+                        throw new MarkerMetException(500, "当前一次数据已结净或者已作废，不允许匹配委托!!");
+                    }
+                }
                 PreTrackScale pls = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 if(pls.getValueFlag().equals("9")) {
                     throw new MarkerMetException(500, "一次数据中包含已结算的委托!!");
                 }
-                if(model.getPredictionType().equals("5") || model.getPredictionType().equals("6") || model.getPredictionType().equals("7")){
+                if(modelTemp.getPredictionType().equals("5") || modelTemp.getPredictionType().equals("6") || modelTemp.getPredictionType().equals("7")){
                     throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
                 }
             }
@@ -631,7 +637,8 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             Assert.isTrue(pts != null, "委托编号：" + predictionNo + "未查询到有效委托信息");
             MeterWorkCarActualFirstBak model = meterWorkCarActualFirstBakMapper.selectByPrimaryKey(actualFirstNo);
             Assert.isTrue(model != null, "一次数据不存在");
-            Assert.isTrue(model.getPredictionNo() == null && StringUtils.isEmpty(model.getPredictionNo()), "一次数据已匹配,不允许计量");
+            Assert.isTrue(!(model.getValueFlag().equals("0") || model.getValueFlag().equals("2")), "当前一次数据已结净或者已作废，不允许匹配委托");
+            Assert.isTrue(model.getPredictionNo() == null || StringUtils.isEmpty(model.getPredictionNo()), "一次数据已匹配,不允许计量");
             MeterWorkCarActualFirstBak modelTemp = meterWorkCarActualFirstBakMapper.selectAndMatch(actualFirstNo, pts.getPredictionNo());
             BeanUtils.copyProperties(modelTemp, model);
             model.setIsPreScale("1");

src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/service/impl/MeterWorkRailwayRecMainServiceImpl.java

@@ -10,6 +10,7 @@ import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayRe
 import com.steerinfo.meterwork.meterworkrailwayrecmain.model.MeterWorkRailwayRecMain;
 import com.steerinfo.meterwork.meterworkrailwayrecmain.mapper.MeterWorkRailwayRecMainMapper;
 import com.steerinfo.meterwork.meterworkrailwayrecmain.service.IMeterWorkRailwayRecMainService;
+import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -94,7 +95,7 @@ public class MeterWorkRailwayRecMainServiceImpl extends BaseServiceImpl<MeterWor
 //            String afl = sdf.format(new Date());
 //            String no = meterWorkRailwayReceivedMapper.getNewID(afl);
 //            model.setActualFirstNo(sdf.format(new Date()) + no);
-
+                model.setActualFirstNo(PublicMethod.IdCreate(3));
                 model.setRailwayWorkNo(mainModel.getSoundName());
                 meterWorkRailwayReceivedMapper.insertSelective(model);
             }