后端修改

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/controller/MeterBaseRailwayCarriageWeightController.java

@@ -0,0 +1,134 @@
+package com.steerinfo.baseinfo.meterbaserailwaycarriageweight.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.service.IMeterBaseRailwayCarriageWeightService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import oracle.ucp.proxy.annotation.Post;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseRailwayCarriageWeight RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-06-27 10:16
+ * 类描述
+ * 修订历史：
+ * 日期：2022-06-27
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseRailwayCarriageWeight RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbaserailwaycarriageweights")
+public class MeterBaseRailwayCarriageWeightController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseRailwayCarriageWeightService meterBaseRailwayCarriageWeightService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaserailwaycarriageweight:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseRailwayCarriageWeight> list = meterBaseRailwayCarriageWeightService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaserailwaycarriageweight:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseRailwayCarriageWeight> list = meterBaseRailwayCarriageWeightService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseRailwayCarriageWeight对象创建")
+    @ApiImplicitParam(name = "meterBaseRailwayCarriageWeight", value = "详细实体meterBaseRailwayCarriageWeight", required = true, dataType = "MeterBaseRailwayCarriageWeight")
+    //@RequiresPermissions("meterbaserailwaycarriageweight:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterBaseRailwayCarriageWeight model){
+        model.setCarriageWeightNo(meterBaseRailwayCarriageWeightService.creatId());
+        MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight = meterBaseRailwayCarriageWeightService.add(model);
+        return success(meterBaseRailwayCarriageWeight);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaserailwaycarriageweight:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight = meterBaseRailwayCarriageWeightService.getById(id);
+        return success(meterBaseRailwayCarriageWeight);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseRailwayCarriageWeight信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseRailwayCarriageWeight", value = "详细实体meterBaseRailwayCarriageWeight", required = true, dataType = "MeterBaseRailwayCarriageWeight")
+    })
+    //@RequiresPermissions("meterbaserailwaycarriageweight:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseRailwayCarriageWeight model){
+        model.setId(id);
+        MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight = meterBaseRailwayCarriageWeightService.modify(model);
+        return success(meterBaseRailwayCarriageWeight);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaserailwaycarriageweight:delete")
+    @DeleteMapping(value = "/{id}")//String
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<String> ids = ListUtils.convertList(list);
+			  meterBaseRailwayCarriageWeightService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="根据时间查询", notes="根据时间查询")
+    //@RequiresPermissions("meterbaserailwaycarriageweight:delete")
+    @GetMapping(value = "/queryByTime")//String
+    public RESTfulResult queryByTime(@RequestParam HashMap<String,Object> map,Integer pageNum, Integer pageSize){
+
+        PageList<MeterBaseRailwayCarriageWeight> list = meterBaseRailwayCarriageWeightService.queryByTimeForPage(map,pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="逻辑删除", notes="逻辑删除")
+    //@RequiresPermissions("meterbaserailwaycarriageweight:delete")
+    @PutMapping(value = "/deleteByLogic")//String
+    public RESTfulResult deleteByLogic(@RequestParam String id){
+        //判断主键是否存在
+        MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight = meterBaseRailwayCarriageWeightService.queryByById(id);
+        if (meterBaseRailwayCarriageWeight == null){
+            return failed(null,"找不到主键对应的值");
+        }
+        meterBaseRailwayCarriageWeight.setValueFlag("1");
+        meterBaseRailwayCarriageWeightService.deleteByLogic(meterBaseRailwayCarriageWeight);
+        return success(null,"删除成功");
+    }
+
+}

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/mapper/MeterBaseRailwayCarriageWeightMapper.java

@@ -0,0 +1,17 @@
+package com.steerinfo.baseinfo.meterbaserailwaycarriageweight.mapper;
+
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterBaseRailwayCarriageWeightMapper extends IBaseMapper<MeterBaseRailwayCarriageWeight, String> {
+    //生成流水号
+    String GetNewID();
+
+    List<MeterBaseRailwayCarriageWeight> queryByTime(HashMap<String,Object>  map);
+}

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/mapper/MeterBaseRailwayCarriageWeightMapper.xml

@@ -0,0 +1,450 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.baseinfo.meterbaserailwaycarriageweight.mapper.MeterBaseRailwayCarriageWeightMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight">
+    <id column="CARRIAGE_WEIGHT_NO" jdbcType="VARCHAR" property="carriageWeightNo" />
+    <result column="CARRIAGE_CODE" jdbcType="VARCHAR" property="carriageCode" />
+    <result column="CARRIAGE_WEIGHT" jdbcType="DECIMAL" property="carriageWeight" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="CARRIAGE_NAME" jdbcType="VARCHAR" property="carriageName" />
+    <result column="SPOT_NO" jdbcType="VARCHAR" property="spotNo" />
+    <result column="SPOT_NAME" jdbcType="VARCHAR" property="spotName" />
+  </resultMap>
+  <sql id="columns">
+    CARRIAGE_WEIGHT_NO, CARRIAGE_CODE, CARRIAGE_WEIGHT, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CARRIAGE_NAME, SPOT_NO, 
+    SPOT_NAME
+  </sql>
+  <sql id="columns_alias">
+    t.CARRIAGE_WEIGHT_NO, t.CARRIAGE_CODE, t.CARRIAGE_WEIGHT, t.VALUE_FLAG, t.CREATE_MAN_NO, 
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, 
+    t.CARRIAGE_NAME, t.SPOT_NO, t.SPOT_NAME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_RAILWAY_CARRIAGE_WEIGHT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="carriageWeightNo != null and carriageWeightNo != ''">
+        and CARRIAGE_WEIGHT_NO = #{carriageWeightNo}
+      </if>
+      <if test="carriageCode != null and carriageCode != ''">
+        and CARRIAGE_CODE = #{carriageCode}
+      </if>
+      <if test="carriageWeight != null">
+        and CARRIAGE_WEIGHT = #{carriageWeight}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="carriageName != null and carriageName != ''">
+        and CARRIAGE_NAME = #{carriageName}
+      </if>
+      <if test="spotNo != null and spotNo != ''">
+        and SPOT_NO = #{spotNo}
+      </if>
+      <if test="spotName != null and spotName != ''">
+        and SPOT_NAME = #{spotName}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="carriageWeightNo != null and carriageWeightNo != ''">
+        and CARRIAGE_WEIGHT_NO LIKE '%${carriageWeightNo}%'
+      </if>
+      <if test="carriageCode != null and carriageCode != ''">
+        and CARRIAGE_CODE LIKE '%${carriageCode}%'
+      </if>
+      <if test="carriageWeight != null">
+        and CARRIAGE_WEIGHT = #{carriageWeight}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="carriageName != null and carriageName != ''">
+        and CARRIAGE_NAME LIKE '%${carriageName}%'
+      </if>
+      <if test="spotNo != null and spotNo != ''">
+        and SPOT_NO LIKE '%${spotNo}%'
+      </if>
+      <if test="spotName != null and spotName != ''">
+        and SPOT_NAME LIKE '%${spotName}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+    where CARRIAGE_WEIGHT_NO = #{carriageWeightNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+    where 1!=1 
+      <if test="carriageCode != null and carriageCode != ''">
+        or CARRIAGE_CODE = #{carriageCode}
+      </if>
+      <if test="carriageWeight != null">
+        or CARRIAGE_WEIGHT = #{carriageWeight}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="carriageName != null and carriageName != ''">
+        or CARRIAGE_NAME = #{carriageName}
+      </if>
+      <if test="spotNo != null and spotNo != ''">
+        or SPOT_NO = #{spotNo}
+      </if>
+      <if test="spotName != null and spotName != ''">
+        or SPOT_NAME = #{spotName}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight">
+    insert into METER_BASE_RAILWAY_CARRIAGE_WEIGHT (CARRIAGE_WEIGHT_NO, CARRIAGE_CODE, CARRIAGE_WEIGHT, 
+      VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME, CARRIAGE_NAME, SPOT_NO, 
+      SPOT_NAME)
+    values (#{carriageWeightNo,jdbcType=VARCHAR}, #{carriageCode,jdbcType=VARCHAR}, #{carriageWeight,jdbcType=DECIMAL}, 
+      #{valueFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{carriageName,jdbcType=VARCHAR}, #{spotNo,jdbcType=VARCHAR}, 
+      #{spotName,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight">
+    insert into METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="carriageWeightNo != null">
+        CARRIAGE_WEIGHT_NO,
+      </if>
+      <if test="carriageCode != null">
+        CARRIAGE_CODE,
+      </if>
+      <if test="carriageWeight != null">
+        CARRIAGE_WEIGHT,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="carriageName != null">
+        CARRIAGE_NAME,
+      </if>
+      <if test="spotNo != null">
+        SPOT_NO,
+      </if>
+      <if test="spotName != null">
+        SPOT_NAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="carriageWeightNo != null">
+        #{carriageWeightNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carriageCode != null">
+        #{carriageCode,jdbcType=VARCHAR},
+      </if>
+      <if test="carriageWeight != null">
+        #{carriageWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="carriageName != null">
+        #{carriageName,jdbcType=VARCHAR},
+      </if>
+      <if test="spotNo != null">
+        #{spotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="spotName != null">
+        #{spotName,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight">
+    update METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+    set CARRIAGE_CODE = #{carriageCode,jdbcType=VARCHAR},
+      CARRIAGE_WEIGHT = #{carriageWeight,jdbcType=DECIMAL},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      CARRIAGE_NAME = #{carriageName,jdbcType=VARCHAR},
+      SPOT_NO = #{spotNo,jdbcType=VARCHAR},
+      SPOT_NAME = #{spotName,jdbcType=VARCHAR}
+    where CARRIAGE_WEIGHT_NO = #{carriageWeightNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight">
+    update METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+    <set>
+      <if test="carriageCode != null">
+        CARRIAGE_CODE = #{carriageCode,jdbcType=VARCHAR},
+      </if>
+      <if test="carriageWeight != null">
+        CARRIAGE_WEIGHT = #{carriageWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="carriageName != null">
+        CARRIAGE_NAME = #{carriageName,jdbcType=VARCHAR},
+      </if>
+      <if test="spotNo != null">
+        SPOT_NO = #{spotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="spotName != null">
+        SPOT_NAME = #{spotName,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where CARRIAGE_WEIGHT_NO = #{carriageWeightNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where CARRIAGE_WEIGHT_NO = #{carriageWeightNo,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_BASE_RAILWAY_CARRIAGE_WEIGHT 
+      (CARRIAGE_WEIGHT_NO, 
+      CARRIAGE_CODE, CARRIAGE_WEIGHT, 
+      VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME, CARRIAGE_NAME, SPOT_NO, 
+      SPOT_NAME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.carriageWeightNo,jdbcType=VARCHAR}, 
+      #{item.carriageCode,jdbcType=VARCHAR}, #{item.carriageWeight,jdbcType=DECIMAL}, 
+      #{item.valueFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, 
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.carriageName,jdbcType=VARCHAR}, #{item.spotNo,jdbcType=VARCHAR}, 
+      #{item.spotName,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+     set
+       CARRIAGE_WEIGHT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageWeightNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIAGE_CODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageCode,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIAGE_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CARRIAGE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.carriageName,jdbcType=VARCHAR}
+       </foreach>
+       ,SPOT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.spotNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SPOT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CARRIAGE_WEIGHT_NO" close="end">
+          when #{item.carriageWeightNo,jdbcType=VARCHAR} then #{item.spotName,jdbcType=VARCHAR}
+       </foreach>
+     where CARRIAGE_WEIGHT_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.carriageWeightNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+    where CARRIAGE_WEIGHT_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+  <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(COMPARE_SPOT_ID, LENGTH(COMPARE_SPOT_ID) - 4))),0) + 1,5,'0') COMPARE_SPOT_ID
+    FROM METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+  </select>
+
+
+  <select id="queryByTime" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    SELECT * FROM METER_BASE_RAILWAY_CARRIAGE_WEIGHT
+    WHERE 1=1
+    <if test="(beginTime != null and beginTime !='') or (endTime != null and endTime !='')">
+     and   CREATE_TIME BETWEEN to_date(#{beginTime},'YYYY-MM-DD hh24:mi:ss') and to_date(#{endTime},'YYYY-MM-DD hh24:mi:ss')
+    </if>
+    <if test="valueFlag != null and valueFlag != ''" >
+      and VALUE_FLAG = #{valueFlag}
+    </if>
+    <if test="spotNo != null and spotNo != ''" >
+      and SPOT_NO = #{spotNo}
+    </if>
+    <if test="spotName != null and spotName != ''" >
+      and SPOT_NAME = #{spotName}
+    </if>
+    <if test="carriageCode != null and carriageCode != ''" >
+      and CARRIAGE_CODE like #{carriageCode}
+    </if>
+    <if test="carriageName != null and carriageName != ''" >
+      and CARRIAGE_NAME like #{carriageName}
+    </if>
+    order by CREATE_TIME desc
+  </select>
+  
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/model/MeterBaseRailwayCarriageWeight.java

@@ -0,0 +1,227 @@
+package com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="null")
+public class MeterBaseRailwayCarriageWeight implements IBasePO<String> {
+    /**
+     * 主键编号(CARRIAGE_WEIGHT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键编号",required=true)
+    private String carriageWeightNo;
+
+    /**
+     * 火车车厢编号(CARRIAGE_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="火车车厢编号",required=false)
+    private String carriageCode;
+
+    /**
+     * 车厢重量(CARRIAGE_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="车厢重量",required=false)
+    private Long carriageWeight;
+
+    /**
+     * 状态(0:有效 1:无效)(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:有效 1:无效)",required=false)
+    private String valueFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人姓名",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 车厢名称(CARRIAGE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="车厢名称",required=false)
+    private String carriageName;
+
+    /**
+     * 计量站点编号(SPOT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量站点编号",required=false)
+    private String spotNo;
+
+    /**
+     * 计量站点名称(SPOT_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量站点名称",required=false)
+    private String spotName;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.carriageWeightNo;
+    }
+
+    @Override
+    public void setId(String carriageWeightNo) {
+        this.carriageWeightNo = carriageWeightNo == null ? null : carriageWeightNo.trim();
+    }
+
+    public String getCarriageWeightNo() {
+        return carriageWeightNo;
+    }
+
+    public void setCarriageWeightNo(String carriageWeightNo) {
+        this.carriageWeightNo = carriageWeightNo == null ? null : carriageWeightNo.trim();
+    }
+
+    public String getCarriageCode() {
+        return carriageCode;
+    }
+
+    public void setCarriageCode(String carriageCode) {
+        this.carriageCode = carriageCode == null ? null : carriageCode.trim();
+    }
+
+    public Long getCarriageWeight() {
+        return carriageWeight;
+    }
+
+    public void setCarriageWeight(Long carriageWeight) {
+        this.carriageWeight = carriageWeight;
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getCarriageName() {
+        return carriageName;
+    }
+
+    public void setCarriageName(String carriageName) {
+        this.carriageName = carriageName == null ? null : carriageName.trim();
+    }
+
+    public String getSpotNo() {
+        return spotNo;
+    }
+
+    public void setSpotNo(String spotNo) {
+        this.spotNo = spotNo == null ? null : spotNo.trim();
+    }
+
+    public String getSpotName() {
+        return spotName;
+    }
+
+    public void setSpotName(String spotName) {
+        this.spotName = spotName == null ? null : spotName.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", carriageWeightNo=").append(carriageWeightNo);
+        sb.append(", carriageCode=").append(carriageCode);
+        sb.append(", carriageWeight=").append(carriageWeight);
+        sb.append(", valueFlag=").append(valueFlag);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", carriageName=").append(carriageName);
+        sb.append(", spotNo=").append(spotNo);
+        sb.append(", spotName=").append(spotName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/service/IMeterBaseRailwayCarriageWeightService.java

@@ -0,0 +1,37 @@
+package com.steerinfo.baseinfo.meterbaserailwaycarriageweight.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
+import com.steerinfo.framework.service.pagehelper.PageList;
+
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.HashMap;
+
+/**
+ * MeterBaseRailwayCarriageWeight服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-06-27 10:16
+ * 类描述
+ * 修订历史：
+ * 日期：2022-06-27
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseRailwayCarriageWeight服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseRailwayCarriageWeightService extends IBaseService<MeterBaseRailwayCarriageWeight, String>{
+
+    /**
+     * 创建主键
+     * @return 返回主键
+     */
+    String creatId();
+
+    PageList<MeterBaseRailwayCarriageWeight> queryByTimeForPage(HashMap<String,Object>  map, Integer pageNum, Integer pageSize);
+
+    void deleteByLogic(MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight);
+
+    MeterBaseRailwayCarriageWeight queryByById(String id);
+}

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/service/impl/MeterBaseRailwayCarriageWeightServiceImpl.java

@@ -0,0 +1,71 @@
+package com.steerinfo.baseinfo.meterbaserailwaycarriageweight.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.mapper.MeterBaseRailwayCarriageWeightMapper;
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.service.IMeterBaseRailwayCarriageWeightService;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MeterBaseRailwayCarriageWeight服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-06-27 10:16
+ * 类描述
+ * 修订历史：
+ * 日期：2022-06-27
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseRailwayCarriageWeight服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseRailwayCarriageWeightService")
+public class MeterBaseRailwayCarriageWeightServiceImpl extends BaseServiceImpl<MeterBaseRailwayCarriageWeight, String> implements IMeterBaseRailwayCarriageWeightService {
+
+    @Autowired
+    private MeterBaseRailwayCarriageWeightMapper meterBaseRailwayCarriageWeightMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseRailwayCarriageWeight, String> getMapper() {
+        return meterBaseRailwayCarriageWeightMapper;
+    }
+
+    @Override
+    public String creatId() {
+        String id =   new SimpleDateFormat("yyyyMMdd").format(new Date()) + meterBaseRailwayCarriageWeightMapper.GetNewID();
+        //System.out.println(id);
+        return id;
+    }
+
+    @Override
+    public PageList<MeterBaseRailwayCarriageWeight> queryByTimeForPage(HashMap map, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterBaseRailwayCarriageWeight> rows = meterBaseRailwayCarriageWeightMapper.queryByTime(map);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public void deleteByLogic(MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight) {
+        meterBaseRailwayCarriageWeightMapper.updateByPrimaryKeySelective(meterBaseRailwayCarriageWeight);
+    }
+
+    @Override
+    public MeterBaseRailwayCarriageWeight queryByById(String id) {
+       return meterBaseRailwayCarriageWeightMapper.selectByPrimaryKey(id);
+    }
+
+
+
+}

src/main/java/com/steerinfo/baseinfo/meterbaserailwayweight/controller/MeterBaseRailwayWeightController.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -75,6 +76,23 @@ public class MeterBaseRailwayWeightController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaserailwayweight:view")
+    @PostMapping(value = "/noPage")
+    public RESTfulResult noPage(@RequestBody HashMap parmas) {
+        try {
+            List<MeterBaseRailwayWeight> list = meterBaseRailwayWeightService.queryLike(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "创建", notes = "根据MeterBaseRailwayWeight对象创建")
     @ApiImplicitParam(name = "meterBaseRailwayWeight", value = "详细实体meterBaseRailwayWeight", required = true, dataType = "MeterBaseRailwayWeight")
     //@RequiresPermissions("meterbaserailwayweight:create")

src/main/java/com/steerinfo/baseinfo/meterbaserailwayweight/mapper/MeterBaseRailwayWeightMapper.java

@@ -14,4 +14,5 @@ public interface MeterBaseRailwayWeightMapper extends IBaseMapper<MeterBaseRailw
     List<MeterBaseRailwayWeight> selectForUpdate(Map<String, Object> parameters);
 
     List<MeterBaseRailwayWeight> selectForMeter(Map<String, Object> parameters);
+    List<MeterBaseRailwayWeight> noPage(Map<String, Object> var1);
 }

src/main/java/com/steerinfo/baseinfo/meterbaserailwayweight/mapper/MeterBaseRailwayWeightMapper.xml

@@ -597,4 +597,64 @@
       </if>
     </where>
   </select>
+
+  <select id="noPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <where>
+      <if test="railwayPk != null and railwayPk != ''">
+        and RAILWAY_PK LIKE '%${railwayPk}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="railwayWeight != null">
+        and RAILWAY_WEIGHT = #{railwayWeight}
+      </if>
+      <if test="railwayType != null and railwayType != ''">
+        and RAILWAY_TYPE LIKE '%${railwayType}%'
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="termValidity != null">
+        and TERM_VALIDITY = #{termValidity}
+      </if>
+      <if test="tareTypeNo != null and tareTypeNo != ''">
+        and TARE_TYPE_NO LIKE '%${tareTypeNo}%'
+      </if>
+      <if test="tareTypeName != null and tareTypeName != ''">
+        and TARE_TYPE_NAME LIKE '%${tareTypeName}%'
+      </if>
+      <if test="tareType != null and tareType != ''">
+        and TARE_TYPE LIKE '%${tareType}%'
+      </if>
+        and TO_CHAR(#{startTime},'yyyy-MM-dd') >= start_time
+        and TO_CHAR(#{endTime},'yyyy-MM-dd') &lt;= end_time
+    </where>
+    order by CREATE_TIME  desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbaserailwayweight/service/IMeterBaseRailwayWeightService.java

@@ -5,6 +5,7 @@ import com.steerinfo.baseinfo.meterbaserailwayweight.model.MeterBaseRailwayWeigh
 
 import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * MeterBaseRailwayWeight服务接口：
@@ -22,6 +23,7 @@ import java.util.List;
 public interface IMeterBaseRailwayWeightService extends IBaseService<MeterBaseRailwayWeight, String>{
 
     List<MeterBaseRailwayWeight> selectTo(String railwayNo, String flag);
+    List<MeterBaseRailwayWeight> noPage(Map<String, Object> param);
 
     MeterBaseRailwayWeight checkandadd(MeterBaseRailwayWeight model);
 

src/main/java/com/steerinfo/baseinfo/meterbaserailwayweight/service/impl/MeterBaseRailwayWeightServiceImpl.java

@@ -65,6 +65,11 @@ public class MeterBaseRailwayWeightServiceImpl extends BaseServiceImpl<MeterBase
         return null;
     }
 
+    @Override
+    public List<MeterBaseRailwayWeight> noPage(Map<String, Object> param) {
+        return meterBaseRailwayWeightMapper.noPage(param);
+    }
+
     @Override
     @Transactional(rollbackFor=Exception.class)
     public MeterBaseRailwayWeight checkandadd(MeterBaseRailwayWeight model)

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/controller/MeterWorkCompareSpotController.java

@@ -1,8 +1,10 @@
 package com.steerinfo.meterwork.meterworkcomparespot.controller;
 
+import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot;
 import com.steerinfo.meterwork.meterworkcomparespot.service.IMeterWorkCompareSpotService;
@@ -43,7 +45,14 @@ public class MeterWorkCompareSpotController extends BaseRESTfulController {
     @GetMapping(value = "/")
     public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
         PageList<MeterWorkCompareSpot> list = meterWorkCompareSpotService.queryForPage(parmas, pageNum, pageSize);
-        return success(list);
+        List list1 = (List) list;
+        Collections.sort(list1, new Comparator<MeterBaseRailwayCarriageWeight>() {
+            @Override
+            public int compare(MeterBaseRailwayCarriageWeight o1, MeterBaseRailwayCarriageWeight o2) {
+                return o1.getCreateTime().compareTo(o2.getCreateTime());
+            }
+        });
+        return success(list1);
     }
 
     @ApiOperation(value="获取列表", notes="分页模糊查询")
@@ -89,6 +98,27 @@ public class MeterWorkCompareSpotController extends BaseRESTfulController {
         return success(meterWorkCompareSpot);
     }
 
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkCompareSpot信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "meterWorkCompareSpot", value = "详细实体meterWorkCompareSpot", required = true, dataType = "MeterWorkCompareSpot")
+    })
+    //@RequiresPermissions("meterworkcomparespot:update")
+    @PostMapping(value = "/updateModel", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@RequestBody MeterWorkCompareSpot model){
+        String userName = "";
+        try {
+            UserPayload payload = UserPayload.getCurrUser();
+            userName = payload.getUserName();
+        } catch (Exception ex) {
+            userName = "admins";
+        }
+        model.setUpdateManName(userName);
+        model.setUpdateTime(new Date());
+        MeterWorkCompareSpot meterWorkCompareSpot = meterWorkCompareSpotService.modify(model);
+        return success(meterWorkCompareSpot.getCompareSpotId());
+    }
+
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("meterworkcomparespot:delete")
@@ -198,7 +228,7 @@ public class MeterWorkCompareSpotController extends BaseRESTfulController {
                 spot.setUpdateTime(date);
                 //设置更新操作人们姓名
                 spot.setUpdateManName(name);
-                //通过站点名来判断
+                //通过重量和站点名来判断
                 if (spot.getWeightNum2()==null||spot.getBaseSpotName2()==null) {
                     //重量
                     spot.setWeightNum2(weight);
@@ -241,4 +271,22 @@ public class MeterWorkCompareSpotController extends BaseRESTfulController {
         return success(null,"提交成功");
     }
 
+    @ApiOperation(value="提交结果", notes="提交断差结果")
+    @GetMapping(value = "/queryByComparetype/{type}")
+    public RESTfulResult queryByComparetype(@PathVariable String type){
+        if ("0".equals(type)){
+            List<MeterWorkCompareSpot> list = meterWorkCompareSpotService.queryAll();
+            return success(list,"查询成功");
+        }else if ("1".equals(type)){
+            List<MeterWorkCompareSpot> list = meterWorkCompareSpotService.queryByCompareType(type);
+            return success(list,"查询成功");
+        }else if ("2".equals(type)){
+            List<MeterWorkCompareSpot> list = meterWorkCompareSpotService.queryByCompareType(type);
+            return success(list,"查询成功");
+        }else{
+            return failed("","参数传递错误");
+        }
+
+    }
+
 }

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/mapper/MeterWorkCompareSpotMapper.java

@@ -4,6 +4,8 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface MeterWorkCompareSpotMapper extends IBaseMapper<MeterWorkCompareSpot, String> {
     //生成流水号
@@ -16,4 +18,8 @@ public interface MeterWorkCompareSpotMapper extends IBaseMapper<MeterWorkCompare
      * @return 存在：返回最近的主键
      */
     String isExistWithinHour(Integer time,String carNo,String type);
+
+    List<MeterWorkCompareSpot> queryAll();
+
+    List<MeterWorkCompareSpot> queryByCompareType(String type);
 }

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/mapper/MeterWorkCompareSpotMapper.xml

@@ -886,5 +886,13 @@
   <select id="isExistWithinHour" resultType="java.lang.String">
     SELECT COMPARE_SPOT_ID FROM (SELECT * FROM METER_WORK_COMPARE_SPOT WHERE (CREATE_TIME BETWEEN SYSDATE-(#{time}/24) AND SYSDATE) AND CAR_NO = #{carNo} AND COMPARE_TYPE = #{type} ORDER BY CREATE_TIME DESC )  WHERE ROWNUM = 1
   </select>
+
+  <select id="queryAll" resultMap="BaseResultMap">
+    select * from METER_WORK_COMPARE_SPOT ORDER BY CREATE_TIME desc
+  </select>
+
+  <select id="queryByCompareType" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select * from METER_WORK_COMPARE_SPOT where COMPARE_TYPE = #{type}  ORDER BY CREATE_TIME desc
+  </select>
   
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/service/IMeterWorkCompareSpotService.java

@@ -4,6 +4,8 @@ import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot;
 import com.steerinfo.meterwork.meterworkcomparespotscale.model.MeterWorkCompareSpotScale;
 
+import java.util.List;
+
 /**
  * MeterWorkCompareSpot服务接口：
  * @author generator
@@ -51,4 +53,8 @@ public interface IMeterWorkCompareSpotService extends IBaseService<MeterWorkComp
      * @param spot 需要更新的较秤数据
      */
     void updateSpotAndScale(MeterWorkCompareSpotScale scale, MeterWorkCompareSpot spot);
+
+    List<MeterWorkCompareSpot> queryAll();
+
+    List<MeterWorkCompareSpot> queryByCompareType(String type);
 }

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/service/impl/MeterWorkCompareSpotServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * MeterWorkCompareSpot服务实现：
@@ -70,7 +70,15 @@ public class MeterWorkCompareSpotServiceImpl extends BaseServiceImpl<MeterWorkCo
         meterWorkCompareSpotMapper.updateByPrimaryKeySelective(spot);
     }
 
+    @Override
+    public List<MeterWorkCompareSpot> queryAll() {
+        return meterWorkCompareSpotMapper.queryAll();
+    }
 
+    @Override
+    public List<MeterWorkCompareSpot> queryByCompareType(String type) {
 
+        return meterWorkCompareSpotMapper.queryByCompareType(type);
+    }
 
 }

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/controller/MeterWorkCompareSpotScaleController.java

@@ -348,4 +348,10 @@ public class MeterWorkCompareSpotScaleController extends BaseRESTfulController {
 
     }
 
+    @ApiOperation(value = "查询预约",notes = "查询24以内所有预约")
+    @GetMapping(value = "/getALLScaleNo")
+    public RESTfulResult getAllScaleNo(){
+        List<MeterWorkCompareSpotScale> allScaleNo = meterWorkCompareSpotScaleService.getAllScaleNo();
+        return success(allScaleNo,"查询成功");
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/mapper/MeterWorkCompareSpotScaleMapper.java

@@ -2,9 +2,10 @@ package com.steerinfo.meterwork.meterworkcomparespotscale.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.meterworkcomparespotscale.model.MeterWorkCompareSpotScale;
-import java.math.*;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface MeterWorkCompareSpotScaleMapper extends IBaseMapper<MeterWorkCompareSpotScale, String> {
     //生成流水号
@@ -16,4 +17,6 @@ public interface MeterWorkCompareSpotScaleMapper extends IBaseMapper<MeterWorkCo
      * @return 存在：返回最近的主键
      */
     String isExistWithinHour(Integer time,String carNo);
+
+    List<MeterWorkCompareSpotScale> getAllScaleNo();
 }

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/mapper/MeterWorkCompareSpotScaleMapper.xml

@@ -373,4 +373,8 @@
     SELECT COMPARE_SPOT_SCALE_ID FROM (SELECT * FROM METER_WORK_COMPARE_SPOT_SCALE WHERE (CREATE_TIME BETWEEN SYSDATE-(#{time}/24) AND SYSDATE) AND CAR_NO = #{carNo} AND VALUE_FLAG = 1 ORDER BY CREATE_TIME DESC )  WHERE ROWNUM = 1
   </select>
   
+  <select id="getAllScaleNo" resultMap="BaseResultMap">
+    SELECT * FROM METER_WORK_COMPARE_SPOT_SCALE WHERE (CREATE_TIME BETWEEN SYSDATE-1 AND SYSDATE) AND VALUE_FLAG != 0 ORDER BY CREATE_TIME DESC
+  </select>
+  
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/service/IMeterWorkCompareSpotScaleService.java

@@ -3,6 +3,9 @@ package com.steerinfo.meterwork.meterworkcomparespotscale.service;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot;
 import com.steerinfo.meterwork.meterworkcomparespotscale.model.MeterWorkCompareSpotScale;
+
+import java.util.List;
+
 /**
  * MeterWorkCompareSpotScale服务接口：
  * @author generator
@@ -36,4 +39,6 @@ public interface IMeterWorkCompareSpotScaleService extends IBaseService<MeterWor
      * @param scale 需要新增比对预约的数据
      */
     void creatSpotAndScale(MeterWorkCompareSpot spot, MeterWorkCompareSpotScale scale);
+
+    List<MeterWorkCompareSpotScale> getAllScaleNo();
 }

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/service/impl/MeterWorkCompareSpotScaleServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * MeterWorkCompareSpotScale服务实现：
@@ -61,5 +61,10 @@ public class MeterWorkCompareSpotScaleServiceImpl extends BaseServiceImpl<MeterW
         meterWorkCompareSpotMapper.insertSelective(spot);
     }
 
+    @Override
+    public List<MeterWorkCompareSpotScale> getAllScaleNo() {
+       return meterWorkCompareSpotScaleMapper.getAllScaleNo();
+    }
+
 
 }

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

@@ -1152,6 +1152,26 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "动态衡维护界面--对从表数据进行标准皮洁净", notes = "根据毛的MeterWorkRailwayMotorialReceivedt对象进行批量匹配洁净保存")
+    @PostMapping(value = "/doAddNetWeight")
+    public RESTfulResult doAddNetWeight(@RequestBody CommonCombination<MeterBaseRailwayWeight,MeterWorkRailwayMotorialReceived, MeterBaseRailwayWeight,MeterBaseRailwayWeight> com) {
+        RESTfulResult rm = failed();
+        try {
+            if(Objects.nonNull(com.getOne()) && Objects.nonNull(com.getTwo())) {
+                rm = meterWorkRailwayActFirstService.doAddNetWeight(com.getTwo(),com.getOne());
+            }else if(Objects.isNull(com.getOne())){
+                rm.setMessage("选择一条AI标志皮重数据进行匹配洁净保存，请确认！！");
+            }else if(Objects.isNull(com.getTwo())) {
+                rm.setMessage("选择一条一次数据进行匹配洁净保存，请确认！！");
+            }
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
+
     @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
     @PostMapping(value = "/selfServiceMeasurement")
     public RESTfulResult selfServiceMeasurement(@RequestBody MeterWorkRailwayActFirst first) {

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

@@ -113,6 +113,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult doAddRailNetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterWorkRailwayActFirst> tareModels);
     RESTfulResult doAddRailAINetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterBaseRailwayAiweight> tareModels);
     RESTfulResult doAddNetInnerWf(MeterWorkRailwayMotorialReceived grossModel, MeterBaseRailwayAiweight tareModel);
+    RESTfulResult doAddNetWeight(MeterWorkRailwayMotorialReceived grossModel, MeterBaseRailwayWeight tareModel);
 
     RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first);
     RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActFirst> models);

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

@@ -87,6 +87,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Resource
     private IMeterWorkRailwayScheduledHelpService meterWorkRailwayScheduledHelpService;
 
+    @Resource
+    private MeterBaseRailwayWeightMapper meterBaseRailwayWeightMapper;
+
     @Resource
     private MeterWorkRailwayScheduledHelpMapper meterWorkRailwayScheduledHelpMapper;
 
@@ -114,9 +117,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Resource
     private MeterBaseRailwayHisTareDetailMapper meterBaseRailwayHisTareDetailMapper;
 
-    @Resource
-    private MeterBaseRailwayWeightMapper meterBaseRailwayWeightMapper;
-
     @Override
     protected IBaseMapper<MeterWorkRailwayActFirst, String> getMapper() {
         return meterWorkRailwayActFirstMapper;
@@ -4400,6 +4400,122 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return rm;
     }
 
+    @Override
+    public RESTfulResult doAddNetWeight(MeterWorkRailwayMotorialReceived received, MeterBaseRailwayWeight first) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+            String userId = "", userName = "";
+            try {
+                UserPayload payload = UserPayload.getCurrUser();
+                userId = payload.getId();
+                userName = payload.getUserName();
+            } catch (Exception ex) {
+                userId = "admin";
+                userName = "admins";
+            }
+
+            Assert.isTrue(received.getRailwayNo().equals(first.getRailwayNo()), "车号不一致,请重新选择！");
+            //两个车号一样则匹配，否则则不匹配
+            if (received.getRailwayNo().equals(first.getRailwayNo())) {
+                MeterWorkRailwayActFirst AIFirst = new MeterWorkRailwayActFirst();
+                //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
+                preRailwayScaleMapper.updateMeterWorkRailwayReceived(received.getActualFirstNo());
+
+                //将一次表中的皮重设置为已洁净
+                String firstNo = afl + meterWorkRailwayActFirstMapper.getNewID(afl);
+                AIFirst.setActualFirstNo(firstNo);
+                AIFirst.setValueFlag("2");
+                AIFirst.setRailwayNo(first.getRailwayNo());
+                AIFirst.setMeterWeight(first.getRailwayWeight());
+                AIFirst.setRailwayTypeNo(first.getRailwayTypeNo());
+                AIFirst.setRailwayTypeName(first.getRailwayTypeName());
+                AIFirst.setCreateManNo(first.getCreateManNo());
+                AIFirst.setCreateManName(first.getCreateManName());
+                AIFirst.setCreateTime(first.getCreateTime());
+                AIFirst.setConveyanceType(first.getRailwayType());
+                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(AIFirst);
+
+                //新增一条毛重信息
+                MeterWorkRailwayActFirst second = new MeterWorkRailwayActFirst();
+                second.setActualFirstNo(received.getActualFirstNo());
+                second.setValueFlag("2");
+                second.setRailwayNo(received.getRailwayNo());
+                second.setRailwayCarriageNo(received.getRailwayCarriageNo());
+                second.setRailwaySpeed(received.getRailwaySpeed());
+                second.setMeterWeight(received.getMeterWeight());
+                second.setCreateTime(received.getCreateTime());
+                second.setCreateManNo(userId);
+                second.setCreateManName(userName);
+                second.setWeightType("0");
+                second.setRailwayTypeNo(received.getRailwayTypeNo());
+                second.setRailwayTypeName(received.getRailwayTypeName());
+                second.setBaseSpotNo(received.getBaseSpotNo());
+                second.setBaseSpotName(received.getBaseSpotName());
+                second.setShipmentGrossWeight(received.getShipmentGrossWeight());
+                second.setShipmentNetWeight(received.getShipmentNetWeight());
+                second.setRailwayModelName(received.getRailwayModel());
+                meterWorkRailwayActFirstMapper.insertSelective(second);
+
+                //新增一条洁净数据
+                MeterWorkRailwayActual netRail = new MeterWorkRailwayActual();
+                String netNo = meterWorkRailwayActualMapper.getNewID(afl);
+                netRail.setActualNo(afl + netNo);
+                netRail.setRailwayNo(received.getRailwayNo());
+                netRail.setRailwayCarriageNo(received.getRailwayCarriageNo());
+                netRail.setGrossWeight(received.getMeterWeight());
+                netRail.setGrossMode("1");
+                netRail.setGrossManNo(userId);
+                netRail.setGrossManName(userName);
+                netRail.setGrossTime(received.getCreateTime());
+                netRail.setGrossClass(received.getShipmentGrossWeight() + ""); //左右偏载
+                netRail.setGrossGroup(received.getShipmentNetWeight() + "");//前后偏载
+                netRail.setBaseSpot1No(received.getBaseSpotNo());
+                netRail.setBaseSpot1Name(received.getBaseSpotName());
+                netRail.setActualFirst1No(second.getActualFirstNo());
+                netRail.setRailwayTypeNo(received.getRailwayTypeNo());
+                netRail.setRailwayTypeName(received.getRailwayTypeName());
+                netRail.setConveyanceType(received.getRailwayModel());
+                //netRail.setRailwayModelName(received.getRailwayModel());
+                netRail.setTareWeight(AIFirst.getMeterWeight());
+                netRail.setTareManNo(userId);
+                netRail.setTareManName(userName);
+                netRail.setTareTime(AIFirst.getCreateTime());
+                netRail.setTareMode("1");
+                netRail.setTareClass(second.getShipmentGrossWeight() + ""); //左右偏载
+                netRail.setTareGroup(second.getShipmentNetWeight() + "");//前后偏载
+                netRail.setBaseSpot2No(second.getBaseSpotNo());
+                netRail.setBaseSpot2Name(second.getBaseSpotName());
+                netRail.setActualFirst2No(second.getActualFirstNo());
+                netRail.setNetMode("1");
+                netRail.setNetWeight(second.getMeterWeight().subtract(AIFirst.getMeterWeight()));
+                netRail.setNetTime(new Date());
+                netRail.setNetManNo(userId);
+                netRail.setNetManName(userName);
+                netRail.setNetSpot3No(received.getBaseSpotNo());
+                netRail.setNetSpot3Name(received.getBaseSpotName());
+                netRail.setValueFlag("0");
+                netRail.setUploadFlag("0");
+                netRail.setMeterTypeNo(received.getMeterTypeNo());
+                netRail.setMeterTypeName(received.getMeterTypeName());
+                int i = meterWorkRailwayActualMapper.insertSelective(netRail);
+
+                if (i >= 1) {
+                    meterWorkRailwayActFirstMapper.deleteByPrimaryKey(firstNo);
+                }
+            }
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("操作成功,匹配标准皮洁净成功！！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常,请确认！！！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
     @Override
     public RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first) {
         RESTfulResult rm = new RESTfulResult();

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

@@ -1775,10 +1775,11 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             return rm;
         }
         //models必须是2个，而且他们的预报组合号一致
-        if(!models.get(0).getPredictionCombination().equals(models.get(1).getPredictionCombination())){
-            rm.setMessage("必须选择两个预报组合号一致的洁净数据!!!");
-            return rm;
-        }
+//        if(!models.get(0).getPredictionCombination().equals(models.get(1).getPredictionCombination())){
+//            rm.setMessage("必须选择两个预报组合号一致的洁净数据!!!");
+//            return rm;
+//        }
+
         for(MeterWorkRailwayActual modelTemp: models) {
             PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
             if(scaleTemp.getValueFlag().equals("9")) {