后端提交

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

@@ -803,12 +803,25 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
+    @ApiOperation(value = "C#端轨道衡实绩静轨需标志皮重结净", notes = "根据MeterWorkStorageActual对象创建")
+    @PostMapping(value = "/doIdentifyWeightAndUpload")
+    public RESTfulResult doIdentifyWeightAndUpload(@RequestBody MeterWorkRailwayActFirst model) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkRailwayActFirstService.doIdentifyWeight(model, true);
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常,请确认！！！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "C#端轨道衡实绩静轨需标志皮重结净", notes = "根据MeterWorkStorageActual对象创建")
     @PostMapping(value = "/doIdentifyWeight")
     public RESTfulResult doIdentifyWeight(@RequestBody MeterWorkRailwayActFirst model) {
         RESTfulResult rm = failed();
         try {
-            rm = meterWorkRailwayActFirstService.doIdentifyWeight(model);
+            rm = meterWorkRailwayActFirstService.doIdentifyWeight(model, false);
         } catch (Exception e) {
             e.printStackTrace();
             rm.setMessage("操作异常,请确认！！！>>>" + e.getMessage());
@@ -816,12 +829,26 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
+    @ApiOperation(value = "C#端轨道衡实绩静轨结净--两条数据", notes = "根据两个MeterWorkStorageActual对象创建")
+    @PostMapping(value = "/doAddWfStaticTwoAndUpload")
+    public RESTfulResult doAddWfStaticTwoAndUpload(@RequestBody CommonCombination<PreRailwayScale, MeterWorkRailwayActFirst, MeterWorkRailwayActFirst, MeterWorkRailwayActFirst> com) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkRailwayActFirstService.doAddWfStaticTwo(com.getOne(), com.getTwo(), com.getThree(), true);
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "C#端轨道衡实绩静轨结净--两条数据", notes = "根据两个MeterWorkStorageActual对象创建")
     @PostMapping(value = "/doAddWfStaticTwo")
     public RESTfulResult doAddWfStaticTwo(@RequestBody CommonCombination<PreRailwayScale, MeterWorkRailwayActFirst, MeterWorkRailwayActFirst, MeterWorkRailwayActFirst> com) {
         RESTfulResult rm = failed();
         try {
-            rm = meterWorkRailwayActFirstService.doAddWfStaticTwo(com.getOne(), com.getTwo(), com.getThree());
+            rm = meterWorkRailwayActFirstService.doAddWfStaticTwo(com.getOne(), com.getTwo(), com.getThree(), false);
             return rm;
         } catch (Exception e) {
             e.printStackTrace();
@@ -951,12 +978,26 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "双委托结净--远程计量")
+    @Transactional
+    @PostMapping(value = "/doNetAddTwo02AndUpload", produces = "application/json;charset=UTF-8")
+    public RESTfulResult doNetAddTwo02AndUpload(@RequestBody CommonCombination<List<MeterWorkRailwayActFirst>, List<MeterWorkRailwayActFirst>, List<PreRailwayScale>, String> com) {
+        try {
+            RESTfulResult rm = meterWorkRailwayActFirstService.doNetAddTwo02(com.getOne(), com.getTwo(), com.getThree(), com.getFour(), true);
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
+
     @ApiOperation(value = "双委托结净--远程计量")
     @Transactional
     @PostMapping(value = "/doNetAddTwo02", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetAddTwo02(@RequestBody CommonCombination<List<MeterWorkRailwayActFirst>, List<MeterWorkRailwayActFirst>, List<PreRailwayScale>, String> com) {
         try {
-            RESTfulResult rm = meterWorkRailwayActFirstService.doNetAddTwo02(com.getOne(), com.getTwo(), com.getThree(), com.getFour());
+            RESTfulResult rm = meterWorkRailwayActFirstService.doNetAddTwo02(com.getOne(), com.getTwo(), com.getThree(), com.getFour(), false);
             return rm;
         } catch (Exception e) {
             e.printStackTrace();
@@ -1056,7 +1097,7 @@ throw new MarkerMetException(500, "操作异常！！");
             String tareWeight = parmas.get("tareWeight") == null ? "" : parmas.get("tareWeight").toString();
 
             String msg = meterWorkRailwayActFirstService.fixedTare(actualNo, tareWeight, predictionNo);
-            if (msg.equals("")){
+            if (!msg.equals("")){
                 return rm;
             }
             rm.setSucceed();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -83,7 +83,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
 
     RESTfulResult doAddWfStatic(MeterWorkRailwayActFirst firstRail) throws Exception;
 
-    RESTfulResult doAddWfStaticTwo(PreRailwayScale scale, MeterWorkRailwayActFirst grossModel, MeterWorkRailwayActFirst tareModel);
+    RESTfulResult doAddWfStaticTwo(PreRailwayScale scale, MeterWorkRailwayActFirst grossModel, MeterWorkRailwayActFirst tareModel, boolean needUpload);
 
     String doAddWf(MeterWorkRailwayActFirst firstRail, MeterWorkRailwayActual netRail);
 
@@ -102,7 +102,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
 
     RESTfulResult doAddNetHZHX(MeterWorkRailwayActFirst first02, MeterWorkRailwayActual carModel, MeterWorkRailwayActFirst first03,  MeterMonitorNote note);
     RESTfulResult doNetAddTwo(MeterWorkRailwayActFirst one, MeterWorkRailwayActual two, PreRailwayScale three, PreRailwayScale four);
-    RESTfulResult doNetAddTwo02(List<MeterWorkRailwayActFirst> selectedFirsts, List<MeterWorkRailwayActFirst> addFirsts, List<PreRailwayScale> scales, String note);
+    RESTfulResult doNetAddTwo02(List<MeterWorkRailwayActFirst> selectedFirsts, List<MeterWorkRailwayActFirst> addFirsts, List<PreRailwayScale> scales, String note, Boolean needUpload);
 
     RESTfulResult doAddNetHZHXTwo(PreRailwayScale scale, MeterWorkRailwayActFirst first01, MeterWorkRailwayActFirst first02,  MeterMonitorNote note, String flag);
     RESTfulResult doNetAddTwoDouble(PreRailwayScale scale01, PreRailwayScale scale02,  MeterWorkRailwayActFirst first01, MeterWorkRailwayActFirst first02);
@@ -124,7 +124,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first);
     RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActFirst> models);
 
-    RESTfulResult doIdentifyWeight(MeterWorkRailwayActFirst model);
+    RESTfulResult doIdentifyWeight(MeterWorkRailwayActFirst model, boolean needUpload);
 
     PageList<MeterWorkRailwayActFirst> likeByDescTSDG(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize);
 

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

@@ -1228,7 +1228,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     }
 
     @Override
-    public RESTfulResult doNetAddTwo02(List<MeterWorkRailwayActFirst> selectedFirsts, List<MeterWorkRailwayActFirst> addFirsts, List<PreRailwayScale> scales, String note){
+    public RESTfulResult doNetAddTwo02(List<MeterWorkRailwayActFirst> selectedFirsts, List<MeterWorkRailwayActFirst> addFirsts, List<PreRailwayScale> scales, String note,Boolean needUpload){
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try {
@@ -1322,6 +1322,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow01.setPredictionType("5");
                 actualRow01.setPredictionCombination(scales.get(0).getPredictionNo() + "," + scales.get(1).getPredictionNo());
                 actualRow01.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow01.getActualFirst1No()));
+                //是否发布 ture发布，false不发布
+                if(needUpload) {
+                    if(actualRow01.getIsPreSacale() != null && actualRow01.getIsPreSacale().equals("1")) {
+                        actualRow01.setValueFlag("2");
+                        actualRow01.setUploadFlag("1");
+                    }
+                }
                 meterWorkRailwayActualMapper.insertSelective(actualRow01);
 
                 actualRow02.setActualNo(PublicMethod.IdCreate(3));
@@ -1331,6 +1338,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow02.setPredictionType("5");
                 actualRow02.setPredictionCombination(scales.get(0).getPredictionNo() + "," + scales.get(1).getPredictionNo());
                 actualRow02.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow02.getActualFirst1No()));
+                //是否发布 ture发布，false不发布
+                if(needUpload) {
+                    if(actualRow02.getIsPreSacale() != null && actualRow02.getIsPreSacale().equals("1")) {
+                        actualRow02.setValueFlag("2");
+                        actualRow02.setUploadFlag("1");
+                    }
+                }
                 meterWorkRailwayActualMapper.insertSelective(actualRow02);
 
                 newActuals.add(actualRow01);
@@ -1468,6 +1482,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualRow.setCreateManName(actualRow.getTareManName());
                             actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                         }
+                        //是否发布 ture发布，false不发布
+                        if(needUpload) {
+                            if(actualRow.getIsPreSacale() != null && actualRow.getIsPreSacale().equals("1")) {
+                                actualRow.setValueFlag("2");
+                                actualRow.setUploadFlag("1");
+                            }
+                        }
                         meterWorkRailwayActualMapper.insertSelective(actualRow);
                         newActuals.add(actualRow);
                     }
@@ -2996,7 +3017,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         }
         MeterWorkRailwayActFirst grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualNo);
         if (!grossModel.getValueFlag().equals("1")) {
-            return "当前计量数据已结净，请确认！！";
+            if (grossModel.getValueFlag().equals("0")) {
+                return "当前数据已作废，请确认！！";
+            } else if (grossModel.getValueFlag().equals("2")) {
+                return "当前计量数据已结净，请确认！！";
+            }else {
+                return "当前计量数据状态不允许结净，状态为"+grossModel.getValueFlag()+"，请确认！！";
+            }
         }
         MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualNo);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
@@ -3093,9 +3120,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }
             actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
             meterWorkRailwayActualMapper.insertSelective(actualRow);
-            return "操作成功";
+            return "";
         }
-        return "";
+        return "保存失败";
     }
 
     @Override
@@ -4090,7 +4117,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     @Override
     public RESTfulResult doAddWfStaticTwo(PreRailwayScale scale, MeterWorkRailwayActFirst
-            grossModel, MeterWorkRailwayActFirst tareModel) {
+            grossModel, MeterWorkRailwayActFirst tareModel, boolean needUpload) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
 
@@ -4207,6 +4234,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setCreateManName(actualRow.getTareManName());
                     actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
+                //是否发布 ture发布，false不发布
+                if(needUpload) {
+                    if(actualRow.getIsPreSacale() != null && actualRow.getIsPreSacale().equals("1")) {
+                        actualRow.setValueFlag("2");
+                        actualRow.setUploadFlag("1");
+                    }
+                }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
 
                 //修改委托编号
@@ -6469,7 +6503,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     //静轨标识皮结净
     @Override
-    public RESTfulResult doIdentifyWeight(MeterWorkRailwayActFirst model) {
+    public RESTfulResult doIdentifyWeight(MeterWorkRailwayActFirst model, boolean needUpload) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
 
@@ -6579,6 +6613,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setCreateManName(actualRow.getTareManName());
                         actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
+                    //是否发布 ture发布，false不发布
+                    if(needUpload) {
+                        if(actualRow.getIsPreSacale() != null && actualRow.getIsPreSacale().equals("1")) {
+                            actualRow.setValueFlag("2");
+                            actualRow.setUploadFlag("1");
+                        }
+                    }
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
                     //修改委托编号
@@ -6648,6 +6689,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setCreateManName(actualRow.getTareManName());
                     actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
+                //是否发布 ture发布，false不发布
+                if(needUpload) {
+                    if(actualRow.getIsPreSacale() != null && actualRow.getIsPreSacale().equals("1")) {
+                        actualRow.setValueFlag("2");
+                        actualRow.setUploadFlag("1");
+                    }
+                }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
                 firsts.add(grossModel);
             }
@@ -6663,6 +6711,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             return rm;
         } catch (Exception e) {
             e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             rm.setMessage("操作异常，请确认！>>>" + e.getMessage());
         }
         return rm;

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

@@ -444,9 +444,29 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try{
+            //勾选的两个一次数据为空，报错
+            if((actFirstNo01 == null || StringUtils.isEmpty(actFirstNo01)) || (actFirstNo02 == null || StringUtils.isEmpty(actFirstNo02))) {
+                rm.setMessage("未选择两个一次记录");
+                return rm;
+            }
             MeterWorkRailwayActFirst actFirst01 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actFirstNo01);
             MeterWorkRailwayActFirst actFirst02 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actFirstNo02);
-            PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(predictionNo);
+            String scaleNo = null;
+            //从勾选的委托、两个一次数据中赋值委托号
+            if(predictionNo != null && StringUtils.isNotEmpty(predictionNo)){
+                if((actFirst01.getPredictionNo() != null && StringUtils.isNotEmpty(actFirst01.getPredictionNo())
+                        || actFirst02.getPredictionNo() != null && StringUtils.isNotEmpty(actFirst02.getPredictionNo()))){
+                    rm.setMessage("两个一次记录已带有委托，不能在勾选委托");
+                    return rm;
+                }
+                scaleNo = predictionNo;
+            }else if((actFirst01.getPredictionNo() != null && StringUtils.isNotEmpty(actFirst01.getPredictionNo()))){
+                scaleNo = actFirst01.getPredictionNo();
+            }else if(actFirst02.getPredictionNo() != null && StringUtils.isNotEmpty(actFirst02.getPredictionNo())){
+                scaleNo = actFirst01.getPredictionNo();
+            }
+
+            PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(scaleNo);
             //存储结净记录
             MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
@@ -2530,7 +2550,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             for (MeterWorkRailwayActual model: models) {
                 //循环每一个结净记录
                 //委托不能为空
-                if(StringUtils.isNotEmpty(model.getPredictionNo())){
+                if(model.getPredictionNo() != null){
                     // 改委托
                     if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                         PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());