后端修改

src/main/java/com/steerinfo/appservice/appmeterworkcaractual/controller/AppMeterWorkCarActualController.java

@@ -288,7 +288,7 @@ public class AppMeterWorkCarActualController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "卸货实绩查询-查询洁净表的数据", notes = "查询明细数据")
+    @ApiOperation(value = "卸货实绩查询-查询结净表的数据", notes = "查询明细数据")
     @GetMapping(value = "/selectLoadLinkActual")
     public RESTfulResult selectLoadLinkActual(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
         try {

src/main/java/com/steerinfo/appservice/appmeterworkcaractual/service/impl/AppMeterWorkCarActualServiceImpl.java

@@ -717,7 +717,7 @@ public class AppMeterWorkCarActualServiceImpl extends BaseServiceImpl<AppMeterWo
     }
 
     /**
-     * 卸货实绩查询-查询洁净表的数据
+     * 卸货实绩查询-查询结净表的数据
      *
      * @param parmas
      * @param pageNum

src/main/java/com/steerinfo/baseinfo/meterbaserailwaymetertarenetconfig/controller/MeterBaseRailwayMeterTareNetConfigController.java

@@ -23,10 +23,10 @@ import java.math.BigDecimal;
 /**
  * MeterBaseRailwayMeterTareNetConfig RESTful接口：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-08-09 02:55
+ * @version 1.0-SNAPSHORT 2022-08-12 09:19
  * 类描述
  * 修订历史：
- * 日期：2022-08-09
+ * 日期：2022-08-12
  * 作者：generator
  * 参考：
  * 描述：MeterBaseRailwayMeterTareNetConfig RESTful接口

src/main/java/com/steerinfo/baseinfo/meterbaserailwaymetertarenetconfig/mapper/MeterBaseRailwayMeterTareNetConfigMapper.xml

@@ -20,17 +20,20 @@
     <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
     <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
     <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+    <result column="MATTER_TYPE_NO" jdbcType="VARCHAR" property="matterTypeNo" />
+    <result column="MATTER_TYPE_NAME" jdbcType="VARCHAR" property="matterTypeName" />
   </resultMap>
   <sql id="columns">
     CONFIG_NO, MATTER_NO, MATTER_NAME, FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, 
     RECEIVING_UINT_NAME, MEMO, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
+    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+    MATTER_TYPE_NO, MATTER_TYPE_NAME
   </sql>
   <sql id="columns_alias">
     t.CONFIG_NO, t.MATTER_NO, t.MATTER_NAME, t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, 
     t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, t.MEMO, 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.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME
+    t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.MATTER_TYPE_NO, t.MATTER_TYPE_NAME
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_BASE_RAILWAY_METER_TARE_NET_CONFIG
@@ -94,6 +97,12 @@
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
+      <if test="matterTypeNo != null and matterTypeNo != ''">
+        and MATTER_TYPE_NO = #{matterTypeNo}
+      </if>
+      <if test="matterTypeName != null and matterTypeName != ''">
+        and MATTER_TYPE_NAME = #{matterTypeName}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -152,6 +161,12 @@
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
+      <if test="matterTypeNo != null and matterTypeNo != ''">
+        and MATTER_TYPE_NO LIKE '%${matterTypeNo}%'
+      </if>
+      <if test="matterTypeName != null and matterTypeName != ''">
+        and MATTER_TYPE_NAME LIKE '%${matterTypeName}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -212,6 +227,12 @@
       <if test="deleteTime != null">
         or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
       </if>
+      <if test="matterTypeNo != null and matterTypeNo != ''">
+        or MATTER_TYPE_NO = #{matterTypeNo}
+      </if>
+      <if test="matterTypeName != null and matterTypeName != ''">
+        or MATTER_TYPE_NAME = #{matterTypeName}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaserailwaymetertarenetconfig.model.MeterBaseRailwayMeterTareNetConfig">
     insert into METER_BASE_RAILWAY_METER_TARE_NET_CONFIG (CONFIG_NO, MATTER_NO, MATTER_NAME, 
@@ -219,15 +240,15 @@
       RECEIVING_UINT_NAME, MEMO, VALUE_FLAG, 
       CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
       UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-      )
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      MATTER_TYPE_NO, MATTER_TYPE_NAME)
     values (#{configNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR}, 
       #{forwardingUnitNo,jdbcType=VARCHAR}, #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR}, 
       #{receivingUintName,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, 
       #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}
-      )
+      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, 
+      #{matterTypeNo,jdbcType=VARCHAR}, #{matterTypeName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaymetertarenetconfig.model.MeterBaseRailwayMeterTareNetConfig">
     insert into METER_BASE_RAILWAY_METER_TARE_NET_CONFIG
@@ -286,6 +307,12 @@
       <if test="deleteTime != null">
         DELETE_TIME,
       </if>
+      <if test="matterTypeNo != null">
+        MATTER_TYPE_NO,
+      </if>
+      <if test="matterTypeName != null">
+        MATTER_TYPE_NAME,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="configNo != null">
@@ -342,6 +369,12 @@
       <if test="deleteTime != null">
         #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="matterTypeNo != null">
+        #{matterTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterTypeName != null">
+        #{matterTypeName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaserailwaymetertarenetconfig.model.MeterBaseRailwayMeterTareNetConfig">
@@ -362,7 +395,9 @@
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
       DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
       DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP}
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      MATTER_TYPE_NO = #{matterTypeNo,jdbcType=VARCHAR},
+      MATTER_TYPE_NAME = #{matterTypeName,jdbcType=VARCHAR}
     where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaymetertarenetconfig.model.MeterBaseRailwayMeterTareNetConfig">
@@ -419,6 +454,12 @@
       <if test="deleteTime != null">
         DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="matterTypeNo != null">
+        MATTER_TYPE_NO = #{matterTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterTypeName != null">
+        MATTER_TYPE_NAME = #{matterTypeName,jdbcType=VARCHAR},
+      </if>
     </set>
     where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
   </update>
@@ -442,8 +483,8 @@
       RECEIVING_UINT_NAME, MEMO, VALUE_FLAG, 
       CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
       UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-      )
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      MATTER_TYPE_NO, MATTER_TYPE_NAME)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.configNo,jdbcType=VARCHAR}, 
@@ -452,8 +493,8 @@
       #{item.receivingUintName,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{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.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}
-       from dual  
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, 
+      #{item.matterTypeNo,jdbcType=VARCHAR}, #{item.matterTypeName,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -531,6 +572,14 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
           when #{item.configNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
        </foreach>
+       ,MATTER_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.matterTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.matterTypeName,jdbcType=VARCHAR}
+       </foreach>
      where CONFIG_NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.configNo,jdbcType=VARCHAR}

src/main/java/com/steerinfo/baseinfo/meterbaserailwaymetertarenetconfig/model/MeterBaseRailwayMeterTareNetConfig.java

@@ -115,6 +115,18 @@ public class MeterBaseRailwayMeterTareNetConfig implements IBasePO<String> {
     @ApiModelProperty(value="删除时间",required=false)
     private Date deleteTime;
 
+    /**
+     * 物料类别编码(MATTER_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料类别编码",required=false)
+    private String matterTypeNo;
+
+    /**
+     * 物料类别名称(MATTER_TYPE_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="物料类别名称",required=false)
+    private String matterTypeName;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -271,6 +283,22 @@ public class MeterBaseRailwayMeterTareNetConfig implements IBasePO<String> {
         this.deleteTime = deleteTime;
     }
 
+    public String getMatterTypeNo() {
+        return matterTypeNo;
+    }
+
+    public void setMatterTypeNo(String matterTypeNo) {
+        this.matterTypeNo = matterTypeNo == null ? null : matterTypeNo.trim();
+    }
+
+    public String getMatterTypeName() {
+        return matterTypeName;
+    }
+
+    public void setMatterTypeName(String matterTypeName) {
+        this.matterTypeName = matterTypeName == null ? null : matterTypeName.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -295,6 +323,8 @@ public class MeterBaseRailwayMeterTareNetConfig implements IBasePO<String> {
         sb.append(", deleteManNo=").append(deleteManNo);
         sb.append(", deleteManName=").append(deleteManName);
         sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", matterTypeNo=").append(matterTypeNo);
+        sb.append(", matterTypeName=").append(matterTypeName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/baseinfo/meterbaserailwaymetertarenetconfig/service/IMeterBaseRailwayMeterTareNetConfigService.java

@@ -8,10 +8,10 @@ import java.math.BigDecimal;
 /**
  * MeterBaseRailwayMeterTareNetConfig服务接口：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-08-09 02:55
+ * @version 1.0-SNAPSHORT 2022-08-12 09:19
  * 类描述
  * 修订历史：
- * 日期：2022-08-09
+ * 日期：2022-08-12
  * 作者：generator
  * 参考：
  * 描述：MeterBaseRailwayMeterTareNetConfig服务接口

src/main/java/com/steerinfo/baseinfo/meterbaserailwaymetertarenetconfig/service/impl/MeterBaseRailwayMeterTareNetConfigServiceImpl.java

@@ -13,10 +13,10 @@ import java.math.BigDecimal;
 /**
  * MeterBaseRailwayMeterTareNetConfig服务实现：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-08-09 02:55
+ * @version 1.0-SNAPSHORT 2022-08-12 09:19
  * 类描述
  * 修订历史：
- * 日期：2022-08-09
+ * 日期：2022-08-12
  * 作者：generator
  * 参考：
  * 描述：MeterBaseRailwayMeterTareNetConfig服务实现

src/main/java/com/steerinfo/baseinfo/meterbaserailwaymetertype/controller/MeterBaseRailwayMeterTypeController.java

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

src/main/java/com/steerinfo/baseinfo/meterbaserailwaymetertype/mapper/MeterBaseRailwayMeterTypeMapper.java

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

src/main/java/com/steerinfo/baseinfo/meterbaserailwaymetertype/mapper/MeterBaseRailwayMeterTypeMapper.xml

@@ -0,0 +1,444 @@
+<?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.meterbaserailwaymetertype.mapper.MeterBaseRailwayMeterTypeMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbaserailwaymetertype.model.MeterBaseRailwayMeterType">
+    <id column="CONFIG_NO" jdbcType="VARCHAR" property="configNo" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <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="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
+    <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
+    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+    <result column="MATTER_TYPE_NO" jdbcType="VARCHAR" property="matterTypeNo" />
+    <result column="MATTER_TYPE_NAME" jdbcType="VARCHAR" property="matterTypeName" />
+  </resultMap>
+  <sql id="columns">
+    CONFIG_NO, MEMO, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
+    UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, MATTER_TYPE_NO, 
+    MATTER_TYPE_NAME
+  </sql>
+  <sql id="columns_alias">
+    t.CONFIG_NO, t.MEMO, 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.DELETE_MAN_NO, t.DELETE_MAN_NAME, 
+    t.DELETE_TIME, t.MATTER_TYPE_NO, t.MATTER_TYPE_NAME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_RAILWAY_METER_TYPE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_RAILWAY_METER_TYPE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="configNo != null and configNo != ''">
+        and CONFIG_NO = #{configNo}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </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="deleteManNo != null and deleteManNo != ''">
+        and DELETE_MAN_NO = #{deleteManNo}
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        and DELETE_MAN_NAME = #{deleteManName}
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+      <if test="matterTypeNo != null and matterTypeNo != ''">
+        and MATTER_TYPE_NO = #{matterTypeNo}
+      </if>
+      <if test="matterTypeName != null and matterTypeName != ''">
+        and MATTER_TYPE_NAME = #{matterTypeName}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="configNo != null and configNo != ''">
+        and CONFIG_NO LIKE '%${configNo}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </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="deleteManNo != null and deleteManNo != ''">
+        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+      <if test="matterTypeNo != null and matterTypeNo != ''">
+        and MATTER_TYPE_NO LIKE '%${matterTypeNo}%'
+      </if>
+      <if test="matterTypeName != null and matterTypeName != ''">
+        and MATTER_TYPE_NAME LIKE '%${matterTypeName}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_RAILWAY_METER_TYPE
+    where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_RAILWAY_METER_TYPE
+    where 1!=1 
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </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="deleteManNo != null and deleteManNo != ''">
+        or DELETE_MAN_NO = #{deleteManNo}
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        or DELETE_MAN_NAME = #{deleteManName}
+      </if>
+      <if test="deleteTime != null">
+        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
+      </if>
+      <if test="matterTypeNo != null and matterTypeNo != ''">
+        or MATTER_TYPE_NO = #{matterTypeNo}
+      </if>
+      <if test="matterTypeName != null and matterTypeName != ''">
+        or MATTER_TYPE_NAME = #{matterTypeName}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaserailwaymetertype.model.MeterBaseRailwayMeterType">
+    insert into METER_BASE_RAILWAY_METER_TYPE (CONFIG_NO, MEMO, VALUE_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      MATTER_TYPE_NO, MATTER_TYPE_NAME)
+    values (#{configNo,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, 
+      #{matterTypeNo,jdbcType=VARCHAR}, #{matterTypeName,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaymetertype.model.MeterBaseRailwayMeterType">
+    insert into METER_BASE_RAILWAY_METER_TYPE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="configNo != null">
+        CONFIG_NO,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </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="deleteManNo != null">
+        DELETE_MAN_NO,
+      </if>
+      <if test="deleteManName != null">
+        DELETE_MAN_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+      <if test="matterTypeNo != null">
+        MATTER_TYPE_NO,
+      </if>
+      <if test="matterTypeName != null">
+        MATTER_TYPE_NAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="configNo != null">
+        #{configNo,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </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="deleteManNo != null">
+        #{deleteManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteManName != null">
+        #{deleteManName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="matterTypeNo != null">
+        #{matterTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterTypeName != null">
+        #{matterTypeName,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaserailwaymetertype.model.MeterBaseRailwayMeterType">
+    update METER_BASE_RAILWAY_METER_TYPE
+    set MEMO = #{memo,jdbcType=VARCHAR},
+      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},
+      DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
+      DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      MATTER_TYPE_NO = #{matterTypeNo,jdbcType=VARCHAR},
+      MATTER_TYPE_NAME = #{matterTypeName,jdbcType=VARCHAR}
+    where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaymetertype.model.MeterBaseRailwayMeterType">
+    update METER_BASE_RAILWAY_METER_TYPE
+    <set>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </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="deleteManNo != null">
+        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteManName != null">
+        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="matterTypeNo != null">
+        MATTER_TYPE_NO = #{matterTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterTypeName != null">
+        MATTER_TYPE_NAME = #{matterTypeName,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where CONFIG_NO = #{configNo,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_METER_TYPE 
+      (CONFIG_NO, 
+      MEMO, VALUE_FLAG, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      MATTER_TYPE_NO, MATTER_TYPE_NAME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.configNo,jdbcType=VARCHAR}, 
+      #{item.memo,jdbcType=VARCHAR}, #{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.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, 
+      #{item.matterTypeNo,jdbcType=VARCHAR}, #{item.matterTypeName,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_RAILWAY_METER_TYPE
+     set
+       CONFIG_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.configNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DELETE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,MATTER_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.matterTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.matterTypeName,jdbcType=VARCHAR}
+       </foreach>
+     where CONFIG_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.configNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_RAILWAY_METER_TYPE
+    where CONFIG_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbaserailwaymetertype/model/MeterBaseRailwayMeterType.java

@@ -0,0 +1,242 @@
+package com.steerinfo.baseinfo.meterbaserailwaymetertype.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 MeterBaseRailwayMeterType implements IBasePO<String> {
+    /**
+     * 配置编号(CONFIG_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="配置编号",required=true)
+    private String configNo;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态(0：作废；1：正常)(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0：作废；1：正常)",required=true)
+    private String valueFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=true)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="创建人姓名",required=true)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=true)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 删除人编号(DELETE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="删除人编号",required=false)
+    private String deleteManNo;
+
+    /**
+     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="删除人姓名",required=false)
+    private String deleteManName;
+
+    /**
+     * 删除时间(DELETE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="删除时间",required=false)
+    private Date deleteTime;
+
+    /**
+     * 物料类别编码(MATTER_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料类别编码",required=false)
+    private String matterTypeNo;
+
+    /**
+     * 物料类别名称(MATTER_TYPE_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="物料类别名称",required=false)
+    private String matterTypeName;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.configNo;
+    }
+
+    @Override
+    public void setId(String configNo) {
+        this.configNo = configNo == null ? null : configNo.trim();
+    }
+
+    public String getConfigNo() {
+        return configNo;
+    }
+
+    public void setConfigNo(String configNo) {
+        this.configNo = configNo == null ? null : configNo.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    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 getDeleteManNo() {
+        return deleteManNo;
+    }
+
+    public void setDeleteManNo(String deleteManNo) {
+        this.deleteManNo = deleteManNo == null ? null : deleteManNo.trim();
+    }
+
+    public String getDeleteManName() {
+        return deleteManName;
+    }
+
+    public void setDeleteManName(String deleteManName) {
+        this.deleteManName = deleteManName == null ? null : deleteManName.trim();
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    public String getMatterTypeNo() {
+        return matterTypeNo;
+    }
+
+    public void setMatterTypeNo(String matterTypeNo) {
+        this.matterTypeNo = matterTypeNo == null ? null : matterTypeNo.trim();
+    }
+
+    public String getMatterTypeName() {
+        return matterTypeName;
+    }
+
+    public void setMatterTypeName(String matterTypeName) {
+        this.matterTypeName = matterTypeName == null ? null : matterTypeName.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", configNo=").append(configNo);
+        sb.append(", memo=").append(memo);
+        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(", deleteManNo=").append(deleteManNo);
+        sb.append(", deleteManName=").append(deleteManName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", matterTypeNo=").append(matterTypeNo);
+        sb.append(", matterTypeName=").append(matterTypeName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaserailwaymetertype/service/IMeterBaseRailwayMeterTypeService.java

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

src/main/java/com/steerinfo/baseinfo/meterbaserailwaymetertype/service/impl/MeterBaseRailwayMeterTypeServiceImpl.java

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

src/main/java/com/steerinfo/baseinfo/meterbaserailwaystandardtarenetconfig/controller/MeterBaseRailwayStandardTareNetConfigController.java

@@ -23,10 +23,10 @@ import java.math.BigDecimal;
 /**
  * MeterBaseRailwayStandardTareNetConfig RESTful接口：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-08-09 02:55
+ * @version 1.0-SNAPSHORT 2022-08-12 09:19
  * 类描述
  * 修订历史：
- * 日期：2022-08-09
+ * 日期：2022-08-12
  * 作者：generator
  * 参考：
  * 描述：MeterBaseRailwayStandardTareNetConfig RESTful接口

src/main/java/com/steerinfo/baseinfo/meterbaserailwaystandardtarenetconfig/mapper/MeterBaseRailwayStandardTareNetConfigMapper.xml

@@ -20,17 +20,20 @@
     <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
     <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
     <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+    <result column="MATTER_TYPE_NO" jdbcType="VARCHAR" property="matterTypeNo" />
+    <result column="MATTER_TYPE_NAME" jdbcType="VARCHAR" property="matterTypeName" />
   </resultMap>
   <sql id="columns">
     CONFIG_NO, MATTER_NO, MATTER_NAME, FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, 
     RECEIVING_UINT_NAME, MEMO, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
+    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+    MATTER_TYPE_NO, MATTER_TYPE_NAME
   </sql>
   <sql id="columns_alias">
     t.CONFIG_NO, t.MATTER_NO, t.MATTER_NAME, t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, 
     t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, t.MEMO, 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.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME
+    t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.MATTER_TYPE_NO, t.MATTER_TYPE_NAME
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_BASE_RAILWAY_STANDARD_TARE_NET_CONFIG
@@ -94,6 +97,12 @@
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
+      <if test="matterTypeNo != null and matterTypeNo != ''">
+        and MATTER_TYPE_NO = #{matterTypeNo}
+      </if>
+      <if test="matterTypeName != null and matterTypeName != ''">
+        and MATTER_TYPE_NAME = #{matterTypeName}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -152,6 +161,12 @@
       <if test="deleteTime != null">
         and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
       </if>
+      <if test="matterTypeNo != null and matterTypeNo != ''">
+        and MATTER_TYPE_NO LIKE '%${matterTypeNo}%'
+      </if>
+      <if test="matterTypeName != null and matterTypeName != ''">
+        and MATTER_TYPE_NAME LIKE '%${matterTypeName}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -212,6 +227,12 @@
       <if test="deleteTime != null">
         or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
       </if>
+      <if test="matterTypeNo != null and matterTypeNo != ''">
+        or MATTER_TYPE_NO = #{matterTypeNo}
+      </if>
+      <if test="matterTypeName != null and matterTypeName != ''">
+        or MATTER_TYPE_NAME = #{matterTypeName}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaserailwaystandardtarenetconfig.model.MeterBaseRailwayStandardTareNetConfig">
     insert into METER_BASE_RAILWAY_STANDARD_TARE_NET_CONFIG (CONFIG_NO, MATTER_NO, MATTER_NAME, 
@@ -219,15 +240,15 @@
       RECEIVING_UINT_NAME, MEMO, VALUE_FLAG, 
       CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
       UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-      )
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      MATTER_TYPE_NO, MATTER_TYPE_NAME)
     values (#{configNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR}, 
       #{forwardingUnitNo,jdbcType=VARCHAR}, #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR}, 
       #{receivingUintName,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, 
       #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}
-      )
+      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, 
+      #{matterTypeNo,jdbcType=VARCHAR}, #{matterTypeName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaystandardtarenetconfig.model.MeterBaseRailwayStandardTareNetConfig">
     insert into METER_BASE_RAILWAY_STANDARD_TARE_NET_CONFIG
@@ -286,6 +307,12 @@
       <if test="deleteTime != null">
         DELETE_TIME,
       </if>
+      <if test="matterTypeNo != null">
+        MATTER_TYPE_NO,
+      </if>
+      <if test="matterTypeName != null">
+        MATTER_TYPE_NAME,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="configNo != null">
@@ -342,6 +369,12 @@
       <if test="deleteTime != null">
         #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="matterTypeNo != null">
+        #{matterTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterTypeName != null">
+        #{matterTypeName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaserailwaystandardtarenetconfig.model.MeterBaseRailwayStandardTareNetConfig">
@@ -362,7 +395,9 @@
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
       DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
       DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP}
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      MATTER_TYPE_NO = #{matterTypeNo,jdbcType=VARCHAR},
+      MATTER_TYPE_NAME = #{matterTypeName,jdbcType=VARCHAR}
     where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaystandardtarenetconfig.model.MeterBaseRailwayStandardTareNetConfig">
@@ -419,6 +454,12 @@
       <if test="deleteTime != null">
         DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="matterTypeNo != null">
+        MATTER_TYPE_NO = #{matterTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterTypeName != null">
+        MATTER_TYPE_NAME = #{matterTypeName,jdbcType=VARCHAR},
+      </if>
     </set>
     where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
   </update>
@@ -442,8 +483,8 @@
       RECEIVING_UINT_NAME, MEMO, VALUE_FLAG, 
       CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
       UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-      )
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      MATTER_TYPE_NO, MATTER_TYPE_NAME)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.configNo,jdbcType=VARCHAR}, 
@@ -452,8 +493,8 @@
       #{item.receivingUintName,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{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.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}
-       from dual  
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, 
+      #{item.matterTypeNo,jdbcType=VARCHAR}, #{item.matterTypeName,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -531,6 +572,14 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
           when #{item.configNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
        </foreach>
+       ,MATTER_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.matterTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.matterTypeName,jdbcType=VARCHAR}
+       </foreach>
      where CONFIG_NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.configNo,jdbcType=VARCHAR}

src/main/java/com/steerinfo/baseinfo/meterbaserailwaystandardtarenetconfig/model/MeterBaseRailwayStandardTareNetConfig.java

@@ -115,6 +115,18 @@ public class MeterBaseRailwayStandardTareNetConfig implements IBasePO<String> {
     @ApiModelProperty(value="删除时间",required=false)
     private Date deleteTime;
 
+    /**
+     * 物料类别编码(MATTER_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料类别编码",required=false)
+    private String matterTypeNo;
+
+    /**
+     * 物料类别名称(MATTER_TYPE_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="物料类别名称",required=false)
+    private String matterTypeName;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -271,6 +283,22 @@ public class MeterBaseRailwayStandardTareNetConfig implements IBasePO<String> {
         this.deleteTime = deleteTime;
     }
 
+    public String getMatterTypeNo() {
+        return matterTypeNo;
+    }
+
+    public void setMatterTypeNo(String matterTypeNo) {
+        this.matterTypeNo = matterTypeNo == null ? null : matterTypeNo.trim();
+    }
+
+    public String getMatterTypeName() {
+        return matterTypeName;
+    }
+
+    public void setMatterTypeName(String matterTypeName) {
+        this.matterTypeName = matterTypeName == null ? null : matterTypeName.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -295,6 +323,8 @@ public class MeterBaseRailwayStandardTareNetConfig implements IBasePO<String> {
         sb.append(", deleteManNo=").append(deleteManNo);
         sb.append(", deleteManName=").append(deleteManName);
         sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", matterTypeNo=").append(matterTypeNo);
+        sb.append(", matterTypeName=").append(matterTypeName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/baseinfo/meterbaserailwaystandardtarenetconfig/service/IMeterBaseRailwayStandardTareNetConfigService.java

@@ -8,10 +8,10 @@ import java.math.BigDecimal;
 /**
  * MeterBaseRailwayStandardTareNetConfig服务接口：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-08-09 02:55
+ * @version 1.0-SNAPSHORT 2022-08-12 09:19
  * 类描述
  * 修订历史：
- * 日期：2022-08-09
+ * 日期：2022-08-12
  * 作者：generator
  * 参考：
  * 描述：MeterBaseRailwayStandardTareNetConfig服务接口

src/main/java/com/steerinfo/baseinfo/meterbaserailwaystandardtarenetconfig/service/impl/MeterBaseRailwayStandardTareNetConfigServiceImpl.java

@@ -13,10 +13,10 @@ import java.math.BigDecimal;
 /**
  * MeterBaseRailwayStandardTareNetConfig服务实现：
  * @author generator
- * @version 1.0-SNAPSHORT 2022-08-09 02:55
+ * @version 1.0-SNAPSHORT 2022-08-12 09:19
  * 类描述
  * 修订历史：
- * 日期：2022-08-09
+ * 日期：2022-08-12
  * 作者：generator
  * 参考：
  * 描述：MeterBaseRailwayStandardTareNetConfig服务实现

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -430,7 +430,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "洁净")
+    @ApiOperation(value = "结净")
     @PostMapping(value = "/clean")
     public RESTfulResult clean(@RequestParam String actualFirstNo, String dataNo, String predictionNo, String note) {
         RESTfulResult rm = failed();
@@ -472,7 +472,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "数据洁净-C#端")
+    @ApiOperation(value = "数据结净-C#端")
     @PostMapping(value = "/clientClean")
     public RESTfulResult clientClean(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActual, MeterWorkCarActualFirst, MeterWorkCarActual> model) {
         RESTfulResult rm = failed();
@@ -529,7 +529,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "解除", notes = "将洁净后的数据进行还原且清除委托信息")
+    @ApiOperation(value = "解除", notes = "将结净后的数据进行还原且清除委托信息")
     @PostMapping(value = "/remove")
     public RESTfulResult remove(@RequestBody List<MeterWorkCarActual> models) {
         RESTfulResult rm = failed();
@@ -551,7 +551,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
         return rm;
     }
-    @ApiOperation(value = "解除", notes = "将洁净后的数据进行还原但不清除委托信息")
+    @ApiOperation(value = "解除", notes = "将结净后的数据进行还原但不清除委托信息")
     @PostMapping(value = "/removeButNotEntrust")
     public RESTfulResult removeButNotEntrust(@RequestBody List<MeterWorkCarActual> models) {
         RESTfulResult rm = failed();
@@ -574,7 +574,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "特殊委托解除洁净", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "特殊委托解除结净", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/specialRemove")
     public RESTfulResult specialRemove(@RequestBody HashMap params) {
         RESTfulResult rm = failed();
@@ -590,7 +590,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "普通委托解除洁净", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "普通委托解除结净", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/commonRemove")
     public RESTfulResult commonRemove(@RequestBody HashMap params) {
         RESTfulResult rm = failed();
@@ -634,7 +634,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "期限洁净")
+    @ApiOperation(value = "期限结净")
     @PostMapping(value = "/termclean")
     public RESTfulResult termclean(@RequestParam String actualFirstNo, String dataNo) {
         RESTfulResult rm = failed();
@@ -929,7 +929,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "根据HashMap查询最新的洁净信息", notes = "根据HashMap查询最新的洁净信息")
+    @ApiOperation(value = "根据HashMap查询最新的结净信息", notes = "根据HashMap查询最新的结净信息")
     @PostMapping(value = "/selectByMap")
     public RESTfulResult selectByMap(@RequestBody HashMap params) {
         RESTfulResult rm = failed();

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.java

@@ -15,10 +15,10 @@ import java.util.Objects;
 public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual, String> {
 
     List<MeterWorkCarActual> selectView(Map<Objects,String> map);
-    //一次皮重洁净
+    //一次皮重结净
     MeterWorkCarActual manualAdd(@Param( value = "actualFirstNo") String actualFirstNo, @Param( value = "dataNo")String dataNo);
 
-    //一次皮重洁净
+    //一次皮重结净
     MeterWorkCarActual manualAddPre(@Param( value = "actualFirstNo") String actualFirstNo, @Param( value = "dataNo")String dataNo, @Param( value = "predictionNo")String predictionNo);
 
     MeterWorkCarActual mathPredcition(@Param(value = "actualNo") String actualNo, @Param(value = "predictionNo") String predictionNo);
@@ -26,7 +26,7 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
     MeterWorkCarActual cleanPredcition(@Param(value = "actualNo") String actualNo);
 
     String getNewID(@org.apache.ibatis.annotations.Param(value="afl")String afl);
-    //期限皮重洁净
+    //期限皮重结净
     MeterWorkCarActual tareAdd(@Param( value = "actualFirstNo") String actualFirstNo, @Param( value = "dataNo")String dataNo);
 
     List<MeterWorkCarActual> selectByTime(Map<Objects,String> map);

src/main/java/com/steerinfo/meterwork/meterworkcaractual/model/MeterWorkCarActual.java

@@ -352,9 +352,9 @@ public class MeterWorkCarActual implements IBasePO<String> {
     private String netGroup;
 
     /**
-     * 结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）(NET_MODE,VARCHAR,1)
+     * 结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）(NET_MODE,VARCHAR,1)
      */
-    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）",required=false)
+    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）",required=false)
     private String netMode;
 
     /**

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/IMeterWorkCarActualService.java

@@ -88,7 +88,7 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
     //根据传入时间和车号，查询给定时间段去重车号
     List<String> distinctCarNo(HashMap<String, Object> params);
 
-    // 根据传入的一次计量数据和洁净数据实体进行洁净操作
+    // 根据传入的一次计量数据和结净数据实体进行结净操作
     MeterWorkCarActual clientClean(MeterWorkCarActualFirst first, MeterWorkCarActual net);
     //根据实绩id获取一次计量信息和委托信息
     RESTfulResult firstAndEntrustById(String actualNo);

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -321,7 +321,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             // 一次计量数据是否已经完成委托匹配
             if ((mwcaf1.getPredictionNo() != null && "".equals(mwcaf1.getPredictionNo())) || (mwcaf2.getPredictionNo() != null && "".equals(mwcaf2.getPredictionNo()))) {
                 if (!mwcaf1.getPredictionNo().equals(mwcaf2.getPredictionNo())) {
-                    throw new MarkerMetException(500, "选中的两条一次计量数据匹配的委托不一致，不允许进行洁净操作！！！");
+                    throw new MarkerMetException(500, "选中的两条一次计量数据匹配的委托不一致，不允许进行结净操作！！！");
                 } else if (predictionNo != null && !"".equals(predictionNo)) {
                     throw new MarkerMetException(500, "选中的两条一次计量数据已经匹配委托，请正确选择数据！！！");
                 }
@@ -336,7 +336,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
                 mwcaf1.setValueFlag(DbConstants.NET);
                 mwcaf1.setUpdateManName("system");
-                mwcaf1.setUpdateManName("二次计量洁净更新");
+                mwcaf1.setUpdateManName("二次计量结净更新");
                 mwcaf1.setUpdateTime(new Date());
                 mwcaf1.setIsPreScale("1");
                 mwcaf1.setPredictionNo(predictionNo);
@@ -346,7 +346,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 // 皮重数据处理
                 mwcaf2.setValueFlag(DbConstants.NET);
                 mwcaf2.setUpdateManName("system");
-                mwcaf2.setUpdateManName("二次计量洁净更新");
+                mwcaf2.setUpdateManName("二次计量结净更新");
                 mwcaf2.setUpdateTime(new Date());
                 mwcaf2.setPredictionNo(predictionNo);
                 mwcaf2.setPredictionType("1");
@@ -391,7 +391,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 scale.setValueFlag(DbConstants.NET);
                 scale.setUpdateTime(new Date());
                 scale.setUpdateManNo("system");
-                scale.setUpdateManName("二次计量洁净更新");
+                scale.setUpdateManName("二次计量结净更新");
                 scale.setUploadFlag("1");
                 scale.setMeasureStation(actualRow.getNetSpot3No());
                 scale.setMeasureStationName(actualRow.getNetSpot3Name());
@@ -416,7 +416,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
                         mwcaf1.setValueFlag(DbConstants.NET);
                         mwcaf1.setUpdateManName("system");
-                        mwcaf1.setUpdateManName("二次计量洁净更新");
+                        mwcaf1.setUpdateManName("二次计量结净更新");
                         mwcaf1.setUpdateTime(new Date());
                         mwcaf1.setIsPreScale("1");
                         mwcaf1.setPredictionNo(scale.getPredictionNo());
@@ -426,7 +426,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         // 皮重数据处理
                         mwcaf2.setValueFlag(DbConstants.NET);
                         mwcaf2.setUpdateManName("system");
-                        mwcaf2.setUpdateManName("二次计量洁净更新");
+                        mwcaf2.setUpdateManName("二次计量结净更新");
                         mwcaf2.setUpdateTime(new Date());
                         mwcaf2.setIsPreScale("1");
                         mwcaf2.setPredictionNo(scale.getPredictionNo());
@@ -473,7 +473,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         scale.setValueFlag(DbConstants.NET);
                         scale.setUpdateTime(new Date());
                         scale.setUpdateManNo("system");
-                        scale.setUpdateManName("二次计量洁净更新");
+                        scale.setUpdateManName("二次计量结净更新");
                         scale.setUploadFlag("1");
                         scale.setMeasureStation(actualRow.getNetSpot3No());
                         scale.setMeasureStationName(actualRow.getNetSpot3Name());
@@ -489,7 +489,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
                 first1.setValueFlag(DbConstants.NET);
                 first1.setUpdateManName("system");
-                first1.setUpdateManName("二次计量洁净更新");
+                first1.setUpdateManName("二次计量结净更新");
                 first1.setUpdateTime(new Date());
                 first1.setIsPreScale("0");
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(first1);
@@ -497,7 +497,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 // 皮重数据处理
                 first2.setValueFlag(DbConstants.NET);
                 first2.setUpdateManName("system");
-                first2.setUpdateManName("二次计量洁净更新");
+                first2.setUpdateManName("二次计量结净更新");
                 first2.setUpdateTime(new Date());
                 first2.setIsPreScale("0");
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(first2);
@@ -565,11 +565,11 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())){
                     PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
                     if(scaleTemp.getValueFlag().equals("9")) {
-                        throw new MarkerMetException(500, "洁净数据中包含已结算的委托!!!");
+                        throw new MarkerMetException(500, "结净数据中包含已结算的委托!!!");
 
                     }
                     if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                        throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                        throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
                     }
                 }
             }
@@ -631,7 +631,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     scale.setUploadFlag("1");
                     scale.setUpdateTime(new Date());
                     scale.setUpdateManNo("system");
-                    scale.setUpdateManName("计量洁净数据解除操作");
+                    scale.setUpdateManName("计量结净数据解除操作");
                     preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                 }
 //                }
@@ -714,20 +714,20 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         MeterWorkCarActual actualModel01 = meterWorkCarActualMapper.selectByPrimaryKey(params.get("actualNo01").toString());
         MeterWorkCarActual actualModel02 = meterWorkCarActualMapper.selectByPrimaryKey(params.get("actualNo02").toString());
         if(actualModel01 == null || actualModel02 == null){
-            rm.setMessage("未找到洁净计量数据，请确认！！！");
+            rm.setMessage("未找到结净计量数据，请确认！！！");
             return rm;
         }
         List<MeterWorkCarActual> models = new ArrayList<>();
         models.add(actualModel01);
         models.add(actualModel02);
         if(!models.get(0).getPredictionCombination().equals(models.get(1).getPredictionCombination())){
-            rm.setMessage("必须选择两个预报组合号一致的洁净数据!!!");
+            rm.setMessage("必须选择两个预报组合号一致的结净数据!!!");
             return rm;
         }
         for(MeterWorkCarActual modelTemp: models) {
             PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
             if(scaleTemp.getValueFlag().equals("9")) {
-                rm.setMessage("两个洁净数据中包含已结算的委托!!!");
+                rm.setMessage("两个结净数据中包含已结算的委托!!!");
                 return rm;
             }
         }
@@ -739,7 +739,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     //类型为双委托类型
                     for (MeterWorkCarActual model: models) {
                         if(!model.getPredictionType().equals("5")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是双委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是双委托结净数据，请确认！！");
                             return rm;
                         }
                     }
@@ -747,14 +747,14 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     //类型为混卸类型
                     for (MeterWorkCarActual model: models) {
                         if(!model.getPredictionType().equals("6")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是混卸委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是混卸委托结净数据，请确认！！");
                         }
                     }
                 }else if(type.equals("7")){
                     //类型为混装类型
                     for (MeterWorkCarActual model: models) {
                         if(!model.getPredictionType().equals("7")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是混装委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是混装委托结净数据，请确认！！");
                         }
                     }
                 }
@@ -824,7 +824,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         model.setIsPreScale("0");
     }
 
-    //还原洁净
+    //还原结净
     public void removeEl(MeterWorkCarActual model) {
         String userId;
         String userName;
@@ -861,7 +861,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
             MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(params.get("actualNo").toString());
             if(actualModel == null){
-                rm.setMessage("未找到洁净计量数据，请确认！！！");
+                rm.setMessage("未找到结净计量数据，请确认！！！");
                 return rm;
             }
             List<MeterWorkCarActual> models = new ArrayList<MeterWorkCarActual>();
@@ -871,17 +871,17 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())){
                     PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
                     if(scaleTemp.getValueFlag().equals("9")) {
-                        rm.setMessage("洁净数据中包含已结算的委托!!!");
+                        rm.setMessage("结净数据中包含已结算的委托!!!");
                         return rm;
                     }
                     if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                        rm.setMessage("洁净数据中包含特殊委托匹配结净的数据!!!");
+                        rm.setMessage("结净数据中包含特殊委托匹配结净的数据!!!");
                         return rm;
                     }
                 }
             }
             for (MeterWorkCarActual model: models) {
-                //循环每一个洁净记录
+                //循环每一个结净记录
                 //委托不能为空
                 if(StringUtils.isNotEmpty(model.getPredictionNo())){
                     // 改委托
@@ -891,7 +891,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         scale.setUploadFlag("1");
                         scale.setUpdateTime(new Date());
                         scale.setUpdateManNo("system");
-                        scale.setUpdateManName("洁净废除操作");
+                        scale.setUpdateManName("结净废除操作");
                         preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                     }
                 }
@@ -908,7 +908,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 if(firstGross != null){
                     firstGross.setValueFlag(DbConstants.VALID);
                     firstGross.setUpdateManName("system");
-                    firstGross.setUpdateManName("洁净废除更新");
+                    firstGross.setUpdateManName("结净废除更新");
                     firstGross.setNote(model.getNote());
                     firstGross.setUpdateTime(new Date());
                     firstGross.setIsPreScale("0");
@@ -918,18 +918,18 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 if(firstTare != null){
                     firstTare.setValueFlag(DbConstants.VALID);
                     firstTare.setUpdateManName("system");
-                    firstTare.setUpdateManName("洁净废除更新");
+                    firstTare.setUpdateManName("结净废除更新");
                     firstTare.setNote(model.getNote());
                     firstTare.setUpdateTime(new Date());
                     firstTare.setIsPreScale("0");
                     firstTare.setValueFlag("0");
                     meterWorkCarActualFirstMapper.updateByPrimaryKey(firstTare);
                 }
-                // 作废洁净
+                // 作废结净
                 model.setUploadFlag("1");
                 model.setValueFlag("0");
                 meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
-                //删洁净
+                //删结净
                 //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
             }
             rm.setSucceed();
@@ -1079,7 +1079,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         rm.setCode("500");
         try{
             if (com.steerinfo.util.StringUtils.isEmpty(actualNo)) {
-                rm.setMessage("洁净数据主键不能为空,请确认！！");
+                rm.setMessage("结净数据主键不能为空,请确认！！");
                 return rm;
             }
             if (com.steerinfo.util.StringUtils.isEmpty(predictionNo)) {
@@ -1090,7 +1090,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             MeterWorkCarActual model = meterWorkCarActualMapper.selectByPrimaryKey(actualNo);
             PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(predictionNo);
             if(model == null) {
-                rm.setMessage("不存在对应的洁净数据,请确认！！");
+                rm.setMessage("不存在对应的结净数据,请确认！！");
                 return rm;
             }else if(!model.getIsPreScale().equals("0")) {
                 rm.setMessage("只有未匹配的净重数据才能进行委托匹配操作");
@@ -1106,7 +1106,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     return rm;
                 }
                 if (!model.getCarNo().equals(scale.getCarNo())) {
-                    rm.setMessage("洁净数据中车号和预报中车号不一致，请确认！！");
+                    rm.setMessage("结净数据中车号和预报中车号不一致，请确认！！");
                     return rm;
                 }
                 if (!scale.getPredictionType().equals("1")) {
@@ -1124,14 +1124,14 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             // 毛重
             MeterWorkCarActualFirst grossrow = meterWorkCarActualFirstMapper.selectAndMatch(model.getActualFirst1No(), predictionNo);
             grossrow.setUpdateTime(new Date());
-            grossrow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
+            grossrow.setUpdateManName(userName + ": 结净数据匹配委托操作");
             grossrow.setUpdateManNo(userId);
             grossrow.setIsPreScale("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(grossrow);
             // 皮重
             MeterWorkCarActualFirst tarerow = meterWorkCarActualFirstMapper.selectAndMatch(model.getActualFirst2No(), predictionNo);
             tarerow.setUpdateTime(new Date());
-            tarerow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
+            tarerow.setUpdateManName(userName + ": 结净数据匹配委托操作");
             tarerow.setUpdateManNo(userId);
             tarerow.setIsPreScale("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(tarerow);
@@ -1152,7 +1152,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 scale.setUploadFlag("1");
                 scale.setUpdateTime(new Date());
                 scale.setUpdateManNo("system");
-                scale.setUpdateManName("计量洁净数据匹配委托操作");
+                scale.setUpdateManName("计量结净数据匹配委托操作");
                 scale.setMeasureStation(mwca.getNetSpot3No());
                 scale.setMeasureStationName(mwca.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
@@ -1173,14 +1173,14 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkCarActual cleanPrediction (MeterWorkCarActual model) throws MarkerMetException {
         if (model.getActualNo() == null || "".equals(model.getActualNo())) {
-            throw new MarkerMetException(500, "洁净数据主键不能为空");
+            throw new MarkerMetException(500, "结净数据主键不能为空");
         }
         if (!model.getValueFlag().equals("1") && model.getPredictionNo() != null && !"".equals(model.getPredictionNo())) {
-            throw new MarkerMetException(500, "只有有效已匹配的洁净数据才能进行解除操作");
+            throw new MarkerMetException(500, "只有有效已匹配的结净数据才能进行解除操作");
         }
         MeterWorkCarActual mwcaquery = meterWorkCarActualMapper.selectByPrimaryKey(model.getActualNo());
         if (mwcaquery == null) {
-            throw new MarkerMetException(500, "不存在对应的洁净数据");
+            throw new MarkerMetException(500, "不存在对应的结净数据");
         }
 
         PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
@@ -1189,7 +1189,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 throw new MarkerMetException(500, "结净数据包含已结算的委托!!!");
             }
             if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
             }
         }
 
@@ -1202,7 +1202,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         MeterWorkCarActualFirst grossrow = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
 //        grossrow.setValueFlag("3");
         grossrow.setUpdateTime(new Date());
-        grossrow.setUpdateManName(userName + ": 洁净数据解除委托操作");
+        grossrow.setUpdateManName(userName + ": 结净数据解除委托操作");
         grossrow.setUpdateManNo(userId);
         grossrow.setIsPreScale("0");
         meterWorkCarActualFirstMapper.updateByPrimaryKey(grossrow);
@@ -1211,7 +1211,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         MeterWorkCarActualFirst tarerow = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst2No());
 //        tarerow.setValueFlag("3");
         tarerow.setUpdateTime(new Date());
-        tarerow.setUpdateManName(userName + ": 洁净数据解除委托操作");
+        tarerow.setUpdateManName(userName + ": 结净数据解除委托操作");
         tarerow.setUpdateManNo(userId);
         tarerow.setIsPreScale("0");
         meterWorkCarActualFirstMapper.updateByPrimaryKey(tarerow);
@@ -1224,7 +1224,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             scale.setUploadFlag("1");
             scale.setUpdateTime(new Date());
             scale.setUpdateManNo("system");
-            scale.setUpdateManName("计量洁净数据解除委托操作");
+            scale.setUpdateManName("计量结净数据解除委托操作");
             preTrackScaleMapper.updateByPrimaryKeySelective(scale);
         }
         MeterWorkCarActual mwca = meterWorkCarActualMapper.cleanPredcition(model.getActualNo());
@@ -1318,7 +1318,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 scale.setUpdateTime(new Date());
                 scale.setUploadFlag("1");
                 scale.setUpdateManNo("system");
-                scale.setUpdateManName("计量洁净数据洁净操作");
+                scale.setUpdateManName("计量结净数据结净操作");
                 scale.setMeasureStation(mwca.getNetSpot3No());
                 scale.setMeasureStationName(mwca.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
@@ -1473,7 +1473,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     }
 
     /***
-     * 定期将汽车洁净的数据转换到计量转换表中（已废弃）
+     * 定期将汽车结净的数据转换到计量转换表中（已废弃）
      * @return
      */
     @Autowired
@@ -1694,7 +1694,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     }
 
     /**
-     * 按照合同号新增汽车洁净数据：用于驻外检测
+     * 按照合同号新增汽车结净数据：用于驻外检测
      *
      * @param actual
      * @return
@@ -1745,7 +1745,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             trackScale.setCreateManName(userName);
             trackScale.setCreateTime(new Date());
             trackScale.setValueFlag(DbConstants.NET);
-            trackScale.setMemo("驻外检测自动新增一条洁净的预报");
+            trackScale.setMemo("驻外检测自动新增一条结净的预报");
             trackScale.setCarNo(actual.getCarNo());
             trackScale.setUploadFlag("1");
             preTrackScaleMapper.insertSelective(trackScale);
@@ -1792,7 +1792,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
 
     /**
-     * 按照合同号新增汽车洁净数据：单包计量
+     * 按照合同号新增汽车结净数据：单包计量
      *
      * @param actual
      * @return
@@ -2187,7 +2187,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 preTrackScale.setUploadFlag("1");
                 preTrackScale.setUpdateTime(new Date());
                 preTrackScale.setUpdateManNo("system");
-                preTrackScale.setUpdateManName("计量洁净数据手动录入");
+                preTrackScale.setUpdateManName("计量结净数据手动录入");
                 preTrackScale.setMeasureStation(model.getNetSpot3No());
                 preTrackScale.setMeasureStationName(model.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
@@ -2337,9 +2337,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try {
-            Assert.isTrue(!(actualNo == null || StringUtils.isEmpty(actualNo)), "洁净编号不能为空");
+            Assert.isTrue(!(actualNo == null || StringUtils.isEmpty(actualNo)), "结净编号不能为空");
             MeterWorkCarActual model = meterWorkCarActualMapper.selectByPrimaryKey(actualNo);
-            Assert.isTrue(!Objects.isNull(model), "未查询到洁净数据");
+            Assert.isTrue(!Objects.isNull(model), "未查询到结净数据");
             List<String> firstNoList = new ArrayList<>();
             firstNoList.add(model.getActualFirst1No());
             firstNoList.add(model.getActualFirst2No());

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/controller/MeterWorkCarActualBakController.java

@@ -416,7 +416,7 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "洁净")
+    @ApiOperation(value = "结净")
     @PostMapping(value = "/clean")
     public RESTfulResult clean(@RequestParam String actualFirstNo, String dataNo, String predictionNo, String note) {
         RESTfulResult rm = failed();
@@ -458,7 +458,7 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "数据洁净-C#端")
+    @ApiOperation(value = "数据结净-C#端")
     @PostMapping(value = "/clientClean")
     public RESTfulResult clientClean(@RequestBody CommonCombination<MeterWorkCarActualFirstBak, MeterWorkCarActualBak, MeterWorkCarActualFirstBak, MeterWorkCarActualBak> model) {
         RESTfulResult rm = failed();
@@ -515,7 +515,7 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "解除", notes = "将洁净后的数据进行还原且清除委托信息")
+    @ApiOperation(value = "解除", notes = "将结净后的数据进行还原且清除委托信息")
     @PostMapping(value = "/remove")
     public RESTfulResult remove(@RequestBody List<MeterWorkCarActualBak> models) {
         RESTfulResult rm = failed();
@@ -537,7 +537,7 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         }
         return rm;
     }
-    @ApiOperation(value = "解除", notes = "将洁净后的数据进行还原但不清除委托信息")
+    @ApiOperation(value = "解除", notes = "将结净后的数据进行还原但不清除委托信息")
     @PostMapping(value = "/removeButNotEntrust")
     public RESTfulResult removeButNotEntrust(@RequestBody List<MeterWorkCarActualBak> models) {
         RESTfulResult rm = failed();
@@ -560,7 +560,7 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "特殊委托解除洁净", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "特殊委托解除结净", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/specialRemove")
     public RESTfulResult specialRemove(@RequestBody HashMap params) {
         RESTfulResult rm = failed();
@@ -576,7 +576,7 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "普通委托解除洁净", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "普通委托解除结净", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/commonRemove")
     public RESTfulResult commonRemove(@RequestBody HashMap params) {
         RESTfulResult rm = failed();
@@ -620,7 +620,7 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "期限洁净")
+    @ApiOperation(value = "期限结净")
     @PostMapping(value = "/termclean")
     public RESTfulResult termclean(@RequestParam String actualFirstNo, String dataNo) {
         RESTfulResult rm = failed();
@@ -914,7 +914,7 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "根据HashMap查询最新的洁净信息", notes = "根据HashMap查询最新的洁净信息")
+    @ApiOperation(value = "根据HashMap查询最新的结净信息", notes = "根据HashMap查询最新的结净信息")
     @PostMapping(value = "/selectByMap")
     public RESTfulResult selectByMap(@RequestBody HashMap params) {
         RESTfulResult rm = failed();

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/mapper/MeterWorkCarActualBakMapper.java

@@ -14,10 +14,10 @@ import java.util.Objects;
 public interface MeterWorkCarActualBakMapper extends IBaseMapper<MeterWorkCarActualBak, String> {
 
     List<MeterWorkCarActualBak> selectView(Map<Objects,String> map);
-    //一次皮重洁净
+    //一次皮重结净
     MeterWorkCarActualBak manualAdd(@Param( value = "actualFirstNo") String actualFirstNo, @Param( value = "dataNo")String dataNo);
 
-    //一次皮重洁净
+    //一次皮重结净
     MeterWorkCarActualBak manualAddPre(@Param( value = "actualFirstNo") String actualFirstNo, @Param( value = "dataNo")String dataNo, @Param( value = "predictionNo")String predictionNo);
 
     MeterWorkCarActualBak mathPredcition(@Param(value = "actualNo") String actualNo, @Param(value = "predictionNo") String predictionNo);
@@ -25,7 +25,7 @@ public interface MeterWorkCarActualBakMapper extends IBaseMapper<MeterWorkCarAct
     MeterWorkCarActualBak cleanPredcition(@Param(value = "actualNo") String actualNo);
 
     String getNewID(@org.apache.ibatis.annotations.Param(value="afl")String afl);
-    //期限皮重洁净
+    //期限皮重结净
     MeterWorkCarActualBak tareAdd(@Param( value = "actualFirstNo") String actualFirstNo, @Param( value = "dataNo")String dataNo);
 
     List<MeterWorkCarActualBak> selectByTime(Map<Objects,String> map);

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/model/MeterWorkCarActualBak.java

@@ -351,9 +351,9 @@ public class MeterWorkCarActualBak implements IBasePO<String> {
     private String netGroup;
 
     /**
-     * 结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）(NET_MODE,VARCHAR,1)
+     * 结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）(NET_MODE,VARCHAR,1)
      */
-    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）",required=false)
+    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）",required=false)
     private String netMode;
 
     /**

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/service/IMeterWorkCarActualBakService.java

@@ -86,7 +86,7 @@ public interface IMeterWorkCarActualBakService extends IBaseService<MeterWorkCar
     //根据传入时间和车号，查询给定时间段去重车号
     List<String> distinctCarNo(HashMap<String, Object> params);
 
-    // 根据传入的一次计量数据和洁净数据实体进行洁净操作
+    // 根据传入的一次计量数据和结净数据实体进行结净操作
     MeterWorkCarActualBak clientClean(MeterWorkCarActualFirstBak first, MeterWorkCarActualBak net);
     //根据实绩id获取一次计量信息和委托信息
     RESTfulResult firstAndEntrustById(String actualNo);

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/service/impl/MeterWorkCarActualBakServiceImpl.java

@@ -331,7 +331,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             // 一次计量数据是否已经完成委托匹配
             if ((mwcaf1.getPredictionNo() != null && "".equals(mwcaf1.getPredictionNo())) || (mwcaf2.getPredictionNo() != null && "".equals(mwcaf2.getPredictionNo()))) {
                 if (!mwcaf1.getPredictionNo().equals(mwcaf2.getPredictionNo())) {
-                    throw new MarkerMetException(500, "选中的两条一次计量数据匹配的委托不一致，不允许进行洁净操作！！！");
+                    throw new MarkerMetException(500, "选中的两条一次计量数据匹配的委托不一致，不允许进行结净操作！！！");
                 } else if (predictionNo != null && !"".equals(predictionNo)) {
                     throw new MarkerMetException(500, "选中的两条一次计量数据已经匹配委托，请正确选择数据！！！");
                 }
@@ -346,7 +346,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
 
                 mwcaf1.setValueFlag(DbConstants.NET);
                 mwcaf1.setUpdateManName("system");
-                mwcaf1.setUpdateManName("二次计量洁净更新");
+                mwcaf1.setUpdateManName("二次计量结净更新");
                 mwcaf1.setUpdateTime(new Date());
                 mwcaf1.setIsPreScale("1");
                 mwcaf1.setPredictionNo(predictionNo);
@@ -356,7 +356,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 // 皮重数据处理
                 mwcaf2.setValueFlag(DbConstants.NET);
                 mwcaf2.setUpdateManName("system");
-                mwcaf2.setUpdateManName("二次计量洁净更新");
+                mwcaf2.setUpdateManName("二次计量结净更新");
                 mwcaf2.setUpdateTime(new Date());
                 mwcaf2.setPredictionNo(predictionNo);
                 mwcaf2.setPredictionType("1");
@@ -401,7 +401,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 scale.setValueFlag(DbConstants.NET);
                 scale.setUpdateTime(new Date());
                 scale.setUpdateManNo("system");
-                scale.setUpdateManName("二次计量洁净更新");
+                scale.setUpdateManName("二次计量结净更新");
                 scale.setUploadFlag("1");
                 scale.setMeasureStation(actualRow.getNetSpot3No());
                 scale.setMeasureStationName(actualRow.getNetSpot3Name());
@@ -426,7 +426,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
 
                         mwcaf1.setValueFlag(DbConstants.NET);
                         mwcaf1.setUpdateManName("system");
-                        mwcaf1.setUpdateManName("二次计量洁净更新");
+                        mwcaf1.setUpdateManName("二次计量结净更新");
                         mwcaf1.setUpdateTime(new Date());
                         mwcaf1.setIsPreScale("1");
                         mwcaf1.setPredictionNo(scale.getPredictionNo());
@@ -436,7 +436,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                         // 皮重数据处理
                         mwcaf2.setValueFlag(DbConstants.NET);
                         mwcaf2.setUpdateManName("system");
-                        mwcaf2.setUpdateManName("二次计量洁净更新");
+                        mwcaf2.setUpdateManName("二次计量结净更新");
                         mwcaf2.setUpdateTime(new Date());
                         mwcaf2.setIsPreScale("1");
                         mwcaf2.setPredictionNo(scale.getPredictionNo());
@@ -483,7 +483,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                         scale.setValueFlag(DbConstants.NET);
                         scale.setUpdateTime(new Date());
                         scale.setUpdateManNo("system");
-                        scale.setUpdateManName("二次计量洁净更新");
+                        scale.setUpdateManName("二次计量结净更新");
                         scale.setUploadFlag("1");
                         scale.setMeasureStation(actualRow.getNetSpot3No());
                         scale.setMeasureStationName(actualRow.getNetSpot3Name());
@@ -499,7 +499,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
 
                 first1.setValueFlag(DbConstants.NET);
                 first1.setUpdateManName("system");
-                first1.setUpdateManName("二次计量洁净更新");
+                first1.setUpdateManName("二次计量结净更新");
                 first1.setUpdateTime(new Date());
                 first1.setIsPreScale("0");
                 meterWorkCarActualFirstBakMapper.updateByPrimaryKey(first1);
@@ -507,7 +507,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 // 皮重数据处理
                 first2.setValueFlag(DbConstants.NET);
                 first2.setUpdateManName("system");
-                first2.setUpdateManName("二次计量洁净更新");
+                first2.setUpdateManName("二次计量结净更新");
                 first2.setUpdateTime(new Date());
                 first2.setIsPreScale("0");
                 meterWorkCarActualFirstBakMapper.updateByPrimaryKey(first2);
@@ -575,11 +575,11 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())){
                     PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
                     if(scaleTemp.getValueFlag().equals("9")) {
-                        throw new MarkerMetException(500, "洁净数据中包含已结算的委托!!!");
+                        throw new MarkerMetException(500, "结净数据中包含已结算的委托!!!");
 
                     }
                     if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                        throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                        throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
                     }
                 }
             }
@@ -641,7 +641,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                     scale.setUploadFlag("1");
                     scale.setUpdateTime(new Date());
                     scale.setUpdateManNo("system");
-                    scale.setUpdateManName("计量洁净数据解除操作");
+                    scale.setUpdateManName("计量结净数据解除操作");
                     preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                 }
 //                }
@@ -724,20 +724,20 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         MeterWorkCarActualBak actualModel01 = meterWorkCarActualBakMapper.selectByPrimaryKey(params.get("actualNo01").toString());
         MeterWorkCarActualBak actualModel02 = meterWorkCarActualBakMapper.selectByPrimaryKey(params.get("actualNo02").toString());
         if(actualModel01 == null || actualModel02 == null){
-            rm.setMessage("未找到洁净计量数据，请确认！！！");
+            rm.setMessage("未找到结净计量数据，请确认！！！");
             return rm;
         }
         List<MeterWorkCarActualBak> models = new ArrayList<>();
         models.add(actualModel01);
         models.add(actualModel02);
         if(!models.get(0).getPredictionCombination().equals(models.get(1).getPredictionCombination())){
-            rm.setMessage("必须选择两个预报组合号一致的洁净数据!!!");
+            rm.setMessage("必须选择两个预报组合号一致的结净数据!!!");
             return rm;
         }
         for(MeterWorkCarActualBak modelTemp: models) {
             PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
             if(scaleTemp.getValueFlag().equals("9")) {
-                rm.setMessage("两个洁净数据中包含已结算的委托!!!");
+                rm.setMessage("两个结净数据中包含已结算的委托!!!");
                 return rm;
             }
         }
@@ -749,7 +749,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                     //类型为双委托类型
                     for (MeterWorkCarActualBak model: models) {
                         if(!model.getPredictionType().equals("5")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是双委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是双委托结净数据，请确认！！");
                             return rm;
                         }
                     }
@@ -757,14 +757,14 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                     //类型为混卸类型
                     for (MeterWorkCarActualBak model: models) {
                         if(!model.getPredictionType().equals("6")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是混卸委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是混卸委托结净数据，请确认！！");
                         }
                     }
                 }else if(type.equals("7")){
                     //类型为混装类型
                     for (MeterWorkCarActualBak model: models) {
                         if(!model.getPredictionType().equals("7")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是混装委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是混装委托结净数据，请确认！！");
                         }
                     }
                 }
@@ -834,7 +834,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         model.setIsPreScale("0");
     }
 
-    //还原洁净
+    //还原结净
     public void removeEl(MeterWorkCarActualBak model) {
         String userId;
         String userName;
@@ -871,7 +871,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
 
             MeterWorkCarActualBak actualModel = meterWorkCarActualBakMapper.selectByPrimaryKey(params.get("actualNo").toString());
             if(actualModel == null){
-                rm.setMessage("未找到洁净计量数据，请确认！！！");
+                rm.setMessage("未找到结净计量数据，请确认！！！");
                 return rm;
             }
             List<MeterWorkCarActualBak> models = new ArrayList<MeterWorkCarActualBak>();
@@ -881,17 +881,17 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())){
                     PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
                     if(scaleTemp.getValueFlag().equals("9")) {
-                        rm.setMessage("洁净数据中包含已结算的委托!!!");
+                        rm.setMessage("结净数据中包含已结算的委托!!!");
                         return rm;
                     }
                     if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                        rm.setMessage("洁净数据中包含特殊委托匹配结净的数据!!!");
+                        rm.setMessage("结净数据中包含特殊委托匹配结净的数据!!!");
                         return rm;
                     }
                 }
             }
             for (MeterWorkCarActualBak model: models) {
-                //循环每一个洁净记录
+                //循环每一个结净记录
                 //委托不能为空
                 if(StringUtils.isNotEmpty(model.getPredictionNo())){
                     // 改委托
@@ -901,7 +901,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                         scale.setUploadFlag("1");
                         scale.setUpdateTime(new Date());
                         scale.setUpdateManNo("system");
-                        scale.setUpdateManName("洁净废除操作");
+                        scale.setUpdateManName("结净废除操作");
                         preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                     }
                 }
@@ -918,7 +918,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 if(firstGross != null){
                     firstGross.setValueFlag(DbConstants.VALID);
                     firstGross.setUpdateManName("system");
-                    firstGross.setUpdateManName("洁净废除更新");
+                    firstGross.setUpdateManName("结净废除更新");
                     firstGross.setNote(model.getNote());
                     firstGross.setUpdateTime(new Date());
                     firstGross.setIsPreScale("0");
@@ -928,18 +928,18 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 if(firstTare != null){
                     firstTare.setValueFlag(DbConstants.VALID);
                     firstTare.setUpdateManName("system");
-                    firstTare.setUpdateManName("洁净废除更新");
+                    firstTare.setUpdateManName("结净废除更新");
                     firstTare.setNote(model.getNote());
                     firstTare.setUpdateTime(new Date());
                     firstTare.setIsPreScale("0");
                     firstTare.setValueFlag("0");
                     meterWorkCarActualFirstBakMapper.updateByPrimaryKey(firstTare);
                 }
-                // 作废洁净
+                // 作废结净
                 model.setUploadFlag("1");
                 model.setValueFlag("0");
                 meterWorkCarActualBakMapper.updateByPrimaryKeySelective(model);
-                //删洁净
+                //删结净
                 //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
             }
             rm.setSucceed();
@@ -1085,7 +1085,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         rm.setCode("500");
         try{
             if (StringUtils.isEmpty(actualNo)) {
-                rm.setMessage("洁净数据主键不能为空,请确认！！");
+                rm.setMessage("结净数据主键不能为空,请确认！！");
                 return rm;
             }
             if (StringUtils.isEmpty(predictionNo)) {
@@ -1096,7 +1096,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             MeterWorkCarActualBak model = meterWorkCarActualBakMapper.selectByPrimaryKey(actualNo);
             PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(predictionNo);
             if(model == null) {
-                rm.setMessage("不存在对应的洁净数据,请确认！！");
+                rm.setMessage("不存在对应的结净数据,请确认！！");
                 return rm;
             }else if(!model.getIsPreScale().equals("0")) {
                 rm.setMessage("只有未匹配的净重数据才能进行委托匹配操作");
@@ -1112,7 +1112,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                     return rm;
                 }
                 if (!model.getCarNo().equals(scale.getCarNo())) {
-                    rm.setMessage("洁净数据中车号和预报中车号不一致，请确认！！");
+                    rm.setMessage("结净数据中车号和预报中车号不一致，请确认！！");
                     return rm;
                 }
                 if (!scale.getPredictionType().equals("1")) {
@@ -1130,14 +1130,14 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             // 毛重
             MeterWorkCarActualFirstBak grossrow = meterWorkCarActualFirstBakMapper.selectAndMatch(model.getActualFirst1No(), predictionNo);
             grossrow.setUpdateTime(new Date());
-            grossrow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
+            grossrow.setUpdateManName(userName + ": 结净数据匹配委托操作");
             grossrow.setUpdateManNo(userId);
             grossrow.setIsPreScale("1");
             meterWorkCarActualFirstBakMapper.updateByPrimaryKey(grossrow);
             // 皮重
             MeterWorkCarActualFirstBak tarerow = meterWorkCarActualFirstBakMapper.selectAndMatch(model.getActualFirst2No(), predictionNo);
             tarerow.setUpdateTime(new Date());
-            tarerow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
+            tarerow.setUpdateManName(userName + ": 结净数据匹配委托操作");
             tarerow.setUpdateManNo(userId);
             tarerow.setIsPreScale("1");
             meterWorkCarActualFirstBakMapper.updateByPrimaryKey(tarerow);
@@ -1158,7 +1158,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 scale.setUploadFlag("1");
                 scale.setUpdateTime(new Date());
                 scale.setUpdateManNo("system");
-                scale.setUpdateManName("计量洁净数据匹配委托操作");
+                scale.setUpdateManName("计量结净数据匹配委托操作");
                 scale.setMeasureStation(mwca.getNetSpot3No());
                 scale.setMeasureStationName(mwca.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
@@ -1179,14 +1179,14 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkCarActualBak cleanPrediction (MeterWorkCarActualBak model) throws MarkerMetException {
         if (model.getActualNo() == null || "".equals(model.getActualNo())) {
-            throw new MarkerMetException(500, "洁净数据主键不能为空");
+            throw new MarkerMetException(500, "结净数据主键不能为空");
         }
         if (!model.getValueFlag().equals("1") && model.getPredictionNo() != null && !"".equals(model.getPredictionNo())) {
-            throw new MarkerMetException(500, "只有有效已匹配的洁净数据才能进行解除操作");
+            throw new MarkerMetException(500, "只有有效已匹配的结净数据才能进行解除操作");
         }
         MeterWorkCarActualBak mwcaquery = meterWorkCarActualBakMapper.selectByPrimaryKey(model.getActualNo());
         if (mwcaquery == null) {
-            throw new MarkerMetException(500, "不存在对应的洁净数据");
+            throw new MarkerMetException(500, "不存在对应的结净数据");
         }
 
         PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
@@ -1195,7 +1195,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 throw new MarkerMetException(500, "结净数据包含已结算的委托!!!");
             }
             if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
             }
         }
 
@@ -1208,7 +1208,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         MeterWorkCarActualFirstBak grossrow = meterWorkCarActualFirstBakMapper.selectAndRemove(model.getActualFirst1No());
 //        grossrow.setValueFlag("3");
         grossrow.setUpdateTime(new Date());
-        grossrow.setUpdateManName(userName + ": 洁净数据解除委托操作");
+        grossrow.setUpdateManName(userName + ": 结净数据解除委托操作");
         grossrow.setUpdateManNo(userId);
         grossrow.setIsPreScale("0");
         meterWorkCarActualFirstBakMapper.updateByPrimaryKey(grossrow);
@@ -1217,7 +1217,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         MeterWorkCarActualFirstBak tarerow = meterWorkCarActualFirstBakMapper.selectAndRemove(model.getActualFirst2No());
 //        tarerow.setValueFlag("3");
         tarerow.setUpdateTime(new Date());
-        tarerow.setUpdateManName(userName + ": 洁净数据解除委托操作");
+        tarerow.setUpdateManName(userName + ": 结净数据解除委托操作");
         tarerow.setUpdateManNo(userId);
         tarerow.setIsPreScale("0");
         meterWorkCarActualFirstBakMapper.updateByPrimaryKey(tarerow);
@@ -1230,7 +1230,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             scale.setUploadFlag("1");
             scale.setUpdateTime(new Date());
             scale.setUpdateManNo("system");
-            scale.setUpdateManName("计量洁净数据解除委托操作");
+            scale.setUpdateManName("计量结净数据解除委托操作");
             preTrackScaleMapper.updateByPrimaryKeySelective(scale);
         }
         MeterWorkCarActualBak mwca = meterWorkCarActualBakMapper.cleanPredcition(model.getActualNo());
@@ -1324,7 +1324,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 scale.setUpdateTime(new Date());
                 scale.setUploadFlag("1");
                 scale.setUpdateManNo("system");
-                scale.setUpdateManName("计量洁净数据洁净操作");
+                scale.setUpdateManName("计量结净数据结净操作");
                 scale.setMeasureStation(mwca.getNetSpot3No());
                 scale.setMeasureStationName(mwca.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
@@ -1479,7 +1479,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
     }
 
     /***
-     * 定期将汽车洁净的数据转换到计量转换表中（已废弃）
+     * 定期将汽车结净的数据转换到计量转换表中（已废弃）
      * @return
      */
     @Autowired
@@ -1700,7 +1700,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
     }
 
     /**
-     * 按照合同号新增汽车洁净数据：用于驻外检测
+     * 按照合同号新增汽车结净数据：用于驻外检测
      *
      * @param actual
      * @return
@@ -1751,7 +1751,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             trackScale.setCreateManName(userName);
             trackScale.setCreateTime(new Date());
             trackScale.setValueFlag(DbConstants.NET);
-            trackScale.setMemo("驻外检测自动新增一条洁净的预报");
+            trackScale.setMemo("驻外检测自动新增一条结净的预报");
             trackScale.setCarNo(actual.getCarNo());
             trackScale.setUploadFlag("1");
             preTrackScaleMapper.insertSelective(trackScale);
@@ -1798,7 +1798,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
 
 
     /**
-     * 按照合同号新增汽车洁净数据：单包计量
+     * 按照合同号新增汽车结净数据：单包计量
      *
      * @param actual
      * @return
@@ -2193,7 +2193,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 preTrackScale.setUploadFlag("1");
                 preTrackScale.setUpdateTime(new Date());
                 preTrackScale.setUpdateManNo("system");
-                preTrackScale.setUpdateManName("计量洁净数据手动录入");
+                preTrackScale.setUpdateManName("计量结净数据手动录入");
                 preTrackScale.setMeasureStation(model.getNetSpot3No());
                 preTrackScale.setMeasureStationName(model.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
@@ -2349,9 +2349,9 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try {
-            Assert.isTrue(!(actualNo == null || StringUtils.isEmpty(actualNo)), "洁净编号不能为空");
+            Assert.isTrue(!(actualNo == null || StringUtils.isEmpty(actualNo)), "结净编号不能为空");
             MeterWorkCarActualBak model = meterWorkCarActualBakMapper.selectByPrimaryKey(actualNo);
-            Assert.isTrue(!Objects.isNull(model), "未查询到洁净数据");
+            Assert.isTrue(!Objects.isNull(model), "未查询到结净数据");
             List<String> firstNoList = new ArrayList<>();
             firstNoList.add(model.getActualFirst1No());
             firstNoList.add(model.getActualFirst2No());

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

@@ -788,7 +788,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "内倒车辆洁净")
+    @ApiOperation(value = "内倒车辆结净")
     @Transactional
     @PostMapping(value = "/doAddNetInnerWf", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetInnerWf(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActual, MeterWorkPreLink, MeterMonitorNote> com) {
@@ -805,7 +805,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "内倒车辆洁净")
+    @ApiOperation(value = "内倒车辆结净")
     @Transactional
     @PostMapping(value = "/doAddNetNewHZHX", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetNewHZHX(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActualFirst, MeterWorkCarActual, MeterMonitorNote> com) {
@@ -838,7 +838,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "非内倒车辆洁净")
+    @ApiOperation(value = "非内倒车辆结净")
     @PostMapping(value = "/doAddNetWf", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetWf(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActual, MeterWorkPreLink, MeterMonitorNote> com) {
         RESTfulResult rm = failed();
@@ -916,7 +916,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "非内倒车辆使用期限皮重洁净")
+    @ApiOperation(value = "非内倒车辆使用期限皮重结净")
     @PostMapping(value = "/doAddNetByTermWf", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetByTermWf(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActual, MeterMonitorNote, MeterWorkPreLink> com) {
         RESTfulResult rm = failed();
@@ -972,7 +972,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "联达车辆洁净")
+    @ApiOperation(value = "联达车辆结净")
     @PostMapping(value = "/doAddNetLianDaWf", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetLianDaWf(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActual, MeterMonitorNote, MeterMonitorNote> com) {
         RESTfulResult rm = failed();
@@ -1073,7 +1073,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "双委托洁净--远程计量")
+    @ApiOperation(value = "双委托结净--远程计量")
     @Transactional
     @PostMapping(value = "/doNetAddTwo", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetAddTwo(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActual, PreTrackScale, PreTrackScale> com) {
@@ -1133,7 +1133,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "双委托匹配洁净", notes = "双委托匹配洁净")
+    @ApiOperation(value = "双委托匹配结净", notes = "双委托匹配结净")
     //@RequiresPermissions("meterworkcaractual:view")
     @PostMapping(value = "/doubleEntrustmentMatch")
     public RESTfulResult doubleEntrustmentMatch(@RequestBody HashMap parmas) {
@@ -1155,7 +1155,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "期限皮重洁净")
+    @ApiOperation(value = "期限皮重结净")
     @Transactional
     @PostMapping(value = "/doNetTermTare", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetTermTare(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActual,MeterWorkPreLink, MeterMonitorNote> com) {
@@ -1237,7 +1237,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "内倒车辆错误洁净")
+    @ApiOperation(value = "内倒车辆错误结净")
     @Transactional
     @PostMapping(value = "/doAddNetInnerWfError", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetInnerWfError(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActual, MeterWorkPreLink, MeterMonitorNote> com) {
@@ -1254,7 +1254,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "期限皮洁净")
+    @ApiOperation(value = "期限皮结净")
     @Transactional
     @PostMapping(value = "/doNetByFirst", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetByFirst(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActualFirst,PreTrackScale, MeterMonitorNote> com) {
@@ -1274,7 +1274,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "web端-期限皮洁净（可带委托）")
+    @ApiOperation(value = "web端-期限皮结净（可带委托）")
     @Transactional
     @PostMapping(value = "/doNetByTermData", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetByTermData(@RequestBody HashMap<String, Object> params) {

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.java

@@ -46,7 +46,7 @@ public interface MeterWorkCarActualFirstMapper extends IBaseMapper<MeterWorkCarA
     List<MeterWorkCarActualFirst> selectForAppLoad(Map<String, Object> parmas);
 
     /**
-     * 已确认但是未洁净的卸货数据
+     * 已确认但是未结净的卸货数据
      * @param map
      * @return
      */

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2758,7 +2758,7 @@
     order by t1.create_time desc
   </select>
 
-  <!--已确认但是未洁净的卸货数据-->
+  <!--已确认但是未结净的卸货数据-->
   <select id="selectForAppLoadFirst" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     select t2.update_man_no, t2.update_man_name, t2.update_time, t1.actual_first_no, t1.prediction_no, t1.notice_no,
     t1.car_no, t1.trailer_no, t1.matter_no, t1.matter_name, t1.contract_no, t1.batch_no, t1.customer_supplier_no,
@@ -2783,7 +2783,7 @@
     order by t1.create_time desc
   </select>
 
-  <!--查询当天没有洁净的销售出厂的液碱的数据-->
+  <!--查询当天没有结净的销售出厂的液碱的数据-->
   <select id="selectInvalidNaOHData" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     SELECT <include refid="columns"/>
     from meter_work_car_actual_first t
@@ -2855,7 +2855,7 @@
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
-    <!--App特殊条件查询，查询不能为作废、已洁净数据-->
+    <!--App特殊条件查询，查询不能为作废、已结净数据-->
     <if test="flag != null and flag != ''">
        and (value_flag in ('1', '3')
        or (
@@ -2880,7 +2880,7 @@
   <select id="queryForTimeInterval" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
-    <!--App特殊条件查询，查询不能为作废、已洁净数据-->
+    <!--App特殊条件查询，查询不能为作废、已结净数据-->
     and value_flag != '0'
     order by create_time desc
   </select>
@@ -2888,7 +2888,7 @@
   <select id="ApplikeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
-    <!--已洁净且未匹配委托-->
+    <!--已结净且未匹配委托-->
     <if test="flag != null and flag != ''">
       and (value_flag = '2'
       and (is_pre_scale = '0' or is_pre_scale is null))

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/controller/MeterWorkCarActualFirstBakController.java

@@ -786,7 +786,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         }
     }
 
-    @ApiOperation(value = "内倒车辆洁净")
+    @ApiOperation(value = "内倒车辆结净")
     @Transactional
     @PostMapping(value = "/doAddNetInnerWf", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetInnerWf(@RequestBody CommonCombination<MeterWorkCarActualFirstBak, MeterWorkCarActualBak, MeterWorkPreLink, MeterMonitorNote> com) {
@@ -803,7 +803,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         }
     }
 
-    @ApiOperation(value = "内倒车辆洁净")
+    @ApiOperation(value = "内倒车辆结净")
     @Transactional
     @PostMapping(value = "/doAddNetNewHZHX", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetNewHZHX(@RequestBody CommonCombination<MeterWorkCarActualFirstBak, MeterWorkCarActualFirstBak, MeterWorkCarActualBak, MeterMonitorNote> com) {
@@ -836,7 +836,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         return rm;
     }
 
-    @ApiOperation(value = "非内倒车辆洁净")
+    @ApiOperation(value = "非内倒车辆结净")
     @PostMapping(value = "/doAddNetWf", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetWf(@RequestBody CommonCombination<MeterWorkCarActualFirstBak, MeterWorkCarActualBak, MeterWorkPreLink, MeterMonitorNote> com) {
         RESTfulResult rm = failed();
@@ -914,7 +914,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         }
     }
 
-    @ApiOperation(value = "非内倒车辆使用期限皮重洁净")
+    @ApiOperation(value = "非内倒车辆使用期限皮重结净")
     @PostMapping(value = "/doAddNetByTermWf", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetByTermWf(@RequestBody CommonCombination<MeterWorkCarActualFirstBak, MeterWorkCarActualBak, MeterMonitorNote, MeterWorkPreLink> com) {
         RESTfulResult rm = failed();
@@ -970,7 +970,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         return rm;
     }
 
-    @ApiOperation(value = "联达车辆洁净")
+    @ApiOperation(value = "联达车辆结净")
     @PostMapping(value = "/doAddNetLianDaWf", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetLianDaWf(@RequestBody CommonCombination<MeterWorkCarActualFirstBak, MeterWorkCarActualBak, MeterMonitorNote, MeterMonitorNote> com) {
         RESTfulResult rm = failed();
@@ -1071,7 +1071,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         }
     }
 
-    @ApiOperation(value = "双委托洁净--远程计量")
+    @ApiOperation(value = "双委托结净--远程计量")
     @Transactional
     @PostMapping(value = "/doNetAddTwo", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetAddTwo(@RequestBody CommonCombination<MeterWorkCarActualFirstBak, MeterWorkCarActualBak, PreTrackScale, PreTrackScale> com) {
@@ -1131,7 +1131,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         }
     }
 
-    @ApiOperation(value = "双委托匹配洁净", notes = "双委托匹配洁净")
+    @ApiOperation(value = "双委托匹配结净", notes = "双委托匹配结净")
     //@RequiresPermissions("meterworkcaractual:view")
     @PostMapping(value = "/doubleEntrustmentMatch")
     public RESTfulResult doubleEntrustmentMatch(@RequestBody HashMap parmas) {
@@ -1153,7 +1153,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         }
     }
 
-    @ApiOperation(value = "期限皮重洁净")
+    @ApiOperation(value = "期限皮重结净")
     @Transactional
     @PostMapping(value = "/doNetTermTare", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetTermTare(@RequestBody CommonCombination<MeterWorkCarActualFirstBak, MeterWorkCarActualBak,MeterWorkPreLink, MeterMonitorNote> com) {
@@ -1235,7 +1235,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         }
     }
 
-    @ApiOperation(value = "内倒车辆错误洁净")
+    @ApiOperation(value = "内倒车辆错误结净")
     @Transactional
     @PostMapping(value = "/doAddNetInnerWfError", produces = "application/json;charset=UTF-8")
     public RESTfulResult doAddNetInnerWfError(@RequestBody CommonCombination<MeterWorkCarActualFirstBak, MeterWorkCarActualBak, MeterWorkPreLink, MeterMonitorNote> com) {
@@ -1252,7 +1252,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         }
     }
 
-    @ApiOperation(value = "期限皮洁净")
+    @ApiOperation(value = "期限皮结净")
     @Transactional
     @PostMapping(value = "/doNetByFirst", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetByFirst(@RequestBody CommonCombination<MeterWorkCarActualFirstBak, MeterWorkCarActualFirstBak,PreTrackScale, MeterMonitorNote> com) {
@@ -1272,7 +1272,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         }
     }
 
-    @ApiOperation(value = "web端-期限皮洁净（可带委托）")
+    @ApiOperation(value = "web端-期限皮结净（可带委托）")
     @Transactional
     @PostMapping(value = "/doNetByTermData", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetByTermData(@RequestBody HashMap<String, Object> params) {

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/mapper/MeterWorkCarActualFirstBakMapper.java

@@ -48,7 +48,7 @@ public interface MeterWorkCarActualFirstBakMapper extends IBaseMapper<MeterWorkC
     List<MeterWorkCarActualFirstBak> selectForAppLoad(Map<String, Object> parmas);
 
     /**
-     * 已确认但是未洁净的卸货数据
+     * 已确认但是未结净的卸货数据
      * @param map
      * @return
      */

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/mapper/MeterWorkCarActualFirstBakMapper.xml

@@ -2758,7 +2758,7 @@
     order by t1.create_time desc
   </select>
 
-  <!--已确认但是未洁净的卸货数据-->
+  <!--已确认但是未结净的卸货数据-->
   <select id="selectForAppLoadFirst" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     select t2.update_man_no, t2.update_man_name, t2.update_time, t1.actual_first_no, t1.prediction_no, t1.notice_no,
     t1.car_no, t1.trailer_no, t1.matter_no, t1.matter_name, t1.contract_no, t1.batch_no, t1.customer_supplier_no,
@@ -2783,7 +2783,7 @@
     order by t1.create_time desc
   </select>
 
-  <!--查询当天没有洁净的销售出厂的液碱的数据-->
+  <!--查询当天没有结净的销售出厂的液碱的数据-->
   <select id="selectInvalidNaOHData" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     SELECT <include refid="columns"/>
     from meter_work_car_actual_first_bak t
@@ -2847,7 +2847,7 @@
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
-    <!--App特殊条件查询，查询不能为作废、已洁净数据-->
+    <!--App特殊条件查询，查询不能为作废、已结净数据-->
     <if test="flag != null and flag != ''">
       and (value_flag in ('1', '3')
       or (
@@ -2864,7 +2864,7 @@
   <select id="queryForTimeInterval" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
-    <!--App特殊条件查询，查询不能为作废、已洁净数据-->
+    <!--App特殊条件查询，查询不能为作废、已结净数据-->
     and value_flag != '0'
     order by create_time desc
   </select>
@@ -2872,7 +2872,7 @@
   <select id="ApplikeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
-    <!--已洁净且未匹配委托-->
+    <!--已结净且未匹配委托-->
     <if test="flag != null and flag != ''">
       and (value_flag = '2'
       and (is_pre_scale = '0' or is_pre_scale is null))

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/controller/MeterWorkHookActFirstController.java

@@ -382,7 +382,7 @@ public class MeterWorkHookActFirstController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "吊钩秤洁净", notes = "根据MeterWorkHookActFirst对象创建")
+    @ApiOperation(value = "吊钩秤结净", notes = "根据MeterWorkHookActFirst对象创建")
     @PostMapping(value = "/doAddWfStatic")
     public RESTfulResult doAddWfStatic(@RequestBody MeterWorkHookActFirst model) {
         RESTfulResult rm = failed();
@@ -404,7 +404,7 @@ public class MeterWorkHookActFirstController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "C#端轨道衡实绩静轨洁净--两条数据", notes = "根据两个MeterWorkStorageActual对象创建")
+    @ApiOperation(value = "C#端轨道衡实绩静轨结净--两条数据", notes = "根据两个MeterWorkStorageActual对象创建")
     @PostMapping(value = "/doAddWfStaticTwo")
     public RESTfulResult doAddWfStaticTwo(@RequestBody CommonCombination<PreHookScale, MeterWorkHookActFirst, MeterWorkHookActFirst, MeterWorkHookActFirst> com) {
         RESTfulResult rm = failed();
@@ -418,7 +418,7 @@ public class MeterWorkHookActFirstController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配结净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配结净保存")
     @PostMapping(value = "/selfServiceMeasurement")
     public RESTfulResult selfServiceMeasurement(@RequestBody MeterWorkHookActFirst first) {
         RESTfulResult rm = failed();
@@ -426,7 +426,7 @@ public class MeterWorkHookActFirstController extends BaseRESTfulController {
             if(first != null) {
                 rm = meterWorkHookActFirstService.selfServiceMeasurement(first);
             }else {
-                rm.setMessage("至少需要穿一条一次数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("至少需要穿一条一次数据进行匹配结净保存，请确认！！！！");
             }
             return rm;
         }catch (Exception e) {

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/service/impl/MeterWorkHookActFirstServiceImpl.java

@@ -553,11 +553,11 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
         }
 
 
-        //1、判断是否是二次数据（二次数据需要洁净）
+        //1、判断是否是二次数据（二次数据需要结净）
         HashMap<String, Object> obj = new HashMap<>();
         obj.put("railwayNo", model.getRailwayNo());
         obj.put("railwayCarriageNo", model.getRailwayCarriageNo());
-        obj.put("valueFlag", "1");//有效，未洁净
+        obj.put("valueFlag", "1");//有效，未结净
         List<MeterWorkHookActFirst> mwrafs = meterWorkHookActFirstMapper.selectBy(obj);
 
         //2、判断是否为混装,若为混装将计量预报分割出
@@ -665,7 +665,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                 meterWorkHookActFirst.setSourceArea(prs.getSourceArea());
 
                 id = doAddWfStaticFrist(meterWorkHookActFirst);
-                //保存洁净数据
+                //保存结净数据
                 if (mwraf.getMeterWeight().compareTo(meterWorkHookActFirst.getMeterWeight()) >= 0) {
                     doAddWfStaticNet(prs, mwraf, meterWorkHookActFirst); //预报，毛重，皮重
                 } else {
@@ -775,12 +775,12 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
 
                 MeterWorkHookActual mwca1 = meterWorkHookActualMapper.manualAddPre(model01.getActualFirstNo(), model02.getActualFirstNo(), scale.getPredictionNo());
                 BeanUtils.copyProperties(mwca1, actualRow);
-                //保存洁净
+                //保存结净
                 String no = meterWorkHookActualMapper.getNewID(sdf.format(new Date()));
                 actualRow.setActualNo(sdf.format(new Date()) + no);
                 actualRow.setNetTime(new Date());
                 actualRow.setNetMode(DbConstants.TYPE);
-                actualRow.setNote("自动匹配洁净");
+                actualRow.setNote("自动匹配结净");
                 actualRow.setNetMode("1");
                 actualRow.setUploadFlag("1");
                 actualRow.setValueFlag("1");
@@ -809,12 +809,12 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
 
                 MeterWorkHookActual mwca1 = meterWorkHookActualMapper.manualAdd(model01.getActualFirstNo(), model02.getActualFirstNo());
                 BeanUtils.copyProperties(mwca1, actualRow);
-                //保存洁净
+                //保存结净
                 String no = meterWorkHookActualMapper.getNewID(sdf.format(new Date()));
                 actualRow.setActualNo(sdf.format(new Date()) + no);
                 actualRow.setNetTime(new Date());
                 actualRow.setNetMode(DbConstants.TYPE);
-                actualRow.setNote("自动匹配洁净");
+                actualRow.setNote("自动匹配结净");
                 actualRow.setNetMode("1");
                 actualRow.setUploadFlag("1");
                 actualRow.setValueFlag("1");
@@ -861,7 +861,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
     }
 
     /**
-     * 需要两次计量时完善洁净数据
+     * 需要两次计量时完善结净数据
      *
      * @param prs 预报
      * @param one 毛重实体
@@ -957,7 +957,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
         netHook.setUploadFlag("1");
         if ("001019002".equals(one.getRailwayTypeNo())) {
             netHook.setNetTime(new Date()); //动轨的特殊处理
-            //假如一次数据为补录，则洁净数据中的grossModel为3，标识毛重为手工录入的
+            //假如一次数据为补录，则结净数据中的grossModel为3，标识毛重为手工录入的
             if ("补录".equals(one.getRailwayModelName())) {
                 netHook.setGrossMode("3");
                 //METER_WORK_RAILWAY_ACTUAL_BAR
@@ -968,9 +968,9 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
 
 
         //修改一次的状态
-        one.setValueFlag("2");//洁净
+        one.setValueFlag("2");//结净
         one.setWeightType("0");//毛重
-        two.setValueFlag("2");//洁净
+        two.setValueFlag("2");//结净
         two.setWeightType("1");//皮重
         meterWorkHookActFirstMapper.updateByPrimaryKeySelective(one);
         meterWorkHookActFirstMapper.updateByPrimaryKeySelective(two);
@@ -1071,7 +1071,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                         first.setCreateTime(new Date());
                         meterWorkHookActFirstMapper.insertSelective(first);
                         BigDecimal num = firstList.get(0).getMeterWeight().subtract(first.getMeterWeight()).abs();
-                        //洁净数据不能小于10t
+                        //结净数据不能小于10t
                         if (num.compareTo(DbConstants.RAILWAY_WEIGHT) == -1) {
                             first.setActualFirstNo(afl + meterWorkHookActFirstMapper.getNewID(afl));
                             first.setCreateTime(new Date());
@@ -1117,10 +1117,10 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                         int i = meterWorkHookActFirstMapper.insertSelective(first);
                         if (i >= 1) {
                             firsts.add(first);
-                            railwayHelp.setHelpContent("计量完成，车号" + first.getRailwayNo() + "存在多条一次记录未洁净，保存一次记录成功！！");
+                            railwayHelp.setHelpContent("计量完成，车号" + first.getRailwayNo() + "存在多条一次记录未结净，保存一次记录成功！！");
                             meterWorkRailwayScheduledHelpService.checkAdd(railwayHelp);
                             rm.setSucceed();
-                            rm.setMessage("计量完成，车号" + first.getRailwayNo() + "存在多条一次记录未洁净，保存一次记录成功！！");
+                            rm.setMessage("计量完成，车号" + first.getRailwayNo() + "存在多条一次记录未结净，保存一次记录成功！！");
                             resultMap.put("firsts", firsts);
                             resultMap.put("actuals", null);
                             rm.setData(resultMap);
@@ -1171,7 +1171,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                 scale.setValueFlag(DbConstants.NET);
                 scale.setUpdateTime(new Date());
                 scale.setUpdateManNo("system");
-                scale.setUpdateManName("自助计量洁净更新");
+                scale.setUpdateManName("自助计量结净更新");
                 scale.setUploadFlag("1");
                 scale.setPredictionType("1");
                 preHookScaleMapper.updateByPrimaryKeySelective(scale);
@@ -1180,7 +1180,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                 //更新第一次毛重数据库
                 grossModel.setValueFlag(DbConstants.NET);
                 grossModel.setUpdateManName("system");
-                grossModel.setUpdateManName("智能计量双委托洁净更新");
+                grossModel.setUpdateManName("智能计量双委托结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setWeightType("0");
                 grossModel.setIsPreScale("1");
@@ -1190,7 +1190,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                 //更新第一次皮重数据库
                 tareModel.setValueFlag(DbConstants.NET);
                 tareModel.setUpdateManName("system");
-                tareModel.setUpdateManName("自助计量洁净更新");
+                tareModel.setUpdateManName("自助计量结净更新");
                 tareModel.setUpdateTime(new Date());
                 tareModel.setWeightType("1");
                 tareModel.setIsPreScale("1");
@@ -1207,7 +1207,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                 actualRow.setActualNo(sdf.format(new Date()) + no);
                 actualRow.setNetTime(new Date());
                 actualRow.setNetMode(DbConstants.TYPE);
-//                actualRow.setNote("自助计量匹配洁净");
+//                actualRow.setNote("自助计量匹配结净");
                 actualRow.setNetMode("1");
                 actualRow.setUploadFlag("1");
                 actualRow.setValueFlag("1");
@@ -1221,7 +1221,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                 //更新第一次毛重数据库
                 grossModel.setValueFlag(DbConstants.NET);
                 grossModel.setUpdateManName("system");
-                grossModel.setUpdateManName("自助计量洁净更新");
+                grossModel.setUpdateManName("自助计量结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setWeightType("0");
                 grossModel.setIsPreScale("0");
@@ -1229,7 +1229,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                 //更新第一次皮重数据库
                 tareModel.setValueFlag(DbConstants.NET);
                 tareModel.setUpdateManName("system");
-                tareModel.setUpdateManName("自助计量洁净更新");
+                tareModel.setUpdateManName("自助计量结净更新");
                 tareModel.setUpdateTime(new Date());
                 tareModel.setWeightType("1");
                 tareModel.setIsPreScale("0");
@@ -1244,14 +1244,14 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                 actualRow.setActualNo(sdf.format(new Date()) + no);
                 actualRow.setNetTime(new Date());
                 actualRow.setNetMode(DbConstants.TYPE);
-                actualRow.setNote("自助计量匹配洁净");
+                actualRow.setNote("自助计量匹配结净");
                 actualRow.setNetMode("1");
                 actualRow.setUploadFlag("1");
                 actualRow.setValueFlag("1");
                 actualRow.setIsPreScale("0");
                 actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
                 meterWorkHookActualMapper.insertSelective(actualRow);
-                return "计量完成，车号" + grossModel.getRailwayNo() + "在委托信息表含有多条有效委托信息,无委托洁净";
+                return "计量完成，车号" + grossModel.getRailwayNo() + "在委托信息表含有多条有效委托信息,无委托结净";
             }
         } else {
             ///////////无委托自动计量
@@ -1259,7 +1259,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
             //更新第一次毛重数据库
             grossModel.setValueFlag(DbConstants.NET);
             grossModel.setUpdateManName("system");
-            grossModel.setUpdateManName("自助计量洁净更新");
+            grossModel.setUpdateManName("自助计量结净更新");
             grossModel.setUpdateTime(new Date());
             grossModel.setWeightType("0");
             grossModel.setIsPreScale("0");
@@ -1267,7 +1267,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
             //更新第一次皮重数据库
             tareModel.setValueFlag(DbConstants.NET);
             tareModel.setUpdateManName("system");
-            tareModel.setUpdateManName("自助计量洁净更新");
+            tareModel.setUpdateManName("自助计量结净更新");
             tareModel.setUpdateTime(new Date());
             tareModel.setWeightType("1");
             tareModel.setIsPreScale("0");
@@ -1282,14 +1282,14 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
             actualRow.setActualNo(sdf.format(new Date()) + no);
             actualRow.setNetTime(new Date());
             actualRow.setNetMode(DbConstants.TYPE);
-            actualRow.setNote("自助计量匹配洁净");
+            actualRow.setNote("自助计量匹配结净");
             actualRow.setNetMode("1");
             actualRow.setUploadFlag("1");
             actualRow.setValueFlag("1");
             actualRow.setIsPreScale("0");
             actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
             meterWorkHookActualMapper.insertSelective(actualRow);
-            return "计量完成，车号" + grossModel.getRailwayNo() + "无委托洁净";
+            return "计量完成，车号" + grossModel.getRailwayNo() + "无委托结净";
         }
     }
 }

src/main/java/com/steerinfo/meterwork/meterworkhookactual/service/impl/MeterWorkHookActualServiceImpl.java

@@ -83,7 +83,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
         // 处理一次计量数据
         // 毛重
         queryrow.setUpdateTime(new Date());
-        queryrow.setUpdateManName(userName + ": 一次数据输入历史皮重洁净操作");
+        queryrow.setUpdateManName(userName + ": 一次数据输入历史皮重结净操作");
         queryrow.setUpdateManNo(userId);
         queryrow.setValueFlag("2");
         meterWorkHookActFirstMapper.updateByPrimaryKey(queryrow);
@@ -110,7 +110,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
         PreHookScale pres = new PreHookScale();
         pres.setPredictionNo(model.getPredictionNo());
         pres.setValueFlag("2");
-        pres.setUpdateManName(userName + ": 使用历史皮重洁净操作");
+        pres.setUpdateManName(userName + ": 使用历史皮重结净操作");
         pres.setUpdateTime(new Date());
         pres.setUpdateManNo(userId);
         preHookScaleMapper.updateByPrimaryKeySelective(pres);
@@ -295,7 +295,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
             // 一次计量数据是否已经完成委托匹配
             if ((mwcaf1.getPredictionNo() != null && "".equals(mwcaf1.getPredictionNo())) || (mwcaf2.getPredictionNo() != null && "".equals(mwcaf2.getPredictionNo()))) {
                 if (!mwcaf1.getPredictionNo().equals(mwcaf2.getPredictionNo())) {
-                    throw new MarkerMetException(500, "选中的两条一次计量数据匹配的委托不一致，不允许进行洁净操作！！！");
+                    throw new MarkerMetException(500, "选中的两条一次计量数据匹配的委托不一致，不允许进行结净操作！！！");
                 } else if (predictionNo != null && !"".equals(predictionNo)) {
                     throw new MarkerMetException(500, "选中的两条一次计量数据已经匹配委托，请正确选择数据！！！");
                 }
@@ -315,7 +315,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
                 scale.setValueFlag(DbConstants.NET);
                 scale.setUpdateTime(new Date());
                 scale.setUpdateManNo("system");
-                scale.setUpdateManName("二次计量洁净更新");
+                scale.setUpdateManName("二次计量结净更新");
                 preHookScaleMapper.updateByPrimaryKeySelective(scale);
             }
 
@@ -363,7 +363,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
                 prs.setValueFlag(DbConstants.NET); //已结净
                 prs.setUpdateTime(new Date());
                 prs.setUpdateManNo("system");
-                prs.setUpdateManName("火车二次计量洁净操作");
+                prs.setUpdateManName("火车二次计量结净操作");
                 preHookScaleMapper.updateByPrimaryKeySelective(prs);
             }
             return actualRow;
@@ -447,7 +447,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
             throw new MarkerMetException(500, "只有未使用的委托才能进行匹配委托操作");
         }
         if (!queryrow.getRailwayNo().equals(prerow.getRailwayNo())) {
-            throw new MarkerMetException(500, "洁净数据中车号和预报中车号不一致，不允许进行匹配委托操作");
+            throw new MarkerMetException(500, "结净数据中车号和预报中车号不一致，不允许进行匹配委托操作");
         }
         UserPayload payload = UserPayload.getCurrUser();
         String userId = payload.getId();
@@ -457,14 +457,14 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
         // 毛重
         MeterWorkHookActFirst grossrow = meterWorkHookActFirstMapper.selectAndMatch(queryrow.getActualFirst1No(), predictionNo);
         grossrow.setUpdateTime(new Date());
-        grossrow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
+        grossrow.setUpdateManName(userName + ": 结净数据匹配委托操作");
         grossrow.setUpdateManNo(userId);
         meterWorkHookActFirstMapper.updateByPrimaryKey(grossrow);
 
         // 皮重
         MeterWorkHookActFirst tarerow = meterWorkHookActFirstMapper.selectAndMatch(queryrow.getActualFirst2No(), predictionNo);
         tarerow.setUpdateTime(new Date());
-        tarerow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
+        tarerow.setUpdateManName(userName + ": 结净数据匹配委托操作");
         tarerow.setUpdateManNo(userId);
         meterWorkHookActFirstMapper.updateByPrimaryKey(tarerow);
 
@@ -475,7 +475,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
             scale.setValueFlag("2");
             scale.setUpdateTime(new Date());
             scale.setUpdateManNo("system");
-            scale.setUpdateManName("计量洁净数据匹配委托操作");
+            scale.setUpdateManName("计量结净数据匹配委托操作");
             preHookScaleMapper.updateByPrimaryKeySelective(scale);
         }
 
@@ -516,7 +516,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
         MeterWorkHookActFirst tarerow = meterWorkHookActFirstMapper.selectAndRemove(model.getActualFirst2No());
         tarerow.setValueFlag("3");
         tarerow.setUpdateTime(new Date());
-        tarerow.setUpdateManName(userName + ": 洁净数据解除委托操作");
+        tarerow.setUpdateManName(userName + ": 结净数据解除委托操作");
         tarerow.setUpdateManNo(userId);
         meterWorkHookActFirstMapper.updateByPrimaryKey(tarerow);
 
@@ -527,7 +527,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
             scale.setValueFlag("1");
             scale.setUpdateTime(new Date());
             scale.setUpdateManNo("system");
-            scale.setUpdateManName("计量洁净数据解除委托操作");
+            scale.setUpdateManName("计量结净数据解除委托操作");
             preHookScaleMapper.updateByPrimaryKeySelective(scale);
         }
         MeterWorkHookActual mwca = meterWorkHookActualMapper.cleanPredcition(model.getActualNo());

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

@@ -33,7 +33,7 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
     /*
      * 汽车衡新老系统查询接口
      */
-    @ApiOperation(value="查询洁净老系统和新系统", notes="返回List<HashMap>对象")
+    @ApiOperation(value="查询结净老系统和新系统", notes="返回List<HashMap>对象")
     @PostMapping(value = "/doQueryOldAndNew")
     public RESTfulResult doQueryOldAndNew(@RequestBody HashMap params) {
         RESTfulResult rm = success();
@@ -94,7 +94,7 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value="统计洁净老系统和新系统", notes="返回List<HashMap>对象")
+    @ApiOperation(value="统计结净老系统和新系统", notes="返回List<HashMap>对象")
     @PostMapping(value = "/countOldAndNew")
     public RESTfulResult countOldAndNew(@RequestBody HashMap params) {
         RESTfulResult rm = success();
@@ -124,17 +124,17 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value="查询洁净老系统和新系统", notes="返回List<HashMap>对象")
+    @ApiOperation(value="查询结净老系统和新系统", notes="返回List<HashMap>对象")
     @PostMapping(value = "/doQueryOldAndNew2")
     public RESTfulResult doQueryOldAndNew2(@RequestBody HashMap params) {
         RESTfulResult rm = success();
         try {
             //PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
 
-            // 新系统洁净数据
+            // 新系统结净数据
             List<HashMap> newList = meterWorkOldAndNewService.getNew(params);
 
-            // 老系统洁净数据
+            // 老系统结净数据
             List<HashMap> oldList = meterWorkOldAndNewService.getOld(params);
 
             // 新老系统数据联合查询
@@ -183,7 +183,7 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value="统计洁净老系统和新系统", notes="返回List<HashMap>对象")
+    @ApiOperation(value="统计结净老系统和新系统", notes="返回List<HashMap>对象")
     @PostMapping(value = "/countOldAndNew2")
     public RESTfulResult countOldAndNew2(@RequestBody HashMap params) {
         RESTfulResult rm = success();
@@ -202,10 +202,10 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
 //                return rm;
 //            }
 
-            // 新系统洁净数据
+            // 新系统结净数据
             List<HashMap> newList = meterWorkOldAndNewService.countNew(params);
 
-            // 老系统洁净数据
+            // 老系统结净数据
             List<HashMap> oldList = meterWorkOldAndNewService.countOld(params);
 
             // 新老系统数据联合查询
@@ -228,17 +228,17 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
     /*
      * 轨道衡新老系统查询接口
      */
-    @ApiOperation(value="查询轨道衡洁净老系统和新系统", notes="返回List<HashMap>对象")
+    @ApiOperation(value="查询轨道衡结净老系统和新系统", notes="返回List<HashMap>对象")
     @PostMapping(value = "/railway/doQueryOldAndNew2")
     public RESTfulResult doQueryRailwayOldAndNew2(@RequestBody HashMap params) {
         RESTfulResult rm = success();
         try {
             //PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
 
-            // 新系统洁净数据
+            // 新系统结净数据
             List<HashMap> newList = meterWorkOldAndNewService.getRailwayNew(params);
 
-            // 老系统洁净数据
+            // 老系统结净数据
             List<HashMap> oldList = meterWorkOldAndNewService.getRailwayOld(params);
 
             // 新老系统数据联合查询
@@ -260,16 +260,16 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
     /*
      * 轨道衡新老计量系统联合查询接口
      */
-    @ApiOperation(value="查询轨道衡洁净老系统和新系统", notes="返回List<HashMap>对象")
+    @ApiOperation(value="查询轨道衡结净老系统和新系统", notes="返回List<HashMap>对象")
     @PostMapping(value = "/railway/doQueryFirstOldAndNew2")
     public RESTfulResult doQueryRailwayFirstOldAndNew2(@RequestBody HashMap params) {
         RESTfulResult rm = success();
         try {
 
-            // 新系统洁净数据
+            // 新系统结净数据
             List<HashMap> newList = meterWorkOldAndNewService.getRailwayFirstNew(params);
 
-            // 老系统洁净数据
+            // 老系统结净数据
             List<HashMap> oldList = meterWorkOldAndNewService.getRailwayFirstOld(params);
 
             // 新老系统数据联合查询
@@ -291,17 +291,17 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value="统计洁净老系统和新系统", notes="返回List<HashMap>对象")
+    @ApiOperation(value="统计结净老系统和新系统", notes="返回List<HashMap>对象")
     @PostMapping(value = "/railway/countOldAndNew2")
     public RESTfulResult countRailwayOldAndNew2(@RequestBody HashMap params) {
         RESTfulResult rm = success();
         try {
             //PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
 
-            // 新系统洁净数据
+            // 新系统结净数据
             List<HashMap> newList = meterWorkOldAndNewService.countRailwayNew(params);
 
-            // 老系统洁净数据
+            // 老系统结净数据
             List<HashMap> oldList = meterWorkOldAndNewService.countRailwayOld(params);
 
             // 新老系统数据联合查询

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

@@ -28,6 +28,7 @@ import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayRe
 import com.steerinfo.meterwork.meterworkrailwayscheduledhelp.model.MeterWorkRailwayScheduledHelp;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
+import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import io.micrometer.core.instrument.Meter;
 import io.swagger.annotations.ApiImplicitParam;
@@ -706,7 +707,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "C#端入库秤实绩静轨使用固重洁净", notes = "根据MeterWorkStorageActual对象创建")
+    @ApiOperation(value = "C#端入库秤实绩静轨使用固重结净", notes = "根据MeterWorkStorageActual对象创建")
     @ApiImplicitParam(name = "meterWorkStorageActual", value = "详细实体meterWorkStorageActual", required = true, dataType = "MeterWorkStorageActual")
     //@RequiresPermissions("meterworkstorageactual:create")
     @PostMapping(value = "/doAddWf")
@@ -760,8 +761,10 @@ throw new MarkerMetException(500, "操作异常！！");
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
                     String afl = sdf.format(new Date());
                     //一次数据
-                    String firstNo = actFirstMapper.getNewID(afl);
-                    first.setActualFirstNo(afl + firstNo);
+//                    String firstNo = actFirstMapper.getNewID(afl);
+//                    first.setActualFirstNo(afl + firstNo);
+                    String firstNo = PublicMethod.IdCreate(3);
+                    first.setActualFirstNo(firstNo);
                 }else if(first.getActualFirstNo().length()>14){
                     first.setActualFirstNo(first.getActualFirstNo().substring(2));
                 }
@@ -784,7 +787,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "C#端轨道衡实绩静轨需二次洁净", notes = "根据MeterWorkStorageActual对象创建")
+    @ApiOperation(value = "C#端轨道衡实绩静轨需二次结净", notes = "根据MeterWorkStorageActual对象创建")
     @PostMapping(value = "/doAddWfStatic")
     public RESTfulResult doAddWfStatic(@RequestBody MeterWorkRailwayActFirst model) {
         RESTfulResult rm = failed();
@@ -800,7 +803,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "C#端轨道衡实绩静轨需标志皮重洁净", notes = "根据MeterWorkStorageActual对象创建")
+    @ApiOperation(value = "C#端轨道衡实绩静轨需标志皮重结净", notes = "根据MeterWorkStorageActual对象创建")
     @PostMapping(value = "/doIdentifyWeight")
     public RESTfulResult doIdentifyWeight(@RequestBody MeterWorkRailwayActFirst model) {
         RESTfulResult rm = failed();
@@ -813,7 +816,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "C#端轨道衡实绩静轨洁净--两条数据", notes = "根据两个MeterWorkStorageActual对象创建")
+    @ApiOperation(value = "C#端轨道衡实绩静轨结净--两条数据", notes = "根据两个MeterWorkStorageActual对象创建")
     @PostMapping(value = "/doAddWfStaticTwo")
     public RESTfulResult doAddWfStaticTwo(@RequestBody CommonCombination<PreRailwayScale, MeterWorkRailwayActFirst, MeterWorkRailwayActFirst, MeterWorkRailwayActFirst> com) {
         RESTfulResult rm = failed();
@@ -934,7 +937,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "双委托洁净--远程计量")
+    @ApiOperation(value = "双委托结净--远程计量")
     @Transactional
     @PostMapping(value = "/doNetAddTwo", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetAddTwo(@RequestBody CommonCombination<MeterWorkRailwayActFirst, MeterWorkRailwayActual, PreRailwayScale, PreRailwayScale> com) {
@@ -948,7 +951,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "双委托洁净--远程计量")
+    @ApiOperation(value = "双委托结净--远程计量")
     @Transactional
     @PostMapping(value = "/doNetAddTwo02", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetAddTwo02(@RequestBody CommonCombination<List<MeterWorkRailwayActFirst>, List<MeterWorkRailwayActFirst>, List<PreRailwayScale>, String> com) {
@@ -962,7 +965,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "双委托洁净--智能计量(记录)")
+    @ApiOperation(value = "双委托结净--智能计量(记录)")
     @Transactional
     @PostMapping(value = "/doNetAddTwoDouble", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetAddTwoDouble(@RequestBody CommonCombination<PreRailwayScale, PreRailwayScale, MeterWorkRailwayActFirst, MeterWorkRailwayActFirst> com) {
@@ -976,7 +979,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "轨道衡双委托匹配洁净", notes = "轨道衡双委托匹配洁净")
+    @ApiOperation(value = "轨道衡双委托匹配结净", notes = "轨道衡双委托匹配结净")
     //@RequiresPermissions("meterworkcaractual:view")
     @PostMapping(value = "/doubleEntrustMatch")
     public RESTfulResult doubleEntrustmentMatch(@RequestBody HashMap parmas) {
@@ -1042,7 +1045,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "标识皮重洁净", notes = "标识皮重洁净")
+    @ApiOperation(value = "标识皮重结净", notes = "标识皮重结净")
     //@RequiresPermissions("meterworkcaractual:view")
     @PostMapping(value = "/fixedTare")
     public RESTfulResult fixedTare(@RequestBody HashMap parmas) {
@@ -1060,15 +1063,13 @@ throw new MarkerMetException(500, "操作异常！！");
             rm.setCode("200");
             rm.setMessage(msg);
             return rm;
-
-
         } catch (Exception ex) {
             ex.printStackTrace();
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "历史皮重洁净", notes = "历史皮重洁净")
+    @ApiOperation(value = "历史皮重结净", notes = "历史皮重结净")
     //@RequiresPermissions("meterworkcaractual:view")
     @PostMapping(value = "/HistoricalTare")
     public RESTfulResult HistoricalTare(@RequestBody HashMap parmas) {
@@ -1149,7 +1150,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配结净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配结净保存")
     @PostMapping(value = "/doAddRailNetWf")
     public RESTfulResult doAddRailNetWf(@RequestBody CommonCombination<List<MeterWorkRailwayMotorialReceived>, List<MeterWorkRailwayActFirst>, MeterBaseRailwayWeight,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
@@ -1158,9 +1159,9 @@ throw new MarkerMetException(500, "操作异常！！");
             if(com.getOne().size() >= 1 && com.getTwo().size() >= 1) {
                 rm = meterWorkRailwayActFirstService.doAddRailNetWf(com.getOne(), com.getTwo());
             }else if(com.getOne().size() < 1){
-                rm.setMessage("至少需要选择一条毛重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("至少需要选择一条毛重数据进行匹配结净保存，请确认！！！！");
             }else if(com.getTwo().size() < 1) {
-                rm.setMessage("至少需要选择一条皮重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("至少需要选择一条皮重数据进行匹配结净保存，请确认！！！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1170,7 +1171,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配结净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配结净保存")
     @PostMapping(value = "/doNetAddMotoriaRailway")
     public RESTfulResult doNetAddMotoriaRailway(@RequestBody CommonCombination<MeterWorkRailwayMotorialReceived, MeterWorkRailwayActFirst, PreRailwayScale,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
@@ -1179,9 +1180,9 @@ throw new MarkerMetException(500, "操作异常！！");
             if(Objects.nonNull(com.getOne()) && Objects.nonNull(com.getTwo())) {
                 rm = meterWorkRailwayActFirstService.doNetAddMotoriaRailway(com.getOne(), com.getTwo(), com.getThree());
             }else if(Objects.isNull(com.getOne())){
-                rm.setMessage("需要选择一条毛重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("需要选择一条毛重数据进行匹配结净保存，请确认！！！！");
             }else if(Objects.isNull(com.getTwo())) {
-                rm.setMessage("需要选择一条皮重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("需要选择一条皮重数据进行匹配结净保存，请确认！！！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1191,7 +1192,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配结净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配结净保存")
     @PostMapping(value = "/doAddRailAINetWf")
     public RESTfulResult doAddRailAINetWf(@RequestBody CommonCombination<List<MeterWorkRailwayMotorialReceived>, List<MeterBaseRailwayAiweight>, MeterBaseRailwayWeight,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
@@ -1200,9 +1201,9 @@ throw new MarkerMetException(500, "操作异常！！");
             if(com.getOne().size() >= 1 && com.getTwo().size() >= 1) {
                 rm = meterWorkRailwayActFirstService.doAddRailAINetWf(com.getOne(), com.getTwo());
             }else if(com.getOne().size() < 1){
-                rm.setMessage("至少需要选择一条毛重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("至少需要选择一条毛重数据进行匹配结净保存，请确认！！！！");
             }else if(com.getTwo().size() < 1) {
-                rm.setMessage("至少需要选择一条AI标志皮重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("至少需要选择一条AI标志皮重数据进行匹配结净保存，请确认！！！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1212,7 +1213,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--对从表数据进行AI标志皮洁净", notes = "根据毛皮的MeterWorkRailwayActFirst对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--对从表数据进行AI标志皮结净", notes = "根据毛皮的MeterWorkRailwayActFirst对象进行批量匹配结净保存")
     @PostMapping(value = "/doAddNetInnerWf")
     public RESTfulResult doAddNetInnerWf(@RequestBody CommonCombination<MeterBaseRailwayAiweight,MeterWorkRailwayMotorialReceived, PreRailwayScale,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
@@ -1220,9 +1221,9 @@ throw new MarkerMetException(500, "操作异常！！");
             if(Objects.nonNull(com.getOne()) && Objects.nonNull(com.getTwo())) {
                 rm = meterWorkRailwayActFirstService.doAddNetInnerWf(com.getTwo(),com.getOne(), com.getThree());
             }else if(Objects.isNull(com.getOne())){
-                rm.setMessage("选择一条AI标志皮重数据进行匹配洁净保存，请确认！！");
+                rm.setMessage("选择一条AI标志皮重数据进行匹配结净保存，请确认！！");
             }else if(Objects.isNull(com.getTwo())) {
-                rm.setMessage("选择一条一次数据进行匹配洁净保存，请确认！！");
+                rm.setMessage("选择一条一次数据进行匹配结净保存，请确认！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1232,7 +1233,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--对从表数据进行标准皮洁净", notes = "根据毛的MeterWorkRailwayMotorialReceivedt对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--对从表数据进行标准皮结净", notes = "根据毛的MeterWorkRailwayMotorialReceivedt对象进行批量匹配结净保存")
     @PostMapping(value = "/doAddNetWeight")
     public RESTfulResult doAddNetWeight(@RequestBody CommonCombination<MeterBaseRailwayCarriageWeight,MeterWorkRailwayMotorialReceived, PreRailwayScale,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
@@ -1240,9 +1241,9 @@ throw new MarkerMetException(500, "操作异常！！");
             if(Objects.nonNull(com.getOne()) && Objects.nonNull(com.getTwo())) {
                 rm = meterWorkRailwayActFirstService.doAddNetWeight(com.getTwo(),com.getOne(), com.getThree());
             }else if(Objects.isNull(com.getOne())){
-                rm.setMessage("选择一条标准皮重数据进行匹配洁净保存，请确认！！");
+                rm.setMessage("选择一条标准皮重数据进行匹配结净保存，请确认！！");
             }else if(Objects.isNull(com.getTwo())) {
-                rm.setMessage("选择一条一次数据进行匹配洁净保存，请确认！！");
+                rm.setMessage("选择一条一次数据进行匹配结净保存，请确认！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1252,7 +1253,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配结净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配结净保存")
     @PostMapping(value = "/selfServiceMeasurement")
     public RESTfulResult selfServiceMeasurement(@RequestBody MeterWorkRailwayActFirst first) {
         RESTfulResult rm = failed();
@@ -1261,7 +1262,7 @@ throw new MarkerMetException(500, "操作异常！！");
             if(first != null) {
                 rm = meterWorkRailwayActFirstService.selfServiceMeasurement(first);
             }else {
-                rm.setMessage("至少需要穿一条一次数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("至少需要穿一条一次数据进行匹配结净保存，请确认！！！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1289,7 +1290,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "静态衡维护界面--对一次数据进行标准皮洁净", notes = "根据毛的MeterWorkRailwayactFirst对象进行批量匹配洁净保存")
+    @ApiOperation(value = "静态衡维护界面--对一次数据进行标准皮结净", notes = "根据毛的MeterWorkRailwayactFirst对象进行批量匹配结净保存")
     @PostMapping(value = "/doStandardMatch")
     public RESTfulResult doStandardMatch(@RequestBody HashMap param) {
         RESTfulResult rm = failed();
@@ -1333,7 +1334,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配AI标识皮", notes = "一定要有委托才能才能进行洁净")
+    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配AI标识皮", notes = "一定要有委托才能才能进行结净")
     @Transactional
     @PostMapping(value = "/DynamicBatchMatchAIweight")
     public RESTfulResult DynamicBatchMatchAIweight(@RequestBody List<MeterWorkRailwayReceived> receivedList) {
@@ -1348,7 +1349,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配标准皮", notes = "一定要有委托才能才能进行洁净")
+    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配标准皮", notes = "一定要有委托才能才能进行结净")
     @Transactional
     @PostMapping(value = "/DynamicBatchMatchCarriageWeight")
     public RESTfulResult DynamicBatchMatchCarriageWeight(@RequestBody List<MeterWorkRailwayReceived> receivedList) {
@@ -1363,7 +1364,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配一次空皮", notes = "一定要有委托才能才能进行洁净")
+    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配一次空皮", notes = "一定要有委托才能才能进行结净")
     @Transactional
     @PostMapping(value = "/DynamicBatchMatchFirstWeight")
     public RESTfulResult DynamicBatchMatchFirstWeight(@RequestBody List<MeterWorkRailwayReceived> receivedList) {
@@ -1378,7 +1379,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配一次历史皮", notes = "一定要有委托才能才能进行洁净")
+    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配一次历史皮", notes = "一定要有委托才能才能进行结净")
     @Transactional
     @PostMapping(value = "/DynamicBatchMatchHisTareWeight")
     public RESTfulResult DynamicBatchMatchHisTareWeight(@RequestBody List<MeterWorkRailwayReceived> receivedList) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/controller/MeterWorkRailwayActFirstBakController.java

@@ -751,7 +751,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "C#端入库秤实绩静轨使用固重洁净", notes = "根据MeterWorkStorageActual对象创建")
+    @ApiOperation(value = "C#端入库秤实绩静轨使用固重结净", notes = "根据MeterWorkStorageActual对象创建")
     @ApiImplicitParam(name = "meterWorkStorageActual", value = "详细实体meterWorkStorageActual", required = true, dataType = "MeterWorkStorageActual")
     //@RequiresPermissions("meterworkstorageactual:create")
     @PostMapping(value = "/doAddWf")
@@ -829,7 +829,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "C#端轨道衡实绩静轨需二次洁净", notes = "根据MeterWorkStorageActual对象创建")
+    @ApiOperation(value = "C#端轨道衡实绩静轨需二次结净", notes = "根据MeterWorkStorageActual对象创建")
     @PostMapping(value = "/doAddWfStatic")
     public RESTfulResult doAddWfStatic(@RequestBody MeterWorkRailwayActFirstBak model) {
         RESTfulResult rm = failed();
@@ -845,7 +845,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "C#端轨道衡实绩静轨需标志皮重洁净", notes = "根据MeterWorkStorageActual对象创建")
+    @ApiOperation(value = "C#端轨道衡实绩静轨需标志皮重结净", notes = "根据MeterWorkStorageActual对象创建")
     @PostMapping(value = "/doIdentifyWeight")
     public RESTfulResult doIdentifyWeight(@RequestBody MeterWorkRailwayActFirstBak model) {
         RESTfulResult rm = failed();
@@ -858,7 +858,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "C#端轨道衡实绩静轨洁净--两条数据", notes = "根据两个MeterWorkStorageActual对象创建")
+    @ApiOperation(value = "C#端轨道衡实绩静轨结净--两条数据", notes = "根据两个MeterWorkStorageActual对象创建")
     @PostMapping(value = "/doAddWfStaticTwo")
     public RESTfulResult doAddWfStaticTwo(@RequestBody CommonCombination<PreRailwayScale, MeterWorkRailwayActFirstBak, MeterWorkRailwayActFirstBak, MeterWorkRailwayActFirstBak> com) {
         RESTfulResult rm = failed();
@@ -979,7 +979,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "双委托洁净--远程计量")
+    @ApiOperation(value = "双委托结净--远程计量")
     @Transactional
     @PostMapping(value = "/doNetAddTwo", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetAddTwo(@RequestBody CommonCombination<MeterWorkRailwayActFirstBak, MeterWorkRailwayActualBak, PreRailwayScale, PreRailwayScale> com) {
@@ -993,7 +993,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "双委托洁净--远程计量")
+    @ApiOperation(value = "双委托结净--远程计量")
     @Transactional
     @PostMapping(value = "/doNetAddTwo02", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetAddTwo02(@RequestBody CommonCombination<List<MeterWorkRailwayActFirstBak>, List<MeterWorkRailwayActFirstBak>, List<PreRailwayScale>, String> com) {
@@ -1007,7 +1007,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "双委托洁净--智能计量(记录)")
+    @ApiOperation(value = "双委托结净--智能计量(记录)")
     @Transactional
     @PostMapping(value = "/doNetAddTwoDouble", produces = "application/json;charset=UTF-8")
     public RESTfulResult doNetAddTwoDouble(@RequestBody CommonCombination<PreRailwayScale, PreRailwayScale, MeterWorkRailwayActFirstBak, MeterWorkRailwayActFirstBak> com) {
@@ -1021,7 +1021,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "轨道衡双委托匹配洁净", notes = "轨道衡双委托匹配洁净")
+    @ApiOperation(value = "轨道衡双委托匹配结净", notes = "轨道衡双委托匹配结净")
     //@RequiresPermissions("meterworkcaractual:view")
     @PostMapping(value = "/doubleEntrustMatch")
     public RESTfulResult doubleEntrustmentMatch(@RequestBody HashMap parmas) {
@@ -1087,7 +1087,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "标识皮重洁净", notes = "标识皮重洁净")
+    @ApiOperation(value = "标识皮重结净", notes = "标识皮重结净")
     //@RequiresPermissions("meterworkcaractual:view")
     @PostMapping(value = "/fixedTare")
     public RESTfulResult fixedTare(@RequestBody HashMap parmas) {
@@ -1113,7 +1113,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "历史皮重洁净", notes = "历史皮重洁净")
+    @ApiOperation(value = "历史皮重结净", notes = "历史皮重结净")
     //@RequiresPermissions("meterworkcaractual:view")
     @PostMapping(value = "/HistoricalTare")
     public RESTfulResult HistoricalTare(@RequestBody HashMap parmas) {
@@ -1194,7 +1194,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配结净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配结净保存")
     @PostMapping(value = "/doAddRailNetWf")
     public RESTfulResult doAddRailNetWf(@RequestBody CommonCombination<List<MeterWorkRailwayMotorialReceived>, List<MeterWorkRailwayActFirstBak>, MeterBaseRailwayWeight,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
@@ -1203,9 +1203,9 @@ throw new MarkerMetException(500, "操作异常！！");
             if(com.getOne().size() >= 1 && com.getTwo().size() >= 1) {
                 rm = meterWorkRailwayActFirstBakService.doAddRailNetWf(com.getOne(), com.getTwo());
             }else if(com.getOne().size() < 1){
-                rm.setMessage("至少需要选择一条毛重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("至少需要选择一条毛重数据进行匹配结净保存，请确认！！！！");
             }else if(com.getTwo().size() < 1) {
-                rm.setMessage("至少需要选择一条皮重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("至少需要选择一条皮重数据进行匹配结净保存，请确认！！！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1215,7 +1215,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配结净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配结净保存")
     @PostMapping(value = "/doNetAddMotoriaRailway")
     public RESTfulResult doNetAddMotoriaRailway(@RequestBody CommonCombination<MeterWorkRailwayMotorialReceived, MeterWorkRailwayActFirstBak, PreRailwayScale,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
@@ -1224,9 +1224,9 @@ throw new MarkerMetException(500, "操作异常！！");
             if(Objects.nonNull(com.getOne()) && Objects.nonNull(com.getTwo())) {
                 rm = meterWorkRailwayActFirstBakService.doNetAddMotoriaRailway(com.getOne(), com.getTwo(), com.getThree());
             }else if(Objects.isNull(com.getOne())){
-                rm.setMessage("需要选择一条毛重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("需要选择一条毛重数据进行匹配结净保存，请确认！！！！");
             }else if(Objects.isNull(com.getTwo())) {
-                rm.setMessage("需要选择一条皮重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("需要选择一条皮重数据进行匹配结净保存，请确认！！！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1236,7 +1236,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配结净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配结净保存")
     @PostMapping(value = "/doAddRailAINetWf")
     public RESTfulResult doAddRailAINetWf(@RequestBody CommonCombination<List<MeterWorkRailwayMotorialReceived>, List<MeterBaseRailwayAiweight>, MeterBaseRailwayWeight,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
@@ -1245,9 +1245,9 @@ throw new MarkerMetException(500, "操作异常！！");
             if(com.getOne().size() >= 1 && com.getTwo().size() >= 1) {
                 rm = meterWorkRailwayActFirstBakService.doAddRailAINetWf(com.getOne(), com.getTwo());
             }else if(com.getOne().size() < 1){
-                rm.setMessage("至少需要选择一条毛重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("至少需要选择一条毛重数据进行匹配结净保存，请确认！！！！");
             }else if(com.getTwo().size() < 1) {
-                rm.setMessage("至少需要选择一条AI标志皮重数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("至少需要选择一条AI标志皮重数据进行匹配结净保存，请确认！！！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1257,7 +1257,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--对从表数据进行AI标志皮洁净", notes = "根据毛皮的MeterWorkRailwayActFirst对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--对从表数据进行AI标志皮结净", notes = "根据毛皮的MeterWorkRailwayActFirst对象进行批量匹配结净保存")
     @PostMapping(value = "/doAddNetInnerWf")
     public RESTfulResult doAddNetInnerWf(@RequestBody CommonCombination<MeterBaseRailwayAiweight,MeterWorkRailwayMotorialReceived, PreRailwayScale,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
@@ -1265,9 +1265,9 @@ throw new MarkerMetException(500, "操作异常！！");
             if(Objects.nonNull(com.getOne()) && Objects.nonNull(com.getTwo())) {
                 rm = meterWorkRailwayActFirstBakService.doAddNetInnerWf(com.getTwo(),com.getOne(), com.getThree());
             }else if(Objects.isNull(com.getOne())){
-                rm.setMessage("选择一条AI标志皮重数据进行匹配洁净保存，请确认！！");
+                rm.setMessage("选择一条AI标志皮重数据进行匹配结净保存，请确认！！");
             }else if(Objects.isNull(com.getTwo())) {
-                rm.setMessage("选择一条一次数据进行匹配洁净保存，请确认！！");
+                rm.setMessage("选择一条一次数据进行匹配结净保存，请确认！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1277,7 +1277,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--对从表数据进行标准皮洁净", notes = "根据毛的MeterWorkRailwayMotorialReceivedt对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--对从表数据进行标准皮结净", notes = "根据毛的MeterWorkRailwayMotorialReceivedt对象进行批量匹配结净保存")
     @PostMapping(value = "/doAddNetWeight")
     public RESTfulResult doAddNetWeight(@RequestBody CommonCombination<MeterBaseRailwayCarriageWeight,MeterWorkRailwayMotorialReceived, PreRailwayScale,MeterBaseRailwayWeight> com) {
         RESTfulResult rm = failed();
@@ -1285,9 +1285,9 @@ throw new MarkerMetException(500, "操作异常！！");
             if(Objects.nonNull(com.getOne()) && Objects.nonNull(com.getTwo())) {
                 rm = meterWorkRailwayActFirstBakService.doAddNetWeight(com.getTwo(),com.getOne(), com.getThree());
             }else if(Objects.isNull(com.getOne())){
-                rm.setMessage("选择一条标准皮重数据进行匹配洁净保存，请确认！！");
+                rm.setMessage("选择一条标准皮重数据进行匹配结净保存，请确认！！");
             }else if(Objects.isNull(com.getTwo())) {
-                rm.setMessage("选择一条一次数据进行匹配洁净保存，请确认！！");
+                rm.setMessage("选择一条一次数据进行匹配结净保存，请确认！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1297,7 +1297,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配结净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配结净保存")
     @PostMapping(value = "/selfServiceMeasurement")
     public RESTfulResult selfServiceMeasurement(@RequestBody MeterWorkRailwayActFirstBak first) {
         RESTfulResult rm = failed();
@@ -1306,7 +1306,7 @@ throw new MarkerMetException(500, "操作异常！！");
             if(first != null) {
                 rm = meterWorkRailwayActFirstBakService.selfServiceMeasurement(first);
             }else {
-                rm.setMessage("至少需要穿一条一次数据进行匹配洁净保存，请确认！！！！");
+                rm.setMessage("至少需要穿一条一次数据进行匹配结净保存，请确认！！！！");
             }
             return rm;
         }catch (Exception e) {
@@ -1334,7 +1334,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "静态衡维护界面--对一次数据进行标准皮洁净", notes = "根据毛的MeterWorkRailwayactFirst对象进行批量匹配洁净保存")
+    @ApiOperation(value = "静态衡维护界面--对一次数据进行标准皮结净", notes = "根据毛的MeterWorkRailwayactFirst对象进行批量匹配结净保存")
     @PostMapping(value = "/doStandardMatch")
     public RESTfulResult doStandardMatch(@RequestBody HashMap param) {
         RESTfulResult rm = failed();
@@ -1363,7 +1363,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配AI标识皮", notes = "一定要有委托才能才能进行洁净")
+    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配AI标识皮", notes = "一定要有委托才能才能进行结净")
     @Transactional
     @PostMapping(value = "/DynamicBatchMatchAIweight")
     public RESTfulResult DynamicBatchMatchAIweight(@RequestBody List<MeterWorkRailwayReceived> receivedList) {
@@ -1378,7 +1378,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配标准皮", notes = "一定要有委托才能才能进行洁净")
+    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配标准皮", notes = "一定要有委托才能才能进行结净")
     @Transactional
     @PostMapping(value = "/DynamicBatchMatchCarriageWeight")
     public RESTfulResult DynamicBatchMatchCarriageWeight(@RequestBody List<MeterWorkRailwayReceived> receivedList) {
@@ -1393,7 +1393,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配一次空皮", notes = "一定要有委托才能才能进行洁净")
+    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配一次空皮", notes = "一定要有委托才能才能进行结净")
     @Transactional
     @PostMapping(value = "/DynamicBatchMatchFirstWeight")
     public RESTfulResult DynamicBatchMatchFirstWeight(@RequestBody List<MeterWorkRailwayReceived> receivedList) {
@@ -1408,7 +1408,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配一次历史皮", notes = "一定要有委托才能才能进行洁净")
+    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配一次历史皮", notes = "一定要有委托才能才能进行结净")
     @Transactional
     @PostMapping(value = "/DynamicBatchMatchHisTareWeight")
     public RESTfulResult DynamicBatchMatchHisTareWeight(@RequestBody List<MeterWorkRailwayReceived> receivedList) {

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

@@ -217,7 +217,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "洁净数据维护-网页", notes = "根据传入时间查询去重列次编号")
+    @ApiOperation(value = "结净数据维护-网页", notes = "根据传入时间查询去重列次编号")
     @PostMapping(value = "/distinctLcNo")
     public RESTfulResult distinctLcNo(@RequestBody HashMap param) {
         RESTfulResult rm = failed();
@@ -288,7 +288,6 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
-
     @ApiOperation(value = "动轨匹配委托")
     @PostMapping(value = "/matchPredictionD")
     public RESTfulResult matchPredictionD(@RequestBody HashMap map) {
@@ -399,7 +398,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "取消发布", notes = "将洁净数据重置为未发布状态")
+    @ApiOperation(value = "取消发布", notes = "将结净数据重置为未发布状态")
     @ApiImplicitParam(name = "model", value = "详细实体MeterWorkRailwayActual", required = true, dataType = "MeterWorkRailwayActual")
     @PostMapping(value = "/cancel")
     public RESTfulResult cancel(@RequestBody MeterWorkRailwayActual model) {
@@ -423,7 +422,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "取消发布", notes = "将洁净数据重置为未发布状态")
+    @ApiOperation(value = "取消发布", notes = "将结净数据重置为未发布状态")
     @ApiImplicitParam(name = "model", value = "详细实体MeterWorkRailwayActual", required = true, dataType = "MeterWorkRailwayActual")
     @PostMapping(value = "/publish")
     public RESTfulResult publish(@RequestBody MeterWorkRailwayActual model) {
@@ -447,6 +446,25 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value = "取消发布", notes = "将结净数据重置为未发布状态")
+    @ApiImplicitParam(name = "model", value = "详细实体MeterWorkRailwayActual", required = true, dataType = "MeterWorkRailwayActual")
+    @PostMapping(value = "/batchPublish")
+    public RESTfulResult batchPublish(@RequestBody List<MeterWorkRailwayActual> models) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkRailwayActualService.batchPublish(models);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "条件查询视图", notes = "根据传入参数进行查询")
     @GetMapping(value = "/selectView")
     public RESTfulResult selectView(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
@@ -467,7 +485,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value = "洁净")
+    @ApiOperation(value = "结净")
     @PostMapping(value = "/clean")
     public RESTfulResult clean(@RequestParam String actualFirstNo, String dataNo, String predictionNo) {
         RESTfulResult rm = failed();
@@ -486,7 +504,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "根据两个一次计量编号和原因文本进行手动匹配洁净", notes = "根据传入参数进行洁净")
+    @ApiOperation(value = "根据两个一次计量编号和原因文本进行手动匹配结净", notes = "根据传入参数进行结净")
     @PostMapping(value = "/cleanByfirstNoAndNotes")
     public RESTfulResult cleanByfirstNoAndNotes(@RequestParam String actFirstNo01, String actFirstNo02, String predictionNo, String Notes) {
         RESTfulResult rm = failed();
@@ -514,7 +532,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "解除", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "解除", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/remove")
     public RESTfulResult remove(@RequestBody List<MeterWorkRailwayActual> models) {
         RESTfulResult rm = failed();
@@ -537,7 +555,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "普通委托解除并作废洁净、毛重、皮重数据", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "普通委托解除并作废结净、毛重、皮重数据", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/commonRemove")
     public RESTfulResult commonRemove(@RequestBody HashMap params) {
         RESTfulResult rm = failed();
@@ -553,7 +571,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "解除动态衡洁净数据", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "解除动态衡结净数据", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/removeDynamicModel")
     public RESTfulResult removeDynamicModel(@RequestBody MeterWorkRailwayActual model) {
         RESTfulResult rm = failed();
@@ -572,7 +590,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value = "解除", notes = "将动轨洁净后的数据进行还原")
+    @ApiOperation(value = "解除", notes = "将动轨结净后的数据进行还原")
     @PostMapping(value = "/removeDt")
     public RESTfulResult removeDt(@RequestBody List<MeterWorkRailwayActual> models) {
         RESTfulResult rm = failed();
@@ -614,7 +632,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "固定皮重洁净")
+    @ApiOperation(value = "固定皮重结净")
     @PostMapping(value = "/termclean")
     public RESTfulResult termclean(@RequestParam String actualFirstNo, String dataNo) {
         RESTfulResult rm = failed();
@@ -891,7 +909,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "特殊委托解除洁净", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "特殊委托解除结净", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/specialRemove")
     public RESTfulResult specialRemove(@RequestBody HashMap params) {
         RESTfulResult rm = failed();

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

@@ -27,10 +27,10 @@ public interface MeterWorkRailwayActualMapper extends IBaseMapper<MeterWorkRailw
     List<MeterWorkRailwayActual> selectDiff(HashMap parmas);
 
     void insertSelectiveBar(MeterWorkRailwayActual netRail);
-    //一次皮重洁净
+    //一次皮重结净
     MeterWorkRailwayActual manualAddPre(@feign.Param( value = "actualFirstNo") String actualFirstNo, @feign.Param( value = "dataNo")String dataNo, @feign.Param( value = "predictionNo")String predictionNo);
     /**
-     * 洁净数据匹配委托
+     * 结净数据匹配委托
      */
     MeterWorkRailwayActual mathPredcition(@feign.Param(value = "actualNo") String actualNo, @feign.Param(value = "predictionNo") String predictionNo);
 

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

@@ -4360,7 +4360,9 @@
     to_char(round(E.Meter_weight / 1000, 3),'FM9999999999999999.000') tare_weight,
     E.Weight_Type tare_weight_type,
     A.conveyance_type conveyance_type,
-    to_char(round(B.CARRIAGE_WEIGHT / 1000, 3) ,'FM9999999999999999.000') crriage_weight
+    to_char(round(B.CARRIAGE_WEIGHT / 1000, 3) ,'FM9999999999999999.000') crriage_weight,
+    A.is_pre_sacale is_pre_sacale,
+    A.value_flag value_Flag
     from meter_work_railway_actual A
     left join meter_base_railway_carriage_weight B
     on A.conveyance_type = B.Carriage_Code
@@ -4394,6 +4396,12 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
           and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>
+        <if test="isPreSacale != null and isPreSacale != ''">
+          and A.is_pre_sacale = #{isPreSacale}
+        </if>
+        <if test="valueFlag != null and valueFlag != ''">
+          and A.value_flag = #{valueFlag}
+        </if>
     order by conveyance_type asc, netTime desc
   </select>
 </mapper>

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

@@ -346,9 +346,9 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String netGroup;
 
     /**
-     * 结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）(NET_MODE,VARCHAR,1)
+     * 结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）(NET_MODE,VARCHAR,1)
      */
-    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）",required=false)
+    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）",required=false)
     private String netMode;
 
     /**

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

@@ -35,6 +35,7 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     int cancel(MeterWorkRailwayActual model);
 
     int publish(MeterWorkRailwayActual model);
+    RESTfulResult batchPublish(List<MeterWorkRailwayActual> models);
 
     MeterWorkRailwayActual clean(String actualFirstNo, String dataNo, String predictionNo);
 

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

@@ -199,6 +199,42 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         return ++i;
     }
 
+    @Override
+    public RESTfulResult batchPublish(List<MeterWorkRailwayActual> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            Assert.isTrue(models.size() >= 1, "请勾选数据进行发布");
+            for (MeterWorkRailwayActual model: models){
+                MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
+                if (modelTemp.getPredictionNo() == null || "".equals(modelTemp.getPredictionNo()) || "2".equals(modelTemp.getValueFlag())) {
+                    throw new MarkerMetException(500, "只有已匹配委托且未发布的数据才能进行数据发布操作");
+                }
+            }
+            UserPayload userPayload = new UserPayload();
+            String userName = userPayload.getUserName();
+            String userId = userPayload.getId();
+            int count = 0;
+            for (MeterWorkRailwayActual model: models){
+                MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
+                modelTemp.setValueFlag("2");
+                modelTemp.setUploadFlag("1");
+                modelTemp.setUpdateTime(new Date());
+                modelTemp.setUpdateManName(userName);
+                modelTemp.setUpdateManNo(userId);
+                meterWorkRailwayActualMapper.updateByPrimaryKeySelective(modelTemp);
+                count ++;
+            }
+            rm.setSucceed();
+            rm.setMessage("共有"+ count +"条数据发布成功");
+            rm.setData(count);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        }
+        return rm;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkRailwayActual clean(String actualFirstNo, String dataNo, String predictionNo) throws MarkerMetException {
@@ -230,7 +266,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             // 一次计量数据是否已经完成委托匹配
             if ((mwcaf1.getPredictionNo() != null && "".equals(mwcaf1.getPredictionNo())) || (mwcaf2.getPredictionNo() != null && "".equals(mwcaf2.getPredictionNo()))) {
                 if (!mwcaf1.getPredictionNo().equals(mwcaf2.getPredictionNo())) {
-                    throw new MarkerMetException(500, "选中的两条一次计量数据匹配的委托不一致，不允许进行洁净操作！！！");
+                    throw new MarkerMetException(500, "选中的两条一次计量数据匹配的委托不一致，不允许进行结净操作！！！");
                 } else if (predictionNo != null && !"".equals(predictionNo)) {
                     throw new MarkerMetException(500, "选中的两条一次计量数据已经匹配委托，请正确选择数据！！！");
                 }
@@ -272,7 +308,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 scale.setUpdateTime(new Date());
                 scale.setUpdateManNo("system");
                 scale.setUploadFlag("1");
-                scale.setUpdateManName("二次计量洁净更新");
+                scale.setUpdateManName("二次计量结净更新");
                 scale.setMeasureStation(mwcaf2.getBaseSpotNo());
                 scale.setMeasureStationName(mwcaf2.getBaseSpotName());
                 preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
@@ -309,9 +345,11 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
             }
             actualRow.setNetMode(DbConstants.TYPE);
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
-            actualRow.setActualNo(sdf.format(new Date()) + no);
+//            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//            String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
+//            actualRow.setActualNo(sdf.format(new Date()) + no);
+            String no = PublicMethod.IdCreate(3);
+            actualRow.setActualNo(no);
             actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
             actualRow.setUploadFlag("1");
             if(mwcaf1.getLcNo().equals(mwcaf2.getLcNo())){
@@ -350,7 +388,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 prs.setUploadFlag("1");
                 prs.setUpdateTime(new Date());
                 prs.setUpdateManNo("system");
-                prs.setUpdateManName("火车二次计量洁净操作");
+                prs.setUpdateManName("火车二次计量结净操作");
                 prs.setMeasureStation(actualRow.getNetManName());
                 prs.setMeasureStationName(actualRow.getNetSpot3Name());
                 preRailwayScaleMapper.updateByPrimaryKeySelective(prs);
@@ -369,7 +407,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             MeterWorkRailwayActFirst actFirst01 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actFirstNo01);
             MeterWorkRailwayActFirst actFirst02 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actFirstNo02);
             PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(predictionNo);
-            //存储洁净记录
+            //存储结净记录
             MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             UserPayload payload = new UserPayload();
@@ -420,7 +458,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 MeterWorkRailwayActual mwca = meterWorkRailwayActualMapper.manualAddPre(actFirst01.getActualFirstNo(), actFirst02.getActualFirstNo(), scale.getPredictionNo());
                 BeanUtils.copyProperties(mwca, actualRow);
 
-                actualRow.setActualNo(sdf.format(new Date()) + meterWorkRailwayActualMapper.getNewID(sdf.format(new Date())));
+//                actualRow.setActualNo(sdf.format(new Date()) + meterWorkRailwayActualMapper.getNewID(sdf.format(new Date())));
+                String no = PublicMethod.IdCreate(3);
+                actualRow.setActualNo(no);
                 actualRow.setUploadFlag("1");
                 actualRow.setValueFlag("1");
                 actualRow.setIsPreSacale("1");
@@ -465,7 +505,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 MeterWorkRailwayActual mwca2 = meterWorkRailwayActualMapper.manualAdd(actFirst01.getActualFirstNo(), actFirst02.getActualFirstNo());
                 BeanUtils.copyProperties(mwca2, actualRow);
 
-                //标志位为洁净
+                //标志位为结净
                 actFirst01.setWeightType("0");
                 actFirst01.setNote(Notes);
                 actFirst01.setIsPreSacale("0");
@@ -486,7 +526,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
                 }
-                actualRow.setActualNo(sdf.format(new Date()) + meterWorkRailwayActualMapper.getNewID(sdf.format(new Date())));
+//                actualRow.setActualNo(sdf.format(new Date()) + meterWorkRailwayActualMapper.getNewID(sdf.format(new Date())));
+                String no = PublicMethod.IdCreate(3);
+                actualRow.setActualNo(no);
                 actualRow.setUploadFlag("1");
                 actualRow.setValueFlag("1");
                 actualRow.setIsPreSacale("0");
@@ -532,7 +574,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkRailwayActual matchPrediction (String actualNo, String predictionNo, String note) throws MarkerMetException {
         if (actualNo == null || "".equals(actualNo)) {
-            throw new MarkerMetException(500, "洁净数据主键不能为空");
+            throw new MarkerMetException(500, "结净数据主键不能为空");
         }
         if (predictionNo == null || "".equals(predictionNo)) {
             throw new MarkerMetException(500, "委托编号不能为空");
@@ -545,7 +587,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         }
 
         if (queryrow == null) {
-            throw new MarkerMetException(500, "不存在对应的洁净数据");
+            throw new MarkerMetException(500, "不存在对应的结净数据");
         } else if (!queryrow.getIsPreSacale().equals("0") && queryrow.getPredictionNo() != null) {
             throw new MarkerMetException(500, "只有未匹配的净重数据才能进行委托匹配操作");
         }
@@ -556,7 +598,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             throw new MarkerMetException(500, "只有未使用的委托才能进行匹配委托操作");
         }
         if (!queryrow.getRailwayNo().equals(prerow.getRailwayNo())) {
-            throw new MarkerMetException(500, "洁净数据中车号和预报中车号不一致，不允许进行匹配委托操作");
+            throw new MarkerMetException(500, "结净数据中车号和预报中车号不一致，不允许进行匹配委托操作");
         }
         String userId;
         String userName;
@@ -575,7 +617,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         grossrow.setUpdateTime(new Date());
         grossrow.setUpdateManNo(userId);
         grossrow.setUpdateManName(userName);
-        grossrow.setNote("洁净数据匹配委托操作");
+        grossrow.setNote("结净数据匹配委托操作");
         grossrow.setIsPreSacale("1");
         meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossrow);
 
@@ -585,7 +627,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             tarerow.setUpdateTime(new Date());
             tarerow.setUpdateManNo(userId);
             tarerow.setUpdateManName(userName);
-            tarerow.setNote("洁净数据匹配委托操作");
+            tarerow.setNote("结净数据匹配委托操作");
             tarerow.setIsPreSacale("1");
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(tarerow);
         }catch(Exception e) {
@@ -608,7 +650,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             scale.setUploadFlag("1");
             scale.setUpdateTime(new Date());
             scale.setUpdateManNo("system");
-            scale.setUpdateManName("计量洁净数据匹配委托操作");
+            scale.setUpdateManName("计量结净数据匹配委托操作");
             scale.setMeasureStation(mwca.getNetSpot3No());
             scale.setMeasureStationName(mwca.getNetSpot3Name());
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
@@ -653,7 +695,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         // 处理一次计量数据
         // 毛重
         queryrow.setUpdateTime(new Date());
-        queryrow.setUpdateManName(userName + ": 一次数据输入历史皮重洁净操作");
+        queryrow.setUpdateManName(userName + ": 一次数据输入历史皮重结净操作");
         queryrow.setUpdateManNo(userId);
         queryrow.setValueFlag("2");
         meterWorkRailwayActFirstMapper.updateByPrimaryKey(queryrow);
@@ -662,7 +704,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         MeterWorkRailwayActFirst tarerow = new MeterWorkRailwayActFirst();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         Date time = new Date();
-        String idNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(sdf.format(time));
+//        String idNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(sdf.format(time));
+//        tarerow.setActualFirstNo(idNo);
+        String idNo = PublicMethod.IdCreate(3);
         tarerow.setActualFirstNo(idNo);
         tarerow.setRailwayNo(model.getRailwayNo());
         tarerow.setMeterWeight(model.getTareWeight());
@@ -671,13 +715,15 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         tarerow.setCreateTime(new Date());
         tarerow.setMeterMode("3");
         tarerow.setDataSource(queryrow.getDataSource());
-        tarerow.setMemo("静轨一次计量数据输入历史皮重洁净操作新增皮重数据");
+        tarerow.setMemo("静轨一次计量数据输入历史皮重结净操作新增皮重数据");
         tarerow.setValueFlag("2");
         tarerow.setWeightType("3");
         int num1 = meterWorkRailwayActFirstMapper.insertSelective(tarerow);
 
         // 新增净重数据
-        String idNo2 = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(sdf.format(time));
+//        String idNo2 = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(sdf.format(time));
+//        model.setActualNo(idNo2);
+        String idNo2 = PublicMethod.IdCreate(3);
         model.setActualNo(idNo2);
         model.setTareManName(userName);
         model.setTareManNo(userId);
@@ -718,7 +764,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         pres.setPredictionNo(model.getPredictionNo());
         pres.setValueFlag("2");
         pres.setUploadFlag("1");
-        pres.setUpdateManName(userName+ ": 使用历史皮重洁净操作");
+        pres.setUpdateManName(userName+ ": 使用历史皮重结净操作");
         pres.setUpdateTime(new Date());
         pres.setUpdateManNo(userId);
         pres.setMeasureStation(model.getNetSpot3No());
@@ -731,23 +777,23 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkRailwayActual cleanPrediction (MeterWorkRailwayActual model) throws MarkerMetException {
         if (model.getActualNo() == null || "".equals(model.getActualNo())) {
-            throw new MarkerMetException(500, "洁净数据主键不能为空");
+            throw new MarkerMetException(500, "结净数据主键不能为空");
         }
         if (!model.getValueFlag().equals("1") && model.getPredictionNo() != null && !"".equals(model.getPredictionNo())) {
-            throw new MarkerMetException(500, "只有有效已匹配的洁净数据才能进行解除操作");
+            throw new MarkerMetException(500, "只有有效已匹配的结净数据才能进行解除操作");
         }
         MeterWorkRailwayActual mwcaquery = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
         if (mwcaquery == null) {
-            throw new MarkerMetException(500, "不存在对应的洁净数据");
+            throw new MarkerMetException(500, "不存在对应的结净数据");
         }
 
         if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())){
             PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
             if(scaleTemp.getValueFlag().equals("9")) {
-                throw new MarkerMetException(500, "洁净数据中包含已结算的委托");
+                throw new MarkerMetException(500, "结净数据中包含已结算的委托");
             }
             if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
             }
         }
 
@@ -762,7 +808,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         grossrow.setUpdateTime(new Date());
         grossrow.setUpdateManName(userName);
         grossrow.setUpdateManNo(userId);
-        grossrow.setNote("洁净数据解除委托操作");
+        grossrow.setNote("结净数据解除委托操作");
         grossrow.setIsPreSacale("0");
         meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossrow);
 
@@ -773,7 +819,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             tarerow.setUpdateTime(new Date());
             tarerow.setUpdateManName(userName);
             tarerow.setUpdateManNo(userId);
-            tarerow.setNote("洁净数据解除委托操作");
+            tarerow.setNote("结净数据解除委托操作");
             tarerow.setIsPreSacale("0");
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(tarerow);
         }catch(Exception e) {
@@ -788,7 +834,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             scale.setUploadFlag("1");
             scale.setUpdateTime(new Date());
             scale.setUpdateManNo(userId);
-            scale.setUpdateManName(userName + ": 洁净数据解除委托操作");
+            scale.setUpdateManName(userName + ": 结净数据解除委托操作");
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
         }
         MeterWorkRailwayActual mwca = meterWorkRailwayActualMapper.cleanPredcition(model.getActualNo());
@@ -827,15 +873,15 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             }
             for(MeterWorkRailwayActual model: models) {
                 if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())) {
-                    throw new MarkerMetException(500, "洁净数据已匹配委托，请撤销委托之后才能进行毛皮分解");
+                    throw new MarkerMetException(500, "结净数据已匹配委托，请撤销委托之后才能进行毛皮分解");
                 }
 //                if (StringUtils.isNotEmpty(model.getPredictionNo())) {
 //                    PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
 //                    if(scaleTemp.getValueFlag().equals("9")) {
-//                        throw new MarkerMetException(500,"洁净数据中包含已结算的委托！！！");
+//                        throw new MarkerMetException(500,"结净数据中包含已结算的委托！！！");
 //                    }
 //                    if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-//                        throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+//                        throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
 //                    }
 //                }
             }
@@ -857,7 +903,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 grossrow.setUpdateManNo(userId);
                 grossrow.setUpdateManName(userName);
                 grossrow.setUpdateTime(new Date());
-                grossrow.setNote("洁净数据毛皮分解");
+                grossrow.setNote("结净数据毛皮分解");
 //                grossrow.setUpdateManNo("system");
 //                grossrow.setUpdateManName("静态衡解除操作");
 //                grossrow.setUpdateTime(new Date());
@@ -895,7 +941,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     tarerow.setUpdateManNo(userId);
                     tarerow.setUpdateManName(userName);
                     tarerow.setUpdateTime(new Date());
-                    tarerow.setNote("洁净数据毛皮分解");
+                    tarerow.setNote("结净数据毛皮分解");
 //                    tarerow.setLcNo(model.getLcNo());
                     tarerow.setValueFlag("1");
                     meterWorkRailwayActFirstMapper.updateByPrimaryKey(tarerow);
@@ -951,17 +997,17 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())){
                 PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 if(scaleTemp.getValueFlag().equals("9")) {
-                    throw new MarkerMetException(500, "洁净数据中包含已结算的委托!!!");
+                    throw new MarkerMetException(500, "结净数据中包含已结算的委托!!!");
                 }
                 if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                    throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                    throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
                 }
             }
 
-            Assert.isTrue(Objects.nonNull(model.getActualNo()), "洁净数据为空");
+            Assert.isTrue(Objects.nonNull(model.getActualNo()), "结净数据为空");
             if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                 PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-                Assert.isTrue(!scaleTemp.getValueFlag().equals("9"), "洁净数据匹配的委托已结算");
+                Assert.isTrue(!scaleTemp.getValueFlag().equals("9"), "结净数据匹配的委托已结算");
             }
 
             //毛重
@@ -1359,8 +1405,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             }
             mwca.setNetMode(DbConstants.TYPE);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
-            mwca.setActualNo(sdf.format(new Date()) + no);
+//            String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
+//            mwca.setActualNo(sdf.format(new Date()) + no);
+            String no = PublicMethod.IdCreate(3);
+            mwca.setActualNo(no);
             mwca.setNetWeight(mwraf1.getMeterWeight().subtract(mbrw.getRailwayWeight()));
             mwca.setUploadFlag("1");
             mwca.setCreateTime(new Date());
@@ -1958,7 +2006,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             String afl = sdf.format(new Date());
             if(predictionNo == "" || "".equals(predictionNo)){
                 //添加毛重一次计量数据
-                String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+//                String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+//                mwraf1.setActualFirstNo(actualFirstNo);
+                String actualFirstNo = PublicMethod.IdCreate(3);
                 mwraf1.setActualFirstNo(actualFirstNo);
                 mwraf1.setValueFlag("2");
                 mwraf1.setCreateTime(new Date());
@@ -1971,7 +2021,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 mwraf1.setIsPreSacale("0");
                 meterWorkRailwayActFirstMapper.insertSelective(mwraf1);
                 //添加皮重一次计量数据
-                String dataNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+//                String dataNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+//                mwraf2.setActualFirstNo(dataNo);
+                String dataNo = PublicMethod.IdCreate(3);
                 mwraf2.setActualFirstNo(dataNo);
                 mwraf2.setValueFlag("2");
                 mwraf2.setCreateTime(new Date());
@@ -1984,7 +2036,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 mwraf2.setIsPreSacale("0");
                 meterWorkRailwayActFirstMapper.insertSelective(mwraf2);
                 //添加净重重一次计量数据
-                String ActualNo = sdf.format(new Date()) + meterWorkRailwayActualMapper.getNewID(afl);
+//                String ActualNo = sdf.format(new Date()) + meterWorkRailwayActualMapper.getNewID(afl);
+//                model.setActualNo(ActualNo);
+                String ActualNo = PublicMethod.IdCreate(3);
                 model.setActualNo(ActualNo);
                 model.setValueFlag("2");
                 model.setActualFirst1No(actualFirstNo);
@@ -2033,10 +2087,11 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 preRailwayScale.setUploadFlag("1");
                 preRailwayScale.setUpdateTime(new Date());
                 preRailwayScale.setUpdateManNo("system");
-                preRailwayScale.setUpdateManName("计量洁净数据手动录入");
+                preRailwayScale.setUpdateManName("计量结净数据手动录入");
 
                 //添加毛重一次计量数据
-                String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+//                String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+                String actualFirstNo = PublicMethod.IdCreate(3);
                 BeanUtils.copyProperties(preRailwayScale, mwraf1);
                 mwraf1.setActualFirstNo(actualFirstNo);
                 mwraf1.setIsPreSacale("1");
@@ -2050,7 +2105,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 mwraf1.setMeterMode("3");
                 meterWorkRailwayActFirstMapper.insertSelective(mwraf1);
                 //添加皮重一次计量数据
-                String dataNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+//                String dataNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+                String dataNo = PublicMethod.IdCreate(3);
                 BeanUtils.copyProperties(preRailwayScale, mwraf2, predictionNo);
                 mwraf2.setActualFirstNo(dataNo);
                 mwraf2.setIsPreSacale("1");
@@ -2064,7 +2120,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 mwraf2.setMeterMode("3");
                 meterWorkRailwayActFirstMapper.insertSelective(mwraf2);
                 //添加净重重一次计量数据
-                String ActualNo = sdf.format(new Date()) + meterWorkRailwayActualMapper.getNewID(afl);
+//                String ActualNo = sdf.format(new Date()) + meterWorkRailwayActualMapper.getNewID(afl);
+                String ActualNo = PublicMethod.IdCreate(3);
                 BeanUtils.copyProperties(preRailwayScale, model);
                 model.setActualNo(ActualNo);
                 model.setIsPreSacale("1");
@@ -2147,7 +2204,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             String userName = payload.getUserName();*/
 
             //毛重
-            String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+//            String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+            String actualFirstNo = PublicMethod.IdCreate(3);
             mwcaf1.setActualFirstNo(actualFirstNo);
             mwcaf1.setRailwayNo(model.getRailwayNo());
             mwcaf1.setMeterWeight(model.getGrossWeight());
@@ -2166,7 +2224,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             mwcaf1.setIsPreSacale("0");
             meterWorkRailwayActFirstMapper.insertSelective(mwcaf1);
             //皮重
-            String actualSecondNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+//            String actualSecondNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+            String actualSecondNo = PublicMethod.IdCreate(3);
             mwcaf2.setActualFirstNo(actualSecondNo);
             mwcaf2.setRailwayNo(model.getRailwayNo());
             mwcaf2.setMeterWeight(model.getTareWeight());
@@ -2215,8 +2274,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAdd(actualFirstNo, actualSecondNo);
                 BeanUtils.copyProperties(mwca1, actualRow);
             }
-            String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
-            actualRow.setActualNo(sdf.format(new Date()) + no);
+//            String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
+//            actualRow.setActualNo(sdf.format(new Date()) + no);
+            String no = PublicMethod.IdCreate(3);
+            actualRow.setActualNo(no);
             actualRow.setRailwayTypeNo(model.getRailwayTypeNo());
             actualRow.setRailwayTypeName(model.getRailwayTypeName());
             actualRow.setNetTime(model.getNetTime());
@@ -2322,14 +2383,14 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         }
         //models必须是2个，而且他们的预报组合号一致
 //        if(!models.get(0).getPredictionCombination().equals(models.get(1).getPredictionCombination())){
-//            rm.setMessage("必须选择两个预报组合号一致的洁净数据!!!");
+//            rm.setMessage("必须选择两个预报组合号一致的结净数据!!!");
 //            return rm;
 //        }
 
         for(MeterWorkRailwayActual modelTemp: models) {
             PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
             if(scaleTemp.getValueFlag().equals("9")) {
-                rm.setMessage("两个洁净数据中包含已结算的委托!!!");
+                rm.setMessage("两个结净数据中包含已结算的委托!!!");
                 return rm;
             }
         }
@@ -2342,7 +2403,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     //类型为双委托类型
                     for (MeterWorkRailwayActual model: models) {
                         if(!model.getPredictionType().equals("5")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是双委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是双委托结净数据，请确认！！");
                             return rm;
                         }
                     }
@@ -2350,14 +2411,14 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     //类型为混卸类型
                     for (MeterWorkRailwayActual model: models) {
                         if(!model.getPredictionType().equals("6")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是混卸委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是混卸委托结净数据，请确认！！");
                         }
                     }
                 }else if(type.equals("7")){
                     //类型为混装类型
                     for (MeterWorkRailwayActual model: models) {
                         if(!model.getPredictionType().equals("7")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是混装委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是混装委托结净数据，请确认！！");
                         }
                     }
                 }
@@ -2398,7 +2459,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 
             MeterWorkRailwayActual actualModel = meterWorkRailwayActualMapper.selectByPrimaryKey(params.get("actualNo").toString());
             if(actualModel == null){
-                rm.setMessage("未找到洁净计量数据，请确认！！！");
+                rm.setMessage("未找到结净计量数据，请确认！！！");
                 return rm;
             }
             if(actualModel.getPredictionNo() == null || StringUtils.isEmpty(actualModel.getPredictionNo())) {
@@ -2417,17 +2478,17 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())){
                     PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
                     if(scaleTemp.getValueFlag().equals("9")) {
-                        rm.setMessage("洁净数据中包含已结算的委托!!!");
+                        rm.setMessage("结净数据中包含已结算的委托!!!");
                         return rm;
                     }
                     if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                        rm.setMessage("洁净数据中包含特殊委托匹配结净的数据!!!");
+                        rm.setMessage("结净数据中包含特殊委托匹配结净的数据!!!");
                         return rm;
                     }
                 }
             }
             for (MeterWorkRailwayActual model: models) {
-                //循环每一个洁净记录
+                //循环每一个结净记录
                 //委托不能为空
                 if(StringUtils.isNotEmpty(model.getPredictionNo())){
                     // 改委托
@@ -2454,7 +2515,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 if(firstGross != null){
                     firstGross.setValueFlag(DbConstants.VALID);
 //                    firstGross.setUpdateManName("system");
-//                    firstGross.setUpdateManName("洁净废除更新");
+//                    firstGross.setUpdateManName("结净废除更新");
                     firstGross.setUpdateManNo(userId);
                     firstGross.setUpdateManName(userName);
                     firstGross.setNote(model.getNote());
@@ -2466,7 +2527,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 if(firstTare != null){
                     firstTare.setValueFlag(DbConstants.VALID);
 //                    firstTare.setUpdateManNo("system");
-//                    firstTare.setUpdateManName("洁净废除更新");
+//                    firstTare.setUpdateManName("结净废除更新");
                     firstTare.setUpdateManNo(userId);
                     firstTare.setUpdateManName(userName);
                     firstTare.setNote(model.getNote());
@@ -2475,12 +2536,12 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     firstTare.setValueFlag("0");
                     meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstTare);
                 }
-                // 作废洁净数据并解除委托
+                // 作废结净数据并解除委托
                 MeterWorkRailwayActual cleanModel = meterWorkRailwayActualMapper.cleanPredcition(model.getActualNo());
                 cleanModel.setUploadFlag("1");
                 cleanModel.setValueFlag("0");
                 meterWorkRailwayActualMapper.updateByPrimaryKeySelective(cleanModel);
-                //删洁净
+                //删结净
                 //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
             }
             rm.setSucceed();
@@ -2533,7 +2594,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         model.setIsPreSacale("0");
     }
 
-    //还原洁净
+    //还原结净
     public void removeEl(MeterWorkRailwayActual model) {
         String userId;
         String userName;

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/controller/MeterWorkRailwayActualBakController.java

@@ -221,7 +221,7 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "洁净数据维护-网页", notes = "根据传入时间查询去重列次编号")
+    @ApiOperation(value = "结净数据维护-网页", notes = "根据传入时间查询去重列次编号")
     @PostMapping(value = "/distinctLcNo")
     public RESTfulResult distinctLcNo(@RequestBody HashMap param) {
         RESTfulResult rm = failed();
@@ -403,7 +403,7 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "取消发布", notes = "将洁净数据重置为未发布状态")
+    @ApiOperation(value = "取消发布", notes = "将结净数据重置为未发布状态")
     @ApiImplicitParam(name = "model", value = "详细实体MeterWorkRailwayActual", required = true, dataType = "MeterWorkRailwayActual")
     @PostMapping(value = "/cancel")
     public RESTfulResult cancel(@RequestBody MeterWorkRailwayActualBak model) {
@@ -427,7 +427,7 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "取消发布", notes = "将洁净数据重置为未发布状态")
+    @ApiOperation(value = "取消发布", notes = "将结净数据重置为未发布状态")
     @ApiImplicitParam(name = "model", value = "详细实体MeterWorkRailwayActual", required = true, dataType = "MeterWorkRailwayActual")
     @PostMapping(value = "/publish")
     public RESTfulResult publish(@RequestBody MeterWorkRailwayActualBak model) {
@@ -471,7 +471,7 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value = "洁净")
+    @ApiOperation(value = "结净")
     @PostMapping(value = "/clean")
     public RESTfulResult clean(@RequestParam String actualFirstNo, String dataNo, String predictionNo) {
         RESTfulResult rm = failed();
@@ -490,7 +490,7 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "根据两个一次计量编号和原因文本进行手动匹配洁净", notes = "根据传入参数进行洁净")
+    @ApiOperation(value = "根据两个一次计量编号和原因文本进行手动匹配结净", notes = "根据传入参数进行结净")
     @PostMapping(value = "/cleanByfirstNoAndNotes")
     public RESTfulResult cleanByfirstNoAndNotes(@RequestParam String actFirstNo01, String actFirstNo02, String predictionNo, String Notes) {
         RESTfulResult rm = failed();
@@ -518,7 +518,7 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "解除", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "解除", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/remove")
     public RESTfulResult remove(@RequestBody List<MeterWorkRailwayActualBak> models) {
         RESTfulResult rm = failed();
@@ -541,7 +541,7 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "普通委托解除并作废洁净、毛重、皮重数据", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "普通委托解除并作废结净、毛重、皮重数据", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/commonRemove")
     public RESTfulResult commonRemove(@RequestBody HashMap params) {
         RESTfulResult rm = failed();
@@ -557,7 +557,7 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "解除动态衡洁净数据", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "解除动态衡结净数据", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/removeDynamicModel")
     public RESTfulResult removeDynamicModel(@RequestBody MeterWorkRailwayActualBak model) {
         RESTfulResult rm = failed();
@@ -576,7 +576,7 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value = "解除", notes = "将动轨洁净后的数据进行还原")
+    @ApiOperation(value = "解除", notes = "将动轨结净后的数据进行还原")
     @PostMapping(value = "/removeDt")
     public RESTfulResult removeDt(@RequestBody List<MeterWorkRailwayActualBak> models) {
         RESTfulResult rm = failed();
@@ -618,7 +618,7 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "固定皮重洁净")
+    @ApiOperation(value = "固定皮重结净")
     @PostMapping(value = "/termclean")
     public RESTfulResult termclean(@RequestParam String actualFirstNo, String dataNo) {
         RESTfulResult rm = failed();
@@ -895,7 +895,7 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "特殊委托解除洁净", notes = "将洁净后的数据进行还原")
+    @ApiOperation(value = "特殊委托解除结净", notes = "将结净后的数据进行还原")
     @PostMapping(value = "/specialRemove")
     public RESTfulResult specialRemove(@RequestBody HashMap params) {
         RESTfulResult rm = failed();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/mapper/MeterWorkRailwayActualBakMapper.java

@@ -28,10 +28,10 @@ public interface MeterWorkRailwayActualBakMapper extends IBaseMapper<MeterWorkRa
     List<MeterWorkRailwayActualBak> selectDiff(HashMap parmas);
 
     void insertSelectiveBar(MeterWorkRailwayActualBak netRail);
-    //一次皮重洁净
+    //一次皮重结净
     MeterWorkRailwayActualBak manualAddPre(@feign.Param( value = "actualFirstNo") String actualFirstNo, @feign.Param( value = "dataNo")String dataNo, @feign.Param( value = "predictionNo")String predictionNo);
     /**
-     * 洁净数据匹配委托
+     * 结净数据匹配委托
      */
     MeterWorkRailwayActualBak mathPredcition(@feign.Param(value = "actualNo") String actualNo, @feign.Param(value = "predictionNo") String predictionNo);
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/model/MeterWorkRailwayActualBak.java

@@ -346,9 +346,9 @@ public class MeterWorkRailwayActualBak implements IBasePO<String> {
     private String netGroup;
 
     /**
-     * 结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）(NET_MODE,VARCHAR,1)
+     * 结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）(NET_MODE,VARCHAR,1)
      */
-    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）",required=false)
+    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）",required=false)
     private String netMode;
 
     /**

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/service/impl/MeterWorkRailwayActualBakServiceImpl.java

@@ -242,7 +242,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             // 一次计量数据是否已经完成委托匹配
             if ((mwcaf1.getPredictionNo() != null && "".equals(mwcaf1.getPredictionNo())) || (mwcaf2.getPredictionNo() != null && "".equals(mwcaf2.getPredictionNo()))) {
                 if (!mwcaf1.getPredictionNo().equals(mwcaf2.getPredictionNo())) {
-                    throw new MarkerMetException(500, "选中的两条一次计量数据匹配的委托不一致，不允许进行洁净操作！！！");
+                    throw new MarkerMetException(500, "选中的两条一次计量数据匹配的委托不一致，不允许进行结净操作！！！");
                 } else if (predictionNo != null && !"".equals(predictionNo)) {
                     throw new MarkerMetException(500, "选中的两条一次计量数据已经匹配委托，请正确选择数据！！！");
                 }
@@ -284,7 +284,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                 scale.setUpdateTime(new Date());
                 scale.setUpdateManNo("system");
                 scale.setUploadFlag("1");
-                scale.setUpdateManName("二次计量洁净更新");
+                scale.setUpdateManName("二次计量结净更新");
                 scale.setMeasureStation(mwcaf2.getBaseSpotNo());
                 scale.setMeasureStationName(mwcaf2.getBaseSpotName());
                 preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
@@ -360,7 +360,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                 prs.setUploadFlag("1");
                 prs.setUpdateTime(new Date());
                 prs.setUpdateManNo("system");
-                prs.setUpdateManName("火车二次计量洁净操作");
+                prs.setUpdateManName("火车二次计量结净操作");
                 prs.setMeasureStation(actualRow.getNetManName());
                 prs.setMeasureStationName(actualRow.getNetSpot3Name());
                 preRailwayScaleMapper.updateByPrimaryKeySelective(prs);
@@ -379,7 +379,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         MeterWorkRailwayActFirstBak actFirst01 = meterWorkRailwayActFirstBakMapper.selectByPrimaryKey(actFirstNo01);
         MeterWorkRailwayActFirstBak actFirst02 = meterWorkRailwayActFirstBakMapper.selectByPrimaryKey(actFirstNo02);
         PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(predictionNo);
-        //存储洁净记录
+        //存储结净记录
         MeterWorkRailwayActualBak actualRow = new MeterWorkRailwayActualBak();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         UserPayload payload = new UserPayload();
@@ -473,7 +473,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             MeterWorkRailwayActualBak mwca2 = meterWorkRailwayActualBakMapper.manualAdd(actFirst01.getActualFirstNo(), actFirst02.getActualFirstNo());
             BeanUtils.copyProperties(mwca2, actualRow);
 
-            //标志位为洁净
+            //标志位为结净
             actFirst01.setWeightType("0");
             actFirst01.setNote(Notes);
             actFirst01.setIsPreSacale("0");
@@ -534,7 +534,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkRailwayActualBak matchPrediction (String actualNo, String predictionNo, String note) throws MarkerMetException {
         if (actualNo == null || "".equals(actualNo)) {
-            throw new MarkerMetException(500, "洁净数据主键不能为空");
+            throw new MarkerMetException(500, "结净数据主键不能为空");
         }
         if (predictionNo == null || "".equals(predictionNo)) {
             throw new MarkerMetException(500, "委托编号不能为空");
@@ -547,7 +547,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         }
 
         if (queryrow == null) {
-            throw new MarkerMetException(500, "不存在对应的洁净数据");
+            throw new MarkerMetException(500, "不存在对应的结净数据");
         } else if (!queryrow.getIsPreSacale().equals("0") && queryrow.getPredictionNo() != null) {
             throw new MarkerMetException(500, "只有未匹配的净重数据才能进行委托匹配操作");
         }
@@ -558,7 +558,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             throw new MarkerMetException(500, "只有未使用的委托才能进行匹配委托操作");
         }
         if (!queryrow.getRailwayNo().equals(prerow.getRailwayNo())) {
-            throw new MarkerMetException(500, "洁净数据中车号和预报中车号不一致，不允许进行匹配委托操作");
+            throw new MarkerMetException(500, "结净数据中车号和预报中车号不一致，不允许进行匹配委托操作");
         }
         String userId;
         String userName;
@@ -577,7 +577,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         grossrow.setUpdateTime(new Date());
         grossrow.setUpdateManNo(userId);
         grossrow.setUpdateManName(userName);
-        grossrow.setNote("洁净数据匹配委托操作");
+        grossrow.setNote("结净数据匹配委托操作");
         grossrow.setIsPreSacale("1");
         meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(grossrow);
 
@@ -587,7 +587,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             tarerow.setUpdateTime(new Date());
             tarerow.setUpdateManNo(userId);
             tarerow.setUpdateManName(userName);
-            tarerow.setNote("洁净数据匹配委托操作");
+            tarerow.setNote("结净数据匹配委托操作");
             tarerow.setIsPreSacale("1");
             meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(tarerow);
         }catch(Exception e) {
@@ -610,7 +610,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             scale.setUploadFlag("1");
             scale.setUpdateTime(new Date());
             scale.setUpdateManNo("system");
-            scale.setUpdateManName("计量洁净数据匹配委托操作");
+            scale.setUpdateManName("计量结净数据匹配委托操作");
             scale.setMeasureStation(mwca.getNetSpot3No());
             scale.setMeasureStationName(mwca.getNetSpot3Name());
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
@@ -655,7 +655,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         // 处理一次计量数据
         // 毛重
         queryrow.setUpdateTime(new Date());
-        queryrow.setUpdateManName(userName + ": 一次数据输入历史皮重洁净操作");
+        queryrow.setUpdateManName(userName + ": 一次数据输入历史皮重结净操作");
         queryrow.setUpdateManNo(userId);
         queryrow.setValueFlag("2");
         meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(queryrow);
@@ -673,7 +673,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         tarerow.setCreateTime(new Date());
         tarerow.setMeterMode("3");
         tarerow.setDataSource(queryrow.getDataSource());
-        tarerow.setMemo("静轨一次计量数据输入历史皮重洁净操作新增皮重数据");
+        tarerow.setMemo("静轨一次计量数据输入历史皮重结净操作新增皮重数据");
         tarerow.setValueFlag("2");
         tarerow.setWeightType("3");
         int num1 = meterWorkRailwayActFirstBakMapper.insertSelective(tarerow);
@@ -718,7 +718,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         pres.setPredictionNo(model.getPredictionNo());
         pres.setValueFlag("2");
         pres.setUploadFlag("1");
-        pres.setUpdateManName(userName+ ": 使用历史皮重洁净操作");
+        pres.setUpdateManName(userName+ ": 使用历史皮重结净操作");
         pres.setUpdateTime(new Date());
         pres.setUpdateManNo(userId);
         pres.setMeasureStation(model.getNetSpot3No());
@@ -731,22 +731,22 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkRailwayActualBak cleanPrediction (MeterWorkRailwayActualBak model) throws MarkerMetException {
         if (model.getActualNo() == null || "".equals(model.getActualNo())) {
-            throw new MarkerMetException(500, "洁净数据主键不能为空");
+            throw new MarkerMetException(500, "结净数据主键不能为空");
         }
         if (!model.getValueFlag().equals("1") && model.getPredictionNo() != null && !"".equals(model.getPredictionNo())) {
-            throw new MarkerMetException(500, "只有有效已匹配的洁净数据才能进行解除操作");
+            throw new MarkerMetException(500, "只有有效已匹配的结净数据才能进行解除操作");
         }
         MeterWorkRailwayActualBak mwcaquery = meterWorkRailwayActualBakMapper.selectByPrimaryKey(model.getActualNo());
         if (mwcaquery == null) {
-            throw new MarkerMetException(500, "不存在对应的洁净数据");
+            throw new MarkerMetException(500, "不存在对应的结净数据");
         }
         if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())){
             PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
             if(scaleTemp.getValueFlag().equals("9")) {
-                throw new MarkerMetException(500, "洁净数据中包含已结算的委托");
+                throw new MarkerMetException(500, "结净数据中包含已结算的委托");
             }
             if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
             }
         }
 
@@ -759,9 +759,9 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         MeterWorkRailwayActFirstBak grossrow = meterWorkRailwayActFirstBakMapper.selectAndRemove(model.getActualFirst1No());
 //        grossrow.setValueFlag("3");
         grossrow.setUpdateTime(new Date());
-        grossrow.setUpdateManName(userName + ": 洁净数据解除委托操作");
+        grossrow.setUpdateManName(userName + ": 结净数据解除委托操作");
         grossrow.setUpdateManNo(userId);
-        grossrow.setNote("洁净数据解除委托操作");
+        grossrow.setNote("结净数据解除委托操作");
         grossrow.setIsPreSacale("0");
         meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(grossrow);
 
@@ -770,9 +770,9 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             MeterWorkRailwayActFirstBak tarerow = meterWorkRailwayActFirstBakMapper.selectAndRemove(model.getActualFirst2No());
 //        tarerow.setValueFlag("3");
             tarerow.setUpdateTime(new Date());
-            tarerow.setUpdateManName(userName + ": 洁净数据解除委托操作");
+            tarerow.setUpdateManName(userName + ": 结净数据解除委托操作");
             tarerow.setUpdateManNo(userId);
-            tarerow.setNote("洁净数据解除委托操作");
+            tarerow.setNote("结净数据解除委托操作");
             tarerow.setIsPreSacale("0");
             meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(tarerow);
         }catch(Exception e) {
@@ -787,7 +787,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             scale.setUploadFlag("1");
             scale.setUpdateTime(new Date());
             scale.setUpdateManNo(userId);
-            scale.setUpdateManName(userName + ": 洁净数据解除委托操作");
+            scale.setUpdateManName(userName + ": 结净数据解除委托操作");
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
         }
         MeterWorkRailwayActualBak mwca = meterWorkRailwayActualBakMapper.cleanPredcition(model.getActualNo());
@@ -826,15 +826,15 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             }
             for(MeterWorkRailwayActualBak model: models) {
                 if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())) {
-                    throw new MarkerMetException(500, "洁净数据已匹配委托，请撤销委托之后才能进行毛皮分解");
+                    throw new MarkerMetException(500, "结净数据已匹配委托，请撤销委托之后才能进行毛皮分解");
                 }
 //                if (StringUtils.isNotEmpty(model.getPredictionNo())) {
 //                    PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
 //                    if(scaleTemp.getValueFlag().equals("9")) {
-//                        throw new MarkerMetException(500,"洁净数据中包含已结算的委托！！！");
+//                        throw new MarkerMetException(500,"结净数据中包含已结算的委托！！！");
 //                    }
 //                    if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-//                        throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+//                        throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
 //                    }
 //                }
             }
@@ -856,7 +856,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                 grossrow.setUpdateManNo(userId);
                 grossrow.setUpdateManName(userName);
                 grossrow.setUpdateTime(new Date());
-                grossrow.setNote("洁净数据毛皮分解");
+                grossrow.setNote("结净数据毛皮分解");
 //                grossrow.setUpdateManNo("system");
 //                grossrow.setUpdateManName("静态衡解除操作");
 //                grossrow.setUpdateTime(new Date());
@@ -894,7 +894,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                     tarerow.setUpdateManNo(userId);
                     tarerow.setUpdateManName(userName);
                     tarerow.setUpdateTime(new Date());
-                    tarerow.setNote("洁净数据毛皮分解");
+                    tarerow.setNote("结净数据毛皮分解");
 //                    tarerow.setLcNo(model.getLcNo());
                     tarerow.setValueFlag("1");
                     meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(tarerow);
@@ -950,17 +950,17 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())){
                 PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 if(scaleTemp.getValueFlag().equals("9")) {
-                    throw new MarkerMetException(500, "洁净数据中包含已结算的委托!!!");
+                    throw new MarkerMetException(500, "结净数据中包含已结算的委托!!!");
                 }
                 if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                    throw new MarkerMetException(500, "洁净数据中包含特殊委托匹配结净的数据!!!");
+                    throw new MarkerMetException(500, "结净数据中包含特殊委托匹配结净的数据!!!");
                 }
             }
 
-            Assert.isTrue(Objects.nonNull(model.getActualNo()), "洁净数据为空");
+            Assert.isTrue(Objects.nonNull(model.getActualNo()), "结净数据为空");
             if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                 PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-                Assert.isTrue(!scaleTemp.getValueFlag().equals("9"), "洁净数据匹配的委托已结算");
+                Assert.isTrue(!scaleTemp.getValueFlag().equals("9"), "结净数据匹配的委托已结算");
             }
 
             //毛重
@@ -2028,7 +2028,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                 preRailwayScale.setUploadFlag("1");
                 preRailwayScale.setUpdateTime(new Date());
                 preRailwayScale.setUpdateManNo("system");
-                preRailwayScale.setUpdateManName("计量洁净数据手动录入");
+                preRailwayScale.setUpdateManName("计量结净数据手动录入");
 
                 //添加毛重一次计量数据
                 String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstBakMapper.getNewID(afl);
@@ -2308,14 +2308,14 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         }
         //models必须是2个，而且他们的预报组合号一致
 //        if(!models.get(0).getPredictionCombination().equals(models.get(1).getPredictionCombination())){
-//            rm.setMessage("必须选择两个预报组合号一致的洁净数据!!!");
+//            rm.setMessage("必须选择两个预报组合号一致的结净数据!!!");
 //            return rm;
 //        }
 
         for(MeterWorkRailwayActualBak modelTemp: models) {
             PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
             if(scaleTemp.getValueFlag().equals("9")) {
-                rm.setMessage("两个洁净数据中包含已结算的委托!!!");
+                rm.setMessage("两个结净数据中包含已结算的委托!!!");
                 return rm;
             }
         }
@@ -2328,7 +2328,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                     //类型为双委托类型
                     for (MeterWorkRailwayActualBak model: models) {
                         if(!model.getPredictionType().equals("5")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是双委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是双委托结净数据，请确认！！");
                             return rm;
                         }
                     }
@@ -2336,14 +2336,14 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                     //类型为混卸类型
                     for (MeterWorkRailwayActualBak model: models) {
                         if(!model.getPredictionType().equals("6")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是混卸委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是混卸委托结净数据，请确认！！");
                         }
                     }
                 }else if(type.equals("7")){
                     //类型为混装类型
                     for (MeterWorkRailwayActualBak model: models) {
                         if(!model.getPredictionType().equals("7")) {
-                            rm.setMessage("选中的计量数据当中有一条或多条不是混装委托洁净数据，请确认！！");
+                            rm.setMessage("选中的计量数据当中有一条或多条不是混装委托结净数据，请确认！！");
                         }
                     }
                 }
@@ -2384,7 +2384,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
 
             MeterWorkRailwayActualBak actualModel = meterWorkRailwayActualBakMapper.selectByPrimaryKey(params.get("actualNo").toString());
             if(actualModel == null){
-                rm.setMessage("未找到洁净计量数据，请确认！！！");
+                rm.setMessage("未找到结净计量数据，请确认！！！");
                 return rm;
             }
             if(actualModel.getPredictionNo() == null || StringUtils.isEmpty(actualModel.getPredictionNo())) {
@@ -2403,17 +2403,17 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                 if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())){
                     PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
                     if(scaleTemp.getValueFlag().equals("9")) {
-                        rm.setMessage("洁净数据中包含已结算的委托!!!");
+                        rm.setMessage("结净数据中包含已结算的委托!!!");
                         return rm;
                     }
                     if(scaleTemp.getPredictionType().equals("5") || scaleTemp.getPredictionType().equals("6") || scaleTemp.getPredictionType().equals("7")){
-                        rm.setMessage("洁净数据中包含特殊委托匹配结净的数据!!!");
+                        rm.setMessage("结净数据中包含特殊委托匹配结净的数据!!!");
                         return rm;
                     }
                 }
             }
             for (MeterWorkRailwayActualBak model: models) {
-                //循环每一个洁净记录
+                //循环每一个结净记录
                 //委托不能为空
                 if(StringUtils.isNotEmpty(model.getPredictionNo())){
                     // 改委托
@@ -2440,7 +2440,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                 if(firstGross != null){
                     firstGross.setValueFlag(DbConstants.VALID);
 //                    firstGross.setUpdateManName("system");
-//                    firstGross.setUpdateManName("洁净废除更新");
+//                    firstGross.setUpdateManName("结净废除更新");
                     firstGross.setUpdateManNo(userId);
                     firstGross.setUpdateManName(userName);
                     firstGross.setNote(model.getNote());
@@ -2452,7 +2452,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                 if(firstTare != null){
                     firstTare.setValueFlag(DbConstants.VALID);
 //                    firstTare.setUpdateManNo("system");
-//                    firstTare.setUpdateManName("洁净废除更新");
+//                    firstTare.setUpdateManName("结净废除更新");
                     firstTare.setUpdateManNo(userId);
                     firstTare.setUpdateManName(userName);
                     firstTare.setNote(model.getNote());
@@ -2461,12 +2461,12 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                     firstTare.setValueFlag("0");
                     meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(firstTare);
                 }
-                // 作废洁净数据并解除委托
+                // 作废结净数据并解除委托
                 MeterWorkRailwayActualBak cleanModel = meterWorkRailwayActualBakMapper.cleanPredcition(model.getActualNo());
                 cleanModel.setUploadFlag("1");
                 cleanModel.setValueFlag("0");
                 meterWorkRailwayActualBakMapper.updateByPrimaryKeySelective(cleanModel);
-                //删洁净
+                //删结净
                 //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
             }
             rm.setSucceed();
@@ -2519,7 +2519,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         model.setIsPreSacale("0");
     }
 
-    //还原洁净
+    //还原结净
     public void removeEl(MeterWorkRailwayActualBak model) {
         String userId;
         String userName;
@@ -2660,7 +2660,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                 if (actualBak == null) {
                     //抛出异常
                     //事务回滚
-                    throw new Exception("洁净数据为空");
+                    throw new Exception("结净数据为空");
                 }
 
                 if (!railwayNo.equals(actualBak.getRailwayNo())) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayscheduledhelp/mapper/MeterWorkRailwayScheduledHelpMapper.xml

@@ -81,7 +81,7 @@
       </if>
       <if test="endTime01 != null and endTime01 != ''">
         and create_time &lt;= to_date(#{endTime01}, 'yyyy-MM-dd HH24:mi:ss')
-      </if>>
+      </if>
     </where>
   </sql>
   <sql id="whereLike">

src/main/java/com/steerinfo/meterwork/meterworkrailwayscheduledhelp/service/impl/MeterWorkRailwayScheduledHelpServiceImpl.java

@@ -64,7 +64,7 @@ public class MeterWorkRailwayScheduledHelpServiceImpl extends BaseServiceImpl<Me
         map.put("baseSpotName", baseSpotName);
         List<MeterWorkRailwayScheduledHelp> model = meterWorkRailwayScheduledHelpMapper.selectByParameters(map);
         //若是远程求助信息里面没有求助信息，重新生成Id直接插入
-        if(model.size() >= 1){
+        if(model.size() < 1){
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
             helpModel.setHelpId(sdf.format(new Date()));
             helpModel.setRailwayNo(railwayNo);

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/service/impl/MeterWorkScheduledHelpServiceImpl.java

@@ -58,7 +58,7 @@ public class MeterWorkScheduledHelpServiceImpl extends BaseServiceImpl<MeterWork
         map.put("baseSpotName", baseSpotName);
         List<MeterWorkScheduledHelp> model = meterWorkScheduledHelpMapper.selectByParameters(map);
         //若是远程求助信息里面没有求助信息，重新生成Id直接插入
-        if(model.size() >= 1){
+        if(model.size() < 1){
 //            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
 //            helpModel.setHelpId(sdf.format(new Date()));
             String no =  PublicMethod.IdCreate(3);

src/main/java/com/steerinfo/pretrack/prerailwayscale/controller/PreRailwayScaleController.java

@@ -165,7 +165,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "web端--静轨一次、洁净数据界面获取委托未过期的倒序列表", notes = "不分页模糊查询")
+    @ApiOperation(value = "web端--静轨一次、结净数据界面获取委托未过期的倒序列表", notes = "不分页模糊查询")
     @PostMapping(value = "/noPageDesc")
     public RESTfulResult noPageDesc(@RequestBody HashMap parmas) {
         try {

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.xml

@@ -3149,6 +3149,9 @@
       <if test="railwayNo != '' and railwayNo != null">
         and railway_No =  #{railwayNo}
       </if>
+      <if test="valueFlag != null and valueFlag != ''">
+         and value_Flag = #{valueFlag}
+      </if>
       and value_flag in ('0', '1')
       and TRUST_AVAILABILITY_TIME >= sysDate
       order by TRUST_DATE_TIME desc

src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

@@ -104,7 +104,7 @@ public class PreTrackScaleController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "汽车衡洁净数据补录界面获取委托未过期的倒序列表", notes = "分页模糊查询")
+    @ApiOperation(value = "汽车衡结净数据补录界面获取委托未过期的倒序列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
@@ -120,7 +120,7 @@ public class PreTrackScaleController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "web端--汽车衡一次、洁净数据界面获取委托未过期的倒序列表", notes = "不分页模糊查询")
+    @ApiOperation(value = "web端--汽车衡一次、结净数据界面获取委托未过期的倒序列表", notes = "不分页模糊查询")
     @PostMapping(value = "/noPageDesc")
     public RESTfulResult noPageDesc(@RequestBody HashMap parmas) {
         try {