后端修改

src/main/java/com/steerinfo/baseinfo/meterbasespecialunit/controller/MeterBaseSpecialUnitController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.baseinfo.meterbasespecialunit.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.meterbasespecialunit.model.MeterBaseSpecialUnit;
+import com.steerinfo.baseinfo.meterbasespecialunit.service.IMeterBaseSpecialUnitService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+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.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseSpecialUnit RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-05-06 10:02
+ * 类描述
+ * 修订历史：
+ * 日期：2022-05-06
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseSpecialUnit RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbasespecialunits")
+public class MeterBaseSpecialUnitController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseSpecialUnitService meterBaseSpecialUnitService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasespecialunit:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseSpecialUnit> list = meterBaseSpecialUnitService.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("meterbasespecialunit:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseSpecialUnit> list = meterBaseSpecialUnitService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseSpecialUnit对象创建")
+    @ApiImplicitParam(name = "meterBaseSpecialUnit", value = "详细实体meterBaseSpecialUnit", required = true, dataType = "MeterBaseSpecialUnit")
+    //@RequiresPermissions("meterbasespecialunit:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterBaseSpecialUnit model){
+        MeterBaseSpecialUnit meterBaseSpecialUnit = meterBaseSpecialUnitService.add(model);
+        return success(meterBaseSpecialUnit);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasespecialunit:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseSpecialUnit meterBaseSpecialUnit = meterBaseSpecialUnitService.getById(id);
+        return success(meterBaseSpecialUnit);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseSpecialUnit信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseSpecialUnit", value = "详细实体meterBaseSpecialUnit", required = true, dataType = "MeterBaseSpecialUnit")
+    })
+    //@RequiresPermissions("meterbasespecialunit:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseSpecialUnit model){
+        model.setId(id);
+        MeterBaseSpecialUnit meterBaseSpecialUnit = meterBaseSpecialUnitService.modify(model);
+        return success(meterBaseSpecialUnit);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasespecialunit: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);
+			  meterBaseSpecialUnitService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasespecialunit/mapper/MeterBaseSpecialUnitMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.baseinfo.meterbasespecialunit.mapper;
+
+import com.steerinfo.baseinfo.meterbasespecialunit.model.MeterBaseSpecialUnit;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterBaseSpecialUnitMapper extends IBaseMapper<MeterBaseSpecialUnit, String> {
+}

src/main/java/com/steerinfo/baseinfo/meterbasespecialunit/mapper/MeterBaseSpecialUnitMapper.xml

@@ -0,0 +1,238 @@
+<?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.meterbasespecialunit.mapper.MeterBaseSpecialUnitMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbasespecialunit.model.MeterBaseSpecialUnit">
+    <id column="UNIT_NO" jdbcType="VARCHAR" property="unitNo" />
+    <result column="UNIT_NAME" jdbcType="VARCHAR" property="unitName" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    UNIT_NO, UNIT_NAME, VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.UNIT_NO, t.UNIT_NAME, t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_SPECIAL_UNIT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_SPECIAL_UNIT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="unitNo != null and unitNo != ''">
+        and UNIT_NO = #{unitNo}
+      </if>
+      <if test="unitName != null and unitName != ''">
+        and UNIT_NAME = #{unitName}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="unitNo != null and unitNo != ''">
+        and UNIT_NO LIKE '%${unitNo}%'
+      </if>
+      <if test="unitName != null and unitName != ''">
+        and UNIT_NAME LIKE '%${unitName}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_SPECIAL_UNIT
+    where UNIT_NO = #{unitNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_SPECIAL_UNIT
+    where 1!=1 
+      <if test="unitName != null and unitName != ''">
+        or UNIT_NAME = #{unitName}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasespecialunit.model.MeterBaseSpecialUnit">
+    insert into METER_BASE_SPECIAL_UNIT (UNIT_NO, UNIT_NAME, VALID_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME
+      )
+    values (#{unitNo,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasespecialunit.model.MeterBaseSpecialUnit">
+    insert into METER_BASE_SPECIAL_UNIT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="unitNo != null">
+        UNIT_NO,
+      </if>
+      <if test="unitName != null">
+        UNIT_NAME,
+      </if>
+      <if test="validFlag != null">
+        VALID_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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="unitNo != null">
+        #{unitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="unitName != null">
+        #{unitName,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasespecialunit.model.MeterBaseSpecialUnit">
+    update METER_BASE_SPECIAL_UNIT
+    set UNIT_NAME = #{unitName,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP}
+    where UNIT_NO = #{unitNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasespecialunit.model.MeterBaseSpecialUnit">
+    update METER_BASE_SPECIAL_UNIT
+    <set>
+      <if test="unitName != null">
+        UNIT_NAME = #{unitName,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,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>
+    </set>
+    where UNIT_NO = #{unitNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where UNIT_NO = #{unitNo,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_SPECIAL_UNIT 
+      (UNIT_NO, 
+      UNIT_NAME, VALID_FLAG, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.unitNo,jdbcType=VARCHAR}, 
+      #{item.unitName,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, 
+      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_SPECIAL_UNIT
+     set
+       UNIT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_NO" close="end">
+          when #{item.unitNo,jdbcType=VARCHAR} then #{item.unitNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UNIT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_NO" close="end">
+          when #{item.unitNo,jdbcType=VARCHAR} then #{item.unitName,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_NO" close="end">
+          when #{item.unitNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_NO" close="end">
+          when #{item.unitNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_NO" close="end">
+          when #{item.unitNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case UNIT_NO" close="end">
+          when #{item.unitNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where UNIT_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.unitNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_SPECIAL_UNIT
+    where UNIT_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbasespecialunit/model/MeterBaseSpecialUnit.java

@@ -0,0 +1,122 @@
+package com.steerinfo.baseinfo.meterbasespecialunit.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="特殊单位表")
+public class MeterBaseSpecialUnit implements IBasePO<String> {
+    /**
+     * 特殊单位编号(UNIT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="特殊单位编号",required=true)
+    private String unitNo;
+
+    /**
+     * 特殊单位名称(UNIT_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="特殊单位名称",required=true)
+    private String unitName;
+
+    /**
+     * 状态（0：无效；1:有效）(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（0：无效；1:有效）",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人名称(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人名称",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.unitNo;
+    }
+
+    @Override
+    public void setId(String unitNo) {
+        this.unitNo = unitNo == null ? null : unitNo.trim();
+    }
+
+    public String getUnitNo() {
+        return unitNo;
+    }
+
+    public void setUnitNo(String unitNo) {
+        this.unitNo = unitNo == null ? null : unitNo.trim();
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName == null ? null : unitName.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", unitNo=").append(unitNo);
+        sb.append(", unitName=").append(unitName);
+        sb.append(", validFlag=").append(validFlag);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasespecialunit/service/IMeterBaseSpecialUnitService.java

@@ -0,0 +1,23 @@
+package com.steerinfo.baseinfo.meterbasespecialunit.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.baseinfo.meterbasespecialunit.model.MeterBaseSpecialUnit;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseSpecialUnit服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-05-06 10:02
+ * 类描述
+ * 修订历史：
+ * 日期：2022-05-06
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseSpecialUnit服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseSpecialUnitService extends IBaseService<MeterBaseSpecialUnit, String>{
+
+}

src/main/java/com/steerinfo/baseinfo/meterbasespecialunit/service/impl/MeterBaseSpecialUnitServiceImpl.java

@@ -0,0 +1,36 @@
+package com.steerinfo.baseinfo.meterbasespecialunit.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.baseinfo.meterbasespecialunit.model.MeterBaseSpecialUnit;
+import com.steerinfo.baseinfo.meterbasespecialunit.mapper.MeterBaseSpecialUnitMapper;
+import com.steerinfo.baseinfo.meterbasespecialunit.service.IMeterBaseSpecialUnitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseSpecialUnit服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-05-06 10:02
+ * 类描述
+ * 修订历史：
+ * 日期：2022-05-06
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseSpecialUnit服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseSpecialUnitService")
+public class MeterBaseSpecialUnitServiceImpl extends BaseServiceImpl<MeterBaseSpecialUnit, String> implements IMeterBaseSpecialUnitService {
+
+    @Autowired
+    private MeterBaseSpecialUnitMapper meterBaseSpecialUnitMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseSpecialUnit, String> getMapper() {
+        return meterBaseSpecialUnitMapper;
+    }
+}

src/main/java/com/steerinfo/metermonitor/metermonitornote/service/IMeterMonitorNoteService.java

@@ -3,7 +3,6 @@ package com.steerinfo.metermonitor.metermonitornote.service;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
-import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 
 import java.util.HashMap;
 import java.util.List;

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

@@ -1236,55 +1236,18 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             secondDb.setValueFlag("2");//洁净
             meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
-            //修改一次计量数据为洁净
-            MeterWorkCarActualFirst firstUpdate = new MeterWorkCarActualFirst();
-            //2、存储洁净数据
-            if (secondDb.getMeterWeight().equals(netDb.getTareWeight())) {
-                //二次重量如果跟皮重一样
-                netDb.setActualFirst2No(secondDb.getActualFirstNo());
-                firstUpdate.setActualFirstNo(netDb.getActualFirst1No());
-                firstUpdate.setWeightType("0");
-            } else {
-                netDb.setActualFirst1No(secondDb.getActualFirstNo());
-                firstUpdate.setActualFirstNo(netDb.getActualFirst2No());
-                firstUpdate.setWeightType("1");
-            }
-
-            //3、修改第一次存储的计量数据状态为洁净
-            if (firstUpdate.getActualFirstNo() != null) {
-                firstUpdate.setValueFlag("2");
-                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstUpdate);
-            }
-
-            //判断洁净数据是否匹配委托
-            if (StringUtils.isNotEmpty(netDb.getPredictionNo())) {
-                MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(firstUpdate.getActualFirstNo(), netDb.getPredictionNo());
-                meca1.setIsPreScale("1");
-                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
-                PreTrackScale preTrackScale = new PreTrackScale();
-                preTrackScale.setPredictionNo(netDb.getPredictionNo());
-                preTrackScale.setValueFlag("2");
-                preTrackScale.setUploadFlag("1");
-                preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
-            }
-
-            // 判断当前数据是否存在委托
-//            if (netDb.getPredictionNo() != null && "".equals(netDb.getPredictionNo())) {
-//                MeterWorkCarActualFirst gross = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst1No());
-//                if ((gross.getPredictionNo() == null || "".equals(gross.getPredictionNo()))) {
-//                    // 如果毛重数据还未匹配委托，则匹配委托操作
-//                    MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(gross.getActualFirstNo(), netDb.getPredictionNo());
-//                    meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
-//                    PreTrackScale preTrackScale = new PreTrackScale();
-//                    preTrackScale.setPredictionNo(netDb.getPredictionNo());
-//                    preTrackScale.setValueFlag("2");
-//                    preTrackScale.setUploadFlag("1");
-//                    preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
-//                }
-//            }
+            //1、存储当前计量的数据
+            SimpleDateFormat formatterHZ = new SimpleDateFormat("yyyyMMdd");
+            String aflHZ = formatterHZ.format(new Date());
+            String noHZ = meterWorkCarActualFirstMapper.getNewID(aflHZ);
+            once.setActualFirstNo(formatter.format(new Date()) + noHZ);
+            once.setValueFlag("2");//洁净
+            meterWorkCarActualFirstMapper.insertSelective(once);
 
             String no1 = meterWorkCarActualMapper.getNewID(afl);
             netDb.setActualNo(afl + no1);
+            netDb.setActualFirst2No(formatter.format(new Date()) + no);
+            netDb.setActualFirst1No(formatter.format(new Date()) + noHZ);
             if (netDb != null && netDb.getNetWeight() != null) {
                 //2021年3月7日 净重保留两位小数；
                 BigDecimal net;
@@ -1294,44 +1257,15 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             netDb.setUploadFlag("1");
             meterWorkCarActualMapper.insert(netDb);
 
-            //4、如果为期限皮重，则将期限皮重转化为一条皮重计量数据保存
-            MeterWorkCarActualFirst mwraf = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst2No());
-            if (mwraf == null) {
-                MeterBaseTermTareData mbttd = new MeterBaseTermTareData();
-                HashMap mbMap = new HashMap();
-                SimpleDateFormat mbsdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                mbMap.put("endTime",mbsdf.format(new Date()));
-                if(StringUtils.isNotEmpty(netDb.getActualFirst2No())){
-                    mbMap.put("dataNo",netDb.getActualFirst2No());
-                    mbttd = meterBaseTermTareDataMapper.selectByDataNo(mbMap);
-                }
-                else{
-                    mbMap.put("carNo",netDb.getCarNo());
-                    mbttd = meterBaseTermTareDataMapper.selectByCarNo(mbMap);
-                }
-                MeterWorkCarActualFirst imTare = new MeterWorkCarActualFirst();
-                //补充数据
-                String afl1 = formatter.format(new Date());
-                String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
-                imTare.setActualFirstNo(afl1 + imTareNO);
-                imTare.setMeterTypeNo(secondDb.getMeterTypeNo());
-                imTare.setMeterTypeName(secondDb.getMeterTypeName());
-                imTare.setBaseSpotNo(mbttd.getBaseSpotNo());
-                imTare.setBaseSpotName(mbttd.getBaseSpotName());
-                imTare.setCarNo(mbttd.getCarNo());
-                imTare.setCreateTime(mbttd.getCreateTime());
-                imTare.setCreateManNo(mbttd.getCreateManNo());
-                imTare.setCreateManName(mbttd.getCreateManName());
-                imTare.setMeterWeight(netDb.getTareWeight());
-                imTare.setWeightType("2");//期限皮重
-                imTare.setValueFlag("2");//洁净
-                meterWorkCarActualFirstMapper.insertSelective(imTare);
-                //将洁净数据中的皮重编号修改
-                MeterWorkCarActual mwca = new MeterWorkCarActual();
-                mwca.setActualNo(netDb.getActualNo());
-                mwca.setActualFirst2No(imTare.getActualFirstNo());
-                meterWorkCarActualMapper.updateByPrimaryKeySelective(mwca);
-            }
+            //修改委托编号
+            PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(netDb.getPredictionNo());
+            scale.setValueFlag(DbConstants.NET);
+            scale.setUpdateTime(new Date());
+            scale.setUpdateManNo("system");
+            scale.setUpdateManName("混装洁净更新");
+            scale.setUploadFlag("1");
+            scale.setPredictionType("7");
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 
             //4、存储历史皮重及历史皮重明细信息
             if ("1".equals(saveTare)) {
@@ -1354,9 +1288,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //保存日志
             saveNote(note);
 
-            //当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
-            updatePreWeight(secondDb.getCarNo());
-
             updateMonitorOver(secondDb.getActualFirstNo(), secondDb.getBaseSpotNo());
 
             //重量类型为毛重则调用接口为
@@ -1372,13 +1303,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 insertAddWgtNo(secondDb.getActualFirstNo(), secondDb.getAddWgtPk(), secondDb.getCreateManNo(), secondDb.getCreateManName());
             }
 
-            //1、存储当前计量的数据
-            SimpleDateFormat formatterHZ = new SimpleDateFormat("yyyyMMdd");
-            String aflHZ = formatterHZ.format(new Date());
-            String noHZ = meterWorkCarActualFirstMapper.getNewID(aflHZ);
-            once.setActualFirstNo(formatter.format(new Date()) + noHZ);
-            once.setValueFlag("1");//洁净
-            meterWorkCarActualFirstMapper.insertSelective(once);
+
 
             rm.setData(afl + no1);
             rm.setMessage(flag);
@@ -2847,6 +2772,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             if(first03 != null) {
                 String fristNo03 = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
                 first03.setActualFirstNo(fristNo03);
+                first03.setIsPreScale("0");
                 meterWorkCarActualFirstMapper.insertSelective(first03);
             }
             //6、修改计量监控

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

@@ -23,10 +23,10 @@ import java.math.BigDecimal;
 /**
  * MeterWorkCompareSpot RESTful接口：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-05-04 03:26
+ * @version 1.0-SNAPSHORT 2022-05-06 06:28
  * 类描述
  * 修订历史：
- * 日期：2022-05-04
+ * 日期：2022-05-06
  * 作者：generator
  * 参考：
  * 描述：MeterWorkCompareSpot RESTful接口

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

@@ -21,18 +21,33 @@
     <result column="WEIGHT_DATE4" jdbcType="TIMESTAMP" property="weightDate4" />
     <result column="WEIGHT_NUM5" jdbcType="DECIMAL" property="weightNum5" />
     <result column="WEIGHT_DATE5" jdbcType="TIMESTAMP" property="weightDate5" />
+    <result column="BASE_SPOT_NO1" jdbcType="VARCHAR" property="baseSpotNo1" />
+    <result column="BASE_SPOT_NAME1" jdbcType="VARCHAR" property="baseSpotName1" />
+    <result column="BASE_SPOT_NO2" jdbcType="VARCHAR" property="baseSpotNo2" />
+    <result column="BASE_SPOT_NAME2" jdbcType="VARCHAR" property="baseSpotName2" />
+    <result column="BASE_SPOT_NO3" jdbcType="VARCHAR" property="baseSpotNo3" />
+    <result column="BASE_SPOT_NAME3" jdbcType="VARCHAR" property="baseSpotName3" />
+    <result column="BASE_SPOT_NO4" jdbcType="VARCHAR" property="baseSpotNo4" />
+    <result column="BASE_SPOT_NAME4" jdbcType="VARCHAR" property="baseSpotName4" />
+    <result column="BASE_SPOT_NO5" jdbcType="VARCHAR" property="baseSpotNo5" />
+    <result column="BASE_SPOT_NAME5" jdbcType="VARCHAR" property="baseSpotName5" />
+    <result column="COMPARE_TYPE" jdbcType="VARCHAR" property="compareType" />
   </resultMap>
   <sql id="columns">
     COMPARE_SPOT_ID, VALUE_FLAG, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NAME, UPDATE_TIME, 
     CREATE_MAN_PHONE, UPDATE_MAN_PHONE, CAR_NO, WEIGHT_NUM1, WEIGHT_DATE1, WEIGHT_NUM2, 
     WEIGHT_DATE2, WEIGHT_NUM3, WEIGHT_DATE3, WEIGHT_NUM4, WEIGHT_DATE4, WEIGHT_NUM5, 
-    WEIGHT_DATE5
+    WEIGHT_DATE5, BASE_SPOT_NO1, BASE_SPOT_NAME1, BASE_SPOT_NO2, BASE_SPOT_NAME2, BASE_SPOT_NO3, 
+    BASE_SPOT_NAME3, BASE_SPOT_NO4, BASE_SPOT_NAME4, BASE_SPOT_NO5, BASE_SPOT_NAME5, 
+    COMPARE_TYPE
   </sql>
   <sql id="columns_alias">
     t.COMPARE_SPOT_ID, t.VALUE_FLAG, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NAME, 
     t.UPDATE_TIME, t.CREATE_MAN_PHONE, t.UPDATE_MAN_PHONE, t.CAR_NO, t.WEIGHT_NUM1, t.WEIGHT_DATE1, 
     t.WEIGHT_NUM2, t.WEIGHT_DATE2, t.WEIGHT_NUM3, t.WEIGHT_DATE3, t.WEIGHT_NUM4, t.WEIGHT_DATE4, 
-    t.WEIGHT_NUM5, t.WEIGHT_DATE5
+    t.WEIGHT_NUM5, t.WEIGHT_DATE5, t.BASE_SPOT_NO1, t.BASE_SPOT_NAME1, t.BASE_SPOT_NO2, 
+    t.BASE_SPOT_NAME2, t.BASE_SPOT_NO3, t.BASE_SPOT_NAME3, t.BASE_SPOT_NO4, t.BASE_SPOT_NAME4, 
+    t.BASE_SPOT_NO5, t.BASE_SPOT_NAME5, t.COMPARE_TYPE
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_WORK_COMPARE_SPOT
@@ -99,6 +114,39 @@
       <if test="weightDate5 != null">
         and TO_CHAR(WEIGHT_DATE5,'yyyy-MM-dd') = #{weightDate5}
       </if>
+      <if test="baseSpotNo1 != null and baseSpotNo1 != ''">
+        and BASE_SPOT_NO1 = #{baseSpotNo1}
+      </if>
+      <if test="baseSpotName1 != null and baseSpotName1 != ''">
+        and BASE_SPOT_NAME1 = #{baseSpotName1}
+      </if>
+      <if test="baseSpotNo2 != null and baseSpotNo2 != ''">
+        and BASE_SPOT_NO2 = #{baseSpotNo2}
+      </if>
+      <if test="baseSpotName2 != null and baseSpotName2 != ''">
+        and BASE_SPOT_NAME2 = #{baseSpotName2}
+      </if>
+      <if test="baseSpotNo3 != null and baseSpotNo3 != ''">
+        and BASE_SPOT_NO3 = #{baseSpotNo3}
+      </if>
+      <if test="baseSpotName3 != null and baseSpotName3 != ''">
+        and BASE_SPOT_NAME3 = #{baseSpotName3}
+      </if>
+      <if test="baseSpotNo4 != null and baseSpotNo4 != ''">
+        and BASE_SPOT_NO4 = #{baseSpotNo4}
+      </if>
+      <if test="baseSpotName4 != null and baseSpotName4 != ''">
+        and BASE_SPOT_NAME4 = #{baseSpotName4}
+      </if>
+      <if test="baseSpotNo5 != null and baseSpotNo5 != ''">
+        and BASE_SPOT_NO5 = #{baseSpotNo5}
+      </if>
+      <if test="baseSpotName5 != null and baseSpotName5 != ''">
+        and BASE_SPOT_NAME5 = #{baseSpotName5}
+      </if>
+      <if test="compareType != null and compareType != ''">
+        and COMPARE_TYPE = #{compareType}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -160,6 +208,39 @@
       <if test="weightDate5 != null">
         and TO_CHAR(WEIGHT_DATE5,'yyyy-MM-dd') = #{weightDate5}
       </if>
+      <if test="baseSpotNo1 != null and baseSpotNo1 != ''">
+        and BASE_SPOT_NO1 LIKE '%${baseSpotNo1}%'
+      </if>
+      <if test="baseSpotName1 != null and baseSpotName1 != ''">
+        and BASE_SPOT_NAME1 LIKE '%${baseSpotName1}%'
+      </if>
+      <if test="baseSpotNo2 != null and baseSpotNo2 != ''">
+        and BASE_SPOT_NO2 LIKE '%${baseSpotNo2}%'
+      </if>
+      <if test="baseSpotName2 != null and baseSpotName2 != ''">
+        and BASE_SPOT_NAME2 LIKE '%${baseSpotName2}%'
+      </if>
+      <if test="baseSpotNo3 != null and baseSpotNo3 != ''">
+        and BASE_SPOT_NO3 LIKE '%${baseSpotNo3}%'
+      </if>
+      <if test="baseSpotName3 != null and baseSpotName3 != ''">
+        and BASE_SPOT_NAME3 LIKE '%${baseSpotName3}%'
+      </if>
+      <if test="baseSpotNo4 != null and baseSpotNo4 != ''">
+        and BASE_SPOT_NO4 LIKE '%${baseSpotNo4}%'
+      </if>
+      <if test="baseSpotName4 != null and baseSpotName4 != ''">
+        and BASE_SPOT_NAME4 LIKE '%${baseSpotName4}%'
+      </if>
+      <if test="baseSpotNo5 != null and baseSpotNo5 != ''">
+        and BASE_SPOT_NO5 LIKE '%${baseSpotNo5}%'
+      </if>
+      <if test="baseSpotName5 != null and baseSpotName5 != ''">
+        and BASE_SPOT_NAME5 LIKE '%${baseSpotName5}%'
+      </if>
+      <if test="compareType != null and compareType != ''">
+        and COMPARE_TYPE LIKE '%${compareType}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -223,6 +304,39 @@
       <if test="weightDate5 != null">
         or TO_CHAR(WEIGHT_DATE5,'yyyy-MM-dd') = '#{weightDate5}'
       </if>
+      <if test="baseSpotNo1 != null and baseSpotNo1 != ''">
+        or BASE_SPOT_NO1 = #{baseSpotNo1}
+      </if>
+      <if test="baseSpotName1 != null and baseSpotName1 != ''">
+        or BASE_SPOT_NAME1 = #{baseSpotName1}
+      </if>
+      <if test="baseSpotNo2 != null and baseSpotNo2 != ''">
+        or BASE_SPOT_NO2 = #{baseSpotNo2}
+      </if>
+      <if test="baseSpotName2 != null and baseSpotName2 != ''">
+        or BASE_SPOT_NAME2 = #{baseSpotName2}
+      </if>
+      <if test="baseSpotNo3 != null and baseSpotNo3 != ''">
+        or BASE_SPOT_NO3 = #{baseSpotNo3}
+      </if>
+      <if test="baseSpotName3 != null and baseSpotName3 != ''">
+        or BASE_SPOT_NAME3 = #{baseSpotName3}
+      </if>
+      <if test="baseSpotNo4 != null and baseSpotNo4 != ''">
+        or BASE_SPOT_NO4 = #{baseSpotNo4}
+      </if>
+      <if test="baseSpotName4 != null and baseSpotName4 != ''">
+        or BASE_SPOT_NAME4 = #{baseSpotName4}
+      </if>
+      <if test="baseSpotNo5 != null and baseSpotNo5 != ''">
+        or BASE_SPOT_NO5 = #{baseSpotNo5}
+      </if>
+      <if test="baseSpotName5 != null and baseSpotName5 != ''">
+        or BASE_SPOT_NAME5 = #{baseSpotName5}
+      </if>
+      <if test="compareType != null and compareType != ''">
+        or COMPARE_TYPE = #{compareType}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot">
     insert into METER_WORK_COMPARE_SPOT (COMPARE_SPOT_ID, VALUE_FLAG, CREATE_MAN_NAME, 
@@ -231,14 +345,22 @@
       WEIGHT_NUM1, WEIGHT_DATE1, WEIGHT_NUM2, 
       WEIGHT_DATE2, WEIGHT_NUM3, WEIGHT_DATE3, 
       WEIGHT_NUM4, WEIGHT_DATE4, WEIGHT_NUM5, 
-      WEIGHT_DATE5)
+      WEIGHT_DATE5, BASE_SPOT_NO1, BASE_SPOT_NAME1, 
+      BASE_SPOT_NO2, BASE_SPOT_NAME2, BASE_SPOT_NO3, 
+      BASE_SPOT_NAME3, BASE_SPOT_NO4, BASE_SPOT_NAME4, 
+      BASE_SPOT_NO5, BASE_SPOT_NAME5, COMPARE_TYPE
+      )
     values (#{compareSpotId,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{createManPhone,jdbcType=VARCHAR}, #{updateManPhone,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, 
       #{weightNum1,jdbcType=DECIMAL}, #{weightDate1,jdbcType=TIMESTAMP}, #{weightNum2,jdbcType=DECIMAL}, 
       #{weightDate2,jdbcType=TIMESTAMP}, #{weightNum3,jdbcType=DECIMAL}, #{weightDate3,jdbcType=TIMESTAMP}, 
       #{weightNum4,jdbcType=DECIMAL}, #{weightDate4,jdbcType=TIMESTAMP}, #{weightNum5,jdbcType=DECIMAL}, 
-      #{weightDate5,jdbcType=TIMESTAMP})
+      #{weightDate5,jdbcType=TIMESTAMP}, #{baseSpotNo1,jdbcType=VARCHAR}, #{baseSpotName1,jdbcType=VARCHAR}, 
+      #{baseSpotNo2,jdbcType=VARCHAR}, #{baseSpotName2,jdbcType=VARCHAR}, #{baseSpotNo3,jdbcType=VARCHAR}, 
+      #{baseSpotName3,jdbcType=VARCHAR}, #{baseSpotNo4,jdbcType=VARCHAR}, #{baseSpotName4,jdbcType=VARCHAR}, 
+      #{baseSpotNo5,jdbcType=VARCHAR}, #{baseSpotName5,jdbcType=VARCHAR}, #{compareType,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot">
     insert into METER_WORK_COMPARE_SPOT
@@ -300,6 +422,39 @@
       <if test="weightDate5 != null">
         WEIGHT_DATE5,
       </if>
+      <if test="baseSpotNo1 != null">
+        BASE_SPOT_NO1,
+      </if>
+      <if test="baseSpotName1 != null">
+        BASE_SPOT_NAME1,
+      </if>
+      <if test="baseSpotNo2 != null">
+        BASE_SPOT_NO2,
+      </if>
+      <if test="baseSpotName2 != null">
+        BASE_SPOT_NAME2,
+      </if>
+      <if test="baseSpotNo3 != null">
+        BASE_SPOT_NO3,
+      </if>
+      <if test="baseSpotName3 != null">
+        BASE_SPOT_NAME3,
+      </if>
+      <if test="baseSpotNo4 != null">
+        BASE_SPOT_NO4,
+      </if>
+      <if test="baseSpotName4 != null">
+        BASE_SPOT_NAME4,
+      </if>
+      <if test="baseSpotNo5 != null">
+        BASE_SPOT_NO5,
+      </if>
+      <if test="baseSpotName5 != null">
+        BASE_SPOT_NAME5,
+      </if>
+      <if test="compareType != null">
+        COMPARE_TYPE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="compareSpotId != null">
@@ -359,6 +514,39 @@
       <if test="weightDate5 != null">
         #{weightDate5,jdbcType=TIMESTAMP},
       </if>
+      <if test="baseSpotNo1 != null">
+        #{baseSpotNo1,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName1 != null">
+        #{baseSpotName1,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo2 != null">
+        #{baseSpotNo2,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName2 != null">
+        #{baseSpotName2,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo3 != null">
+        #{baseSpotNo3,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName3 != null">
+        #{baseSpotName3,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo4 != null">
+        #{baseSpotNo4,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName4 != null">
+        #{baseSpotName4,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo5 != null">
+        #{baseSpotNo5,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName5 != null">
+        #{baseSpotName5,jdbcType=VARCHAR},
+      </if>
+      <if test="compareType != null">
+        #{compareType,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot">
@@ -380,7 +568,18 @@
       WEIGHT_NUM4 = #{weightNum4,jdbcType=DECIMAL},
       WEIGHT_DATE4 = #{weightDate4,jdbcType=TIMESTAMP},
       WEIGHT_NUM5 = #{weightNum5,jdbcType=DECIMAL},
-      WEIGHT_DATE5 = #{weightDate5,jdbcType=TIMESTAMP}
+      WEIGHT_DATE5 = #{weightDate5,jdbcType=TIMESTAMP},
+      BASE_SPOT_NO1 = #{baseSpotNo1,jdbcType=VARCHAR},
+      BASE_SPOT_NAME1 = #{baseSpotName1,jdbcType=VARCHAR},
+      BASE_SPOT_NO2 = #{baseSpotNo2,jdbcType=VARCHAR},
+      BASE_SPOT_NAME2 = #{baseSpotName2,jdbcType=VARCHAR},
+      BASE_SPOT_NO3 = #{baseSpotNo3,jdbcType=VARCHAR},
+      BASE_SPOT_NAME3 = #{baseSpotName3,jdbcType=VARCHAR},
+      BASE_SPOT_NO4 = #{baseSpotNo4,jdbcType=VARCHAR},
+      BASE_SPOT_NAME4 = #{baseSpotName4,jdbcType=VARCHAR},
+      BASE_SPOT_NO5 = #{baseSpotNo5,jdbcType=VARCHAR},
+      BASE_SPOT_NAME5 = #{baseSpotName5,jdbcType=VARCHAR},
+      COMPARE_TYPE = #{compareType,jdbcType=VARCHAR}
     where COMPARE_SPOT_ID = #{compareSpotId,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot">
@@ -440,6 +639,39 @@
       <if test="weightDate5 != null">
         WEIGHT_DATE5 = #{weightDate5,jdbcType=TIMESTAMP},
       </if>
+      <if test="baseSpotNo1 != null">
+        BASE_SPOT_NO1 = #{baseSpotNo1,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName1 != null">
+        BASE_SPOT_NAME1 = #{baseSpotName1,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo2 != null">
+        BASE_SPOT_NO2 = #{baseSpotNo2,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName2 != null">
+        BASE_SPOT_NAME2 = #{baseSpotName2,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo3 != null">
+        BASE_SPOT_NO3 = #{baseSpotNo3,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName3 != null">
+        BASE_SPOT_NAME3 = #{baseSpotName3,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo4 != null">
+        BASE_SPOT_NO4 = #{baseSpotNo4,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName4 != null">
+        BASE_SPOT_NAME4 = #{baseSpotName4,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo5 != null">
+        BASE_SPOT_NO5 = #{baseSpotNo5,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName5 != null">
+        BASE_SPOT_NAME5 = #{baseSpotName5,jdbcType=VARCHAR},
+      </if>
+      <if test="compareType != null">
+        COMPARE_TYPE = #{compareType,jdbcType=VARCHAR},
+      </if>
     </set>
     where COMPARE_SPOT_ID = #{compareSpotId,jdbcType=VARCHAR}
   </update>
@@ -464,7 +696,11 @@
       CAR_NO, WEIGHT_NUM1, WEIGHT_DATE1, 
       WEIGHT_NUM2, WEIGHT_DATE2, WEIGHT_NUM3, 
       WEIGHT_DATE3, WEIGHT_NUM4, WEIGHT_DATE4, 
-      WEIGHT_NUM5, WEIGHT_DATE5)
+      WEIGHT_NUM5, WEIGHT_DATE5, BASE_SPOT_NO1, 
+      BASE_SPOT_NAME1, BASE_SPOT_NO2, BASE_SPOT_NAME2, 
+      BASE_SPOT_NO3, BASE_SPOT_NAME3, BASE_SPOT_NO4, 
+      BASE_SPOT_NAME4, BASE_SPOT_NO5, BASE_SPOT_NAME5, 
+      COMPARE_TYPE)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.compareSpotId,jdbcType=VARCHAR}, 
@@ -474,7 +710,11 @@
       #{item.carNo,jdbcType=VARCHAR}, #{item.weightNum1,jdbcType=DECIMAL}, #{item.weightDate1,jdbcType=TIMESTAMP}, 
       #{item.weightNum2,jdbcType=DECIMAL}, #{item.weightDate2,jdbcType=TIMESTAMP}, #{item.weightNum3,jdbcType=DECIMAL}, 
       #{item.weightDate3,jdbcType=TIMESTAMP}, #{item.weightNum4,jdbcType=DECIMAL}, #{item.weightDate4,jdbcType=TIMESTAMP}, 
-      #{item.weightNum5,jdbcType=DECIMAL}, #{item.weightDate5,jdbcType=TIMESTAMP} from dual  
+      #{item.weightNum5,jdbcType=DECIMAL}, #{item.weightDate5,jdbcType=TIMESTAMP}, #{item.baseSpotNo1,jdbcType=VARCHAR}, 
+      #{item.baseSpotName1,jdbcType=VARCHAR}, #{item.baseSpotNo2,jdbcType=VARCHAR}, #{item.baseSpotName2,jdbcType=VARCHAR}, 
+      #{item.baseSpotNo3,jdbcType=VARCHAR}, #{item.baseSpotName3,jdbcType=VARCHAR}, #{item.baseSpotNo4,jdbcType=VARCHAR}, 
+      #{item.baseSpotName4,jdbcType=VARCHAR}, #{item.baseSpotNo5,jdbcType=VARCHAR}, #{item.baseSpotName5,jdbcType=VARCHAR}, 
+      #{item.compareType,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -556,6 +796,50 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
           when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.weightDate5,jdbcType=TIMESTAMP}
        </foreach>
+       ,BASE_SPOT_NO1=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.baseSpotNo1,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME1=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.baseSpotName1,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO2=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.baseSpotNo2,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME2=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.baseSpotName2,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO3=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.baseSpotNo3,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME3=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.baseSpotName3,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO4=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.baseSpotNo4,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME4=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.baseSpotName4,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO5=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.baseSpotNo5,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME5=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.baseSpotName5,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPARE_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_SPOT_ID" close="end">
+          when #{item.compareSpotId,jdbcType=VARCHAR} then #{item.compareType,jdbcType=VARCHAR}
+       </foreach>
      where COMPARE_SPOT_ID in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.compareSpotId,jdbcType=VARCHAR}

src/main/java/com/steerinfo/meterwork/meterworkcomparespot/model/MeterWorkCompareSpot.java

@@ -14,9 +14,9 @@ public class MeterWorkCompareSpot implements IBasePO<String> {
     private String compareSpotId;
 
     /**
-     * 数据状态(0：作废，1：未使用， 2：已使用)(VALUE_FLAG,VARCHAR,1)
+     * 数据状态(0：作废，1：未使用， 2：正使用)(VALUE_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="数据状态(0：作废，1：未使用， 2：已使用)",required=false)
+    @ApiModelProperty(value="数据状态(0：作废，1：未使用， 2：正使用)",required=false)
     private String valueFlag;
 
     /**
@@ -121,6 +121,72 @@ public class MeterWorkCompareSpot implements IBasePO<String> {
     @ApiModelProperty(value="时间5",required=false)
     private Date weightDate5;
 
+    /**
+     * 计量点编号1(BASE_SPOT_NO1,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号1",required=false)
+    private String baseSpotNo1;
+
+    /**
+     * 计量点名称1(BASE_SPOT_NAME1,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点名称1",required=false)
+    private String baseSpotName1;
+
+    /**
+     * 计量点编号2(BASE_SPOT_NO2,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号2",required=false)
+    private String baseSpotNo2;
+
+    /**
+     * 计量点名称2(BASE_SPOT_NAME2,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点名称2",required=false)
+    private String baseSpotName2;
+
+    /**
+     * 计量点编号3(BASE_SPOT_NO3,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号3",required=false)
+    private String baseSpotNo3;
+
+    /**
+     * 计量点名称3(BASE_SPOT_NAME3,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点名称3",required=false)
+    private String baseSpotName3;
+
+    /**
+     * 计量点编号4(BASE_SPOT_NO4,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号4",required=false)
+    private String baseSpotNo4;
+
+    /**
+     * 计量点名称4(BASE_SPOT_NAME4,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点名称4",required=false)
+    private String baseSpotName4;
+
+    /**
+     * 计量点编号5(BASE_SPOT_NO5,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号5",required=false)
+    private String baseSpotNo5;
+
+    /**
+     * 计量点名称5(BASE_SPOT_NAME5,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点名称5",required=false)
+    private String baseSpotName5;
+
+    /**
+     * 较称类型（1:断差；2：较称）(COMPARE_TYPE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="较称类型（1:断差；2：较称）",required=false)
+    private String compareType;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -285,6 +351,94 @@ public class MeterWorkCompareSpot implements IBasePO<String> {
         this.weightDate5 = weightDate5;
     }
 
+    public String getBaseSpotNo1() {
+        return baseSpotNo1;
+    }
+
+    public void setBaseSpotNo1(String baseSpotNo1) {
+        this.baseSpotNo1 = baseSpotNo1 == null ? null : baseSpotNo1.trim();
+    }
+
+    public String getBaseSpotName1() {
+        return baseSpotName1;
+    }
+
+    public void setBaseSpotName1(String baseSpotName1) {
+        this.baseSpotName1 = baseSpotName1 == null ? null : baseSpotName1.trim();
+    }
+
+    public String getBaseSpotNo2() {
+        return baseSpotNo2;
+    }
+
+    public void setBaseSpotNo2(String baseSpotNo2) {
+        this.baseSpotNo2 = baseSpotNo2 == null ? null : baseSpotNo2.trim();
+    }
+
+    public String getBaseSpotName2() {
+        return baseSpotName2;
+    }
+
+    public void setBaseSpotName2(String baseSpotName2) {
+        this.baseSpotName2 = baseSpotName2 == null ? null : baseSpotName2.trim();
+    }
+
+    public String getBaseSpotNo3() {
+        return baseSpotNo3;
+    }
+
+    public void setBaseSpotNo3(String baseSpotNo3) {
+        this.baseSpotNo3 = baseSpotNo3 == null ? null : baseSpotNo3.trim();
+    }
+
+    public String getBaseSpotName3() {
+        return baseSpotName3;
+    }
+
+    public void setBaseSpotName3(String baseSpotName3) {
+        this.baseSpotName3 = baseSpotName3 == null ? null : baseSpotName3.trim();
+    }
+
+    public String getBaseSpotNo4() {
+        return baseSpotNo4;
+    }
+
+    public void setBaseSpotNo4(String baseSpotNo4) {
+        this.baseSpotNo4 = baseSpotNo4 == null ? null : baseSpotNo4.trim();
+    }
+
+    public String getBaseSpotName4() {
+        return baseSpotName4;
+    }
+
+    public void setBaseSpotName4(String baseSpotName4) {
+        this.baseSpotName4 = baseSpotName4 == null ? null : baseSpotName4.trim();
+    }
+
+    public String getBaseSpotNo5() {
+        return baseSpotNo5;
+    }
+
+    public void setBaseSpotNo5(String baseSpotNo5) {
+        this.baseSpotNo5 = baseSpotNo5 == null ? null : baseSpotNo5.trim();
+    }
+
+    public String getBaseSpotName5() {
+        return baseSpotName5;
+    }
+
+    public void setBaseSpotName5(String baseSpotName5) {
+        this.baseSpotName5 = baseSpotName5 == null ? null : baseSpotName5.trim();
+    }
+
+    public String getCompareType() {
+        return compareType;
+    }
+
+    public void setCompareType(String compareType) {
+        this.compareType = compareType == null ? null : compareType.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -310,6 +464,17 @@ public class MeterWorkCompareSpot implements IBasePO<String> {
         sb.append(", weightDate4=").append(weightDate4);
         sb.append(", weightNum5=").append(weightNum5);
         sb.append(", weightDate5=").append(weightDate5);
+        sb.append(", baseSpotNo1=").append(baseSpotNo1);
+        sb.append(", baseSpotName1=").append(baseSpotName1);
+        sb.append(", baseSpotNo2=").append(baseSpotNo2);
+        sb.append(", baseSpotName2=").append(baseSpotName2);
+        sb.append(", baseSpotNo3=").append(baseSpotNo3);
+        sb.append(", baseSpotName3=").append(baseSpotName3);
+        sb.append(", baseSpotNo4=").append(baseSpotNo4);
+        sb.append(", baseSpotName4=").append(baseSpotName4);
+        sb.append(", baseSpotNo5=").append(baseSpotNo5);
+        sb.append(", baseSpotName5=").append(baseSpotName5);
+        sb.append(", compareType=").append(compareType);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -8,10 +8,10 @@ import java.math.BigDecimal;
 /**
  * MeterWorkCompareSpot服务接口：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-05-04 03:26
+ * @version 1.0-SNAPSHORT 2022-05-06 06:28
  * 类描述
  * 修订历史：
- * 日期：2022-05-04
+ * 日期：2022-05-06
  * 作者：generator
  * 参考：
  * 描述：MeterWorkCompareSpot服务接口

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

@@ -13,10 +13,10 @@ import java.math.BigDecimal;
 /**
  * MeterWorkCompareSpot服务实现：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-05-04 03:26
+ * @version 1.0-SNAPSHORT 2022-05-06 06:28
  * 类描述
  * 修订历史：
- * 日期：2022-05-04
+ * 日期：2022-05-06
  * 作者：generator
  * 参考：
  * 描述：MeterWorkCompareSpot服务实现

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

@@ -23,10 +23,10 @@ import java.math.BigDecimal;
 /**
  * MeterWorkCompareSpotScale RESTful接口：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-05-04 03:26
+ * @version 1.0-SNAPSHORT 2022-05-06 06:28
  * 类描述
  * 修订历史：
- * 日期：2022-05-04
+ * 日期：2022-05-06
  * 作者：generator
  * 参考：
  * 描述：MeterWorkCompareSpotScale RESTful接口

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

@@ -8,10 +8,10 @@ import java.math.BigDecimal;
 /**
  * MeterWorkCompareSpotScale服务接口：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-05-04 03:26
+ * @version 1.0-SNAPSHORT 2022-05-06 06:28
  * 类描述
  * 修订历史：
- * 日期：2022-05-04
+ * 日期：2022-05-06
  * 作者：generator
  * 参考：
  * 描述：MeterWorkCompareSpotScale服务接口

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

@@ -13,10 +13,10 @@ import java.math.BigDecimal;
 /**
  * MeterWorkCompareSpotScale服务实现：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-05-04 03:26
+ * @version 1.0-SNAPSHORT 2022-05-06 06:28
  * 类描述
  * 修订历史：
- * 日期：2022-05-04
+ * 日期：2022-05-06
  * 作者：generator
  * 参考：
  * 描述：MeterWorkCompareSpotScale服务实现

src/main/java/com/steerinfo/meterwork/meterworkmonitor/controller/MeterWorkMonitorController.java

@@ -181,4 +181,18 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "根据车号查询meterWorkMonitor表的重量", notes = "根据车号返回重量")
+    //@RequiresPermissions("meterworkmonitor:view")
+    @PostMapping(value = "/weightByCarNo")
+    public RESTfulResult weightByCarNo(@RequestBody HashMap params) {
+        try {
+            String rfidCar = params.get("rfidCar") == null ? "": params.get("rfidCar").toString();
+            RESTfulResult rm = meterWorkMonitorService.weightByCarNo(rfidCar);
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.xml

@@ -57,6 +57,8 @@
     <result column="FRONT_INFRARED_RAY_STATE" jdbcType="VARCHAR" property="frontInfraredRayState" />
     <result column="REAR_INFRARED_RAY_STATE" jdbcType="VARCHAR" property="rearInfraredRayState" />
     <result column="RFID_STATE" jdbcType="VARCHAR" property="rfidState" />
+    <result column="VALID_AREA" jdbcType="VARCHAR" property="validArea" />
+    <result column="WEIGHT_STATUS" jdbcType="VARCHAR" property="weightStatus" />
   </resultMap>
   <sql id="columns">
     POINT_NO, POINT_NAME, VALID_WGT, VALID_CARNO, VALID_TARE_TIME, VALID_TIME_INTERVAL, 
@@ -67,7 +69,8 @@
     WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM, MOXA_IP, MOXA_PORT, VALID_LIANDA, 
     IS_OPEN_SCANNING, VALID_IS_PRE, USER_IP, POWER_STATE, DVR_STATE, MOXA_STATE, PLC_STATE, 
     LEFT_INFRARED_RAY_STATE, RIGHT_INFRARED_RAY_STATE, AMPLIFIER_STATE, LAMP_STATE, SPOT_TYPE_NO, 
-    RED_GREEN_LIGHT_STATE, FRONT_INFRARED_RAY_STATE, REAR_INFRARED_RAY_STATE, RFID_STATE
+    RED_GREEN_LIGHT_STATE, FRONT_INFRARED_RAY_STATE, REAR_INFRARED_RAY_STATE, RFID_STATE, 
+    VALID_AREA, WEIGHT_STATUS
   </sql>
   <sql id="columns_alias">
     t.POINT_NO, t.POINT_NAME, t.VALID_WGT, t.VALID_CARNO, t.VALID_TARE_TIME, t.VALID_TIME_INTERVAL, 
@@ -79,7 +82,8 @@
     t.MOXA_IP, t.MOXA_PORT, t.VALID_LIANDA, t.IS_OPEN_SCANNING, t.VALID_IS_PRE, t.USER_IP, 
     t.POWER_STATE, t.DVR_STATE, t.MOXA_STATE, t.PLC_STATE, t.LEFT_INFRARED_RAY_STATE, 
     t.RIGHT_INFRARED_RAY_STATE, t.AMPLIFIER_STATE, t.LAMP_STATE, t.SPOT_TYPE_NO, t.RED_GREEN_LIGHT_STATE, 
-    t.FRONT_INFRARED_RAY_STATE, t.REAR_INFRARED_RAY_STATE, t.RFID_STATE
+    t.FRONT_INFRARED_RAY_STATE, t.REAR_INFRARED_RAY_STATE, t.RFID_STATE, t.VALID_AREA, 
+    t.WEIGHT_STATUS
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM METER_WORK_MONITOR
@@ -254,6 +258,12 @@
       <if test="rfidState != null and rfidState != ''">
         and RFID_STATE = #{rfidState}
       </if>
+      <if test="validArea != null and validArea != ''">
+        and VALID_AREA = #{validArea}
+      </if>
+      <if test="weightStatus != null and weightStatus != ''">
+        and WEIGHT_STATUS = #{weightStatus}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -423,6 +433,12 @@
       <if test="rfidState != null and rfidState != ''">
         and RFID_STATE LIKE '%${rfidState}%'
       </if>
+      <if test="validArea != null and validArea != ''">
+        and VALID_AREA LIKE '%${validArea}%'
+      </if>
+      <if test="weightStatus != null and weightStatus != ''">
+        and WEIGHT_STATUS LIKE '%${weightStatus}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -594,6 +610,12 @@
       <if test="rfidState != null and rfidState != ''">
         or RFID_STATE = #{rfidState}
       </if>
+      <if test="validArea != null and validArea != ''">
+        or VALID_AREA = #{validArea}
+      </if>
+      <if test="weightStatus != null and weightStatus != ''">
+        or WEIGHT_STATUS = #{weightStatus}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
     insert into METER_WORK_MONITOR (POINT_NO, POINT_NAME, VALID_WGT, 
@@ -614,7 +636,8 @@
       PLC_STATE, LEFT_INFRARED_RAY_STATE, RIGHT_INFRARED_RAY_STATE, 
       AMPLIFIER_STATE, LAMP_STATE, SPOT_TYPE_NO, 
       RED_GREEN_LIGHT_STATE, FRONT_INFRARED_RAY_STATE, 
-      REAR_INFRARED_RAY_STATE, RFID_STATE)
+      REAR_INFRARED_RAY_STATE, RFID_STATE, VALID_AREA, 
+      WEIGHT_STATUS)
     values (#{pointNo,jdbcType=VARCHAR}, #{pointName,jdbcType=VARCHAR}, #{validWgt,jdbcType=VARCHAR}, 
       #{validCarno,jdbcType=VARCHAR}, #{validTareTime,jdbcType=VARCHAR}, #{validTimeInterval,jdbcType=VARCHAR}, 
       #{validParkStatus,jdbcType=VARCHAR}, #{validExceedWgt,jdbcType=VARCHAR}, #{validPredictionDiff,jdbcType=VARCHAR}, 
@@ -633,7 +656,8 @@
       #{plcState,jdbcType=VARCHAR}, #{leftInfraredRayState,jdbcType=VARCHAR}, #{rightInfraredRayState,jdbcType=VARCHAR}, 
       #{amplifierState,jdbcType=VARCHAR}, #{lampState,jdbcType=VARCHAR}, #{spotTypeNo,jdbcType=VARCHAR}, 
       #{redGreenLightState,jdbcType=VARCHAR}, #{frontInfraredRayState,jdbcType=VARCHAR}, 
-      #{rearInfraredRayState,jdbcType=VARCHAR}, #{rfidState,jdbcType=VARCHAR})
+      #{rearInfraredRayState,jdbcType=VARCHAR}, #{rfidState,jdbcType=VARCHAR}, #{validArea,jdbcType=VARCHAR}, 
+      #{weightStatus,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
     insert into METER_WORK_MONITOR
@@ -803,6 +827,12 @@
       <if test="rfidState != null">
         RFID_STATE,
       </if>
+      <if test="validArea != null">
+        VALID_AREA,
+      </if>
+      <if test="weightStatus != null">
+        WEIGHT_STATUS,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="pointNo != null">
@@ -970,6 +1000,12 @@
       <if test="rfidState != null">
         #{rfidState,jdbcType=VARCHAR},
       </if>
+      <if test="validArea != null">
+        #{validArea,jdbcType=VARCHAR},
+      </if>
+      <if test="weightStatus != null">
+        #{weightStatus,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
@@ -1027,7 +1063,9 @@
       RED_GREEN_LIGHT_STATE = #{redGreenLightState,jdbcType=VARCHAR},
       FRONT_INFRARED_RAY_STATE = #{frontInfraredRayState,jdbcType=VARCHAR},
       REAR_INFRARED_RAY_STATE = #{rearInfraredRayState,jdbcType=VARCHAR},
-      RFID_STATE = #{rfidState,jdbcType=VARCHAR}
+      RFID_STATE = #{rfidState,jdbcType=VARCHAR},
+      VALID_AREA = #{validArea,jdbcType=VARCHAR},
+      WEIGHT_STATUS = #{weightStatus,jdbcType=VARCHAR}
     where POINT_NO = #{pointNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor">
@@ -1195,6 +1233,12 @@
       <if test="rfidState != null">
         RFID_STATE = #{rfidState,jdbcType=VARCHAR},
       </if>
+      <if test="validArea != null">
+        VALID_AREA = #{validArea,jdbcType=VARCHAR},
+      </if>
+      <if test="weightStatus != null">
+        WEIGHT_STATUS = #{weightStatus,jdbcType=VARCHAR},
+      </if>
     </set>
     where POINT_NO = #{pointNo,jdbcType=VARCHAR}
   </update>
@@ -1233,7 +1277,8 @@
       RIGHT_INFRARED_RAY_STATE, AMPLIFIER_STATE, 
       LAMP_STATE, SPOT_TYPE_NO, RED_GREEN_LIGHT_STATE, 
       FRONT_INFRARED_RAY_STATE, REAR_INFRARED_RAY_STATE, 
-      RFID_STATE)
+      RFID_STATE, VALID_AREA, WEIGHT_STATUS
+      )
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.pointNo,jdbcType=VARCHAR}, 
@@ -1257,7 +1302,8 @@
       #{item.rightInfraredRayState,jdbcType=VARCHAR}, #{item.amplifierState,jdbcType=VARCHAR}, 
       #{item.lampState,jdbcType=VARCHAR}, #{item.spotTypeNo,jdbcType=VARCHAR}, #{item.redGreenLightState,jdbcType=VARCHAR}, 
       #{item.frontInfraredRayState,jdbcType=VARCHAR}, #{item.rearInfraredRayState,jdbcType=VARCHAR}, 
-      #{item.rfidState,jdbcType=VARCHAR} from dual  
+      #{item.rfidState,jdbcType=VARCHAR}, #{item.validArea,jdbcType=VARCHAR}, #{item.weightStatus,jdbcType=VARCHAR}
+       from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -1483,6 +1529,14 @@
        <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
           when #{item.pointNo,jdbcType=VARCHAR} then #{item.rfidState,jdbcType=VARCHAR}
        </foreach>
+       ,VALID_AREA=
+       <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
+          when #{item.pointNo,jdbcType=VARCHAR} then #{item.validArea,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGHT_STATUS=
+       <foreach close="end" collection="list" index="index" item="item" open="case POINT_NO" separator=" ">
+          when #{item.pointNo,jdbcType=VARCHAR} then #{item.weightStatus,jdbcType=VARCHAR}
+       </foreach>
      where POINT_NO in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.pointNo,jdbcType=VARCHAR}
@@ -1888,4 +1942,5 @@
       #{item.pointNo,jdbcType=VARCHAR}
     </foreach>
   </update>
+  
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkmonitor/model/MeterWorkMonitor.java

@@ -56,9 +56,9 @@ public class MeterWorkMonitor implements IBasePO<String> {
     private String validExceedWgt;
 
     /**
-     * 验证预报超差  0不验证  1验证(VALID_PREDICTION_DIFF,VARCHAR,1)
+     * 验证毛皮超差  0不验证  1验证(VALID_PREDICTION_DIFF,VARCHAR,1)
      */
-    @ApiModelProperty(value="验证预报超差  0不验证  1验证",required=false)
+    @ApiModelProperty(value="验证毛皮超差  0不验证  1验证",required=false)
     private String validPredictionDiff;
 
     /**
@@ -248,9 +248,9 @@ public class MeterWorkMonitor implements IBasePO<String> {
     private String isOpenScanning;
 
     /**
-     * 验证是否存在委托  0不验证  1验证(VALID_IS_PRE,VARCHAR,1)
+     * 委托异常  0正常  1异常(VALID_IS_PRE,VARCHAR,1)
      */
-    @ApiModelProperty(value="验证是否存在委托  0不验证  1验证",required=false)
+    @ApiModelProperty(value="委托异常  0正常  1异常",required=false)
     private String validIsPre;
 
     /**
@@ -302,9 +302,9 @@ public class MeterWorkMonitor implements IBasePO<String> {
     private String amplifierState;
 
     /**
-     * 照明灯状态（0正常 1异常）(LAMP_STATE,VARCHAR,1)
+     * 照明灯状态（0关闭的 1打开的）(LAMP_STATE,VARCHAR,1)
      */
-    @ApiModelProperty(value="照明灯状态（0正常 1异常）",required=false)
+    @ApiModelProperty(value="照明灯状态（0关闭的 1打开的）",required=false)
     private String lampState;
 
     /**
@@ -314,9 +314,9 @@ public class MeterWorkMonitor implements IBasePO<String> {
     private String spotTypeNo;
 
     /**
-     * 红绿灯状态(RED_GREEN_LIGHT_STATE,VARCHAR,1)
+     * 红绿灯状态（0绿灯 1红灯）(RED_GREEN_LIGHT_STATE,VARCHAR,1)
      */
-    @ApiModelProperty(value="红绿灯状态",required=false)
+    @ApiModelProperty(value="红绿灯状态（0绿灯 1红灯）",required=false)
     private String redGreenLightState;
 
     /**
@@ -337,6 +337,18 @@ public class MeterWorkMonitor implements IBasePO<String> {
     @ApiModelProperty(value="rfid状态（0正常 1异常）",required=false)
     private String rfidState;
 
+    /**
+     * 允许异地结净     0不验证  1验证(VALID_AREA,VARCHAR,1)
+     */
+    @ApiModelProperty(value="允许异地结净     0不验证  1验证",required=false)
+    private String validArea;
+
+    /**
+     * 重量是否稳定     0不稳定    1稳定(WEIGHT_STATUS,VARCHAR,1)
+     */
+    @ApiModelProperty(value="重量是否稳定     0不稳定    1稳定",required=false)
+    private String weightStatus;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -789,6 +801,22 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.rfidState = rfidState == null ? null : rfidState.trim();
     }
 
+    public String getValidArea() {
+        return validArea;
+    }
+
+    public void setValidArea(String validArea) {
+        this.validArea = validArea == null ? null : validArea.trim();
+    }
+
+    public String getWeightStatus() {
+        return weightStatus;
+    }
+
+    public void setWeightStatus(String weightStatus) {
+        this.weightStatus = weightStatus == null ? null : weightStatus.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -850,6 +878,8 @@ public class MeterWorkMonitor implements IBasePO<String> {
         sb.append(", frontInfraredRayState=").append(frontInfraredRayState);
         sb.append(", rearInfraredRayState=").append(rearInfraredRayState);
         sb.append(", rfidState=").append(rfidState);
+        sb.append(", validArea=").append(validArea);
+        sb.append(", weightStatus=").append(weightStatus);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/IMeterWorkMonitorService.java

@@ -4,8 +4,6 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * MeterWorkMonitor服务接口：
@@ -28,5 +26,7 @@ public interface IMeterWorkMonitorService extends IBaseService<MeterWorkMonitor,
 
     void AutomaticAllocation();
 
+    RESTfulResult weightByCarNo(String rfidCar);
+
 
 }

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

@@ -109,6 +109,29 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         //system.out.println("DATASOURCE = " + dataSource  );
     }
 
+    @Override
+    public RESTfulResult weightByCarNo(String rfidCar) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            HashMap<String, Object> map = new HashMap();
+            map.put("rfidCar", rfidCar);
+            List<MeterWorkMonitor> models = meterWorkMonitorMapper.selectByParameters(map);
+            if(models.size() >= 1) {
+                rm.setSucceed();
+                rm.setData(models.get(0));
+                rm.setMessage("操作成功！！");
+                rm.setCode("200");
+            }else {
+                rm.setMessage("根据车号未查询到相应重量信息,请确认！！");
+            }
+            return rm;
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！！>>>" + e.getMessage());
+            return rm;
+        }
+    }
 
 
     private void RandomAssign() {

src/main/java/com/steerinfo/meterwork/meterworkprewgttype/controller/MeterWorkPreWgttypeController.java

@@ -210,10 +210,14 @@ public class MeterWorkPreWgttypeController extends BaseRESTfulController {
         RESTfulResult rm = failed();
         try {
             String carNo = params.get("carNo") == null?"":params.get("carNo").toString();
-            meterWorkPreWgttypeMapper.updateSubmitFlag(carNo);
+            int i  = meterWorkPreWgttypeMapper.updateSubmitFlag(carNo);
+            /*if(i < 1) {
+                rm.setMessage("预约信息已确认！！");
+                return rm;
+            }*/
+            rm.setSucceed();
             rm.setCode("200");
             rm.setMessage("操作成功");
-            rm.setSucceed();
             rm.setData(null);
         } catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkprewgttype/mapper/MeterWorkPreWgttypeMapper.java

@@ -12,5 +12,5 @@ public interface MeterWorkPreWgttypeMapper extends IBaseMapper<MeterWorkPreWgtty
 
     void updatePreWeight(@Param("CarNo") String CarNo);
 
-    void updateSubmitFlag(@Param("CarNo") String CarNo);
+    int updateSubmitFlag(@Param("CarNo") String CarNo);
 }

src/main/java/com/steerinfo/meterwork/meterworkprewgttype/mapper/MeterWorkPreWgttypeMapper.xml

@@ -426,6 +426,9 @@
   </update>
 
   <update id="updateSubmitFlag" parameterType="java.lang.String">
-    update METER_WORK_PRE_WGTTYPE set SUBMIT_FLAG = '1' where VALUE_FLAG = '1' and CAR_NO = #{CarNo}
+    update METER_WORK_PRE_WGTTYPE
+        set SUBMIT_FLAG = '1'
+    where VALUE_FLAG = '1'
+        and CAR_NO = #{CarNo}
   </update>
 </mapper>

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

@@ -404,9 +404,13 @@ throw new MarkerMetException(500, "操作异常！！");
             String railwayNo = param.get("railwayNo") == null ? "":param.get("railwayNo").toString();
             String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
             String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
-            String dataSource = param.get("dataSource") == null ? "":param.get("dataSource").toString();
+            String baseSpotNo = param.get("baseSpotNo") == null ? "": param.get("baseSpotNo").toString();
+            String matterName = param.get("matterName") == null ? "": param.get("matterName").toString();
+            String predictionNo = param.get("predictionNo") == null ? "": param.get("predictionNo").toString();
+            String forwardingUnitName = param.get("forwardingUnitName") == null ? "": param.get("forwardingUnitName").toString();
+            String receivingUintName = param.get("receivingUintName") == null ? "": param.get("receivingUintName").toString();
             String valueFlag = param.get("valueFlag") == null ? "":param.get("valueFlag").toString();
-            List<String> rows = meterWorkRailwayActFirstService.distinctRailwayNo(railwayTypeNo, lcNo, railwayNo, startTime, endTime, dataSource,valueFlag);
+            List<String> rows = meterWorkRailwayActFirstService.distinctRailwayNo(railwayTypeNo, lcNo, railwayNo, startTime, endTime, baseSpotNo, matterName, predictionNo, forwardingUnitName,receivingUintName,valueFlag);
             return success(rows);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -3236,8 +3236,23 @@
     <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
       and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
-    <if test="dataSource != null and dataSource != ''">
-      and  data_source = '${dataSource}'
+    <if test="matterName != null and matterName != ''">
+      and  matter_name like  '%${matterName}%'
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  base_spot_no = #{baseSpotNo}
+    </if>
+    <if test="predictionNo != null and predictionNo != ''">
+      and  prediction_no =  #{predictionNo}
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and  forwarding_Unit_Name like '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and  receiving_uint_name like  '%${receivingUintName}%'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and  value_flag = #{valueFlag}
     </if>
     <if test="railwayNo != null and railwayNo != ''">
       and  RAILWAY_NO like '%${railwayNo}%'

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

@@ -55,7 +55,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
 
     PageList<MeterWorkRailwayActFirst> likeByDesc(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize);
 
-    List<String> distinctRailwayNo(String railwayTypeNo, String lcNo, String railwayNo, String startTime, String endTime, String dataSource,String valueFlag);
+    List<String> distinctRailwayNo(String railwayTypeNo, String lcNo, String railwayNo, String startTime, String endTime, String baseSpotNo,String matterName, String predictionNo,String forwardingUnitName,String receivingUintName,String valueFlag);
 
     List<String> distinctLcNo(String railwayTypeNo, String startTime, String endTime);
 

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

@@ -340,14 +340,18 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<String> distinctRailwayNo(String railwayTypeNo, String lcNo, String railwayNo, String startTime, String endTime, String dataSource,String valueFlag) {
+    public List<String> distinctRailwayNo(String railwayTypeNo, String lcNo, String railwayNo, String startTime, String endTime, String baseSpotNo,String matterName, String predictionNo,String forwardingUnitName,String receivingUintName,String valueFlag) {
         HashMap<String, Object> obj = new HashMap<>();
         obj.put("railwayTypeNo", railwayTypeNo);
         obj.put("lcNo", lcNo);
         obj.put("railwayNo", railwayNo);
         obj.put("startTime", startTime);
         obj.put("endTime", endTime);
-        obj.put("dataSource", dataSource);
+        obj.put("baseSpotNo", baseSpotNo);
+        obj.put("matterName", matterName);
+        obj.put("predictionNo", predictionNo);
+        obj.put("forwardingUnitName", forwardingUnitName);
+        obj.put("receivingUintName", receivingUintName);
         obj.put("valueFlag", valueFlag);
         List<String> list = meterWorkRailwayActFirstMapper.distinctRailwayNo(obj).stream().map(MeterWorkRailwayActFirst::getRailwayNo).collect(Collectors.toList());
         return list;
@@ -2162,13 +2166,15 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             searchFirst.setValueFlag("1");
             Map<String, Object> mapSearchFirst = FieldsCollector.beanToMap(searchFirst);
             List<MeterWorkRailwayActFirst> searchFirstList = meterWorkRailwayActFirstMapper.selectByParameters(mapSearchFirst);
-            if (searchFirstList != null && searchFirstList.size() > 1) {
-                throw new MarkerMetException(500, "车号【" + model.getRailwayNo() + "】存在【" + searchFirstList.size() + "】条有效数据，不允许计量操作，请先在网页上进行作废!");
-            }
-            if (searchFirstList != null && searchFirstList.size() == 1) {
-                if (!model.getPredictionNo().equals(searchFirstList.get(0).getPredictionNo())) {
-                    throw new MarkerMetException(500, "车号【" + model.getRailwayNo() + "】一次计量的预报【"
-                            + searchFirstList.get(0).getPredictionNo() + "】与当前使用的预报【" + model.getPredictionNo() + "】不一致，不允许计量操作，请先在网页上进行修改!");
+            if(StringUtils.isNotEmpty(model.getPredictionNo())) {
+                if (searchFirstList != null && searchFirstList.size() > 1) {
+                    throw new MarkerMetException(500, "车号【" + model.getRailwayNo() + "】存在【" + searchFirstList.size() + "】条有效数据，不允许计量操作，请先在网页上进行作废!");
+                }
+                if (searchFirstList != null && searchFirstList.size() == 1) {
+                    if (!model.getPredictionNo().equals(searchFirstList.get(0).getPredictionNo())) {
+                        throw new MarkerMetException(500, "车号【" + model.getRailwayNo() + "】一次计量的预报【"
+                                + searchFirstList.get(0).getPredictionNo() + "】与当前使用的预报【" + model.getPredictionNo() + "】不一致，不允许计量操作，请先在网页上进行修改!");
+                    }
                 }
             }
         }

src/main/java/com/steerinfo/pretrack/pretrackscale/model/PreTrackScale.java

@@ -595,11 +595,17 @@ public class PreTrackScale implements IBasePO<String> {
     private String useSite;
 
     /**
-     * 上传状态（1=待上传；2=已上传 ）(UPLOAD_FLAG,VARCHAR,1)
+     * 上传状态（1=待上传；0=已上传 ）(UPLOAD_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="上传状态（1=待上传；2=已上传 ）",required=false)
+    @ApiModelProperty(value="上传状态（1=待上传；0=已上传 ）",required=false)
     private String uploadFlag;
 
+    /**
+     * 确认状态(0：未确认；1：已确认)(SUBMIT_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="确认状态(0：未确认；1：已确认)",required=false)
+    private String submitFlag;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1396,6 +1402,14 @@ public class PreTrackScale implements IBasePO<String> {
         this.uploadFlag = uploadFlag == null ? null : uploadFlag.trim();
     }
 
+    public String getSubmitFlag() {
+        return submitFlag;
+    }
+
+    public void setSubmitFlag(String submitFlag) {
+        this.submitFlag = submitFlag == null ? null : submitFlag.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1500,6 +1514,7 @@ public class PreTrackScale implements IBasePO<String> {
         sb.append(", revocartionStatus=").append(revocartionStatus);
         sb.append(", useSite=").append(useSite);
         sb.append(", uploadFlag=").append(uploadFlag);
+        sb.append(", submitFlag=").append(submitFlag);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();