后端修改

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -1130,23 +1130,23 @@ throw new MarkerMetException(500, "操作异常！！");
 
     @ApiOperation(value = "轨道衡衡一次数据补录", notes = "根据MeterWorkRailwayActFirst对象创建")
     @PostMapping(value = "/supplementaryData")
-    public RESTfulResult supplementaryData(@RequestBody HashMap map) {
+    public RESTfulResult supplementaryData(@RequestBody MeterWorkRailwayActFirst model) {
         RESTfulResult rm = failed();
         try {
-            MeterWorkRailwayActFirst model = new MeterWorkRailwayActFirst();
-            model.setBaseSpotNo(map.get("baseSpotNo").toString());
-            model.setBaseSpotName(map.get("baseSpotName").toString());
-            model.setCreateManNo(map.get("createManNo").toString());
-            model.setCreateManName(map.get("createManName").toString());
-            /*SimpleDateFormat sdf = new SimpleDateFormat( "yyyy/MM/dd HH24:mm:ss" );
-            Date date = sdf.parse(map.get("createTime").toString());*/
-            model.setMeterWeight(new BigDecimal(map.get("meterWeight").toString()));
-            model.setWeightType(map.get("weightType").toString());
-            model.setRailwayNo(map.get("railwayNo").toString());
-            model.setRailwayModelNo(map.get("railwayModelNo").toString());
-            model.setRailwayModelName(map.get("railwayModelName").toString());
-            model.setRailwayTypeNo(map.get("railwayTypeNo").toString());
-            model.setRailwayTypeName(map.get("railwayTypeName").toString());
+//            MeterWorkRailwayActFirst model = new MeterWorkRailwayActFirst();
+//            model.setBaseSpotNo(map.get("baseSpotNo").toString());
+//            model.setBaseSpotName(map.get("baseSpotName").toString());
+//            model.setCreateManNo(map.get("createManNo").toString());
+//            model.setCreateManName(map.get("createManName").toString());
+//            /*SimpleDateFormat sdf = new SimpleDateFormat( "yyyy/MM/dd HH24:mm:ss" );
+//            Date date = sdf.parse(map.get("createTime").toString());*/
+//            model.setMeterWeight(new BigDecimal(map.get("meterWeight").toString()));
+//            model.setWeightType(map.get("weightType").toString());
+//            model.setRailwayNo(map.get("railwayNo").toString());
+//            model.setRailwayModelNo(map.get("railwayModelNo").toString());
+//            model.setRailwayModelName(map.get("railwayModelName").toString());
+//            model.setRailwayTypeNo(map.get("railwayTypeNo").toString());
+//            model.setRailwayTypeName(map.get("railwayTypeName").toString());
 //            model.setBaseSpotNo(splitString(map.get("baseSpotNo").toString(), 0));
 //            model.setBaseSpotName(splitString(map.get("baseSpotNo").toString(), 1));
 //            model.setCreateManNo(splitString(map.get("createManNo").toString(), 0));

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -407,6 +407,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if (model.getValueFlag().equals(DbConstants.NET)) {
                 throw new MarkerMetException(500, "已结净的数据不可再废除!!");
             }
+            if (model.getPredictionNo() != null && model.getPredictionNo().equals("")) {
+                throw new MarkerMetException(500, "已匹配委托的数据不可再废除!!");
+            }
             model.setValueFlag("0");
             int num = meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
             if (model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())) {
@@ -3332,6 +3335,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public RESTfulResult supplementaryData(MeterWorkRailwayActFirst model) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
@@ -3339,7 +3343,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
-            MeterWorkRailwayActFirst mwcaf1 = new MeterWorkRailwayActFirst();
+//            MeterWorkRailwayActFirst mwcaf1 = new MeterWorkRailwayActFirst();
 
             /*String predictionNo = model.getPredictionNo();
             PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(predictionNo);
@@ -3355,26 +3359,28 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //毛重
 //            String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
 //            mwcaf1.setActualFirstNo(actualFirstNo);
-            String actualFirstNo = PublicMethod.IdCreate(3);
-            mwcaf1.setActualFirstNo(actualFirstNo);
-            mwcaf1.setRailwayNo(model.getRailwayNo());
-            mwcaf1.setMeterWeight(model.getMeterWeight());
-            mwcaf1.setRailwayTypeNo(model.getRailwayTypeNo());
-            mwcaf1.setRailwayTypeName(model.getRailwayTypeName());
-            mwcaf1.setWeightType(model.getWeightType());
-            mwcaf1.setCreateManNo(model.getCreateManNo());
-            mwcaf1.setCreateManName(model.getCreateManName());
-            mwcaf1.setCreateTime(new Date());
-            mwcaf1.setBaseSpotNo(model.getBaseSpotNo());
-            mwcaf1.setBaseSpotName(model.getBaseSpotName());
-            mwcaf1.setRailwayModelNo(model.getRailwayModelNo());
-            mwcaf1.setRailwayModelName(model.getRailwayModelName());
-            mwcaf1.setValueFlag("2");
-            mwcaf1.setCheckFlag("0");
-            mwcaf1.setDataSource("4");
-            mwcaf1.setMeterMode("3");
-            mwcaf1.setIsPreSacale("0");
-            int i = meterWorkRailwayActFirstMapper.insertSelective(mwcaf1);
+            String actualFirstNo = PublicMethod.IdCreate(3) + "bak";
+//            mwcaf1.setActualFirstNo(actualFirstNo);
+//            mwcaf1.setRailwayNo(model.getRailwayNo());
+//            mwcaf1.setMeterWeight(model.getMeterWeight());
+//            mwcaf1.setRailwayTypeNo(model.getRailwayTypeNo());
+//            mwcaf1.setRailwayTypeName(model.getRailwayTypeName());
+//            mwcaf1.setWeightType(model.getWeightType());
+//            mwcaf1.setCreateManNo(model.getCreateManNo());
+//            mwcaf1.setCreateManName(model.getCreateManName());
+//            mwcaf1.setCreateTime(new Date());
+//            mwcaf1.setBaseSpotNo(model.getBaseSpotNo());
+//            mwcaf1.setBaseSpotName(model.getBaseSpotName());
+//            mwcaf1.setRailwayModelNo(model.getRailwayModelNo());
+//            mwcaf1.setRailwayModelName(model.getRailwayModelName());
+            model.setActualFirstNo(actualFirstNo);
+            model.setMeterWeight(model.getMeterWeight().multiply(new BigDecimal(1000)));
+            model.setValueFlag("1");
+            model.setCheckFlag("0");
+            model.setDataSource("4");
+            model.setMeterMode("3");
+            model.setIsPreSacale("0");
+            int i = meterWorkRailwayActFirstMapper.insertSelective(model);
 
             if (i < 1) {
                 rm.setMessage("插入失败，请确认！！");
@@ -3397,12 +3403,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }*/
             rm.setSucceed();
 
-            rm.setData(mwcaf1);
+            rm.setData(model);
             rm.setMessage("操作成功！！！");
             rm.setCode("200");
             return rm;
         } catch (Exception e) {
             e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             rm.setMessage("操作异常，请确认！！");
             return rm;
         }

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

@@ -1114,7 +1114,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 //                    meterWorkRailwayActFirstMapper.updateByPrimaryKey(tarerow);
 //                }
                 //未查询到相应的标识皮直接跳过
-                if(mwcaf2 != null && mwcaf2.getMeterWeight().compareTo(model.getTareWeight().multiply(new BigDecimal(1000))) == 0) {
+//                if(mwcaf2 != null && mwcaf2.getMeterWeight().compareTo(model.getTareWeight().multiply(new BigDecimal(1000))) == 0) {
                     // 清空委托信息
 //                MeterWorkRailwayActFirst tarerow = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst2No());
                 MeterWorkRailwayActFirst tarerow = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
@@ -1140,7 +1140,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                         AIModel.get(0).setValueFlag("0");
                         meterBaseRailwayAiweightMapper.updateByPrimaryKeySelective(AIModel.get(0));
                     }
-                }
+//                }
 
                 if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                     PreRailwayScale scale = new PreRailwayScale();