后端提交

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

@@ -1215,18 +1215,17 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             return rm;
         } catch (Exception e) {
             e.printStackTrace();
-            rm.setMessage("操作异常，请确认！！>>>>" + e.getMessage());
+            rm.setMessage(e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return rm;
         }
     }
 
-    @Transactional
     @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){
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try {
-
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
 
@@ -1479,7 +1478,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             return rm;
         } catch (Exception e) {
             e.printStackTrace();
-            rm.setMessage("操作异常，请确认！！>>>>" + e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage(e.getMessage());
             return rm;
         }
     }
@@ -4130,7 +4130,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             MeterWorkRailwayActFirst model02 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(tareModel.getActualFirstNo());
 
             //修改委托状态
-            if (scale != null) {
+            if (scale != null && StringUtils.isNotEmpty(scale.getPredictionNo())) {
                 //委托信息是否为有效数据
                 if (scale.getValueFlag().equals("2") || scale.getValueFlag().equals("3")) {
                     rm.setMessage("委托信息已使用或者已作废！！");
@@ -6869,6 +6869,17 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 }
             }
             List<HashMap> data = meterWorkRailwayActFirstMapper.batchMatchFirstView(param);
+            for (HashMap model: data) {
+                if(model.get("PREDICTION_NO") == null || StringUtils.isEmpty("PREDICTION_NO")){
+                    HashMap<String, Object> obj = new HashMap<>();
+                    obj.put("railwayNo", model.get("RAILWAY_NO"));
+                    List<PreRailwayScale> scaleList = preRailwayScaleMapper.noPage(obj);
+                    if(scaleList.size() == 1) {
+                        model.remove("PREDICTION_NO");
+                        model.put("PREDICTION_NO", scaleList.get(0).getPredictionNo());
+                    }
+                }
+            }
             Map<String, Integer> map = new HashMap<String, Integer>();
             for (Map<String, String> temp : data) {
                 Integer count = map.get(temp.get("RAILWAY_NO"));
@@ -8069,6 +8080,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualModel.setIsPreSacale("1");
                             actualModel.setPredictionType("1");
                             actualModel.setValueFlag("1");
+                            actualModel.setPredictionNo(scale.getPredictionNo());
                             actualModel.setNetWeight(actualModel.getGrossWeight().subtract(tareWeight));
                             if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
                                 actualModel.setNetSpot3No(actualModel.getBaseSpot1No());

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -971,4 +971,18 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
             return failed(null, "操作异常，请确认！");
         }
     }
+
+    @ApiOperation(value = "C#——轨道衡净重批量新增")
+    @Transactional
+    @PostMapping(value = "/copyActual")
+    public RESTfulResult copyActual(@RequestBody List<MeterWorkRailwayActual> models) {
+        try {
+            RESTfulResult rm = meterWorkRailwayActualService.copyActual(models);
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -4338,7 +4338,7 @@
     A.actual_no actual_no,
     A.railway_no railway_no,
     A.prediction_no prediction_no,
-    A.matter_name,
+    A.matter_name matter_name,
     A.forwarding_unit_name forwarding_unit_name,
     A.receiving_uint_name receiving_uint_name,
     A.actual_first1_no grossNo,

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/IMeterWorkRailwayActualService.java

@@ -100,4 +100,7 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
 
     RESTfulResult batchMatchActualView(HashMap<String, Object> param);
     RESTfulResult batchRailwayActual(List<HashMap> models);
+
+
+    RESTfulResult copyActual(List<MeterWorkRailwayActual> models);
 }

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

@@ -2740,6 +2740,23 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 //                }
 //            }
             List<HashMap> data = meterWorkRailwayActualMapper.batchMatchActualView(param);
+            for (HashMap model: data) {
+                if(model.get("PREDICTION_NO") == null || StringUtils.isEmpty("PREDICTION_NO")){
+                    HashMap<String, Object> obj = new HashMap<>();
+                    obj.put("railwayNo", model.get("RAILWAY_NO"));
+                    List<PreRailwayScale> scaleList = preRailwayScaleMapper.noPage(obj);
+                    if(scaleList.size() == 1) {
+                        model.remove("PREDICTION_NO");
+                        model.remove("MATTER_NAME");
+                        model.remove("FORWARDING_UNIT_NAME");
+                        model.remove("RECEIVING_UINT_NAME");
+                        model.put("PREDICTION_NO", scaleList.get(0).getPredictionNo());
+                        model.put("MATTER_NAME", scaleList.get(0).getMatterName());
+                        model.put("FORWARDING_UNIT_NAME", scaleList.get(0).getForwardingUnitName());
+                        model.put("RECEIVING_UINT_NAME", scaleList.get(0).getReceivingUintName());
+                    }
+                }
+            }
 //            Map<String, Integer> map = new HashMap<String, Integer>();
 //            for (Map<String, String> temp : data) {
 //                Integer count = map.get(temp.get("RAILWAY_NO"));
@@ -2885,4 +2902,42 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         }
         return rm;
     }
+
+    @Override
+    public RESTfulResult copyActual(List<MeterWorkRailwayActual> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            Assert.isTrue(models.size() >= 1, "数据不能为空");
+            int count = 0;
+            for(MeterWorkRailwayActual model: models) {
+                String no = PublicMethod.IdCreate(3);
+                model.setActualNo(no);
+                count ++;
+
+                meterWorkRailwayActualMapper.insertSelective(model);
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(model.getCreateManName());
+                logModel.setCreateManName(model.getCreateManName());
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("动态轨道衡-数据维护");
+                logModel.setOperationFunction("数据补录");
+                logModel.setOperationId(model.getActualNo());
+                logModel.setOperationPredictionNo("");
+                logModel.setOperationCarnNo(model.getRailwayNo());
+                logModel.setOperationBeforeFix(model.toString());
+                logModel.setOperationAfterFix("");
+                meterBaseOperationLogMapper.insertSelective(logModel);
+            }
+            rm.setSucceed();
+            rm.setData("200");
+            rm.setMessage("共有" + count + "条数据一次批量新增成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        return rm;
+    }
 }