后端修改

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/controller/MeterBaseSpotInfoController.java

@@ -107,16 +107,13 @@ public class MeterBaseSpotInfoController extends BaseRESTfulController {
     @PostMapping(value = "/")
     public RESTfulResult add(@RequestBody MeterBaseSpotInfo model) {
         try {
-            String msg = meterBaseSpotInfoService.checkandadd(model);
-            if (msg != null && !msg.equals("")) {
-                return failed(null, msg);
-            }
+            RESTfulResult rm = meterBaseSpotInfoService.checkandadd(model);
+            return rm;
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return failed(null, "操作异常，请确认！");
         }
-        return success();
     }
 
     @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/service/IMeterBaseSpotInfoService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.baseinfo.meterbasespotinfo.service;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
 
@@ -21,7 +22,7 @@ import java.util.Map;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface IMeterBaseSpotInfoService extends IBaseService<MeterBaseSpotInfo, String>{
-     String checkandadd(MeterBaseSpotInfo model);
+     RESTfulResult checkandadd(MeterBaseSpotInfo model);
 
      String checkandupdate(String id,MeterBaseSpotInfo model);
 

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/service/impl/MeterBaseSpotInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.steerinfo.baseinfo.meterbasespotinfo.service.impl;
 import com.steerinfo.baseinfo.meterbasespotinfo.mapper.MeterBaseSpotInfoMapper;
 import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
 import com.steerinfo.baseinfo.meterbasespotinfo.service.IMeterBaseSpotInfoService;
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.framework.utils.base.StringUtils;
@@ -64,27 +65,36 @@ public class MeterBaseSpotInfoServiceImpl extends BaseServiceImpl<MeterBaseSpotI
     }
 
     @Override
-    public String checkandadd(MeterBaseSpotInfo model)
+    public RESTfulResult checkandadd(MeterBaseSpotInfo model)
     {
-        String msg=check(model);
-        if (StringUtils.isNotEmpty(msg)){
-            return msg;
-        }
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            String msg=check(model);
+            if (StringUtils.isNotEmpty(msg)){
+                rm.setMessage(msg);
+                return rm;
+            }
+
             HashMap<String, Object> obj = new HashMap<>();
+            obj.put("baseSpotNo", model.getBaseSpotNo());
             obj.put("baseSpotName",model.getBaseSpotName());
-            obj.put("videoIp",model.getVideoIp());
-            obj.put("ledIp",model.getLedIp());
-            obj.put("printerIp",model.getPrinterIp());
-            obj.put("controlIp",model.getControlIp());
-            obj.put("flatComputerIp",model.getFlatComputerIp());
-        List<MeterBaseSpotInfo> com = meterBaseSpotInfoMapper.selectOrParameters(obj);
-        if (com != null && com.size() > 0) {
-            return "数据重复（名称/Ip），请确认！！";
+            List<MeterBaseSpotInfo> models = meterBaseSpotInfoMapper.selectOrParameters(obj);
+            if (models.size() > 0) {
+                rm.setMessage("计量点编号或者名称已存在不能进行新增，请确认！！");
+                return rm;
+            }
+            meterBaseSpotInfoMapper.insertSelective(model);
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setData(model);
+            rm.setMessage("操作成功！！");
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！！>>>" + e.getMessage());
+            return  rm;
         }
-        String no=meterBaseSpotInfoMapper.GetNewID();
-        model.setBaseSpotNo(no);
-        meterBaseSpotInfoMapper.insertSelective(model);
-        return "";
     }
 
     @Override
@@ -160,8 +170,11 @@ public class MeterBaseSpotInfoServiceImpl extends BaseServiceImpl<MeterBaseSpotI
 
     private String check(MeterBaseSpotInfo model)
     {
+        if (StringUtils.isEmpty(model.getBaseSpotNo())) {
+            return "计量点编号不能为空";
+        }
         if (StringUtils.isEmpty(model.getBaseSpotName())) {
-            return "计量点状态名称不能为空";
+            return "计量点名称不能为空";
         }
         if (StringUtils.isEmpty(model.getSpotTypeNo())) {
             return "计量点类型编号不能为空";
@@ -175,17 +188,9 @@ public class MeterBaseSpotInfoServiceImpl extends BaseServiceImpl<MeterBaseSpotI
         if (StringUtils.isEmpty(model.getSpotStateName())) {
             return "计量点状态名称不能为空";
         }
-        if(StringUtils.isEmpty(model.getBaseSpotNo())){
-            model.setCreateTime(new Date());
-        }else{
-            model.setUpdateTime(new Date());
-        }
-        if(StringUtils.isEmpty(model.getBaseSpotNo())){
-            model.setCreateTime(new Date());
-            model.setValidFlag("1");
-        }else{
-            model.setUpdateTime(new Date());
-        }
+
+        model.setCreateTime(new Date());
+        model.setValidFlag("1");
         return "";
     }
 

src/main/java/com/steerinfo/baseinfo/meterbaseunitinfo/service/impl/MeterBaseUnitInfoServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -55,6 +56,15 @@ public class MeterBaseUnitInfoServiceImpl extends BaseServiceImpl<MeterBaseUnitI
                 rm.setMessage("收发货单位头不能为空，请确认！！");
                 return rm;
             }
+            HashMap<String, Object> map =  new HashMap<>();
+            map.put("forwardingUnitNo", model.getForwardingUnitNo());
+            map.put("receivingUnitNo", model.getReceivingUnitNo());
+            map.put("matterNo", model.getMatterNo());
+            List<MeterBaseUnitInfo> models = meterBaseUnitInfoMapper.selectByParameters(map);
+            if(models.size() >= 1) {
+                rm.setMessage("配置的收货单位、发货单位、物料、车号存在相同的数据信息，请确认！！！");
+                return rm;
+            }
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String no = meterBaseUnitInfoMapper.getNewID(sdf.format(new Date()));
             model.setUnitNo(sdf.format(new Date()) + no);

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

@@ -572,7 +572,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //将预环节的前置包括本环节都使用；001021003 = 一次计量
             List<MeterWorkPreLink> mwpls = meterWorkPreLinkService.getPer(predictionNo, DbConstants.CALCULATE);
             for (MeterWorkPreLink mwpl : mwpls) {
-                mwpl.setValueFlag("1");//已使用
+                mwpl.setValueFlag("2");//已使用
                 meterWorkPreLinkMapper.updateByPrimaryKey(mwpl);
             }
 

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/impl/MeterWorkMonitorServiceImpl.java

@@ -123,7 +123,17 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
                 rm.setMessage("操作成功！！");
                 rm.setCode("200");
             }else {
-                rm.setMessage("根据车号未查询到相应重量信息,请确认！！");
+                map.remove("rfidCar");
+                map.put("photoCar", rfidCar);
+                models = meterWorkMonitorMapper.selectByParameters(map);
+                if(models.size() >= 1) {
+                    rm.setSucceed();
+                    rm.setData(models.get(0));
+                    rm.setMessage("操作成功！！");
+                    rm.setCode("200");
+                }else{
+                    rm.setMessage("根据车号未查询到相应重量信息,请确认！！");
+                }
             }
             return rm;
         }catch(Exception e) {

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

@@ -734,6 +734,20 @@ throw new MarkerMetException(500, "操作异常！！");
         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());
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "C#端轨道衡实绩静轨复磅", notes = "根据MeterWorkStorageActual对象创建")
     @PostMapping(value = "/doAddWfRecover")
     public RESTfulResult doAddWfRecover(@RequestBody MeterWorkRailwayActFirst model) {

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

@@ -77,6 +77,8 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
 
     String doAddWfStatic(MeterWorkRailwayActFirst firstRail) throws Exception;
 
+    RESTfulResult doAddWfStaticTwo(PreRailwayScale scale, MeterWorkRailwayActFirst grossModel, MeterWorkRailwayActFirst tareModel);
+
     String doAddWf(MeterWorkRailwayActFirst firstRail, MeterWorkRailwayActual netRail);
 
     String doAddWfAct(PreRailwayScale preRailwayScale, MeterWorkRailwayActFirst First, MeterBaseRailwayWeight baseRailwayWeight);

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

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkrailwayactfirst.service.impl;
 
+import com.google.inject.internal.cglib.proxy.$UndeclaredThrowableException;
 import com.steerinfo.baseinfo.meterbasematterinfo.mapper.MeterBaseMatterInfoMapper;
 import com.steerinfo.baseinfo.meterbaserailwayhistaredata.mapper.MeterBaseRailwayHisTareDataMapper;
 import com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData;
@@ -2402,15 +2403,140 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         }
         //===========二次计量处理结束==============
         //4、保存图片（一、二次计量共用）
-        try{
+        /*try{
             SaveImg(meterWorkRailwayActFirstMapper.selectByPrimaryKey(id));
         }catch(Exception e){
             e.printStackTrace();
-            throw new MarkerMetException(500, "保存图片失败");
-        }
+            //throw new MarkerMetException(500, "保存图片失败");
+        }*/
         return id;
     }
 
+    @Override
+    public RESTfulResult doAddWfStaticTwo(PreRailwayScale scale, MeterWorkRailwayActFirst grossModel, MeterWorkRailwayActFirst tareModel) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+            String firstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+            //存储当前计量的数据
+            if(grossModel.getActualFirstNo() == null) {
+                grossModel.setActualFirstNo(firstNo);
+                meterWorkRailwayActFirstMapper.insertSelective(grossModel);
+            }
+            if(tareModel.getActualFirstNo() == null) {
+                tareModel.setActualFirstNo(firstNo);
+                meterWorkRailwayActFirstMapper.insertSelective(tareModel);
+            }
+
+            MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
+            //毛重一次
+            MeterWorkRailwayActFirst model01 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossModel.getActualFirstNo());
+            //皮重一次
+            MeterWorkRailwayActFirst model02 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(tareModel.getActualFirstNo());
+
+            BigDecimal num = model01.getMeterWeight().subtract(model02.getMeterWeight()).abs();
+            if(num.compareTo(BigDecimal.valueOf(400)) == -1){
+                rm.setMessage("选择的两条一次计量数据不能小于400kg，请确认！！");
+                return rm;
+            }
+            if(!model01.getRailwayNo().equals(model02.getRailwayNo())){
+                rm.setMessage("两条一次计量数据车号不一致,请确认！！");
+                return rm;
+            }
+
+            //修改委托状态
+            if(scale != null) {
+                //委托信息是否为有效数据
+                if(scale.getValueFlag().equals("2") || scale.getValueFlag().equals("3")){
+                    rm.setMessage("委托信息已使用或者已作废！！");
+                    return rm;
+                }
+
+                //将委托中的编号和收发货的等数据拷贝进一次数据中
+                MeterWorkRailwayActFirst first1 = meterWorkRailwayActFirstMapper.selectAndMatch(model01.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(first1, model01);
+                MeterWorkRailwayActFirst first2 = meterWorkRailwayActFirstMapper.selectAndMatch(model02.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(first2, model02);
+
+                //修改委托编号
+                scale.setValueFlag(DbConstants.NET);
+                scale.setUpdateTime(new Date());
+                scale.setUpdateManNo("system");
+                scale.setUpdateManName("自动匹配更新");
+                scale.setUploadFlag("1");
+                scale.setPredictionType("1");
+                preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+
+                //修改毛重一次数据状态
+                model01.setValueFlag(DbConstants.NET);
+                model01.setUpdateManName("system");
+                model01.setUpdateManName("自动匹配更新");
+                model01.setUpdateTime(new Date());
+                model01.setWeightType("0");
+                model01.setIsPreSacale("1");
+                model01.setPredictionNo(scale.getPredictionNo());
+                model01.setPredictionType("1");
+                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
+                //修改皮重一次数据状态
+                model02.setValueFlag(DbConstants.NET);
+                model02.setUpdateManName("system");
+                model02.setUpdateManName("自动匹配更新");
+                model02.setUpdateTime(new Date());
+                model02.setWeightType("1");
+                model02.setIsPreSacale("1");
+                model02.setPredictionNo(scale.getPredictionNo());
+                model02.setPredictionType("1");
+                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model02);
+
+                MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(model01.getActualFirstNo(), model02.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(mwca1, actualRow);
+                //保存洁净
+                String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
+                actualRow.setActualNo(sdf.format(new Date()) + no);
+                actualRow.setNetTime(new Date());
+                actualRow.setNetMode(DbConstants.TYPE);
+                actualRow.setNote("自动匹配洁净");
+                actualRow.setNetMode("1");
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("1");
+                actualRow.setIsPreSacale("1");
+                actualRow.setPredictionNo(scale.getPredictionNo());
+                actualRow.setPredictionType("1");
+                actualRow.setNetWeight(model01.getMeterWeight().subtract(model02.getMeterWeight()));
+                meterWorkRailwayActualMapper.insertSelective(actualRow);
+            }else {
+                MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAdd(model01.getActualFirstNo(), model02.getActualFirstNo());
+                BeanUtils.copyProperties(mwca1, actualRow);
+                //保存洁净
+                String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
+                actualRow.setActualNo(sdf.format(new Date()) + no);
+                actualRow.setNetTime(new Date());
+                actualRow.setNetMode(DbConstants.TYPE);
+                actualRow.setNote("自动匹配洁净");
+                actualRow.setNetMode("1");
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("1");
+                actualRow.setIsPreSacale("0");
+                actualRow.setNetWeight(model01.getMeterWeight().subtract(model02.getMeterWeight()));
+                meterWorkRailwayActualMapper.insertSelective(actualRow);
+            }
+
+            rm.setSucceed();
+            rm.setData(actualRow.getActualNo());
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>" + e.getMessage());
+        }
+        return rm;
+
+    }
+
     public void doSaveTare(MeterWorkRailwayActFirst model){
         //获取ID
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
@@ -2557,6 +2683,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         //补充编号
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         String afl = sdf.format(new Date());
+       /* String firstno = meterWorkRailwayActFirstMapper.getNewID(afl);
+        one.setActualFirstNo(afl + firstno);
+        meterWorkRailwayActFirstMapper.insertSelective(one);*/
+
         String netNo = meterWorkRailwayActualMapper.getNewID(afl);
         netRail.setActualNo(afl + netNo);