修改

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeprintconfig/service/impl/MeterBaseVehicleRangePrintConfigServiceImpl.java

@@ -61,6 +61,9 @@ public class MeterBaseVehicleRangePrintConfigServiceImpl extends BaseServiceImpl
             userId = "admin";
             userName = "admins";
         }
+        model.setNetWeightUpper(model.getNetWeightUpper()*1000);
+        model.setNetWeightLower(model.getNetWeightLower()*1000);
+        model.setLoadWeight(model.getLoadWeight()*1000);
         model.setUpdateManNo(userId);
         model.setUpdateManName(userName);
         model.setUpdateTime(new Date());
@@ -81,6 +84,9 @@ public class MeterBaseVehicleRangePrintConfigServiceImpl extends BaseServiceImpl
             userId = "admin";
             userName = "admins";
         }
+        model.setNetWeightUpper(model.getNetWeightUpper()*1000);
+        model.setNetWeightLower(model.getNetWeightLower()*1000);
+        model.setLoadWeight(model.getLoadWeight()*1000);
         model.setCreateManNo(userId);
         model.setCreateManName(userName);
         model.setCreateTime(new Date());

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -1431,4 +1431,28 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "本地计量-根据两个一次作业编号和备注进行洁净", notes = "关键词：actualFirst1No、actualFirst2No、updateManNo、updateManName、note")
+    @PostMapping(value = "/localCleanByFirstNo", produces = "application/json;charset=UTF-8")
+    public RESTfulResult localCleanByFirstNo(@RequestBody CommonCombination<MeterWorkCarActual, MeterWorkCarActual, MeterWorkPreLink, MeterMonitorNote> com) {
+        try {
+            RESTfulResult rm = meterWorkCarActualFirstService.localCleanByFirstNo(com.getOne());
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
+
+    @ApiOperation(value = "本地计量-根据一次作业编号和备注进行启用或者作废", notes = "关键词：actualFirstNo、updateManNo、updateManName、note、memo")
+    @PostMapping(value = "/localRecoveryOrAbolishByFirstNo", produces = "application/json;charset=UTF-8")
+    public RESTfulResult localRecoveryOrAbolishByFirstNo(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActual, MeterWorkPreLink, MeterMonitorNote> com) {
+        try {
+            RESTfulResult rm = meterWorkCarActualFirstService.localRecoveryOrAbolishByFirstNo(com.getOne());
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java

@@ -156,5 +156,6 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
 
     PageList<MeterWorkCarActualFirst> allStateView(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 
-
+    RESTfulResult localCleanByFirstNo(MeterWorkCarActual actualModel);
+    RESTfulResult localRecoveryOrAbolishByFirstNo(MeterWorkCarActualFirst firstModel);
 }

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

@@ -7061,7 +7061,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         return pageInfo;
     }
 
-
     @Override
     public RESTfulResult doNetAddMuchGross(List<MeterWorkCarActualFirst> gross, MeterWorkCarActualFirst tare, MeterMonitorNote note) throws Exception {
         RESTfulResult rm = new RESTfulResult();
@@ -7242,5 +7241,260 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             return rm;
         }
     }
+
+    @Override
+    @Transactional
+    public RESTfulResult localCleanByFirstNo(MeterWorkCarActual actualModel) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            if(StringUtils.isEmpty(actualModel.getActualFirst1No()) || StringUtils.isEmpty(actualModel.getActualFirst2No())) {
+                rm.setMessage("两个一次作业编号不能为空！");
+                return rm;
+            }
+            MeterWorkCarActualFirst grossModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualModel.getActualFirst1No());
+            if(grossModel == null) {
+                rm.setMessage("毛重一次作业编号【" + actualModel.getActualFirst1No() +"】未查询到一次计量数据！");
+                return rm;
+            }
+            MeterWorkCarActualFirst tareModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualModel.getActualFirst2No());
+            if(tareModel == null) {
+                rm.setMessage("皮重一次作业编号【" + actualModel.getActualFirst2No() +"】未查询到一次计量数据！");
+                return rm;
+            }
+            //判断委托编号是否带委托，结净数据未带委托，再去两个一次数据去取委托
+            String predictionNo = "";
+            if(StringUtils.isNotEmpty(actualModel.getPredictionNo())) {
+                predictionNo = actualModel.getPredictionNo();
+            }else {
+                if(StringUtils.isNotEmpty(grossModel.getPredictionNo())) {
+                    predictionNo = grossModel.getPredictionNo();
+                }else if(StringUtils.isNotEmpty(tareModel.getPredictionNo())) {
+                    predictionNo = tareModel.getPredictionNo();
+                }
+            }
+
+            String userId = actualModel.getUpdateManNo();
+            String userName = actualModel.getUpdateManName();
+            String note = actualModel.getNote();
+            if(StringUtils.isNotEmpty(predictionNo)) {
+                grossModel = meterWorkCarActualFirstMapper.selectAndMatch(grossModel.getActualFirstNo(), predictionNo);
+                grossModel.setWeightType("0");
+                grossModel.setValueFlag("2");
+                grossModel.setIsPreScale("1");
+                grossModel.setPredictionType("1");
+                grossModel.setUpdateManNo(userId);
+                grossModel.setUpdateManName(userName);
+                grossModel.setUpdateTime(new Date());
+                grossModel.setNote(note);
+                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(grossModel);
+
+                tareModel = meterWorkCarActualFirstMapper.selectAndMatch(tareModel.getActualFirstNo(), predictionNo);
+                tareModel.setWeightType("1");
+                tareModel.setValueFlag("2");
+                tareModel.setIsPreScale("1");
+                tareModel.setPredictionType("1");
+                tareModel.setUpdateManNo(userId);
+                tareModel.setUpdateManName(userName);
+                tareModel.setUpdateTime(new Date());
+                tareModel.setNote(note);
+                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(tareModel);
+
+                MeterWorkCarActual mwca = meterWorkCarActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), predictionNo);
+                //更新结净数据状态
+                mwca.setActualNo(PublicMethod.IdCreate(3));
+                mwca.setNetMode(DbConstants.TYPE);
+                mwca.setUpdateManNo(userId);
+                mwca.setUpdateManName(userName);
+                mwca.setNote(note);
+                mwca.setUploadFlag("1");
+                mwca.setIsPreScale("1");
+                mwca.setValueFlag("1");
+                if(mwca.getGrossTime().compareTo(mwca.getTareTime()) >= 0) {
+                    mwca.setNetSpot3No(mwca.getBaseSpot1No());
+                    mwca.setNetSpot3Name(mwca.getBaseSpot1Name());
+                    mwca.setNetManNo(mwca.getGrossManNo());
+                    mwca.setNetManName(mwca.getGrossManName());
+                    mwca.setNetTime(mwca.getGrossTime());
+                    mwca.setCreateTime(mwca.getGrossTime());
+                    mwca.setCreateManName(mwca.getGrossManName());
+                }else {
+                    mwca.setNetSpot3No(mwca.getBaseSpot2No());
+                    mwca.setNetSpot3Name(mwca.getBaseSpot2Name());
+                    mwca.setNetManNo(mwca.getTareManNo());
+                    mwca.setNetManName(mwca.getTareManName());
+                    mwca.setNetTime(mwca.getTareTime());
+                    mwca.setCreateTime(mwca.getTareTime());
+                    mwca.setCreateManName(mwca.getTareManName());
+                }
+                mwca.setPredictionType("1");
+                mwca.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                meterWorkCarActualMapper.insertSelective(mwca);
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("C#端-本地计量一次数据维护");
+                logModel.setOperationFunction("一次数据结净");
+                logModel.setOperationId(mwca.getActualNo());
+                logModel.setOperationPredictionNo(mwca.getPredictionNo());
+                logModel.setOperationCarnNo(mwca.getCarNo());
+                logModel.setOperationBeforeFix(mwca.getActualFirst1No() + "+" + mwca.getActualFirst2No());
+                logModel.setOperationAfterFix("");
+                meterBaseOperationLogMapper.insertSelective(logModel);
+            }else {
+                grossModel.setWeightType("0");
+                grossModel.setValueFlag("2");
+                grossModel.setIsPreScale("0");
+                grossModel.setUpdateManNo(userId);
+                grossModel.setUpdateManName(userName);
+                grossModel.setUpdateTime(new Date());
+                grossModel.setNote(note);
+                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(grossModel);
+
+                tareModel.setWeightType("1");
+                tareModel.setValueFlag("2");
+                tareModel.setIsPreScale("0");
+                tareModel.setUpdateManNo(userId);
+                tareModel.setUpdateManName(userName);
+                tareModel.setUpdateTime(new Date());
+                tareModel.setNote(note);
+                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(tareModel);
+
+                MeterWorkCarActual mwca = meterWorkCarActualMapper.manualAdd(grossModel.getActualFirstNo(), tareModel.getActualFirstNo());
+                //更新结净数据状态
+                mwca.setActualNo(PublicMethod.IdCreate(3));
+                mwca.setNetMode(DbConstants.TYPE);
+                mwca.setUpdateManNo(userId);
+                mwca.setUpdateManName(userName);
+                mwca.setNote(note);
+                mwca.setUploadFlag("1");
+                mwca.setIsPreScale("0");
+                mwca.setValueFlag("1");
+                if(mwca.getGrossTime().compareTo(mwca.getTareTime()) >= 0) {
+                    mwca.setNetSpot3No(mwca.getBaseSpot1No());
+                    mwca.setNetSpot3Name(mwca.getBaseSpot1Name());
+                    mwca.setNetManNo(mwca.getGrossManNo());
+                    mwca.setNetManName(mwca.getGrossManName());
+                    mwca.setNetTime(mwca.getGrossTime());
+                    mwca.setCreateTime(mwca.getGrossTime());
+                    mwca.setCreateManName(mwca.getGrossManName());
+                }else {
+                    mwca.setNetSpot3No(mwca.getBaseSpot2No());
+                    mwca.setNetSpot3Name(mwca.getBaseSpot2Name());
+                    mwca.setNetManNo(mwca.getTareManNo());
+                    mwca.setNetManName(mwca.getTareManName());
+                    mwca.setNetTime(mwca.getTareTime());
+                    mwca.setCreateTime(mwca.getTareTime());
+                    mwca.setCreateManName(mwca.getTareManName());
+                }
+                mwca.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                meterWorkCarActualMapper.insertSelective(mwca);
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("C#端-本地计量一次数据维护");
+                logModel.setOperationFunction("一次数据结净");
+                logModel.setOperationId(mwca.getActualNo());
+                logModel.setOperationPredictionNo(mwca.getPredictionNo());
+                logModel.setOperationCarnNo(mwca.getCarNo());
+                logModel.setOperationBeforeFix(mwca.getActualFirst1No() + "+" + mwca.getActualFirst2No());
+                logModel.setOperationAfterFix("");
+                meterBaseOperationLogMapper.insertSelective(logModel);
+            }
+            rm.setSucceed(true);
+            rm.setMessage("操作成功");
+            rm.setCode("200");
+        }catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常：>>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    @Transactional
+    public RESTfulResult    localRecoveryOrAbolishByFirstNo(MeterWorkCarActualFirst firstModel) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            if(StringUtils.isEmpty(firstModel.getActualFirstNo())) {
+                rm.setMessage("一次作业编号不能为空！");
+                return rm;
+            }
+            MeterWorkCarActualFirst first = meterWorkCarActualFirstMapper.selectByPrimaryKey(firstModel.getActualFirstNo());
+            MeterWorkCarActualFirst firstTemp = first;
+            if(first == null) {
+                rm.setMessage("根据一次作业编号【" + firstModel.getActualFirstNo() + "】未查询到有效的一次数据！");
+                return rm;
+            }
+
+            String userId = firstModel.getUpdateManNo();
+            String userName = firstModel.getUpdateManName();
+            String note = firstModel.getNote();
+            String flag = firstModel.getMemo();
+            if(flag.contains("启用")) {
+                first.setValueFlag("1");
+                first.setUpdateManNo(userId);
+                first.setUpdateManName(userName);
+                first.setUpdateTime(new Date());
+                first.setNote(note);
+                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(first);
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("C#端-本地计量一次数据维护");
+                logModel.setOperationFunction("启用");
+                logModel.setOperationId(first.getActualFirstNo());
+                logModel.setOperationPredictionNo(first.getPredictionNo());
+                logModel.setOperationCarnNo(first.getCarNo());
+                logModel.setOperationBeforeFix(firstTemp.toString());
+                logModel.setOperationAfterFix(first.toString());
+                meterBaseOperationLogMapper.insertSelective(logModel);
+            }else if (flag.contains("作废")) {
+                if(StringUtils.isNotEmpty(first.getPredictionNo())) {
+                    rm.setMessage("一次作业编号【" + first.getActualFirstNo() + "】所对应的一次数据已匹配委托不能进行作废，请撤销委托之后在进行此操作！");
+                    return rm;
+                }
+                first.setValueFlag("0");
+                first.setUpdateManNo(userId);
+                first.setUpdateManName(userName);
+                first.setUpdateTime(new Date());
+                first.setNote(note);
+                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(first);
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("C#端-本地计量一次数据维护");
+                logModel.setOperationFunction("作废");
+                logModel.setOperationId(first.getActualFirstNo());
+                logModel.setOperationPredictionNo(first.getPredictionNo());
+                logModel.setOperationCarnNo(first.getCarNo());
+                logModel.setOperationBeforeFix(firstTemp.toString());
+                logModel.setOperationAfterFix(first.toString());
+                meterBaseOperationLogMapper.insertSelective(logModel);
+            }
+            rm.setSucceed(true);
+            rm.setMessage("操作成功");
+            rm.setCode("200");
+        }catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常：>>>>" + e.getMessage());
+        }
+        return rm;
+    }
 }
 

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.xml

@@ -428,6 +428,7 @@
     left join meter_work_car_actual_first t1
     on t.actual_first_no =t1.actual_first_no
     <where>
+      and t1.base_spot_no is not null
       <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
         and t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
       </if>
@@ -466,6 +467,7 @@
     left join meter_work_car_actual_first t1
     on t.actual_first_no =t1.actual_first_no
     <where>
+      and t1.base_spot_no is not null
       <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
         and t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
       </if>

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

@@ -130,6 +130,40 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "静轨物料车型重量范围配置限制显示-获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkrailwayactual:view")
+    @GetMapping(value = "/staticLimitByDesc/")
+    public RESTfulResult staticLimitByDesc(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkRailwayActual> list = meterWorkRailwayActualService.staticLimitByDesc(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value = "动轨物料车型重量范围配置限制显示-获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkrailwayactual:view")
+    @GetMapping(value = "/dynamicLimitByDesc/")
+    public RESTfulResult dynamicLimitByDesc(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkRailwayActual> list = meterWorkRailwayActualService.dynamicLimitByDesc(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "自动获取轨道衡打印信息", notes = "根据车号、收发货单位获取打印信息")
     //@RequiresPermissions("meterworkrailwayactual:view")
     @GetMapping(value = "/autoPrintRailway/")

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

@@ -99,6 +99,10 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     RESTfulResult commonRemove(HashMap map);
 
     PageList<MeterWorkRailwayActual> likeByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize);
+    //静轨物料车型重量范围配置限制显示
+    PageList<MeterWorkRailwayActual> staticLimitByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize);
+    //动轨物料车型重量范围配置限制显示
+    PageList<MeterWorkRailwayActual> dynamicLimitByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize);
     List<MeterWorkRailwayActual> carActualDataDetail(HashMap<String, Object> params);
     List<MeterWorkRailwayActual> webByLikeDesc(HashMap<String, Object> parameters);
     List<MeterWorkRailwayActual> noPage(Map<String, Object> params);

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

@@ -8,6 +8,8 @@ import com.steerinfo.baseinfo.meterbaserailwayaiweight.mapper.MeterBaseRailwayAi
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
 import com.steerinfo.baseinfo.meterbaserailwayweight.mapper.MeterBaseRailwayWeightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayweight.model.MeterBaseRailwayWeight;
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.mapper.MeterBaseVehicleRangeConfigMapper;
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
 import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.mapper.MeterBaseVehicleRangePrintConfigMapper;
 import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -92,6 +94,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     @Resource
     private MeterBaseVehicleRangePrintConfigMapper meterBaseVehicleRangePrintConfigMapper;
 
+    @Resource
+    private MeterBaseVehicleRangeConfigMapper meterBaseVehicleRangeConfigMapper;
 
     @Resource
     private PreRailwayScaleMapper preRailwayScaleMapper;
@@ -3027,6 +3031,82 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         return pageInfo;
     }
 
+    @Override
+    public PageList<MeterWorkRailwayActual> staticLimitByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkRailwayActual> rows = meterWorkRailwayActualMapper.likeByDesc(parameters);
+        //存储符合条件的净重数据
+        List<MeterWorkRailwayActual> rowsTemp = new ArrayList<>();
+        //查询静轨物料车型重量范围配置
+        HashMap<String, Object> obj = new HashMap<>();
+        obj.put("valueFlag", "1");
+        obj.put("railwayTypeNo", "001019001");
+        List<MeterBaseVehicleRangeConfig> configList = meterBaseVehicleRangeConfigMapper.likeByDesc(obj);
+        if(rows.size() >= 1) {
+            for (MeterWorkRailwayActual model: rows) {
+                if(configList.size() >= 1) {
+                    for (MeterBaseVehicleRangeConfig configModel: configList) {
+                        //判断车号、计量点、物料、车型
+                        if(model.getNetSpot3No().equals(configModel.getBaseSpotNo())
+                            && model.getNetSpot3Name().equals(configModel.getBaseSpotName())
+                            && model.getMatterNo().equals(configModel.getMatterNo())
+                            && model.getMatterName().equals(configModel.getMatterName())
+                            && model.getConveyanceType().equals(configModel.getCarrigeNo())){
+                            //判断毛重大于毛重上限并且毛重小于毛重下限
+                            if(model.getGrossWeight().compareTo(new BigDecimal(configModel.getGrossWeightUpper())) == 1
+                                || model.getGrossWeight().compareTo(new BigDecimal(configModel.getGrossWeightLower())) == -1) {
+                                rowsTemp.add(model);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        PageList pageInfo = new PageList(rowsTemp);
+        return pageInfo;
+    }
+
+    @Override
+    public PageList<MeterWorkRailwayActual> dynamicLimitByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkRailwayActual> rows = meterWorkRailwayActualMapper.likeByDesc(parameters);
+        //存储符合条件的净重数据
+        List<MeterWorkRailwayActual> rowsTemp = new ArrayList<>();
+        //查询静轨物料车型重量范围配置
+        HashMap<String, Object> obj = new HashMap<>();
+        obj.put("valueFlag", "1");
+        obj.put("railwayTypeNo", "001019002");
+        List<MeterBaseVehicleRangeConfig> configList = meterBaseVehicleRangeConfigMapper.likeByDesc(obj);
+        if(rows.size() >= 1) {
+            for (MeterWorkRailwayActual model: rows) {
+                if(configList.size() >= 1) {
+                    for (MeterBaseVehicleRangeConfig configModel: configList) {
+                        //判断车号、计量点、物料、发货单位、收货单位、车型、载重
+                        if(model.getNetSpot3No().equals(configModel.getBaseSpotNo())
+                                && model.getNetSpot3Name().equals(configModel.getBaseSpotName())
+                                && model.getMatterNo().equals(configModel.getMatterNo())
+                                && model.getMatterName().equals(configModel.getMatterName())
+                                && model.getForwardingUnitNo().equals(configModel.getForwardingUnitNo())
+                                && model.getForwardingUnitName().equals(configModel.getForwardingUnitName())
+                                && model.getReceivingUintNo().equals(configModel.getReceivingUintNo())
+                                && model.getReceivingUintName().equals(configModel.getReceivingUintName())
+                                && model.getConveyanceType().equals(configModel.getCarrigeNo())){
+                            //判断毛重大于毛重上限并且毛重小于毛重下限;     毛重上限、毛重下限、净重上限、净重下限
+                            if((model.getGrossWeight().compareTo(new BigDecimal(configModel.getGrossWeightUpper())) == 1
+                                    || model.getGrossWeight().compareTo(new BigDecimal(configModel.getGrossWeightLower())) == -1)
+                                || (model.getNetWeight().compareTo(new BigDecimal(configModel.getNetWeightUpper())) == 1
+                                    || model.getNetWeight().compareTo(new BigDecimal(configModel.getNetWeightLower())) == -1)) {
+                                rowsTemp.add(model);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        PageList pageInfo = new PageList(rowsTemp);
+        return pageInfo;
+    }
+
     @Override
     public List<MeterWorkRailwayActual> carActualDataDetail(HashMap<String, Object> params) {
         if(params.get("railwayTypeNoStr") != null) {