'提交'

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

@@ -3914,7 +3914,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == 1){
                 return "请根据一次数据从小到大的规则，依次选择三条一次数据！！！！";
             }
-            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());
             String toDate = simpleFormat.format(pts2.getCreateTime());
             long from = simpleFormat.parse(fromDate).getTime();
@@ -3923,7 +3923,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             if ( pts1.getMatterNo().equals(pts2.getMatterNo()) &&
                     pts1.getForwardingUnitNo().equals(pts2.getForwardingUnitNo()) &&
                     hours <= 4) {
-                return "委托信息不符合混装委托规则，请确认!!";
+                return "委托信息不符合混装委托规则(同物料同发货单位委托创建时间不能小于4小时)，请确认!!";
             }
 
             //判断一次数据是否存在
@@ -4184,7 +4184,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1){
                 return "请根据一次数据从大到小的规则，依次选择三条一次数据！！";
             }
-            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());
             String toDate = simpleFormat.format(pts2.getCreateTime());
             long from = simpleFormat.parse(fromDate).getTime();

src/main/java/com/steerinfo/meterwork/meterworkdatacount/controller/MeterWorkDataCountController.java

@@ -71,7 +71,7 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
     @RequestMapping("/ExcelCarDownload")
     public void ExcelCarDownload(HttpServletResponse response, @RequestParam HashMap param) throws IOException {
         //表头数据
-        String[] header = {"序号","车号", "物料名称", "数据状态", "匹配委托", "委托单号", "上传状态","预报组合编号","预报类型",
+        String[] header = {"序号","车号","业务类型", "物料名称", "数据状态", "匹配委托", "委托单号", "上传状态","预报组合编号","预报类型",
                 "发货单位","收货单位","毛重(t)","皮重(t)","净重(t)","净重时间","净重计量点名称",
                 "毛重时间","毛重计量点名称","皮重时间","皮重计量点名称","处理人编号","处理人", "处理时间", "操作日志"};
         //声明一个工作簿
@@ -112,18 +112,31 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
             row1.createCell(0).setCellValue(new HSSFRichTextString(String.valueOf(i)));
             //第二列创建并赋值
             row1.createCell(1).setCellValue(new HSSFRichTextString(emps.get(i).getCarNo()));
+
+            //业务类型
+            if (emps.get(i).getMeterTypeName().equals("GM2GM")) {
+                row1.createCell(2).setCellValue(new HSSFRichTextString("厂内转储"));
+            }//业务类型
+            else  if (emps.get(i).getMeterTypeName().equals("PO2GM")) {
+                row1.createCell(2).setCellValue(new HSSFRichTextString("外进"));
+            }//业务类型
+            else if (emps.get(i).getMeterTypeName().equals("SendToOutTms")) {
+                row1.createCell(2).setCellValue(new HSSFRichTextString("外发"));
+            }else {
+                row1.createCell(2).setCellValue(emps.get(i).getMeterTypeName());
+            }
             //第三列创建并赋值
-            row1.createCell(2).setCellValue(new HSSFRichTextString(emps.get(i).getMatterName()));
+            row1.createCell(3).setCellValue(new HSSFRichTextString(emps.get(i).getMatterName()));
             //第5列创建并赋值
-            row1.createCell(3).setCellValue(new HSSFRichTextString(emps.get(i).getValueFlag().equals("1")?"有效":"作废"));
+            row1.createCell(4).setCellValue(new HSSFRichTextString(emps.get(i).getValueFlag().equals("1")?"有效":"作废"));
             //第6列创建并赋值
-            row1.createCell(4).setCellValue(new HSSFRichTextString(emps.get(i).getIsPreScale().equals("1")?"已匹配":"未匹配"));
+            row1.createCell(5).setCellValue(new HSSFRichTextString(emps.get(i).getIsPreScale().equals("1")?"已匹配":"未匹配"));
             //第7列创建并赋值
-            row1.createCell(5).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionNo()));
+            row1.createCell(6).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionNo()));
             //籍贯
-            row1.createCell(6).setCellValue(new HSSFRichTextString(emps.get(i).getUploadFlag().equals("1")?"待上传":"已上传"));
+            row1.createCell(7).setCellValue(new HSSFRichTextString(emps.get(i).getUploadFlag().equals("1")?"待上传":"已上传"));
             //第8列创建并赋值
-            row1.createCell(7).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionCombination()));
+            row1.createCell(8).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionCombination()));
             //第9列创建并赋值
             String predictionType = "";
             if(StringUtils.isEmpty(emps.get(i).getPredictionType())) {
@@ -137,40 +150,40 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
             }else if(emps.get(i).getPredictionType().equals("7")) {
                 predictionType = "混装";
             }
-            row1.createCell(8).setCellValue(new HSSFRichTextString(predictionType));
+            row1.createCell(9).setCellValue(new HSSFRichTextString(predictionType));
             //第10列创建并赋值
-            row1.createCell(9).setCellValue(new HSSFRichTextString(emps.get(i).getForwardingUnitName()));
+            row1.createCell(10).setCellValue(new HSSFRichTextString(emps.get(i).getForwardingUnitName()));
             //第11列创建并赋值
-            row1.createCell(10).setCellValue(new HSSFRichTextString(emps.get(i).getReceivingUintName()));
+            row1.createCell(11).setCellValue(new HSSFRichTextString(emps.get(i).getReceivingUintName()));
             //第12列创建并赋值
-            row1.createCell(11).setCellValue(new HSSFRichTextString((emps.get(i).getGrossWeight().divide(new BigDecimal(1000))).toString()));
+            row1.createCell(12).setCellValue(new HSSFRichTextString((emps.get(i).getGrossWeight().divide(new BigDecimal(1000))).toString()));
             //第13列创建并赋值
-            row1.createCell(12).setCellValue(new HSSFRichTextString((emps.get(i).getTareWeight().divide(new BigDecimal(1000))).toString()));
+            row1.createCell(13).setCellValue(new HSSFRichTextString((emps.get(i).getTareWeight().divide(new BigDecimal(1000))).toString()));
             //第14列创建并赋值
-            row1.createCell(13).setCellValue(new HSSFRichTextString((emps.get(i).getNetWeight().divide(new BigDecimal(1000))).toString()));
+            row1.createCell(14).setCellValue(new HSSFRichTextString((emps.get(i).getNetWeight().divide(new BigDecimal(1000))).toString()));
             //第15列创建并赋值
             if(emps.get(i).getNetTime() != null){
-                row1.createCell(14).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getNetTime())));
+                row1.createCell(15).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getNetTime())));
             }
             //第16列创建并赋值-入职日期
-            row1.createCell(15).setCellValue(new HSSFRichTextString(emps.get(i).getNetSpot3Name()));
+            row1.createCell(16).setCellValue(new HSSFRichTextString(emps.get(i).getNetSpot3Name()));
             if(emps.get(i).getGrossTime() != null){
-                row1.createCell(16).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getGrossTime())));
+                row1.createCell(17).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getGrossTime())));
             }
             //第16列创建并赋值-入职日期
-            row1.createCell(17).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot1Name()));
+            row1.createCell(18).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot1Name()));
             if(emps.get(i).getTareTime() != null){
-                row1.createCell(18).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getTareTime())));
+                row1.createCell(19).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getTareTime())));
             }
             //第16列创建并赋值-入职日期
-            row1.createCell(19).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot2Name()));
+            row1.createCell(20).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot2Name()));
             //转正日期
-            row1.createCell(20).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManNo()));
-            row1.createCell(21).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManName()));
+            row1.createCell(21).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManNo()));
+            row1.createCell(22).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManName()));
             if(emps.get(i).getUpdateTime() != null) {
-                row1.createCell(22).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getUpdateTime())));
+                row1.createCell(23).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getUpdateTime())));
             }
-            row1.createCell(23).setCellValue(new HSSFRichTextString(emps.get(i).getNote()));
+            row1.createCell(24).setCellValue(new HSSFRichTextString(emps.get(i).getNote()));
         }
         //准备将Excel的输出流通过response输出到页面下载
         //八进制输出流
@@ -187,7 +200,7 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
     @RequestMapping("/ExcelRailwayDownload")
     public void ExcelStaticDownload(HttpServletResponse response, @RequestParam HashMap param) throws IOException {
         //表头数据
-        String[] header = {"序号","车号", "物料名称", "数据状态", "匹配委托", "委托单号", "上传状态","预报组合编号","预报类型",
+        String[] header = {"序号","车号","车型","业务类型" , "物料名称", "数据状态", "匹配委托", "委托单号", "上传状态","预报组合编号","预报类型",
                 "发货单位","收货单位","毛重(t)","皮重(t)","净重(t)","净重时间","净重计量点名称",
                 "毛重时间","毛重计量点名称","皮重时间","皮重计量点名称","处理人编号","处理人", "处理时间", "操作日志"};
         //声明一个工作簿
@@ -246,18 +259,34 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
             row1.createCell(0).setCellValue(new HSSFRichTextString(String.valueOf(i)));
             //第二列创建并赋值
             row1.createCell(1).setCellValue(new HSSFRichTextString(emps.get(i).getRailwayNo()));
+
+            //车型
+            row1.createCell(2).setCellValue(new HSSFRichTextString(emps.get(i).getConveyanceType()));
+            //业务类型
+            if (emps.get(i).getMeterTypeName().equals("GM2GM")) {
+                row1.createCell(3).setCellValue(new HSSFRichTextString("厂内转储"));
+            }//业务类型
+            else  if (emps.get(i).getMeterTypeName().equals("PO2GM")) {
+                row1.createCell(3).setCellValue(new HSSFRichTextString("外进"));
+            }//业务类型
+            else if (emps.get(i).getMeterTypeName().equals("SendToOutTms")) {
+                row1.createCell(3).setCellValue(new HSSFRichTextString("外发"));
+            }else {
+                row1.createCell(3).setCellValue(emps.get(i).getMeterTypeName());
+            }
+
             //第三列创建并赋值
-            row1.createCell(2).setCellValue(new HSSFRichTextString(emps.get(i).getMatterName()));
+            row1.createCell(4).setCellValue(new HSSFRichTextString(emps.get(i).getMatterName()));
             //第5列创建并赋值
-            row1.createCell(3).setCellValue(new HSSFRichTextString((emps.get(i).getValueFlag().equals("1") || emps.get(i).getValueFlag().equals("2"))?"有效":"作废"));
+            row1.createCell(5).setCellValue(new HSSFRichTextString((emps.get(i).getValueFlag().equals("1") || emps.get(i).getValueFlag().equals("2"))?"有效":"作废"));
             //第6列创建并赋值
-            row1.createCell(4).setCellValue(new HSSFRichTextString(emps.get(i).getIsPreSacale().equals("1")?"已匹配":"未匹配"));
+            row1.createCell(6).setCellValue(new HSSFRichTextString(emps.get(i).getIsPreSacale().equals("1")?"已匹配":"未匹配"));
             //第7列创建并赋值
-            row1.createCell(5).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionNo()));
+            row1.createCell(7).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionNo()));
             //籍贯
-            row1.createCell(6).setCellValue(new HSSFRichTextString(emps.get(i).getUploadFlag().equals("1")?"待上传":"已上传"));
+            row1.createCell(8).setCellValue(new HSSFRichTextString(emps.get(i).getUploadFlag().equals("1")?"待上传":"已上传"));
             //第8列创建并赋值
-            row1.createCell(7).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionCombination()));
+            row1.createCell(9).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionCombination()));
             //第9列创建并赋值
             String predictionType = "";
             if(StringUtils.isEmpty(emps.get(i).getPredictionType())) {
@@ -271,40 +300,40 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
             }else if(emps.get(i).getPredictionType().equals("7")) {
                 predictionType = "混装";
             }
-            row1.createCell(8).setCellValue(new HSSFRichTextString(predictionType));
+            row1.createCell(10).setCellValue(new HSSFRichTextString(predictionType));
             //第10列创建并赋值
-            row1.createCell(9).setCellValue(new HSSFRichTextString(emps.get(i).getForwardingUnitName()));
+            row1.createCell(11).setCellValue(new HSSFRichTextString(emps.get(i).getForwardingUnitName()));
             //第11列创建并赋值
-            row1.createCell(10).setCellValue(new HSSFRichTextString(emps.get(i).getReceivingUintName()));
+            row1.createCell(12).setCellValue(new HSSFRichTextString(emps.get(i).getReceivingUintName()));
             //第12列创建并赋值
-            row1.createCell(11).setCellValue(new HSSFRichTextString((emps.get(i).getGrossWeight().divide(new BigDecimal(1000))).toString()));
+            row1.createCell(13).setCellValue(new HSSFRichTextString((emps.get(i).getGrossWeight().divide(new BigDecimal(1000))).toString()));
             //第13列创建并赋值
-            row1.createCell(12).setCellValue(new HSSFRichTextString((emps.get(i).getTareWeight().divide(new BigDecimal(1000))).toString()));
+            row1.createCell(14).setCellValue(new HSSFRichTextString((emps.get(i).getTareWeight().divide(new BigDecimal(1000))).toString()));
             //第14列创建并赋值
-            row1.createCell(13).setCellValue(new HSSFRichTextString((emps.get(i).getNetWeight().divide(new BigDecimal(1000))).toString()));
+            row1.createCell(15).setCellValue(new HSSFRichTextString((emps.get(i).getNetWeight().divide(new BigDecimal(1000))).toString()));
             //第15列创建并赋值
             if(emps.get(i).getNetTime() != null){
-                row1.createCell(14).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getNetTime())));
+                row1.createCell(16).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getNetTime())));
             }
             //第16列创建并赋值-入职日期
-            row1.createCell(15).setCellValue(new HSSFRichTextString(emps.get(i).getNetSpot3Name()));
+            row1.createCell(17).setCellValue(new HSSFRichTextString(emps.get(i).getNetSpot3Name()));
             if(emps.get(i).getGrossTime() != null){
-                row1.createCell(16).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getGrossTime())));
+                row1.createCell(18).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getGrossTime())));
             }
             //第16列创建并赋值-入职日期
-            row1.createCell(17).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot1Name()));
+            row1.createCell(19).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot1Name()));
             if(emps.get(i).getTareTime() != null){
-                row1.createCell(18).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getTareTime())));
+                row1.createCell(20).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getTareTime())));
             }
             //第16列创建并赋值-入职日期
-            row1.createCell(19).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot2Name()));
+            row1.createCell(21).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot2Name()));
             //转正日期
-            row1.createCell(20).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManNo()));
-            row1.createCell(21).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManName()));
+            row1.createCell(22).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManNo()));
+            row1.createCell(23).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManName()));
             if(emps.get(i).getUpdateTime() != null) {
-                row1.createCell(22).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getUpdateTime())));
+                row1.createCell(24).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getUpdateTime())));
             }
-            row1.createCell(23).setCellValue(new HSSFRichTextString(emps.get(i).getNote()));
+            row1.createCell(25).setCellValue(new HSSFRichTextString(emps.get(i).getNote()));
         }
         //准备将Excel的输出流通过response输出到页面下载
         //八进制输出流

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/controller/MeterWorkOldAndNew.java

@@ -39,7 +39,7 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
         RESTfulResult rm = success();
         try {
             PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date dateStart = sdf.parse(params.get("startTime").toString());
             Date dateEnd = sdf. parse(params.get("endTime").toString());
             long diff = (dateEnd.getTime() - dateStart.getTime())/(24*60*60*1000);
@@ -69,7 +69,7 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
         RESTfulResult rm = success();
         try {
             PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date dateStart = sdf.parse(params.get("startTime").toString());
             Date dateEnd = sdf. parse(params.get("endTime").toString());
             long diff = (dateEnd.getTime() - dateStart.getTime())/(24*60*60*1000);

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

@@ -3174,7 +3174,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if (pts1.getMatterNo().equals(pts2.getMatterNo()) &&
                     pts1.getForwardingUnitNo().equals(pts2.getForwardingUnitNo()) &&
                     hours <= 4) {
-                return "委托信息不符合混装委托规则，请确认!!";
+                return "委托信息不符合混装委托规则(同物料同发货单位委托创建时间不能小于4小时)，请确认!!";
             }
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/service/impl/MeterWorkRailwayActFirstBakServiceImpl.java

@@ -2379,7 +2379,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == 1) {
                 return "请根据一次数据从小到大的规则，依次选择三条一次数据！！";
             }
-            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());
             String toDate = simpleFormat.format(pts2.getCreateTime());
             long from = simpleFormat.parse(fromDate).getTime();
@@ -2388,7 +2388,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             if (pts1.getMatterNo().equals(pts2.getMatterNo()) &&
                     pts1.getForwardingUnitNo().equals(pts2.getForwardingUnitNo()) &&
                     hours <= 4) {
-                return "委托信息不符合混装委托规则，请确认!!";
+                return "委托信息不符合混装委托规则(同物料同发货单位委托创建时间不能小于4小时)，请确认!!";
             }
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
@@ -2592,7 +2592,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1) {
                 return "请根据一次数据从大到小的规则，依次选择三条一次数据！！！！";
             }
-            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());
             String toDate = simpleFormat.format(pts2.getCreateTime());
             long from = simpleFormat.parse(fromDate).getTime();

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

@@ -197,6 +197,24 @@ 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")
+    @PostMapping(value = "/staticLimitByDesc/")
+    public RESTfulResult staticLimitByDescPost(@RequestBody HashMap parmas) {
+        try {
+            PageList<MeterWorkRailwayActual> list = meterWorkRailwayActualService.staticLimitByDesc(parmas,
+                    Integer.parseInt(parmas.get("pageNum").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "动轨物料车型重量范围配置限制显示-获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -214,6 +232,24 @@ 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")
+    @PostMapping(value = "/dynamicLimitByDesc/")
+    public RESTfulResult dynamicLimitByDescPost(@RequestBody HashMap parmas) {
+        try {
+            PageList<MeterWorkRailwayActual> list = meterWorkRailwayActualService.dynamicLimitByDesc(parmas,
+                    Integer.parseInt(parmas.get("pageNum").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "自动获取轨道衡打印信息", notes = "根据车号、收发货单位获取打印信息")
     //@RequiresPermissions("meterworkrailwayactual:view")
     @GetMapping(value = "/autoPrintRailway/")
@@ -1415,4 +1451,56 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
             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("meterworkcaractualfirst:view")
+    @PostMapping(value = "/getNetFilterCheck")
+    public RESTfulResult getNetFilterCheck(@RequestBody(required = false) HashMap params) {
+        try {
+            PageList<HashMap> list = meterWorkRailwayActualService.getNetFilterCheck(params);
+            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("meterworkcaractualfirst:view")
+    @PostMapping(value = "/getNetFilterCheckWeightReversal")
+    public RESTfulResult getNetFilterCheckWeightReversal(@RequestBody(required = false) HashMap params) {
+        try {
+            PageList<HashMap> list = meterWorkRailwayActualService.getNetFilterCheckWeightReversal(params);
+            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 = "/getConfigQuery/")
+    public RESTfulResult getConfigQuery(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            RESTfulResult list = meterWorkRailwayActualService.getConfigQuery(parmas, pageNum, pageSize);
+            return list;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -66,4 +66,8 @@ public interface MeterWorkRailwayActualMapper extends IBaseMapper<MeterWorkRailw
     List<HashMap> countDayAllState(Map<String, Object> params);
 
     List<MeterWorkRailwayActual> autoPrintRailway2(HashMap<String, Object> params);
+
+    List<HashMap> getNetFilterCheck(HashMap params);
+
+    List<HashMap> getNetFilterCheckWeightReversal(HashMap params);
 }

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

@@ -4317,6 +4317,9 @@
     <include refid="select" />
     <where>
       1 = 1
+      <if test="conveyanceType != null and conveyanceType != ''">
+        and CONVEYANCE_TYPE = #{conveyanceType}
+      </if>
       <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
         and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
       </if>
@@ -5424,4 +5427,103 @@
     A.net_man_no,
     A.net_man_name
   </select>
+  <select id="getNetFilterCheck" resultType="java.util.LinkedHashMap">
+    <include refid="select"></include>
+    <where>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO = #{railwayTypeNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and prediction_no LIKE '%${predictionNo}%'
+      </if>
+      <if test="senderRemark != null and senderRemark != ''">
+        and sender_remark LIKE '%${senderRemark}%'
+      </if>
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and railway_no like '%${railwayNo}%'
+      </if>
+      <if test="netSpot3No != null and netSpot3No != ''">
+        and net_spot3_no like '%${netSpot3No}%'
+      </if>
+      <if test="netSpot3Name != null and netSpot3Name != ''">
+        and net_spot3_name like '%${netSpot3Name}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and matter_no LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and matter_name LIKE '%${matterName}%'
+      </if>
+      <if test="minWgt != null and minWgt != ''">
+        and NET_WEIGHT/1000 >= '${minWgt}'
+      </if>
+      <if test="maxWgt != null and maxWgt != ''">
+        and NET_WEIGHT/1000 &lt;= '${maxWgt}'
+      </if>
+    </where>
+    order by net_time desc
+  </select>
+  <select id="getNetFilterCheckWeightReversal" resultType="java.util.LinkedHashMap">
+    <include refid="select"></include>
+    <where>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO = #{railwayTypeNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and prediction_no LIKE '%${predictionNo}%'
+      </if>
+      <if test="senderRemark != null and senderRemark != ''">
+        and sender_remark LIKE '%${senderRemark}%'
+      </if>
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and railway_no like '%${railwayNo}%'
+      </if>
+      <if test="netSpot3No != null and netSpot3No != ''">
+        and net_spot3_no like '%${netSpot3No}%'
+      </if>
+      <if test="netSpot3Name != null and netSpot3Name != ''">
+        and net_spot3_name like '%${netSpot3Name}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and matter_no LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and matter_name LIKE '%${matterName}%'
+      </if>
+      <if test="minWgt != null and minWgt != '' and maxWgt != null and maxWgt != ''">
+        and (NET_WEIGHT/1000 &lt; '${minWgt}' or NET_WEIGHT/1000 > '${maxWgt}')
+      </if>
+    </where>
+    order by net_time desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/model/MeterWorkRailwayActual.java

@@ -747,6 +747,8 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     @ApiModelProperty(value="三级审核状态",required=false)
     private String checkFlag2;
 
+    private String isOut;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1743,6 +1745,14 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         this.checkFlag2 = checkFlag2 == null ? null : checkFlag2.trim();
     }
 
+    public String getIsOut() {
+        return isOut;
+    }
+
+    public void setIsOut(String isOut) {
+        this.isOut = isOut;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1876,4 +1886,4 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         sb.append("]");
         return sb.toString();
     }
-}
+}

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/model/MeterWorkRailwayActualIsOut.java

@@ -0,0 +1,34 @@
+package com.steerinfo.meterwork.meterworkrailwayactual.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class MeterWorkRailwayActualIsOut{
+    private MeterWorkRailwayActual meterWorkRailwayActual;
+    /**
+     * 1：正常
+     * 0：超差
+     */
+    private Integer isOut;
+
+    public MeterWorkRailwayActual getMeterWorkRailwayActual() {
+        return meterWorkRailwayActual;
+    }
+
+    public void setMeterWorkRailwayActual(MeterWorkRailwayActual meterWorkRailwayActual) {
+        this.meterWorkRailwayActual = meterWorkRailwayActual;
+    }
+
+    public Integer getIsOut() {
+        return isOut;
+    }
+
+    public void setIsOut(Integer isOut) {
+        this.isOut = isOut;
+    }
+}

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

@@ -137,4 +137,10 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     RESTfulResult auditRailwayActual(List<MeterWorkRailwayActual> models, String memo);
 
     RESTfulResult autoPrintRailway2(HashMap<String, Object> map);
-}
+
+    PageList<HashMap> getNetFilterCheck(HashMap params);
+
+    PageList<HashMap> getNetFilterCheckWeightReversal(HashMap params);
+
+    RESTfulResult getConfigQuery(HashMap parmas, Integer pageNum, Integer pageSize);
+}

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

@@ -13,6 +13,7 @@ import com.steerinfo.baseinfo.meterbaseuserprintconfig.mapper.MeterBaseUserPrint
 import com.steerinfo.baseinfo.meterbaseuserprintconfig.model.MeterBaseUserPrintConfig;
 import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.mapper.MeterBaseVehicleRangeConfigMapper;
 import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.service.IMeterBaseVehicleRangeConfigService;
 import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.mapper.MeterBaseVehicleRangePrintConfigMapper;
 import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.model.MeterBaseVehicleRangePrintConfig;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -114,6 +115,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     @Autowired
     IMeterWorkRailwayActFirstService meterWorkRailwayActFirstService;
 
+    @Autowired
+    IMeterBaseVehicleRangeConfigService meterBaseVehicleRangeConfigService;
+
     @Override
     protected IBaseMapper<MeterWorkRailwayActual, String> getMapper() {
         return meterWorkRailwayActualMapper;
@@ -3224,8 +3228,6 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     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");
@@ -3241,17 +3243,19 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                             && 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);
+                            //判断毛重大于毛重上限并且毛重小于毛重下限/
+                            if(model.getGrossWeight().compareTo(new BigDecimal(configModel.getGrossWeightUpper())) == -1
+                                && model.getGrossWeight().compareTo(new BigDecimal(configModel.getGrossWeightLower())) == 1) {
+                                model.setIsOut("1");
+                            }else {
+                                model.setIsOut("0");
                             }
                         }
                     }
                 }
             }
         }
-        PageList pageInfo = new PageList(rowsTemp);
+        PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
 
@@ -3285,14 +3289,16 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                                     || 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);
+                                model.setIsOut("1");
+                            }else {
+                                model.setIsOut("0");
                             }
                         }
                     }
                 }
             }
         }
-        PageList pageInfo = new PageList(rowsTemp);
+        PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
 
@@ -3481,6 +3487,52 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         return rm;
     }
 
+    @Override
+    public PageList<HashMap> getNetFilterCheck(HashMap params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<HashMap> meterWorkCarActualFirsts = meterWorkRailwayActualMapper.getNetFilterCheck(params);
+        PageList pageInfo = new PageList(meterWorkCarActualFirsts);
+        return pageInfo;
+    }
+
+    @Override
+    public PageList<HashMap> getNetFilterCheckWeightReversal(HashMap params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<HashMap> meterWorkCarActualFirsts = meterWorkRailwayActualMapper.getNetFilterCheckWeightReversal(params);
+        PageList pageInfo = new PageList(meterWorkCarActualFirsts);
+        return pageInfo;
+    }
+
+    @Override
+    public RESTfulResult getConfigQuery(HashMap parmas, Integer pageNum, Integer pageSize) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setSucceed();
+        //查询配置
+        List<MeterBaseVehicleRangeConfig> query = meterBaseVehicleRangeConfigService.query(parmas);
+        if(query==null||query.size()==0){
+            rm.setFailed();
+            rm.setMessage("未查询出配置");
+            return rm;
+        }
+        if(query.size()>1){
+            rm.setFailed();
+            rm.setMessage("查询配置数大于1");
+            return rm;
+        }
+        MeterBaseVehicleRangeConfig meterBaseVehicleRangeConfig = query.get(0);
+
+        parmas.put("minGrossWeight",meterBaseVehicleRangeConfig.getGrossWeightLower());
+        parmas.put("maxGrossWeight",meterBaseVehicleRangeConfig.getGrossWeightUpper());
+
+        parmas.put("minNetWeight",meterBaseVehicleRangeConfig.getNetWeightLower());
+        parmas.put("maxNetWeight",meterBaseVehicleRangeConfig.getNetWeightUpper());
+        PageHelper.startPage(pageNum,pageSize);
+        //meterworkrailway
+
+        //根据配置查询
+        return null;
+    }
+
     @Override
     public String subStr(String str, String flag) {
         String[] ss = str.split(",");

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/IMeterWorkRailwayReceivedService.java

@@ -38,5 +38,4 @@ public interface IMeterWorkRailwayReceivedService extends IBaseService<MeterWork
     RESTfulResult addList(List<MeterWorkRailwayReceived> models);
 
     PageList<MeterWorkRailwayReceived> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
-
-}
+}