后端提交

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

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

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

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

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

@@ -0,0 +1,549 @@
+<?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.meterbaserailwaymetertarenetconfig.mapper.MeterBaseRailwayMeterTareNetConfigMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbaserailwaymetertarenetconfig.model.MeterBaseRailwayMeterTareNetConfig">
+    <id column="CONFIG_NO" jdbcType="VARCHAR" property="configNo" />
+    <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo" />
+    <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName" />
+    <result column="FORWARDING_UNIT_NO" jdbcType="VARCHAR" property="forwardingUnitNo" />
+    <result column="FORWARDING_UNIT_NAME" jdbcType="VARCHAR" property="forwardingUnitName" />
+    <result column="RECEIVING_UINT_NO" jdbcType="VARCHAR" property="receivingUintNo" />
+    <result column="RECEIVING_UINT_NAME" jdbcType="VARCHAR" property="receivingUintName" />
+    <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" />
+  </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
+  </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
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_RAILWAY_METER_TARE_NET_CONFIG
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_RAILWAY_METER_TARE_NET_CONFIG t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="configNo != null and configNo != ''">
+        and CONFIG_NO = #{configNo}
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME = #{matterName}
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO = #{forwardingUnitNo}
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME = #{forwardingUnitName}
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO = #{receivingUintNo}
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME = #{receivingUintName}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="configNo != null and configNo != ''">
+        and CONFIG_NO LIKE '%${configNo}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_RAILWAY_METER_TARE_NET_CONFIG
+    where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_RAILWAY_METER_TARE_NET_CONFIG
+    where 1!=1 
+      <if test="matterNo != null and matterNo != ''">
+        or MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        or MATTER_NAME = #{matterName}
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        or FORWARDING_UNIT_NO = #{forwardingUnitNo}
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        or FORWARDING_UNIT_NAME = #{forwardingUnitName}
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        or RECEIVING_UINT_NO = #{receivingUintNo}
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        or RECEIVING_UINT_NAME = #{receivingUintName}
+      </if>
+      <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>
+  </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, 
+      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
+      )
+    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}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaymetertarenetconfig.model.MeterBaseRailwayMeterTareNetConfig">
+    insert into METER_BASE_RAILWAY_METER_TARE_NET_CONFIG
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="configNo != null">
+        CONFIG_NO,
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO,
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME,
+      </if>
+      <if test="forwardingUnitNo != null">
+        FORWARDING_UNIT_NO,
+      </if>
+      <if test="forwardingUnitName != null">
+        FORWARDING_UNIT_NAME,
+      </if>
+      <if test="receivingUintNo != null">
+        RECEIVING_UINT_NO,
+      </if>
+      <if test="receivingUintName != null">
+        RECEIVING_UINT_NAME,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="configNo != null">
+        #{configNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitNo != null">
+        #{forwardingUnitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitName != null">
+        #{forwardingUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintNo != null">
+        #{receivingUintNo,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintName != null">
+        #{receivingUintName,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaserailwaymetertarenetconfig.model.MeterBaseRailwayMeterTareNetConfig">
+    update METER_BASE_RAILWAY_METER_TARE_NET_CONFIG
+    set MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
+      FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
+      RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
+      RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
+      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}
+    where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaymetertarenetconfig.model.MeterBaseRailwayMeterTareNetConfig">
+    update METER_BASE_RAILWAY_METER_TARE_NET_CONFIG
+    <set>
+      <if test="matterNo != null">
+        MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitNo != null">
+        FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitName != null">
+        FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintNo != null">
+        RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintName != null">
+        RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
+      </if>
+      <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>
+    </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_TARE_NET_CONFIG 
+      (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
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.configNo,jdbcType=VARCHAR}, 
+      #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR}, #{item.forwardingUnitNo,jdbcType=VARCHAR}, 
+      #{item.forwardingUnitName,jdbcType=VARCHAR}, #{item.receivingUintNo,jdbcType=VARCHAR}, 
+      #{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  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_RAILWAY_METER_TARE_NET_CONFIG
+     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>
+       ,MATTER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
+       </foreach>
+       ,FORWARDING_UNIT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.forwardingUnitNo,jdbcType=VARCHAR}
+       </foreach>
+       ,FORWARDING_UNIT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.forwardingUnitName,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVING_UINT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.receivingUintNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVING_UINT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.receivingUintName,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>
+     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_TARE_NET_CONFIG
+    where CONFIG_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

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

@@ -0,0 +1,302 @@
+package com.steerinfo.baseinfo.meterbaserailwaymetertarenetconfig.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 MeterBaseRailwayMeterTareNetConfig implements IBasePO<String> {
+    /**
+     * 配置编号(CONFIG_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="配置编号",required=true)
+    private String configNo;
+
+    /**
+     * 物料编号(MATTER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料编号",required=false)
+    private String matterNo;
+
+    /**
+     * 物料名称(MATTER_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="物料名称",required=false)
+    private String matterName;
+
+    /**
+     * 发货单位编号(FORWARDING_UNIT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="发货单位编号",required=false)
+    private String forwardingUnitNo;
+
+    /**
+     * 发货单位名称(FORWARDING_UNIT_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="发货单位名称",required=false)
+    private String forwardingUnitName;
+
+    /**
+     * 收货单位编号(RECEIVING_UINT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="收货单位编号",required=false)
+    private String receivingUintNo;
+
+    /**
+     * 收货单位名称(RECEIVING_UINT_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="收货单位名称",required=false)
+    private String receivingUintName;
+
+    /**
+     * 备注(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;
+
+    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 getMatterNo() {
+        return matterNo;
+    }
+
+    public void setMatterNo(String matterNo) {
+        this.matterNo = matterNo == null ? null : matterNo.trim();
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName == null ? null : matterName.trim();
+    }
+
+    public String getForwardingUnitNo() {
+        return forwardingUnitNo;
+    }
+
+    public void setForwardingUnitNo(String forwardingUnitNo) {
+        this.forwardingUnitNo = forwardingUnitNo == null ? null : forwardingUnitNo.trim();
+    }
+
+    public String getForwardingUnitName() {
+        return forwardingUnitName;
+    }
+
+    public void setForwardingUnitName(String forwardingUnitName) {
+        this.forwardingUnitName = forwardingUnitName == null ? null : forwardingUnitName.trim();
+    }
+
+    public String getReceivingUintNo() {
+        return receivingUintNo;
+    }
+
+    public void setReceivingUintNo(String receivingUintNo) {
+        this.receivingUintNo = receivingUintNo == null ? null : receivingUintNo.trim();
+    }
+
+    public String getReceivingUintName() {
+        return receivingUintName;
+    }
+
+    public void setReceivingUintName(String receivingUintName) {
+        this.receivingUintName = receivingUintName == null ? null : receivingUintName.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;
+    }
+
+    @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(", matterNo=").append(matterNo);
+        sb.append(", matterName=").append(matterName);
+        sb.append(", forwardingUnitNo=").append(forwardingUnitNo);
+        sb.append(", forwardingUnitName=").append(forwardingUnitName);
+        sb.append(", receivingUintNo=").append(receivingUintNo);
+        sb.append(", receivingUintName=").append(receivingUintName);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,549 @@
+<?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.meterbaserailwaystandardtarenetconfig.mapper.MeterBaseRailwayStandardTareNetConfigMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbaserailwaystandardtarenetconfig.model.MeterBaseRailwayStandardTareNetConfig">
+    <id column="CONFIG_NO" jdbcType="VARCHAR" property="configNo" />
+    <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo" />
+    <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName" />
+    <result column="FORWARDING_UNIT_NO" jdbcType="VARCHAR" property="forwardingUnitNo" />
+    <result column="FORWARDING_UNIT_NAME" jdbcType="VARCHAR" property="forwardingUnitName" />
+    <result column="RECEIVING_UINT_NO" jdbcType="VARCHAR" property="receivingUintNo" />
+    <result column="RECEIVING_UINT_NAME" jdbcType="VARCHAR" property="receivingUintName" />
+    <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" />
+  </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
+  </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
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_RAILWAY_STANDARD_TARE_NET_CONFIG
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_RAILWAY_STANDARD_TARE_NET_CONFIG t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="configNo != null and configNo != ''">
+        and CONFIG_NO = #{configNo}
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME = #{matterName}
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO = #{forwardingUnitNo}
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME = #{forwardingUnitName}
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO = #{receivingUintNo}
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME = #{receivingUintName}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="configNo != null and configNo != ''">
+        and CONFIG_NO LIKE '%${configNo}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_RAILWAY_STANDARD_TARE_NET_CONFIG
+    where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_RAILWAY_STANDARD_TARE_NET_CONFIG
+    where 1!=1 
+      <if test="matterNo != null and matterNo != ''">
+        or MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        or MATTER_NAME = #{matterName}
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        or FORWARDING_UNIT_NO = #{forwardingUnitNo}
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        or FORWARDING_UNIT_NAME = #{forwardingUnitName}
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        or RECEIVING_UINT_NO = #{receivingUintNo}
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        or RECEIVING_UINT_NAME = #{receivingUintName}
+      </if>
+      <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>
+  </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, 
+      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
+      )
+    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}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaystandardtarenetconfig.model.MeterBaseRailwayStandardTareNetConfig">
+    insert into METER_BASE_RAILWAY_STANDARD_TARE_NET_CONFIG
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="configNo != null">
+        CONFIG_NO,
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO,
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME,
+      </if>
+      <if test="forwardingUnitNo != null">
+        FORWARDING_UNIT_NO,
+      </if>
+      <if test="forwardingUnitName != null">
+        FORWARDING_UNIT_NAME,
+      </if>
+      <if test="receivingUintNo != null">
+        RECEIVING_UINT_NO,
+      </if>
+      <if test="receivingUintName != null">
+        RECEIVING_UINT_NAME,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="configNo != null">
+        #{configNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitNo != null">
+        #{forwardingUnitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitName != null">
+        #{forwardingUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintNo != null">
+        #{receivingUintNo,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintName != null">
+        #{receivingUintName,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaserailwaystandardtarenetconfig.model.MeterBaseRailwayStandardTareNetConfig">
+    update METER_BASE_RAILWAY_STANDARD_TARE_NET_CONFIG
+    set MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
+      FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
+      RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
+      RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
+      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}
+    where CONFIG_NO = #{configNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaserailwaystandardtarenetconfig.model.MeterBaseRailwayStandardTareNetConfig">
+    update METER_BASE_RAILWAY_STANDARD_TARE_NET_CONFIG
+    <set>
+      <if test="matterNo != null">
+        MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitNo != null">
+        FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitName != null">
+        FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintNo != null">
+        RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintName != null">
+        RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
+      </if>
+      <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>
+    </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_STANDARD_TARE_NET_CONFIG 
+      (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
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.configNo,jdbcType=VARCHAR}, 
+      #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR}, #{item.forwardingUnitNo,jdbcType=VARCHAR}, 
+      #{item.forwardingUnitName,jdbcType=VARCHAR}, #{item.receivingUintNo,jdbcType=VARCHAR}, 
+      #{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  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_RAILWAY_STANDARD_TARE_NET_CONFIG
+     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>
+       ,MATTER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
+       </foreach>
+       ,FORWARDING_UNIT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.forwardingUnitNo,jdbcType=VARCHAR}
+       </foreach>
+       ,FORWARDING_UNIT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.forwardingUnitName,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVING_UINT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.receivingUintNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVING_UINT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CONFIG_NO" close="end">
+          when #{item.configNo,jdbcType=VARCHAR} then #{item.receivingUintName,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>
+     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_STANDARD_TARE_NET_CONFIG
+    where CONFIG_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

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

@@ -0,0 +1,302 @@
+package com.steerinfo.baseinfo.meterbaserailwaystandardtarenetconfig.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 MeterBaseRailwayStandardTareNetConfig implements IBasePO<String> {
+    /**
+     * 配置编号(CONFIG_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="配置编号",required=true)
+    private String configNo;
+
+    /**
+     * 物料编号(MATTER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料编号",required=false)
+    private String matterNo;
+
+    /**
+     * 物料名称(MATTER_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="物料名称",required=false)
+    private String matterName;
+
+    /**
+     * 发货单位编号(FORWARDING_UNIT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="发货单位编号",required=false)
+    private String forwardingUnitNo;
+
+    /**
+     * 发货单位名称(FORWARDING_UNIT_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="发货单位名称",required=false)
+    private String forwardingUnitName;
+
+    /**
+     * 收货单位编号(RECEIVING_UINT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="收货单位编号",required=false)
+    private String receivingUintNo;
+
+    /**
+     * 收货单位名称(RECEIVING_UINT_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="收货单位名称",required=false)
+    private String receivingUintName;
+
+    /**
+     * 备注(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;
+
+    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 getMatterNo() {
+        return matterNo;
+    }
+
+    public void setMatterNo(String matterNo) {
+        this.matterNo = matterNo == null ? null : matterNo.trim();
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName == null ? null : matterName.trim();
+    }
+
+    public String getForwardingUnitNo() {
+        return forwardingUnitNo;
+    }
+
+    public void setForwardingUnitNo(String forwardingUnitNo) {
+        this.forwardingUnitNo = forwardingUnitNo == null ? null : forwardingUnitNo.trim();
+    }
+
+    public String getForwardingUnitName() {
+        return forwardingUnitName;
+    }
+
+    public void setForwardingUnitName(String forwardingUnitName) {
+        this.forwardingUnitName = forwardingUnitName == null ? null : forwardingUnitName.trim();
+    }
+
+    public String getReceivingUintNo() {
+        return receivingUintNo;
+    }
+
+    public void setReceivingUintNo(String receivingUintNo) {
+        this.receivingUintNo = receivingUintNo == null ? null : receivingUintNo.trim();
+    }
+
+    public String getReceivingUintName() {
+        return receivingUintName;
+    }
+
+    public void setReceivingUintName(String receivingUintName) {
+        this.receivingUintName = receivingUintName == null ? null : receivingUintName.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;
+    }
+
+    @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(", matterNo=").append(matterNo);
+        sb.append(", matterName=").append(matterName);
+        sb.append(", forwardingUnitNo=").append(forwardingUnitNo);
+        sb.append(", forwardingUnitName=").append(forwardingUnitName);
+        sb.append(", receivingUintNo=").append(receivingUintNo);
+        sb.append(", receivingUintName=").append(receivingUintName);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

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

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

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

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

@@ -1004,9 +1004,13 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         if(carActual != null) {
             actualNoList.add(0, carActual.getActualFirst1No());
             actualNoList.add(1, carActual.getActualFirst2No());
-            String entrust = carActual.getPredictionNo() == null ? "" : carActual.getPredictionNo();
+//            String entrust = carActual.getPredictionNo() == null ? "" : carActual.getPredictionNo();
+//            String carNo = carActual.getCarNo() == null ? "": carActual.getCarNo();
+            HashMap<String, Object> obj = new HashMap<>();
+            obj.put("carNo", carActual.getCarNo());
+            obj.put("predictionNo", carActual.getPredictionNo());
             List<MeterWorkCarActualFirst> firstList = meterWorkCarActualFirstMapper.selectById(actualNoList);
-            PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(entrust);
+            List<PreTrackScale> scale = preTrackScaleMapper.selectByScale(obj);
             HashMap<String, Object> map = new HashMap<>();
             map.put("firstList", firstList);
             map.put("scale", scale);

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

@@ -2385,7 +2385,6 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
     @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     public void ndCopyToActual(List<String> ids,String carNo) throws Exception {
 
-
         for (String id : ids){
             //根据id获取对应的一次数据
             MeterWorkCarActualBak meterWorkCarActualBak = meterWorkCarActualBakMapper.selectByPrimaryKey(id);
@@ -2405,13 +2404,15 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
 
 
             //判断是否符合要求
-            if (isSuit(meterWorkCarActualBak,0)){
+            String note = isSuit(meterWorkCarActualBak,0);
+            if (note.equals("1")){
                 //复制到First正式表里面
-
                 MeterWorkCarActual actual = new MeterWorkCarActual();
                 //复制一份
                 BeanUtils.copyProperties(meterWorkCarActualBak,actual);
                 //修改主键
+                actual.setActualFirst1No(actual.getActualFirst1No() + "bak");
+                actual.setActualFirst2No(actual.getActualFirst2No() + "bak");
                 actual.setActualNo(actual.getActualNo()+"bak");
 
                 meterWorkCarActualMapper.insert(actual);
@@ -2422,21 +2423,23 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
 
                 MeterWorkCarActualFirst first1 = new MeterWorkCarActualFirst();
                 MeterWorkCarActualFirst first2 = new MeterWorkCarActualFirst();
-
                 BeanUtils.copyProperties(firstBak1,first1);
                 BeanUtils.copyProperties(firstBak2,first2);
-
                 first1.setActualFirstNo(first1.getActualFirstNo()+"bak");
                 first2.setActualFirstNo(first2.getActualFirstNo()+"bak");
-
-
                 meterWorkCarActualFirstMapper.insert(first1);
                 meterWorkCarActualFirstMapper.insert(first2);
 
+                firstBak1.setValueFlag("0");
+                firstBak2.setValueFlag("0");
+                meterWorkCarActualBak.setValueFlag("0");
+                meterWorkCarActualFirstBakMapper.updateByPrimaryKeySelective(firstBak1);
+                meterWorkCarActualFirstBakMapper.updateByPrimaryKeySelective(firstBak2);
+                meterWorkCarActualBakMapper.updateByPrimaryKeySelective(meterWorkCarActualBak);
             }else{
                 //抛出异常
                 //事务回滚
-                throw new Exception("数据不符合要求");
+                throw new Exception(note);
             }
 
         }
@@ -2464,13 +2467,15 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             }
 
             //判断是否符合要求
-            if (isSuit(meterWorkCarActualBak,1)){
+            String note = isSuit(meterWorkCarActualBak,1);
+            if (note.equals("1")){
                 //复制到First正式表里面
-
                 MeterWorkCarActual actual = new MeterWorkCarActual();
                 //复制一份
                 BeanUtils.copyProperties(meterWorkCarActualBak,actual);
                 //修改主键
+                actual.setActualFirst1No(actual.getActualFirst1No() + "bak");
+                actual.setActualFirst2No(actual.getActualFirst2No() + "bak");
                 actual.setActualNo(actual.getActualNo()+"bak");
 
                 meterWorkCarActualMapper.insert(actual);
@@ -2481,19 +2486,21 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
 
                 MeterWorkCarActualFirst first1 = new MeterWorkCarActualFirst();
                 MeterWorkCarActualFirst first2 = new MeterWorkCarActualFirst();
-
                 BeanUtils.copyProperties(firstBak1,first1);
                 BeanUtils.copyProperties(firstBak2,first2);
-
                 first1.setActualFirstNo(first1.getActualFirstNo()+"bak");
                 first2.setActualFirstNo(first2.getActualFirstNo()+"bak");
-
-
                 meterWorkCarActualFirstMapper.insert(first1);
                 meterWorkCarActualFirstMapper.insert(first2);
 
+                firstBak1.setValueFlag("0");
+                firstBak2.setValueFlag("0");
+                meterWorkCarActualBak.setValueFlag("0");
+                meterWorkCarActualFirstBakMapper.updateByPrimaryKeySelective(firstBak1);
+                meterWorkCarActualFirstBakMapper.updateByPrimaryKeySelective(firstBak2);
+                meterWorkCarActualBakMapper.updateByPrimaryKeySelective(meterWorkCarActualBak);
             }else{
-                throw new Exception("数据不符合要求");
+                throw new Exception(note);
             }
 
         }
@@ -2512,81 +2519,81 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
      *
      */
 
-    private boolean isSuit(MeterWorkCarActualBak model,int type){
+    private String isSuit(MeterWorkCarActualBak model,int type){
 
         //毛重信息
         if (model.getBaseSpot1No() == null || StringUtils.isEmpty(model.getBaseSpot1No())) {
-            return false;
+            return "毛重计量编号为空";
         }
         if (model.getBaseSpot1Name() == null || StringUtils.isEmpty(model.getBaseSpot1Name())) {
-            return false;
+            return "毛重计量名称为空";
         }
         if(model.getGrossManNo() == null || StringUtils.isEmpty(model.getGrossManNo())) {
-            return  false;
+            return  "毛重计量员编号为空";
         }
         if(model.getGrossManName() == null || StringUtils.isEmpty(model.getGrossManName())) {
-            return  false;
+            return  "毛重计量员为空";
         }
         if (model.getGrossTime() == null || StringUtils.isEmpty(model.getGrossTime().toString())) {
-            return false;
+            return "毛重时间为空";
         }
         if (model.getGrossWeight() == null || StringUtils.isEmpty(model.getGrossWeight().toString())) {
-            return false;
+            return "毛重为空";
         }
         //皮重信息
         if (model.getBaseSpot2No() == null || StringUtils.isEmpty(model.getBaseSpot2No())) {
-            return false;
+            return "皮重计量点编号为空";
         }
         if (model.getBaseSpot2Name() == null || StringUtils.isEmpty(model.getBaseSpot2Name())) {
-            return false;
+            return "皮重计量点为空";
         }
         if(model.getTareManNo() == null || StringUtils.isEmpty(model.getTareManNo())) {
-            return  false;
+            return  "皮重计量员编号为空";
         }
         if(model.getTareManName() == null || StringUtils.isEmpty(model.getTareManName())) {
-            return  false;
+            return "皮重计量员名称为空";
         }
         if (model.getTareTime() == null || StringUtils.isEmpty(model.getTareTime().toString())) {
-            return false;
+            return "皮重时间为空";
         }
         if (model.getTareWeight() == null || StringUtils.isEmpty(model.getTareWeight().toString())) {
-            return false;
+            return "皮重为空";
         }
 
         //结净信息
         if (model.getNetSpot3No() == null || StringUtils.isEmpty(model.getNetSpot3No())) {
-            return false;
+            return "净重计量点编号为空";
         }
         if (model.getNetSpot3Name() == null || StringUtils.isEmpty(model.getNetSpot3Name())) {
-            return false;
+            return "净重计量点名称为空";
         }
         if(model.getNetManNo() == null || StringUtils.isEmpty(model.getNetManNo())) {
-            return  false;
+            return "净重计量员编号为空";
         }
         if(model.getNetManName() == null || StringUtils.isEmpty(model.getNetManName())) {
-            return  false;
+            return  "净重计量员为空";
         }
         if (model.getNetTime() == null || StringUtils.isEmpty(model.getNetTime().toString())) {
-            return false;
+            return "净重时间为空";
         }
         if (model.getNetWeight() == null || StringUtils.isEmpty(model.getNetWeight().toString())) {
-            return false;
+            return "净重为空";
         }
         //创建人、创建时间
         if(model.getCreateManName() == null || StringUtils.isEmpty(model.getCreateManName())) {
-            return  false;
+            return  "创建人为空";
         }
         if (model.getCreateTime() == null || StringUtils.isEmpty(model.getCreateTime().toString())) {
-            return false;
+            return "创建时间为空";
         }
         if (model.getDataSource() == null || StringUtils.isEmpty(model.getDataSource())) {
-            return false;
+            return "计量数据来源为空";
         }
         if (model.getUploadFlag() == null || StringUtils.isEmpty(model.getUploadFlag())){
-            return false;
+            return "同步标志为空";
         }
         if (model.getValueFlag() == null || StringUtils.isEmpty(model.getValueFlag())){
-            return false;
+            return "数据状态为空";
         }
 
 
@@ -2595,10 +2602,10 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         if (type == 0 ) {
             //委托不能为空
             if(model.getPredictionNo() == null){
-                return false;
+                return "委托编号为空";
             }
         }
 
-        return true;
+        return "1";
     }
 }

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

@@ -214,9 +214,10 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
 //            model.setActualFirstNo(sdf.format(new Date()) + no);
             String no = PublicMethod.IdCreate(3);
             model.setActualFirstNo(no);
-
             model.setValueFlag("1");
-            model.setCreateTime(new Date());
+            if(model.getCreateTime() == null || StringUtils.isEmpty(model.getCreateTime().toString())){
+                model.setCreateTime(new Date());
+            }
             String userId = null;
             String userName = null;
             try{
@@ -229,7 +230,6 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
             }
             model.setCreateManNo(userId);
             model.setCreateManName(userName);
-
             HashMap<String, Object> obj = new HashMap<>();
             obj.put("baseSpotNo", model.getBaseSpotNo());
             List<MeterBaseSpotInfo> spotModel = meterBaseSpotInfoMapper.selectByParameters(obj);

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

@@ -1221,6 +1221,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 preTrackScale.setPredictionNo(netDb.getPredictionNo());
                 preTrackScale.setValueFlag("2");
                 preTrackScale.setUploadFlag("1");
+                preTrackScale.setLineDesc("0");
                 preTrackScale.setMeasureStation(netDb.getNetSpot3No());
                 preTrackScale.setMeasureStationName(netDb.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
@@ -3642,7 +3643,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == 1){
                 return "请根据一次数据从小到大的规则，依次选择三条一次数据！！！！";
             }
-            /*
             SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());
             String toDate = simpleFormat.format(pts2.getCreateTime());
@@ -3654,7 +3654,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     hours <= 4) {
                 return "委托信息不符合混装委托规则，请确认!!";
             }
-             */
 
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
@@ -3874,7 +3873,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1){
                 return "请根据一次数据从大到小的规则，依次选择三条一次数据！！";
             }
-            /*
             SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());
             String toDate = simpleFormat.format(pts2.getCreateTime());
@@ -3888,7 +3886,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     minutes <= 10) {
                 return "委托信息不符合混卸委托规则，请确认!!";
             }
-             */
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
                 return "未查询到相应的一次数据！！";
@@ -4464,6 +4461,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 PreTrackScale preTrackScale = new PreTrackScale();
                 preTrackScale.setPredictionNo(netDb.getPredictionNo());
                 preTrackScale.setValueFlag("2");
+                preTrackScale.setLineDesc("0");
                 preTrackScale.setUploadFlag("1");
                 preTrackScale.setMeasureStation(netDb.getNetSpot3No());
                 preTrackScale.setMeasureStationName(netDb.getNetSpot3Name());
@@ -5119,6 +5117,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 scale.setUpdateManNo("system");
                 scale.setUpdateManName("期限皮洁净更新");
                 scale.setUploadFlag("1");
+                scale.setLineDesc("0");
                 scale.setPredictionType("1");
                 scale.setMeasureStation(model.getNetSpot3No());
                 scale.setMeasureStationName(model.getNetSpot3Name());
@@ -5238,21 +5237,38 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             if(com.steerinfo.util.StringUtils.isNotEmpty(params.get("actualFirstNo").toString())){
                 MeterWorkCarActualFirst model = meterWorkCarActualFirstMapper.selectByPrimaryKey(params.get("actualFirstNo").toString());
                 if(model != null) {
+
                     if(model.getValueFlag().equals("1")) {
-                        if(model.getWeightType().equals("0")){
+                        if(model.getValueFlag().equals("2")){
+                            rm.setMessage("毛皮转换失败：数据已结净，请确认！！");
+                            return rm;
+                        }
+                        if(model.getWeightType() == null || StringUtils.isEmpty(model.getWeightType())) {
+//                            rm.setMessage("毛皮转换失败：重量类型为空，请确认！！");
+//                            return rm;
                             model.setWeightType("1");
-                        }else if (model.getWeightType().equals("1")){
-                            model.setWeightType("0");
-                        }else{
-                            rm.setMessage("毛皮转换失败：毛皮转换只针对毛重和常规皮重，请确认！！");
+                            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(model);
+                            rm.setSucceed();
+                            rm.setMessage("重量类型为空，毛皮转换成皮重!!");
+                            rm.setData(model);
+                            rm.setCode("200");
+                            return rm;
+                        } else {
+                            if(model.getWeightType().equals("0")){
+                                model.setWeightType("1");
+                            }else if (model.getWeightType().equals("1")){
+                                model.setWeightType("0");
+                            }else{
+                                rm.setMessage("毛皮转换失败：毛皮转换只针对毛重和常规皮重，请确认！！");
+                                return rm;
+                            }
+                            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(model);
+                            rm.setSucceed();
+                            rm.setMessage("毛皮转换成功!!");
+                            rm.setData(model);
+                            rm.setCode("200");
                             return rm;
                         }
-                        meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(model);
-                        rm.setSucceed();
-                        rm.setMessage("毛皮转换成功!!");
-                        rm.setData(model);
-                        rm.setCode("200");
-                        return rm;
                     }else{
                         rm.setMessage("毛皮转换失败：毛皮转换只针对有效的毛重和常规皮重，请确认！！");
                     }
@@ -5606,6 +5622,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 scale.setUpdateManNo("system");
                 scale.setUpdateManName("期限皮洁净更新");
                 scale.setUploadFlag("1");
+                scale.setLineDesc("0");
                 scale.setPredictionType("1");
                 scale.setMeasureStation(mwca.getNetSpot3No());
                 scale.setMeasureStationName(mwca.getNetSpot3Name());

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

@@ -31,6 +31,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -204,9 +205,11 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
 //            model.setActualFirstNo(sdf.format(new Date()) + no);
             String no = PublicMethod.IdCreate(3);
             model.setActualFirstNo(no);
-
             model.setValueFlag("1");
-            model.setCreateTime(new Date());
+            model.setMeterWeight(model.getMeterWeight().multiply(new BigDecimal(1000)));
+            if(model.getCreateTime() == null || StringUtils.isEmpty(model.getCreateTime().toString())){
+                model.setCreateTime(new Date());
+            }
             String userId = null;
             String userName = null;
             try{
@@ -233,6 +236,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
             }else {
                 throw new MarkerMetException(500, "计量点配置表未找到相应的计量点！！");
             }
+
             MeterWorkCarActualFirstBak meterWorkCarActualFirstBak = meterWorkCarActualFirstBakService.add(model);
             return success(meterWorkCarActualFirstBak);
         } catch (Exception ex) {
@@ -1348,7 +1352,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
                 meterWorkCarActualFirstBakService.ndCopyToFirst(ids,carNo);
             } catch (Exception e) {
                 e.printStackTrace();
-                return failed(null,"复制失败");
+                return failed(null,e.getMessage());
             }
 
             return success(null,"复制成功");
@@ -1357,7 +1361,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
                 meterWorkCarActualFirstBakService.wwCopyToFirst(ids,carNo);
             } catch (Exception e) {
                 e.printStackTrace();
-                return failed(null,"复制失败");
+                return failed(null,e.getMessage());
             }
 
             return success(null,"复制成功");

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/service/impl/MeterWorkCarActualFirstBakServiceImpl.java

@@ -162,7 +162,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
     @Resource
     private MeterWorkAddWeightMapper meterWorkAddWeightMapper;
 
-    @Autowired
+    @Resource
     private MeterWorkCarActualFirstMapper meterWorkCarActualFirstMapper;
 
     @Override
@@ -5232,23 +5232,39 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             if(StringUtils.isNotEmpty(params.get("actualFirstNo").toString())){
                 MeterWorkCarActualFirstBak model = meterWorkCarActualFirstBakMapper.selectByPrimaryKey(params.get("actualFirstNo").toString());
                 if(model != null) {
-                    if(model.getValueFlag().equals("1")) {
-                        if(model.getWeightType().equals("0")){
-                            model.setWeightType("1");
-                        }else if (model.getWeightType().equals("1")){
-                            model.setWeightType("0");
-                        }else{
-                            rm.setMessage("毛皮转换失败：毛皮转换只针对毛重和常规皮重，请确认！！");
-                            return rm;
-                        }
+                    if(model.getValueFlag().equals("2")){
+                        rm.setMessage("毛皮转换失败：数据已结净，请确认！！");
+                        return rm;
+                    }
+                    if(model.getWeightType() == null || StringUtils.isEmpty(model.getWeightType())) {
+//                            rm.setMessage("毛皮转换失败：重量类型为空，请确认！！");
+//                            return rm;
+                        model.setWeightType("1");
                         meterWorkCarActualFirstBakMapper.updateByPrimaryKeySelective(model);
                         rm.setSucceed();
-                        rm.setMessage("毛皮转换成功!!");
+                        rm.setMessage("重量类型为空，毛皮转换成皮重!!");
                         rm.setData(model);
                         rm.setCode("200");
                         return rm;
-                    }else{
-                        rm.setMessage("毛皮转换失败：毛皮转换只针对有效的毛重和常规皮重，请确认！！");
+                    } else {
+                        if(model.getValueFlag().equals("1")) {
+                            if(model.getWeightType().equals("0")){
+                                model.setWeightType("1");
+                            }else if (model.getWeightType().equals("1")){
+                                model.setWeightType("0");
+                            }else{
+                                rm.setMessage("毛皮转换失败：毛皮转换只针对毛重和常规皮重，请确认！！");
+                                return rm;
+                            }
+                            meterWorkCarActualFirstBakMapper.updateByPrimaryKeySelective(model);
+                            rm.setSucceed();
+                            rm.setMessage("毛皮转换成功!!");
+                            rm.setData(model);
+                            rm.setCode("200");
+                            return rm;
+                        }else{
+                            rm.setMessage("毛皮转换失败：毛皮转换只针对有效的毛重和常规皮重，请确认！！");
+                        }
                     }
                 }else {
                     rm.setMessage("未找到相应的一次计量数据，不能毛皮转换！！");
@@ -5660,7 +5676,6 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
     @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     public void ndCopyToFirst(List<String> ids,String carNo) throws Exception {
 
-
         for (String id : ids){
             //根据id获取对应的一次数据
             MeterWorkCarActualFirstBak meterWorkCarActualFirstBak = meterWorkCarActualFirstBakMapper.selectByPrimaryKey(id);
@@ -5677,7 +5692,8 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             }
 
             //判断是否符合要求
-            if (isSuit(meterWorkCarActualFirstBak,0)){
+            String note = isSuit(meterWorkCarActualFirstBak,0);
+            if (note.equals("1")){
                 //复制到First正式表里面
 
                 MeterWorkCarActualFirst first = new MeterWorkCarActualFirst();
@@ -5688,8 +5704,10 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
 
                 meterWorkCarActualFirstMapper.insert(first);
 
+                meterWorkCarActualFirstBak.setValueFlag("0");
+                meterWorkCarActualFirstBakMapper.updateByPrimaryKeySelective(meterWorkCarActualFirstBak);
             }else{
-                throw new Exception("数据不符合要求");
+                throw new Exception(note);
             }
 
         }
@@ -5717,19 +5735,20 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             }
 
             //判断是否符合要求
-            if (isSuit(meterWorkCarActualFirstBak,1)){
+            String note = isSuit(meterWorkCarActualFirstBak,1);
+            if (note.equals("1")){
                 //复制到First正式表里面
-
                 MeterWorkCarActualFirst first = new MeterWorkCarActualFirst();
                 //复制一份
                 BeanUtils.copyProperties(meterWorkCarActualFirstBak,first);
                 //修改主键
                 first.setActualFirstNo(first.getActualFirstNo()+"bak");
-
                 meterWorkCarActualFirstMapper.insert(first);
 
+                meterWorkCarActualFirstBak.setValueFlag("0");
+                meterWorkCarActualFirstBakMapper.updateByPrimaryKeySelective(meterWorkCarActualFirstBak);
             }else{
-                throw new Exception("数据不符合要求");
+                throw new Exception(note);
             }
 
         }
@@ -5749,37 +5768,37 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
      *
      */
 
-    private boolean isSuit(MeterWorkCarActualFirstBak model,int type){
+    private String isSuit(MeterWorkCarActualFirstBak model,int type){
 
         //不能是已结净的数据
         if ( !"1".equals(model.getValueFlag()) ){
-            return false;
+            return "不能是洁净数据";
         }
 
         //站点、站点名、创建人、创建人编号、创建时间、数据来源、重量类型、重量不能为空
         if (model.getBaseSpotNo() == null || StringUtils.isEmpty(model.getBaseSpotNo())) {
-            return false;
+            return "站点编号为空";
         }
         if (model.getBaseSpotName() == null || StringUtils.isEmpty(model.getBaseSpotName())) {
-            return false;
+            return "站点名称为空";
         }
         if (model.getCreateManNo() == null || StringUtils.isEmpty(model.getCreateManNo())) {
-            return false;
+            return "计量员编号为空";
         }
         if (model.getCreateManName() == null || StringUtils.isEmpty(model.getCreateManName())) {
-            return false;
+            return "计量员名称为空";
         }
         if (model.getCreateTime() == null || StringUtils.isEmpty(model.getCreateTime().toString())) {
-            return false;
+            return "计量时间为空";
         }
         if (model.getDataSource() == null || StringUtils.isEmpty(model.getDataSource())) {
-            return false;
+            return "计量数据来源不能为空";
         }
         if (model.getWeightType() == null || StringUtils.isEmpty(model.getWeightType())){
-            return false;
+            return "计量重量类型不能为空";
         }
         if (model.getMeterWeight() == null){
-            return false;
+            return "计量重量不能为空";
         }
         //内倒车毛重必须有委托
         //毛重 -> 1
@@ -5787,11 +5806,10 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
         if (type == 0 && "1".equals(model.getWeightType()) ){
             //委托不能为空
             if(model.getPredictionNo() == null){
-                return false;
+                return "委托不能为空";
             }
         }
-
-        return true;
+        return "1";
     }
 }
 

src/main/java/com/steerinfo/meterwork/meterworkimage/controller/MeterWorkImageController.java

@@ -178,6 +178,44 @@ public class MeterWorkImageController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value = "净重数据维护界面、批量处理界面---获取一毛一皮轨道衡图片路径", notes = "批量处理界面---获取一毛一皮轨道衡图片路径")
+    @GetMapping(value = "/getRailwayImageUrl")
+    public RESTfulResult getRailwayImageUrl(@RequestParam HashMap<String, Object> map) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkImageService.getRailwayImageUrl(map);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setCode("200");
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
+    @ApiOperation(value = "批量处理界面---获取净重（一毛一皮）和空皮轨道衡图片路径", notes = "批量处理界面---获取净重（一毛一皮）、空皮轨道衡图片路径")
+    @GetMapping(value = "/getRailwayActualImageUrl")
+    public RESTfulResult getRailwayActualImageUrl(@RequestParam HashMap<String, Object> map) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkImageService.getRailwayActualImageUrl(map);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setCode("200");
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "C#创建", notes = "根据MeterWorkImage对象创建")
     @PostMapping(value = "/doSaveWf", produces = "application/json;charset=UTF-8")
     public RESTfulResult doSaveWf(@RequestBody MeterWorkImage model) {

src/main/java/com/steerinfo/meterwork/meterworkimage/service/IMeterWorkImageService.java

@@ -6,6 +6,7 @@ import com.steerinfo.meterwork.dto.MeterWorkImageDto;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 
 /**
  * MeterWorkImage服务接口：
@@ -25,6 +26,8 @@ public interface IMeterWorkImageService extends IBaseService<MeterWorkImage, Str
     ArrayList<String> queryUrl(String actualFirstNo);
 
     ArrayList<String> queryRailwayUrl(String actualFirstNo);
+    RESTfulResult getRailwayImageUrl(HashMap<String, Object> map);
+    RESTfulResult getRailwayActualImageUrl(HashMap<String, Object> map);
 
     RESTfulResult doSaveWf(MeterWorkImage mwi);
 

src/main/java/com/steerinfo/meterwork/meterworkimage/service/impl/MeterWorkImageServiceImpl.java

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkimage.service.impl;
 
+import cn.hutool.core.lang.Assert;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
@@ -9,6 +10,8 @@ import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
 import com.steerinfo.meterwork.meterworkimage.service.IMeterWorkImageService;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
+import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
+import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.meterwork.meterworkrailwayreceived.mapper.MeterWorkRailwayReceivedMapper;
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
 import com.steerinfo.util.StringUtils;
@@ -16,11 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
+import java.util.*;
 
 /**
  * MeterWorkImage服务实现：
@@ -44,6 +45,9 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
     @Resource
     private MeterWorkRailwayReceivedMapper meterWorkRailwayReceivedMapper;
 
+    @Resource
+    private MeterWorkRailwayActualMapper meterWorkRailwayActualMapper;
+
     @Override
     protected IBaseMapper<MeterWorkImage, String> getMapper() {
         return meterWorkImageMapper;
@@ -148,6 +152,253 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
         }
     }
 
+    @Override
+    public RESTfulResult getRailwayImageUrl(HashMap<String, Object> map) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            String grossNo = map.get("grossNo") == null ? "": "R" + map.get("grossNo").toString();
+            String tareNo = map.get("tareNo") == null ? "": "R" + map.get("tareNo").toString();
+            HashMap<String, Object> imageMap = new HashMap<>();
+            List<String> grossImageURL = new ArrayList<>();
+            List<String> tareImageURL = new ArrayList<>();
+            if(grossNo.equals(tareNo)) {
+                tareNo = "";
+            }
+            if(StringUtils.isNotEmpty(grossNo)) {
+                MeterWorkImage mwi = meterWorkImageMapper.selectByPrimaryKey(grossNo);
+                if(mwi != null) {
+                    if (mwi.getImageFile1() != null && !mwi.getImageFile1().equals("")) {
+                        String no = mwi.getImageFile1();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile2() != null && !mwi.getImageFile2().equals("")) {
+                        String no = mwi.getImageFile2();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile3() != null && !mwi.getImageFile3().equals("")) {
+                        String no = mwi.getImageFile3();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile4() != null && !mwi.getImageFile4().equals("")) {
+                        String no = mwi.getImageFile4();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile5() != null && !mwi.getImageFile5().equals("")) {
+                        String no = mwi.getImageFile5();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile6() != null && !mwi.getImageFile6().equals("")) {
+                        String no = mwi.getImageFile6();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile7() != null && !mwi.getImageFile7().equals("")) {
+                        String no = mwi.getImageFile7();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile8() != null && !mwi.getImageFile8().equals("")) {
+                        String no = mwi.getImageFile8();
+                        grossImageURL.add(no);
+                    }
+                }
+            }
+
+            if(StringUtils.isNotEmpty(tareNo)) {
+                MeterWorkImage mwi = meterWorkImageMapper.selectByPrimaryKey(tareNo);
+                if(mwi != null) {
+                    if (mwi.getImageFile1() != null && !mwi.getImageFile1().equals("")) {
+                        String no = mwi.getImageFile1();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile2() != null && !mwi.getImageFile2().equals("")) {
+                        String no = mwi.getImageFile2();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile3() != null && !mwi.getImageFile3().equals("")) {
+                        String no = mwi.getImageFile3();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile4() != null && !mwi.getImageFile4().equals("")) {
+                        String no = mwi.getImageFile4();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile5() != null && !mwi.getImageFile5().equals("")) {
+                        String no = mwi.getImageFile5();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile6() != null && !mwi.getImageFile6().equals("")) {
+                        String no = mwi.getImageFile6();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile7() != null && !mwi.getImageFile7().equals("")) {
+                        String no = mwi.getImageFile7();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile8() != null && !mwi.getImageFile8().equals("")) {
+                        String no = mwi.getImageFile8();
+                        tareImageURL.add(no);
+                    }
+                }
+            }
+            imageMap.put("grossImageURL", grossImageURL);
+            imageMap.put("tareImageURL", tareImageURL);
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setData(imageMap);
+            rm.setMessage("操作成功");
+        } catch (Exception e){
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult getRailwayActualImageUrl(HashMap<String, Object> map) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            String actualNo = map.get("actualNo") == null ? "": map.get("actualNo").toString();
+            Assert.isTrue(StringUtils.isNotEmpty(actualNo), "净重计量编号为空");
+            MeterWorkRailwayActual actualModel = meterWorkRailwayActualMapper.selectByPrimaryKey(actualNo);
+            Assert.isTrue(actualModel != null, "净重数据不存在");
+            String grossNo = actualModel.getActualFirst1No() == null? "": "R" + actualModel.getActualFirst1No();
+            String tareNo = actualModel.getActualFirst2No() == null ? "": "R" + actualModel.getActualFirst2No();
+            if(grossNo.equals(tareNo)) {
+                tareNo = "";
+            }
+            String tare_No = map.get("tareNo") == null? "": "R" + map.get("tareNo").toString();
+            HashMap<String, Object> imageMap = new HashMap<>();
+            List<String> grossImageURL = new ArrayList<>();
+            List<String> tareImageURL = new ArrayList<>();
+            List<String> tareNoImageURL = new ArrayList<>();
+
+            if(StringUtils.isNotEmpty(grossNo)) {
+                MeterWorkImage mwi = meterWorkImageMapper.selectByPrimaryKey(grossNo);
+                if(mwi != null) {
+                    if (mwi.getImageFile1() != null && !mwi.getImageFile1().equals("")) {
+                        String no = mwi.getImageFile1();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile2() != null && !mwi.getImageFile2().equals("")) {
+                        String no = mwi.getImageFile2();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile3() != null && !mwi.getImageFile3().equals("")) {
+                        String no = mwi.getImageFile3();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile4() != null && !mwi.getImageFile4().equals("")) {
+                        String no = mwi.getImageFile4();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile5() != null && !mwi.getImageFile5().equals("")) {
+                        String no = mwi.getImageFile5();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile6() != null && !mwi.getImageFile6().equals("")) {
+                        String no = mwi.getImageFile6();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile7() != null && !mwi.getImageFile7().equals("")) {
+                        String no = mwi.getImageFile7();
+                        grossImageURL.add(no);
+                    }
+                    if (mwi.getImageFile8() != null && !mwi.getImageFile8().equals("")) {
+                        String no = mwi.getImageFile8();
+                        grossImageURL.add(no);
+                    }
+                }
+            }
+
+            if(StringUtils.isNotEmpty(tareNo)) {
+                MeterWorkImage mwi = meterWorkImageMapper.selectByPrimaryKey(tareNo);
+                if(mwi != null) {
+                    if (mwi.getImageFile1() != null && !mwi.getImageFile1().equals("")) {
+                        String no = mwi.getImageFile1();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile2() != null && !mwi.getImageFile2().equals("")) {
+                        String no = mwi.getImageFile2();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile3() != null && !mwi.getImageFile3().equals("")) {
+                        String no = mwi.getImageFile3();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile4() != null && !mwi.getImageFile4().equals("")) {
+                        String no = mwi.getImageFile4();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile5() != null && !mwi.getImageFile5().equals("")) {
+                        String no = mwi.getImageFile5();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile6() != null && !mwi.getImageFile6().equals("")) {
+                        String no = mwi.getImageFile6();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile7() != null && !mwi.getImageFile7().equals("")) {
+                        String no = mwi.getImageFile7();
+                        tareImageURL.add(no);
+                    }
+                    if (mwi.getImageFile8() != null && !mwi.getImageFile8().equals("")) {
+                        String no = mwi.getImageFile8();
+                        tareImageURL.add(no);
+                    }
+                }
+            }
+            if(StringUtils.isNotEmpty(tare_No)) {
+                MeterWorkImage mwi = meterWorkImageMapper.selectByPrimaryKey(tare_No);
+                if(mwi != null) {
+                    if (mwi.getImageFile1() != null && !mwi.getImageFile1().equals("")) {
+                        String no = mwi.getImageFile1();
+                        tareNoImageURL.add(no);
+                    }
+                    if (mwi.getImageFile2() != null && !mwi.getImageFile2().equals("")) {
+                        String no = mwi.getImageFile2();
+                        tareNoImageURL.add(no);
+                    }
+                    if (mwi.getImageFile3() != null && !mwi.getImageFile3().equals("")) {
+                        String no = mwi.getImageFile3();
+                        tareNoImageURL.add(no);
+                    }
+                    if (mwi.getImageFile4() != null && !mwi.getImageFile4().equals("")) {
+                        String no = mwi.getImageFile4();
+                        tareNoImageURL.add(no);
+                    }
+                    if (mwi.getImageFile5() != null && !mwi.getImageFile5().equals("")) {
+                        String no = mwi.getImageFile5();
+                        tareNoImageURL.add(no);
+                    }
+                    if (mwi.getImageFile6() != null && !mwi.getImageFile6().equals("")) {
+                        String no = mwi.getImageFile6();
+                        tareNoImageURL.add(no);
+                    }
+                    if (mwi.getImageFile7() != null && !mwi.getImageFile7().equals("")) {
+                        String no = mwi.getImageFile7();
+                        tareNoImageURL.add(no);
+                    }
+                    if (mwi.getImageFile8() != null && !mwi.getImageFile8().equals("")) {
+                        String no = mwi.getImageFile8();
+                        tareNoImageURL.add(no);
+                    }
+                }
+            }
+            imageMap.put("grossImageURL", grossImageURL);
+            imageMap.put("tareImageURL", tareImageURL);
+            imageMap.put("tareNoImageURL", tareNoImageURL);
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setData(imageMap);
+            rm.setMessage("操作成功");
+        } catch (Exception e){
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        }
+        return rm;
+    }
+
     /**
      * 图片新增操作
      * @param mwi

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

@@ -5,6 +5,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
+import com.steerinfo.meterwork.meterworkoldandnew.service.impl.MeterWorkOldAndNewService;
 import com.steerinfo.util.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,6 +18,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @RestController
 @RequestMapping("/${api.version}/meterworkoldandnews")
@@ -24,6 +27,12 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
     @Resource
     MeterWorkCarActualMapper meterWorkCarActualMapper;
 
+    @Resource
+    MeterWorkOldAndNewService meterWorkOldAndNewService;
+
+    /*
+     * 汽车衡新老系统查询接口
+     */
     @ApiOperation(value="查询洁净老系统和新系统", notes="返回List<HashMap>对象")
     @PostMapping(value = "/doQueryOldAndNew")
     public RESTfulResult doQueryOldAndNew(@RequestBody HashMap params) {
@@ -115,4 +124,243 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
         return rm;
     }
 
+    @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);
+
+            // 新老系统数据联合查询
+            List<HashMap> totalList = Stream.of(newList, oldList)
+                    .flatMap(x -> x.stream())
+                    .collect(Collectors.toList());
+
+            PageList pageInfo = this.helpPage(params, totalList);
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(pageInfo);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @ApiOperation(value="查询一次老系统和新系统", notes="返回List<HashMap>对象")
+    @PostMapping(value = "/doQueryFirstOldAndNew2")
+    public RESTfulResult doQueryFirstOldAndNew2(@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.getNewFirst(params);
+
+            // 老系统一次数据
+            List<HashMap> oldList = meterWorkOldAndNewService.getOldFirst(params);
+
+            // 新老系统数据联合查询
+            List<HashMap> totalList = Stream.of(newList, oldList)
+                    .flatMap(x -> x.stream())
+                    .collect(Collectors.toList());
+
+            PageList pageInfo = this.helpPage(params, totalList);
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(pageInfo);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+
+    @ApiOperation(value="统计洁净老系统和新系统", notes="返回List<HashMap>对象")
+    @PostMapping(value = "/countOldAndNew2")
+    public RESTfulResult countOldAndNew2(@RequestBody HashMap params) {
+        RESTfulResult rm = success();
+        try {
+            //PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+//            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+//            Date dateStart = sdf.parse(params.get("startTime").toString());
+//            Date dateEnd = sdf. parse(params.get("endTime").toString());
+//            long diff = (dateEnd.getTime() - dateStart.getTime())/(24*60*60*1000);
+//            //不可以查询查过两天的新老系统内联合数据
+//            if(diff > 2) {
+//                rm.setFailed();
+//                rm.setMessage("不可以查询超过两天的数据");
+//                rm.setData(null);
+//                rm.setCode("500");
+//                return rm;
+//            }
+
+            // 新系统洁净数据
+            List<HashMap> newList = meterWorkOldAndNewService.countNew(params);
+
+            // 老系统洁净数据
+            List<HashMap> oldList = meterWorkOldAndNewService.countOld(params);
+
+            // 新老系统数据联合查询
+            List<HashMap> totalList = Stream.of(newList, oldList)
+                    .flatMap(x -> x.stream())
+                    .collect(Collectors.toList());
+
+            //List<HashMap> oldAndNewList = meterWorkCarActualMapper.countOldAndNew(params);
+            PageList pageInfo = this.helpPage(params, totalList);
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(pageInfo);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    /*
+     * 轨道衡新老系统查询接口
+     */
+    @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);
+
+            // 新老系统数据联合查询
+            List<HashMap> totalList = Stream.of(newList, oldList)
+                    .flatMap(x -> x.stream())
+                    .collect(Collectors.toList());
+
+            PageList pageInfo = this.helpPage(params, totalList);
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(pageInfo);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    /*
+     * 轨道衡新老计量系统联合查询接口
+     */
+    @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);
+
+            // 新老系统数据联合查询
+            List<HashMap> totalList = Stream.of(newList, oldList)
+                    .flatMap(x -> x.stream())
+                    .collect(Collectors.toList());
+
+
+            //PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), 200);
+
+            PageList pageInfo = this.helpPage(params, totalList);
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(pageInfo);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @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);
+
+            // 新老系统数据联合查询
+            List<HashMap> totalList = Stream.of(newList, oldList)
+                    .flatMap(x -> x.stream())
+                    .collect(Collectors.toList());
+
+            //List<HashMap> oldAndNewList = meterWorkCarActualMapper.countOldAndNew(params);
+            PageList pageInfo = this.helpPage(params, totalList);
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(pageInfo);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    private PageList helpPage(HashMap params, List<HashMap> totalList){
+        Integer pageNo = Integer.parseInt(params.get("pageNum").toString());
+        Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
+        Integer nextPage;
+        Integer prePage;
+        Integer startRow;
+        double pages;
+
+        //split page
+        List<HashMap> pageList = totalList.stream().skip((pageNo-1)*pageSize).limit(pageSize).
+                collect(Collectors.toList());
+
+
+        if(totalList.size() > pageNo * pageSize){
+            nextPage = pageNo + 1;
+        }
+        else {
+            nextPage = pageNo;
+        }
+
+        if(pageNo != 1){
+            prePage = pageNo - 1;
+        }
+        else {
+            prePage = 1;
+        }
+
+        pages = Math.ceil((double) totalList.size() / (double)pageSize);
+
+        startRow = (pageNo - 1) * pageSize + 1;
+
+        PageList pageInfo = new PageList(pageList);
+        pageInfo.setPageNum(pageNo);
+        pageInfo.setPageSize(pageSize);
+        pageInfo.setNextPage(nextPage);
+        pageInfo.setPrePage(prePage);
+        pageInfo.setTotal(totalList.size());
+        pageInfo.setPages((int)pages);
+        pageInfo.setStartRow(startRow);
+
+        return pageInfo;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/mapper/MeterWorkOldAndNewMapper.java

@@ -0,0 +1,41 @@
+package com.steerinfo.meterwork.meterworkoldandnew.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Bourne.Cao
+ * @date 2022-08-06 10:50
+ */
+@Mapper
+public interface MeterWorkOldAndNewMapper {
+
+    // 汽车衡联合查询
+    List<HashMap> doQueryFirstNew(Map<String, Object> params);
+
+    List<HashMap> doQueryFirstOld(Map<String, Object> params);
+
+    List<HashMap> doQueryNew(Map<String, Object> params);
+
+    List<HashMap> doQueryOld(Map<String, Object> params);
+
+    List<HashMap> countNew(Map<String, Object> params);
+
+    List<HashMap> countOld(Map<String, Object> params);
+
+    // 轨道衡联合查询
+    List<HashMap> doQueryRailwayNew(Map<String, Object> params);
+
+    List<HashMap> doQueryRailwayOld(Map<String, Object> params);
+
+    List<HashMap> doQueryRailwayFirstNew(Map<String, Object> params);
+
+    List<HashMap> doQueryRailwayFirstOld(Map<String, Object> params);
+
+    List<HashMap> countRailwayNew(Map<String, Object> params);
+
+    List<HashMap> countRailwayOld(Map<String, Object> params);
+}

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/mapper/MeterWorkOldAndNewMapper.xml

@@ -0,0 +1,747 @@
+<?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.meterwork.meterworkoldandnew.mapper.MeterWorkOldAndNewMapper">
+
+    <select id="doQueryNew" parameterType="java.util.HashMap" resultType="HashMap">
+        select ACTUAL_NO,
+        prediction_no,
+        CAR_NO,
+        GROSS_WEIGHT,
+        BASE_SPOT1_NAME,
+        GROSS_TIME,
+        TARE_WEIGHT,
+        BASE_SPOT2_NAME,
+        TARE_TIME,
+        NET_WEIGHT,
+        net_spot3_no,
+        NET_SPOT3_NAME,
+        NET_TIME,
+        forwarding_unit_no,
+        FORWARDING_UNIT_NAME,
+        receiving_uint_no,
+        RECEIVING_UINT_NAME,
+        matter_no,
+        MATTER_NAME,
+        sender_remark,
+        '新系统' as REMARK
+        from METER_WORK_CAR_ACTUAL
+        where VALUE_FLAG in ('1', '2')
+        and UPLOAD_FLAG='2'
+        <if test="remark != null and remark != ''">
+            and '新系统' LIKE '%${remark}%'
+        </if>
+        <if test="predictionNo != null and predictionNo != ''">
+            and prediction_no LIKE '%${predictionNo}%'
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and sender_remark LIKE '%${senderRemark}%'
+        </if>
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="carNo != null and carNo != ''">
+            and car_no like '%${carNo}%'
+        </if>
+        <if test="netSpot3No != null and netSpot3No != ''">
+            and net_spot3_no like '%${netSpot3No}%'
+        </if>
+        <if test="netSpot3Name != null and netSpot3Name != ''">
+            and net_spot3_name like '%${netSpot3Name}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and matter_name LIKE '%${matterName}%'
+        </if>
+    </select>
+
+    <select id="doQueryOld" parameterType="java.util.HashMap" resultType="HashMap">
+        select FS_WEIGHTNO as ACTUAL_NO,
+        fs_noticeId as prediction_no,
+        REPLACE(FS_CARNO,'-','') as CAR_NO,
+        FS_GROSSWEIGHT * 1000 as GROSS_WEIGHT,
+        FS_GROSSPOINTNAME as BASE_SPOT1_NAME,
+        FS_GROSSWEIGHTTIME as GROSS_TIME,
+        FS_TAREWEIGHT * 1000 as TARE_WEIGHT,
+        FS_TAREPOINTNAME as BASE_SPOT2_NAME,
+        FS_TAREWEIGHTTIME as TARE_TIME,
+        FS_NETWEIGHT * 1000 as NET_WEIGHT,
+        fs_netPointId as net_spot3_no,
+        FS_NETPOINTNAME as NET_SPOT3_NAME,
+        FS_NETWEIGHTTIME as NET_TIME,
+        fs_sender as FORWARDING_UNIT_No,
+        FS_SENDERNAME as FORWARDING_UNIT_NAME,
+        fs_receiver as RECEIVING_UINT_No,
+        FS_RECEIVERNAME as RECEIVING_UINT_NAME,
+        fs_material as matter_no,
+        FS_MATERIALNAME as MATTER_NAME,
+        fs_senderRemark sender_remark,
+        '老系统' as REMARK
+        from jgweight.view_car_net
+        where FS_NETWEIGHTTIME > to_date('2022-07-21','YYYY-MM-DD') AND FS_DELETEDTAG='N'
+        and fs_noticeId is not null
+        <if test="remark != null and remark != ''">
+            and '老系统' LIKE '%${remark}%'
+        </if>
+        <if test="predictionNo != null and predictionNo != ''">
+            and fs_noticeId LIKE '%${predictionNo}%'
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and fs_senderRemark LIKE '%${senderRemark}%'
+        </if>
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and FS_NETWEIGHTTIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and FS_NETWEIGHTTIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="carNo != null and carNo != ''">
+            and REPLACE(FS_CARNO,'-','') like '%${carNo}%'
+        </if>
+        <if test="netSpot3No != null and netSpot3No != ''">
+            and fs_netPointId like '%${netSpot3No}%'
+        </if>
+        <if test="netSpot3Name != null and netSpot3Name != ''">
+            and FS_NETPOINTNAME like '%${netSpot3Name}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and fs_sender LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FS_SENDERNAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and fs_receiver LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and FS_RECEIVERNAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and fs_material LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and FS_MATERIALNAME LIKE '%${matterName}%'
+        </if>
+    </select>
+
+    <select id="doQueryFirstNew" parameterType="java.util.HashMap" resultType="HashMap">
+        select actual_first_no,
+        prediction_no,
+        car_no,
+        meter_weight,
+        create_time,
+        base_spot_no,
+        base_spot_name,
+        forwarding_unit_no,
+        forwarding_unit_name,
+        receiving_uint_no,
+        receiving_uint_name,
+        matter_no,
+        matter_name,
+        sender_remark,
+        '新系统' remark
+        from meter_work_car_actual_first
+        where is_pre_scale = '1'
+        and value_flag in  ('1', '2')
+        <if test="remark != null and remark != ''">
+            and '新系统' LIKE '%${remark}%'
+        </if>
+        <if test="predictionNo != null and predictionNo != ''">
+            and prediction_no LIKE '%${predictionNo}%'
+        </if>
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and sender_remark LIKE '%${senderRemark}%'
+        </if>
+        <if test="carNo != null and carNo != ''">
+            and car_no like '%${carNo}%'
+        </if>
+        <if test="baseSpotNo != null and baseSpotNo != ''">
+            and base_spot_no like '%${baseSpotNo}%'
+        </if>
+        <if test="baseSpotName != null and baseSpotName != ''">
+            and base_spot_name like '%${baseSpotName}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and matter_name LIKE '%${matterName}%'
+        </if>
+    </select>
+
+    <select id="doQueryFirstOld" parameterType="java.util.HashMap" resultType="HashMap">
+        select weightNo actual_first_no,
+        noticeId prediction_no,
+        replace(carNo, '-', '') car_no,
+        weight*1000 meter_weight,
+        weightTime create_time,
+        fs_pointId base_spot_no,
+        pointName base_spot_name,
+        sender forwarding_unit_no,
+        senderName forwarding_unit_name,
+        receiver receiving_uint_no,
+        receiverName receiving_uint_name,
+        material matter_no,
+        materialName matter_name,
+        senderRemark sender_remark,
+        '老系统' remark
+        from jgweight.VIEW_CAR_FIRST
+        where FS_DELETEDTAG='N'
+        <if test="remark != null and remark != ''">
+            and '老系统' LIKE '%${remark}%'
+        </if>
+        <if test="predictionNo != null and predictionNo != ''">
+            and noticeId LIKE '%${predictionNo}%'
+        </if>
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  weightTime  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and weightTime  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and senderRemark LIKE '%${senderRemark}%'
+        </if>
+        <if test="carNo != null and carNo != ''">
+            and replace(carNo, '-', '') like '%${carNo}%'
+        </if>
+        <if test="baseSpotNo != null and baseSpotNo != ''">
+            and fs_pointId like '%${baseSpotNo}%'
+        </if>
+        <if test="baseSpotName != null and baseSpotName != ''">
+            and pointName like '%${baseSpotName}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and sender LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and senderName LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and receiver LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and receiverName LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and material LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and materialName LIKE '%${matterName}%'
+        </if>
+    </select>
+
+    <select id="countNew" parameterType="java.util.HashMap" resultType="HashMap">
+        select * from
+        (
+        select matter_no,
+        matter_name,
+        count(1) countSum,
+        sum(net_weight) net_weight,
+        sum(gross_weight) gross_weight,
+        sum(tare_weight) tare_weight,
+        forwarding_unit_no,
+        forwarding_unit_name,
+        receiving_uint_no,
+        receiving_uint_name,
+        '新系统' remark
+        from meter_work_car_actual
+        where 1= 1
+        and IS_PRE_SCALE='1'
+        and VALUE_FLAG in ('1', '2')
+        and UPLOAD_FLAG='2'
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="netSpot3No != null and netSpot3No != ''">
+            and net_spot3_no like '%${netSpot3No}%'
+        </if>
+        <if test="netSpot3Name != null and netSpot3Name != ''">
+            and net_spot3_name like '%${netSpot3Name}%'
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and sender_remark LIKE '%${senderRemark}%'
+        </if>
+        <if test="carNo != null and carNo != ''">
+            and car_no LIKE '%${carNo}%'
+        </if>
+        group by matter_no, matter_name, forwarding_unit_no, forwarding_unit_name, receiving_uint_no, receiving_uint_name
+        )
+        where 1=1
+        <if test="remark != null and remark != ''">
+            and remark LIKE '%${remark}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and matter_name LIKE '%${matterName}%'
+        </if>
+    </select>
+
+    <select id="countOld" parameterType="java.util.HashMap" resultType="HashMap">
+        select * from
+        (
+        select fs_material matter_no,
+        fs_materialName matter_name,
+        count(1) countSum,
+        sum(fs_netWeight*1000) net_weight,
+        sum(fs_grossWeight*1000) gross_weight,
+        sum(fs_tareWeight*1000) tare_weight,
+        fs_sender forwarding_unit_no,
+        fs_senderName forwarding_unit_name,
+        fs_receiver receiving_uint_no,
+        fs_receiverName receiving_uint_name,
+        '老系统' remark
+        from jgweight.view_car_net
+        where 1 = 1
+        and fs_noticeId is not null
+        and FS_DELETEDTAG='N'
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  fs_netweightTime  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and fs_netweightTime  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="netSpot3No != null and netSpot3No != ''">
+            and fs_netPointId like '%${netSpot3No}%'
+        </if>
+        <if test="netSpot3Name != null and netSpot3Name != ''">
+            and fs_netPointName like '%${netSpot3Name}%'
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and fs_senderRemark LIKE '%${senderRemark}%'
+        </if>
+        <if test="carNo != null and carNo != ''">
+            and FS_CARNO LIKE '%${carNo}%'
+        </if>
+        group by fs_material, fs_materialName, fs_sender , fs_senderName , fs_receiver , fs_receiverName
+        )
+        where 1=1
+        <if test="remark != null and remark != ''">
+            and remark LIKE '%${remark}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and matter_name LIKE '%${matterName}%'
+        </if>
+    </select>
+
+    <select id="doQueryRailwayNew" parameterType="java.util.HashMap" resultType="HashMap">
+        select RAILWAY_NO,
+        PREDICTION_NO,
+        GROSS_WEIGHT,
+        TARE_WEIGHT,
+        NET_WEIGHT,
+        NET_TIME,
+        GROSS_TIME,
+        TARE_TIME,
+        BASE_SPOT1_NAME,
+        BASE_SPOT2_NAME,
+        NET_SPOT3_NAME,
+        RAILWAY_TYPE_NAME,
+        VALUE_FLAG,
+        FORWARDING_UNIT_NAME,
+        SENDER_REMARK,
+        RECEIVING_UINT_NAME,
+        RECEIVER_REMARK,
+        MATTER_NAME,
+        '新系统' as remark
+        from METER_WORK_RAILWAY_ACTUAL
+        where VALUE_FLAG in ('2') and RAILWAY_TYPE_NO = '001019001'
+        <if test="remark != null and remark != ''">
+            and '新系统' LIKE '%${remark}%'
+        </if>
+        <if test="predictionNo != null and predictionNo != ''">
+            and PREDICTION_NO LIKE '%${predictionNo}%'
+        </if>
+        <if test="minWeight != null and minWeight != ''">
+            and NET_WEIGHT &gt; '%${minWeight}%'
+        </if>
+        <if test="maxWeight != null and maxWeight != ''">
+            and NET_WEIGHT &lt; '%${maxWeight}%'
+        </if>
+        <if test="netSpot3No != null and netSpot3No != ''">
+            and BASE_SPOT1_NO like '%${netSpot3No}%'
+        </if>
+        <if test="netSpot3Name != null and netSpot3Name != ''">
+            and BASE_SPOT1_NAME like '%${netSpot3Name}%'
+        </if>
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and NET_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="railwayNo != null and railwayNo != ''">
+            and RAILWAY_NO like '%${railwayNo}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and MATTER_NO LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and materialName LIKE '%${matterName}%'
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and RECEIVER_REMARK LIKE '%${senderRemark}%'
+        </if>
+    </select>
+
+    <select id="doQueryRailwayOld" parameterType="java.util.HashMap" resultType="HashMap">
+    select FS_TRAINNO RAILWAY_NO,
+FS_NOTICENO PREDICTION_NO,
+FN_GROSSWEIGHT*1000 GROSS_WEIGHT,
+FN_TAREWEIGHT*1000 TARE_WEIGHT,
+FN_NETWEIGHT*1000 NET_WEIGHT,
+FD_NETWEIGHTTIME NET_TIME,
+FD_GROSSWEIGHTTIME GROSS_TIME,
+FD_TAREWEIGHTTIME TARE_TIME,
+FS_GROSSWEIGHTPOINTNAME BASE_SPOT1_NAME,
+FS_TAREWEIGHTPOINTNAME BASE_SPOT2_NAME,
+FS_NETPOINTNAME NET_SPOT3_NAME,
+FS_BALANCETYPE RAILWAY_TYPE_NAME,
+FS_ISVALID VALUE_FLAG,
+FS_SENDERNAME FORWARDING_UNIT_NAME,
+FS_SENDERREMARK SENDER_REMARK,
+FS_RECEIVERNAME RECEIVING_UINT_NAME,
+FS_RECEIVERREMARK RECEIVER_REMARK,
+FS_MATERIALNAME MATTER_NAME,
+'老系统' as remark
+from JGWEIGHT.VIEW_TRAIN_NET
+where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and FS_BALANCETYPE='静态'
+        <if test="remark != null and remark != ''">
+            and '老系统' LIKE '%${remark}%'
+        </if>
+        <if test="predictionNo != null and predictionNo != ''">
+            and FS_NOTICENO LIKE '%${predictionNo}%'
+        </if>
+        <if test="minWeight != null and minWeight != ''">
+            and FN_NETWEIGHT &gt; '%${minWeight}%'
+        </if>
+        <if test="maxWeight != null and maxWeight != ''">
+            and FN_NETWEIGHT &lt; '%${maxWeight}%'
+        </if>
+        <if test="netSpot3No != null and netSpot3No != ''">
+            and fs_netPointId like '%${netSpot3No}%'
+        </if>
+        <if test="netSpot3Name != null and netSpot3Name != ''">
+            and FS_NETPOINTNAME like '%${netSpot3Name}%'
+        </if>
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and FD_NETWEIGHTTIME >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and FD_NETWEIGHTTIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FS_SENDER LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FS_SENDERNAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and fs_receiver LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and FS_RECEIVERNAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="railwayNo != null and railwayNo != ''">
+            and FS_TRAINNO like '%${railwayNo}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and fs_material LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and FS_MATERIALNAME LIKE '%${matterName}%'
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and fs_senderRemark LIKE '%${senderRemark}%'
+        </if>
+    </select>
+
+    <select id="doQueryRailwayFirstNew" parameterType="java.util.HashMap" resultType="HashMap">
+        select actual_first_no,
+        prediction_no,
+        RAILWAY_NO,
+        meter_weight,
+        create_time,
+        base_spot_no,
+        base_spot_name,
+        forwarding_unit_no,
+        forwarding_unit_name,
+        receiving_uint_no,
+        receiving_uint_name,
+        matter_no,
+        matter_name,
+        sender_remark,
+        '新系统' remark
+        from meter_work_railway_act_first
+        where VALUE_FLAG in ('2') and RAILWAY_TYPE_NO = '001019001'
+        <if test="remark != null and remark != ''">
+            and '新系统' LIKE '%${remark}%'
+        </if>
+        <if test="predictionNo != null and predictionNo != ''">
+            and prediction_no LIKE '%${predictionNo}%'
+        </if>
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and sender_remark LIKE '%${senderRemark}%'
+        </if>
+        <if test="railwayNo != null and railwayNo != ''">
+            and RAILWAY_NO like '%${railwayNo}%'
+        </if>
+        <if test="baseSpotNo != null and baseSpotNo != ''">
+            and base_spot_no like '%${baseSpotNo}%'
+        </if>
+        <if test="baseSpotName != null and baseSpotName != ''">
+            and base_spot_name like '%${baseSpotName}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and matter_name LIKE '%${matterName}%'
+        </if>
+    </select>
+
+    <select id="doQueryRailwayFirstOld" parameterType="java.util.HashMap" resultType="HashMap">
+        select FS_WEIGHTNO actual_first_no,
+        FS_noticeNO prediction_no,
+        FS_TRAINNO RAILWAY_NO,
+        FN_weight*1000 meter_weight,
+        FD_weightTime create_time,
+        fs_pointId base_spot_no,
+        FS_pointName base_spot_name,
+        FS_sender forwarding_unit_no,
+        FS_senderName forwarding_unit_name,
+        FS_receiver receiving_uint_no,
+        FS_receiverName receiving_uint_name,
+        FS_material matter_no,
+        FS_materialName matter_name,
+        FS_SENDERREMARK sender_remark,
+        '老系统' remark
+        from jgweight.VIEW_TRAIN_FIRST
+        where FS_DELETEDTAG='N' and FS_BALANCETYPE='静态'
+        <if test="remark != null and remark != ''">
+            and '老系统' LIKE '%${remark}%'
+        </if>
+        <if test="predictionNo != null and predictionNo != ''">
+            and FS_noticeNO LIKE '%${predictionNo}%'
+        </if>
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and FD_weightTime >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and FD_weightTime  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and FS_SENDERREMARK LIKE '%${senderRemark}%'
+        </if>
+        <if test="railwayNo != null and railwayNo != ''">
+            and FS_TRAINNO like '%${railwayNo}%'
+        </if>
+        <if test="baseSpotNo != null and baseSpotNo != ''">
+            and fs_pointId like '%${baseSpotNo}%'
+        </if>
+        <if test="baseSpotName != null and baseSpotName != ''">
+            and FS_pointName like '%${baseSpotName}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FS_sender LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FS_senderName LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and FS_receiver LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and FS_receiverName LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and FS_material LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and FS_materialName LIKE '%${matterName}%'
+        </if>
+    </select>
+
+    <select id="countRailwayNew" parameterType="java.util.HashMap" resultType="HashMap">
+        select * from
+        (
+        select matter_no,
+        matter_name,
+        count(1) countSum,
+        sum(net_weight) net_weight,
+        sum(gross_weight) gross_weight,
+        sum(tare_weight) tare_weight,
+        forwarding_unit_no,
+        forwarding_unit_name,
+        receiving_uint_no,
+        receiving_uint_name,
+        '新系统' remark
+        from METER_WORK_RAILWAY_ACTUAL
+        where 1= 1
+        and VALUE_FLAG in ('2') and RAILWAY_TYPE_NO = '001019001'
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="netSpot3No != null and netSpot3No != ''">
+            and net_spot3_no like '%${netSpot3No}%'
+        </if>
+        <if test="netSpot3Name != null and netSpot3Name != ''">
+            and net_spot3_name like '%${netSpot3Name}%'
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and sender_remark LIKE '%${senderRemark}%'
+        </if>
+        <if test="railwayNo != null and railwayNo != ''">
+            and RAILWAY_NO like '%${railwayNo}%'
+        </if>
+        group by matter_no, matter_name, forwarding_unit_no, forwarding_unit_name, receiving_uint_no, receiving_uint_name
+        )
+        where 1=1
+        <if test="remark != null and remark != ''">
+            and remark LIKE '%${remark}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and matter_name LIKE '%${matterName}%'
+        </if>
+    </select>
+
+    <select id="countRailwayOld" parameterType="java.util.HashMap" resultType="HashMap">
+        select * from
+        (
+        select fs_material matter_no,
+        fs_materialName matter_name,
+        count(1) countSum,
+        sum(fn_netWeight*1000) net_weight,
+        sum(fn_grossWeight*1000) gross_weight,
+        sum(fn_tareWeight*1000) tare_weight,
+        fs_sender forwarding_unit_no,
+        fs_senderName forwarding_unit_name,
+        fs_receiver receiving_uint_no,
+        fs_receiverName receiving_uint_name,
+        '老系统' remark
+        from JGWEIGHT.VIEW_TRAIN_NET
+        where 1 = 1
+        and FS_TRAINNO is not null
+        and FS_DELETEDTAG='N' and FS_BALANCETYPE='静态'
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and Fd_NETWEIGHTTIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and Fd_NETWEIGHTTIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="netSpot3No != null and netSpot3No != ''">
+            and fs_netPointId like '%${netSpot3No}%'
+        </if>
+        <if test="netSpot3Name != null and netSpot3Name != ''">
+            and fs_netPointName like '%${netSpot3Name}%'
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and fs_senderRemark LIKE '%${senderRemark}%'
+        </if>
+        <if test="railwayNo != null and railwayNo != ''">
+            and FS_TRAINNO LIKE '%${railwayNo}%'
+        </if>
+        group by fs_material, fs_materialName, fs_sender , fs_senderName , fs_receiver , fs_receiverName
+        )
+        where 1=1
+        <if test="remark != null and remark != ''">
+            and remark LIKE '%${remark}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and matter_name LIKE '%${matterName}%'
+        </if>
+    </select>
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/service/IMeterWorkOldAndNewService.java

@@ -0,0 +1,38 @@
+package com.steerinfo.meterwork.meterworkoldandnew.service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author Bourne.Cao
+ * @date 2022-08-06 10:45
+ */
+public interface IMeterWorkOldAndNewService {
+
+    // 汽车衡联合查询Service
+    List<HashMap> getNewFirst(HashMap params);
+
+    List<HashMap> getOldFirst(HashMap params);
+
+    List<HashMap> getNew(HashMap params);
+
+    List<HashMap> getOld(HashMap params);
+
+    List<HashMap> countNew(HashMap params);
+
+    List<HashMap> countOld(HashMap params);
+
+    // 轨道衡联合查询Service
+    List<HashMap> getRailwayNew(HashMap params);
+
+    List<HashMap> getRailwayOld(HashMap params);
+
+    List<HashMap> getRailwayFirstNew(HashMap params);
+
+    List<HashMap> getRailwayFirstOld(HashMap params);
+
+    List<HashMap> countRailwayNew(HashMap params);
+
+    List<HashMap> countRailwayOld(HashMap params);
+}

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/service/impl/MeterWorkOldAndNewService.java

@@ -0,0 +1,88 @@
+package com.steerinfo.meterwork.meterworkoldandnew.service.impl;
+
+import com.steerinfo.framework.datasource.DataSourceKey;
+import com.steerinfo.framework.datasource.TargetDataSource;
+import com.steerinfo.meterwork.meterworkoldandnew.mapper.MeterWorkOldAndNewMapper;
+import com.steerinfo.meterwork.meterworkoldandnew.service.IMeterWorkOldAndNewService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author Bourne.Cao
+ * @date 2022-08-06 10:46
+ */
+@Service(value = "MeterWorkOldAndNewService")
+public class MeterWorkOldAndNewService implements IMeterWorkOldAndNewService {
+
+    @Resource
+    private MeterWorkOldAndNewMapper meterWorkOldAndNewMapper;
+
+    @Override
+    public List<HashMap> getNewFirst(HashMap params) {
+        return meterWorkOldAndNewMapper.doQueryFirstNew(params);
+    }
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
+    public List<HashMap> getOldFirst(HashMap params) {
+        return meterWorkOldAndNewMapper.doQueryFirstOld(params);
+    }
+
+    @Override
+    public List<HashMap> getNew(HashMap params) {
+        return meterWorkOldAndNewMapper.doQueryNew(params);
+    }
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
+    public List<HashMap> getOld(HashMap params) {
+        return meterWorkOldAndNewMapper.doQueryOld(params);
+    }
+
+    @Override
+    public List<HashMap> countNew(HashMap params) {
+        return meterWorkOldAndNewMapper.countNew(params);
+    }
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
+    public List<HashMap> countOld(HashMap params) {
+        return meterWorkOldAndNewMapper.countOld(params);
+    }
+
+    @Override
+    public List<HashMap> getRailwayNew(HashMap params) {
+        return meterWorkOldAndNewMapper.doQueryRailwayNew(params);
+    }
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
+    public List<HashMap> getRailwayOld(HashMap params) {
+        return meterWorkOldAndNewMapper.doQueryRailwayOld(params);
+    }
+
+    @Override
+    public List<HashMap> getRailwayFirstNew(HashMap params) {
+        return meterWorkOldAndNewMapper.doQueryRailwayFirstNew(params);
+    }
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
+    public List<HashMap> getRailwayFirstOld(HashMap params) {
+        return meterWorkOldAndNewMapper.doQueryRailwayFirstOld(params);
+    }
+
+    @Override
+    public List<HashMap> countRailwayNew(HashMap params) {
+        return meterWorkOldAndNewMapper.countRailwayNew(params);
+    }
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
+    public List<HashMap> countRailwayOld(HashMap params) {
+        return meterWorkOldAndNewMapper.countRailwayOld(params);
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkprewgttype/service/impl/MeterWorkPreWgttypeServiceImpl.java

@@ -9,6 +9,7 @@ import com.steerinfo.meterwork.meterworkprewgttype.mapper.MeterWorkPreWgttypeMap
 import com.steerinfo.meterwork.meterworkprewgttype.service.IMeterWorkPreWgttypeService;
 import com.steerinfo.pretrack.pretrackscale.mapper.PreTrackScaleMapper;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
+import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import com.sun.net.httpserver.Authenticator;
 import org.apache.shiro.crypto.hash.Hash;
@@ -92,8 +93,11 @@ public class MeterWorkPreWgttypeServiceImpl extends BaseServiceImpl<MeterWorkPre
                 tempModel.setUpdateTime(new Date());
                 meterWorkPreWgttypeMapper.updateByPrimaryKey(tempModel);
             }
-            String no = meterWorkPreWgttypeMapper.GetNewID();
-            model.setWgtTypeId(new SimpleDateFormat("yyyyMMdd").format(new Date()) + no);
+            //修改主键为yyyyMMddHHmmssSSS+随机数
+//            String no = meterWorkPreWgttypeMapper.GetNewID();
+            String no = PublicMethod.IdCreate(3);
+//            model.setWgtTypeId(new SimpleDateFormat("yyyyMMdd").format(new Date()) + no);
+            model.setWgtTypeId(no);
             model.setCreateTime(new Date());
             model.setValueFlag("1");
             model.setSubmitFlag("0");

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

@@ -1471,4 +1471,18 @@ throw new MarkerMetException(500, "操作异常！！");
             return failed(null, "操作异常，请确认！");
         }
     }
+
+    @ApiOperation(value = "web端——批量匹配界面")
+    @Transactional
+    @PostMapping(value = "/batchRailwayFirst")
+    public RESTfulResult batchRailwayFirst(@RequestBody List<HashMap> models) {
+        try {
+            RESTfulResult rm = meterWorkRailwayActFirstService.batchRailwayFirst(models);
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
 }

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

@@ -2576,6 +2576,7 @@
   <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(ACTUAL_FIRST_NO, LENGTH(ACTUAL_FIRST_NO) - 3))),0) + 1,4,'0') ACTUAL_FIRST_NO
     FROM METER_WORK_RAILWAY_ACT_FIRST where instr(ACTUAL_FIRST_NO,#{afl,jdbcType=VARCHAR})>0
+        and actual_first_no not in (select distinct B.actual_first_no from METER_WORK_RAILWAY_ACT_FIRST B where B.actual_first_no like '%bak%')
   </select>
 
 
@@ -3461,11 +3462,17 @@
       <if test="railwayNo != null and railwayNo != ''">
         and RAILWAY_NO LIKE '%${railwayNo}%'
       </if>
-      <if test="railwayNoList != null">
-        and railway_no in
+      <if test="railwayNoList != null and railwayNoList != ''">
+        and ( railway_no in
         <foreach collection="railwayNoList" item="item" open="(" separator="," close=")">
           #{item}
         </foreach>
+        <if test="railwayNoNull != null and railwayNoNull != ''">
+          or railway_no is null )
+        </if>
+        <if test="railwayNoNull == null or railwayNoNull == ''">
+          and railway_no is not null)
+        </if>
       </if>
       <if test="lcNo != null and lcNo != ''">
         and LC_NO LIKE '%${lcNo}%'
@@ -3488,8 +3495,9 @@
       <!--静轨组列次号需要-->
       <if test="flag != null and flag != ''">
         and value_flag in ('1','2')
-        and lc_no is null
+        and (lc_no is null or lc_no = '无列次')
       </if>
+
     </where>
     order by create_time desc
   </select>
@@ -3687,6 +3695,7 @@
     select A.create_time gross_Time,
     A.actual_first_no gross_no,
     A.prediction_no prediction_no,
+    A.matter_name matter_name,
     A.lc_no gorss_lc_No,
     A.railway_no railway_No,
     A.meter_weight/1000 gross_Weight,
@@ -3704,7 +3713,8 @@
     E.Weight_Type tare_weight_type,
     B.CARRIAGE_WEIGHT/1000 carriage_Weight,
     A.conveyance_type conveyance_Type,
-    A.railway_factory_weight/1000 railway_Factory_Weight
+    A.railway_factory_weight/1000 railway_Factory_Weight,
+    A.note note
     from meter_work_railway_act_first A
       left join meter_base_railway_carriage_weight B
           on A.conveyance_type = B.Carriage_Code

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

@@ -153,5 +153,6 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult doNetEmergency(MeterWorkRailwayActual model)  throws Exception;
 
     RESTfulResult furConversion(HashMap<String, Object> params);
+    RESTfulResult batchRailwayFirst(List<HashMap> models);
 }
 

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

@@ -494,7 +494,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     @Override
     public List<MeterWorkRailwayActFirst> webByLikeDesc(HashMap<String, Object> parameters) {
-        String[] lcNoTemp = parameters.get("lcNoTemp").toString().split(",");
+        String[] lcNoTemp = parameters.get("lcNoTemp") == null? "".split(",") :parameters.get("lcNoTemp").toString().split(",");
         parameters.remove("lcNoTemp");
         parameters.put("lcNoTemp", lcNoTemp);
         for (String str:
@@ -506,6 +506,18 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 parameters.put("lcNoNull", "");
             }
         }
+        String[] railwayNoList = parameters.get("railwayNoList") == null? "".split(",") :parameters.get("railwayNoList").toString().split(",");
+        parameters.remove("railwayNoList");
+        parameters.put("railwayNoList", railwayNoList);
+        for (String str:
+                railwayNoList) {
+            if(str.equals("")) {
+                parameters.put("railwayNoNull", "1");
+                break;
+            }else {
+                parameters.put("railwayNoNull", "");
+            }
+        }
         List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDesc(parameters);
         return rows;
     }
@@ -513,7 +525,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<String> distinctRailwayNo(HashMap<String, Object> param) {
-        String[] lcNoTemp = param.get("lcNo").toString().split(",");
+        String[] lcNoTemp = param.get("lcNo") == null ? "".split(","): param.get("lcNo").toString().split(",");
         param.put("lcNoTemp", lcNoTemp);
         for (String str: lcNoTemp) {
             if(str.equals("")) {
@@ -797,6 +809,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -805,6 +818,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 MeterWorkRailwayActFirst grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualRow.getActualFirst1No());
                 MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualRow.getActualFirst2No());
@@ -888,6 +902,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -896,6 +911,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -1077,6 +1093,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow1.setNetTime(actualRow1.getGrossTime());
                 actualRow1.setCreateTime(actualRow1.getGrossTime());
                 actualRow1.setCreateManName(actualRow1.getGrossManName());
+                actualRow1.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow1.getActualFirst1No()));
             }else {
                 actualRow1.setNetSpot3No(actualRow1.getBaseSpot2No());
                 actualRow1.setNetSpot3Name(actualRow1.getBaseSpot2Name());
@@ -1085,6 +1102,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow1.setNetTime(actualRow1.getTareTime());
                 actualRow1.setCreateTime(actualRow1.getTareTime());
                 actualRow1.setCreateManName(actualRow1.getTareManName());
+                actualRow1.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow1.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(actualRow1);
 
@@ -1118,6 +1136,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow2.setNetTime(actualRow2.getGrossTime());
                 actualRow2.setCreateTime(actualRow2.getGrossTime());
                 actualRow2.setCreateManName(actualRow2.getGrossManName());
+                actualRow2.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow2.getActualFirst1No()));
             }else {
                 actualRow2.setNetSpot3No(actualRow2.getBaseSpot2No());
                 actualRow2.setNetSpot3Name(actualRow2.getBaseSpot2Name());
@@ -1126,6 +1145,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow2.setNetTime(actualRow2.getTareTime());
                 actualRow2.setCreateTime(actualRow2.getTareTime());
                 actualRow2.setCreateManName(actualRow2.getTareManName());
+                actualRow2.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow2.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(actualRow2);
 
@@ -1310,6 +1330,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -1318,6 +1339,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
                     newActuals.add(actualRow);
@@ -1448,6 +1470,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setUploadFlag("1");
                     actualRow.setValueFlag("1");
                     actualRow.setIsPreSacale("0");
+                    actualRow.setNetWeight(actualRow.getGrossWeight().subtract(actualRow.getTareWeight()));
                     if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
@@ -1456,6 +1479,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -1464,6 +1488,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
                     //修改委托编号
@@ -1520,6 +1545,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setUploadFlag("1");
                     actualRow.setValueFlag("1");
                     actualRow.setIsPreSacale("0");
+                    actualRow.setNetWeight(actualRow.getGrossWeight().subtract(actualRow.getTareWeight()));
                     if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
@@ -1528,6 +1554,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -1536,6 +1563,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
                     //修改委托编号
@@ -1693,6 +1721,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -1701,6 +1730,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -1773,6 +1803,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -1781,6 +1812,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -2010,6 +2042,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow1.setNetTime(actualRow1.getGrossTime());
                 actualRow1.setCreateTime(actualRow1.getGrossTime());
                 actualRow1.setCreateManName(actualRow1.getGrossManName());
+                actualRow1.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow1.getActualFirst1No()));
             }else {
                 actualRow1.setNetSpot3No(actualRow1.getBaseSpot2No());
                 actualRow1.setNetSpot3Name(actualRow1.getBaseSpot2Name());
@@ -2018,6 +2051,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow1.setNetTime(actualRow1.getTareTime());
                 actualRow1.setCreateTime(actualRow1.getTareTime());
                 actualRow1.setCreateManName(actualRow1.getTareManName());
+                actualRow1.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow1.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(actualRow1);
 
@@ -2042,6 +2076,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow2.setNetTime(actualRow2.getGrossTime());
                 actualRow2.setCreateTime(actualRow2.getGrossTime());
                 actualRow2.setCreateManName(actualRow2.getGrossManName());
+                actualRow2.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow2.getActualFirst1No()));
             }else {
                 actualRow2.setNetSpot3No(actualRow2.getBaseSpot2No());
                 actualRow2.setNetSpot3Name(actualRow2.getBaseSpot2Name());
@@ -2050,6 +2085,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow2.setNetTime(actualRow2.getTareTime());
                 actualRow2.setCreateTime(actualRow2.getTareTime());
                 actualRow2.setCreateManName(actualRow2.getTareManName());
+                actualRow2.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow2.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(actualRow2);
 
@@ -2351,17 +2387,17 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == 1) {
                 return "请根据一次数据从小到大的规则，依次选择三条一次数据！！";
             }
-//            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
-//            String fromDate = simpleFormat.format(pts1.getCreateTime());
-//            String toDate = simpleFormat.format(pts2.getCreateTime());
-//            long from = simpleFormat.parse(fromDate).getTime();
-//            long to = simpleFormat.parse(toDate).getTime();
-//            int hours = (int) ((to - from) / (1000 * 60 * 60));
-//            if (pts1.getMatterNo().equals(pts2.getMatterNo()) &&
-//                    pts1.getForwardingUnitNo().equals(pts2.getForwardingUnitNo()) &&
-//                    hours <= 4) {
-//                return "委托信息不符合混装委托规则，请确认!!";
-//            }
+            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+            String fromDate = simpleFormat.format(pts1.getCreateTime());
+            String toDate = simpleFormat.format(pts2.getCreateTime());
+            long from = simpleFormat.parse(fromDate).getTime();
+            long to = simpleFormat.parse(toDate).getTime();
+            int hours = (int) ((to - from) / (1000 * 60 * 60));
+            if (pts1.getMatterNo().equals(pts2.getMatterNo()) &&
+                    pts1.getForwardingUnitNo().equals(pts2.getForwardingUnitNo()) &&
+                    hours <= 4) {
+                return "委托信息不符合混装委托规则，请确认!!";
+            }
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
                 return "未查询到相应的一次数据！！";
@@ -2504,7 +2540,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow2.setNetTime(actualRow2.getGrossTime());
                 actualRow2.setCreateTime(actualRow2.getGrossTime());
                 actualRow2.setCreateManName(actualRow2.getGrossManName());
-                actualRow2.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow2.getActualFirst2No()));
+                actualRow2.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow2.getActualFirst1No()));
             }else {
                 actualRow2.setNetSpot3No(actualRow2.getBaseSpot2No());
                 actualRow2.setNetSpot3Name(actualRow2.getBaseSpot2Name());
@@ -2571,19 +2607,19 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1) {
                 return "请根据一次数据从大到小的规则，依次选择三条一次数据！！！！";
             }
-//            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
-//            String fromDate = simpleFormat.format(pts1.getCreateTime());
-//            String toDate = simpleFormat.format(pts2.getCreateTime());
-//            long from = simpleFormat.parse(fromDate).getTime();
-//            long to = simpleFormat.parse(toDate).getTime();
-//            int minutes = (int) ((to - from) / (1000 * 60));
-//            //判断混卸 物料相同、AB发货单位相同、收货单位一定不一致：签发时间10分钟内
-//            if (pts1.getMatterNo().equals(pts2.getMatterNo()) &&
-//                    pts1.getForwardingUnitNo().equals(pts2.getForwardingUnitNo()) &&
-//                    !pts1.getReceivingUintNo().equals(pts2.getReceivingUintNo()) &&
-//                    minutes <= 10) {
-//                return "委托信息不符合混卸委托规则，请确认!!";
-//            }
+            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+            String fromDate = simpleFormat.format(pts1.getCreateTime());
+            String toDate = simpleFormat.format(pts2.getCreateTime());
+            long from = simpleFormat.parse(fromDate).getTime();
+            long to = simpleFormat.parse(toDate).getTime();
+            int minutes = (int) ((to - from) / (1000 * 60));
+            //判断混卸 物料相同、AB发货单位相同、收货单位一定不一致：签发时间10分钟内
+            if (pts1.getMatterNo().equals(pts2.getMatterNo()) &&
+                    pts1.getForwardingUnitNo().equals(pts2.getForwardingUnitNo()) &&
+                    !pts1.getReceivingUintNo().equals(pts2.getReceivingUintNo()) &&
+                    minutes <= 10) {
+                return "委托信息不符合混卸委托规则，请确认!!";
+            }
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
                 return "未查询到相应的一次数据！！";
@@ -2838,12 +2874,14 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             grossModel.setUpdateManNo("system");
             grossModel.setUpdateManName("二次计量洁净更新");
             grossModel.setUpdateTime(new Date());
+            grossModel.setWeightType("0");
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
             //更新第一次皮重数据
             tareModel.setValueFlag(DbConstants.NET);
             tareModel.setUpdateManNo("system");
             tareModel.setUpdateManName("二次计量洁净更新");
             tareModel.setUpdateTime(new Date());
+            tareModel.setWeightType("1");
 //            meterWorkRailwayActFirstMapper.updateByPrimaryKey(tareModel);
             meterWorkRailwayActFirstMapper.deleteByPrimaryKey(tareModel.getActualFirstNo());
 
@@ -2865,6 +2903,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setNetTime(actualRow.getGrossTime());
                 actualRow.setCreateTime(actualRow.getGrossTime());
                 actualRow.setCreateManName(actualRow.getGrossManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
             }else {
                 actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                 actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -2873,6 +2912,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setNetTime(actualRow.getTareTime());
                 actualRow.setCreateTime(actualRow.getTareTime());
                 actualRow.setCreateManName(actualRow.getTareManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(actualRow);
             return "操作成功";
@@ -2983,6 +3023,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -2991,6 +3032,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
                 rm.setSucceed();
@@ -3464,6 +3506,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             netRail.setNetTime(netRail.getGrossTime());
             netRail.setCreateTime(netRail.getGrossTime());
             netRail.setCreateManName(netRail.getGrossManName());
+            netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst1No()));
         }else{
             netRail.setNetSpot3No(netRail.getBaseSpot2No());
             netRail.setNetSpot3Name(netRail.getBaseSpot2Name());
@@ -3472,6 +3515,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             netRail.setNetTime(netRail.getTareTime());
             netRail.setCreateTime(netRail.getTareTime());
             netRail.setCreateManName(netRail.getTareManName());
+            netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst2No()));
         }
         meterWorkRailwayActualMapper.insertSelective(netRail);
         //修改预报状态
@@ -3933,6 +3977,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -3941,6 +3986,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -3994,6 +4040,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -4002,6 +4049,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
             }
@@ -4279,6 +4327,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     netRail.setNetTime(netRail.getGrossTime());
                     netRail.setCreateTime(netRail.getGrossTime());
                     netRail.setCreateManName(netRail.getGrossManName());
+                    netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst1No()));
                 }else{
                     netRail.setNetSpot3No(netRail.getBaseSpot2No());
                     netRail.setNetSpot3Name(netRail.getBaseSpot2Name());
@@ -4287,6 +4336,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     netRail.setNetTime(netRail.getTareTime());
                     netRail.setCreateTime(netRail.getTareTime());
                     netRail.setCreateManName(netRail.getTareManName());
+                    netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelectiveBar(netRail);
             }
@@ -4299,6 +4349,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             netRail.setNetTime(netRail.getGrossTime());
             netRail.setCreateTime(netRail.getGrossTime());
             netRail.setCreateManName(netRail.getGrossManName());
+            netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst1No()));
         }else{
             netRail.setNetSpot3No(netRail.getBaseSpot2No());
             netRail.setNetSpot3Name(netRail.getBaseSpot2Name());
@@ -4307,6 +4358,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             netRail.setNetTime(netRail.getTareTime());
             netRail.setCreateTime(netRail.getTareTime());
             netRail.setCreateManName(netRail.getTareManName());
+            netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst2No()));
         }
         meterWorkRailwayActualMapper.insertSelective(netRail);
 
@@ -4430,6 +4482,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     netRail.setNetTime(netRail.getGrossTime());
                     netRail.setCreateTime(netRail.getGrossTime());
                     netRail.setCreateManName(netRail.getGrossManName());
+                    netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst1No()));
                 }else{
                     netRail.setNetSpot3No(netRail.getBaseSpot2No());
                     netRail.setNetSpot3Name(netRail.getBaseSpot2Name());
@@ -4438,6 +4491,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     netRail.setNetTime(netRail.getTareTime());
                     netRail.setCreateTime(netRail.getTareTime());
                     netRail.setCreateManName(netRail.getTareManName());
+                    netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelectiveBar(netRail);
             }
@@ -4450,6 +4504,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             netRail.setNetTime(netRail.getGrossTime());
             netRail.setCreateTime(netRail.getGrossTime());
             netRail.setCreateManName(netRail.getGrossManName());
+            netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst1No()));
         }else{
             netRail.setNetSpot3No(netRail.getBaseSpot2No());
             netRail.setNetSpot3Name(netRail.getBaseSpot2Name());
@@ -4458,6 +4513,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             netRail.setNetTime(netRail.getTareTime());
             netRail.setCreateTime(netRail.getTareTime());
             netRail.setCreateManName(netRail.getTareManName());
+            netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst2No()));
         }
         meterWorkRailwayActualMapper.insertSelective(netRail);
 
@@ -4798,6 +4854,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             netRail.setNetTime(netRail.getGrossTime());
                             netRail.setCreateTime(netRail.getGrossTime());
                             netRail.setCreateManName(netRail.getGrossManName());
+                            netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst1No()));
                         }else{
                             netRail.setNetSpot3No(netRail.getBaseSpot2No());
                             netRail.setNetSpot3Name(netRail.getBaseSpot2Name());
@@ -4806,6 +4863,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             netRail.setNetTime(netRail.getTareTime());
                             netRail.setCreateTime(netRail.getTareTime());
                             netRail.setCreateManName(netRail.getTareManName());
+                            netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst2No()));
                         }
                         int i = meterWorkRailwayActualMapper.insertSelective(netRail);
 
@@ -5011,6 +5069,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         netRail.setNetTime(netRail.getGrossTime());
                         netRail.setCreateTime(netRail.getGrossTime());
                         netRail.setCreateManName(netRail.getGrossManName());
+                        netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst1No()));
                     }else{
                         netRail.setNetSpot3No(netRail.getBaseSpot2No());
                         netRail.setNetSpot3Name(netRail.getBaseSpot2Name());
@@ -5019,6 +5078,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         netRail.setNetTime(netRail.getTareTime());
                         netRail.setCreateTime(netRail.getTareTime());
                         netRail.setCreateManName(netRail.getTareManName());
+                        netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(netRail);
                 }
@@ -5149,6 +5209,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             netRail.setNetTime(netRail.getGrossTime());
                             netRail.setCreateTime(netRail.getGrossTime());
                             netRail.setCreateManName(netRail.getGrossManName());
+                            netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst1No()));
                         }else{
                             netRail.setNetSpot3No(netRail.getBaseSpot2No());
                             netRail.setNetSpot3Name(netRail.getBaseSpot2Name());
@@ -5157,6 +5218,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             netRail.setNetTime(netRail.getTareTime());
                             netRail.setCreateTime(netRail.getTareTime());
                             netRail.setCreateManName(netRail.getTareManName());
+                            netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst2No()));
                         }
                         int i = meterWorkRailwayActualMapper.insertSelective(netRail);
 
@@ -5385,6 +5447,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         netRail.setNetTime(netRail.getGrossTime());
                         netRail.setCreateTime(netRail.getGrossTime());
                         netRail.setCreateManName(netRail.getGrossManName());
+                        netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst1No()));
                     }else{
                         netRail.setNetSpot3No(netRail.getBaseSpot2No());
                         netRail.setNetSpot3Name(netRail.getBaseSpot2Name());
@@ -5393,6 +5456,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         netRail.setNetTime(netRail.getTareTime());
                         netRail.setCreateTime(netRail.getTareTime());
                         netRail.setCreateManName(netRail.getTareManName());
+                        netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst2No()));
                     }
                     int i = meterWorkRailwayActualMapper.insertSelective(netRail);
                     if(i >= 1) {
@@ -5603,6 +5667,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         netRail.setNetTime(netRail.getGrossTime());
                         netRail.setCreateTime(netRail.getGrossTime());
                         netRail.setCreateManName(netRail.getGrossManName());
+                        netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst1No()));
                     }else{
                         netRail.setNetSpot3No(netRail.getBaseSpot2No());
                         netRail.setNetSpot3Name(netRail.getBaseSpot2Name());
@@ -5611,6 +5676,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         netRail.setNetTime(netRail.getTareTime());
                         netRail.setCreateTime(netRail.getTareTime());
                         netRail.setCreateManName(netRail.getTareManName());
+                        netRail.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(netRail.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(netRail);
 
@@ -5682,6 +5748,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setNetTime(actualRow.getGrossTime());
                 actualRow.setCreateTime(actualRow.getGrossTime());
                 actualRow.setCreateManName(actualRow.getGrossManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
             }else {
                 actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                 actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -5690,6 +5757,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setNetTime(actualRow.getTareTime());
                 actualRow.setCreateTime(actualRow.getTareTime());
                 actualRow.setCreateManName(actualRow.getTareManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -5744,6 +5812,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setNetTime(actualRow.getGrossTime());
                 actualRow.setCreateTime(actualRow.getGrossTime());
                 actualRow.setCreateManName(actualRow.getGrossManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
             }else {
                 actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                 actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -5752,6 +5821,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setNetTime(actualRow.getTareTime());
                 actualRow.setCreateTime(actualRow.getTareTime());
                 actualRow.setCreateManName(actualRow.getTareManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(actualRow);
         }
@@ -5958,6 +6028,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -5966,6 +6037,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -6021,6 +6093,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -6029,6 +6102,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
                 return "计量完成，车号" + grossModel.getRailwayNo() + "在委托信息表含有多条有效委托信息,无委托洁净";
@@ -6076,6 +6150,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setNetTime(actualRow.getGrossTime());
                 actualRow.setCreateTime(actualRow.getGrossTime());
                 actualRow.setCreateManName(actualRow.getGrossManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
             }else {
                 actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                 actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -6084,6 +6159,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setNetTime(actualRow.getTareTime());
                 actualRow.setCreateTime(actualRow.getTareTime());
                 actualRow.setCreateManName(actualRow.getTareManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(actualRow);
             return "计量完成，车号" + grossModel.getRailwayNo() + "无委托洁净";
@@ -6219,6 +6295,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -6227,6 +6304,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -6285,6 +6363,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -6293,6 +6372,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
                 firsts.add(grossModel);
@@ -6395,6 +6475,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -6403,6 +6484,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -6449,6 +6531,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -6457,6 +6540,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
             }
@@ -6512,7 +6596,15 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     param.put("lcNoNull", "");
                 }
             }
-            rm.setData(meterWorkRailwayActFirstMapper.batchMatchFirstView(param));
+            List<HashMap> data = meterWorkRailwayActFirstMapper.batchMatchFirstView(param);
+            Map<String, Integer> map = new HashMap<String, Integer>();
+            for (Map<String, String> temp : data) {
+                Integer count = map.get(temp.get("RAILWAY_NO"));
+                map.put(temp.get("RAILWAY_NO"), (count == null) ? 1 : count + 1);
+                Assert.isTrue(map.get(temp.get("RAILWAY_NO")) <= 2, "车号["+temp.get("RAILWAY_NO")+"]存在超过2条一次记录，请先处理后再进行批量处理！");
+            }
+
+            rm.setData(data);
             rm.setSucceed();
             rm.setMessage("操作成功");
             rm.setCode("200");
@@ -6612,6 +6704,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -6620,6 +6713,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -6750,6 +6844,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -6758,6 +6853,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -6903,6 +6999,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -6911,6 +7008,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -7041,6 +7139,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -7049,6 +7148,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
+                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -7174,6 +7274,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualRow.setNetTime(actualRow.getGrossTime());
                             actualRow.setCreateTime(actualRow.getGrossTime());
                             actualRow.setCreateManName(actualRow.getGrossManName());
+                            actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                         }else {
                             actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                             actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -7182,6 +7283,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualRow.setNetTime(actualRow.getTareTime());
                             actualRow.setCreateTime(actualRow.getTareTime());
                             actualRow.setCreateManName(actualRow.getTareManName());
+                            actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                         }
                         meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -7236,6 +7338,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualRow.setNetTime(actualRow.getGrossTime());
                             actualRow.setCreateTime(actualRow.getGrossTime());
                             actualRow.setCreateManName(actualRow.getGrossManName());
+                            actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                         }else {
                             actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                             actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -7244,6 +7347,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualRow.setNetTime(actualRow.getTareTime());
                             actualRow.setCreateTime(actualRow.getTareTime());
                             actualRow.setCreateManName(actualRow.getTareManName());
+                            actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                         }
                         meterWorkRailwayActualMapper.insertSelective(actualRow);
                     }
@@ -7299,6 +7403,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     com.getThree().setNetTime(com.getThree().getGrossTime());
                     com.getThree().setCreateTime(com.getThree().getGrossTime());
                     com.getThree().setCreateManName(com.getThree().getGrossManName());
+                    com.getThree().setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(com.getThree().getActualFirst1No()));
                 }else {
                     com.getThree().setNetSpot3No(com.getThree().getBaseSpot2No());
                     com.getThree().setNetSpot3Name(com.getThree().getBaseSpot2Name());
@@ -7307,6 +7412,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     com.getThree().setNetTime(com.getThree().getTareTime());
                     com.getThree().setCreateTime(com.getThree().getTareTime());
                     com.getThree().setCreateManName(com.getThree().getTareManName());
+                    com.getThree().setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(com.getThree().getActualFirst2No()));
                 }
                 int i = meterWorkRailwayActualMapper.insertSelective(com.getThree());
                 MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(com.getThree().getActualFirst2No());
@@ -7429,14 +7535,14 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWeight = secondTemp.getMeterWeight().subtract(firstTemp.getMeterWeight());
             }
             firstTemp.setValueFlag(DbConstants.NET);
-            firstTemp.setUpdateManName("system");
+            firstTemp.setUpdateManNo("system");
             firstTemp.setUpdateManName("紧急洁净更新");
             firstTemp.setUpdateTime(new Date());
             firstTemp.setIsPreSacale("0");
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstTemp);
             //更新第一次皮重数据库
             secondTemp.setValueFlag(DbConstants.NET);
-            secondTemp.setUpdateManName("system");
+            secondTemp.setUpdateManNo("system");
             secondTemp.setUpdateManName("紧急洁净更新");
             secondTemp.setUpdateTime(new Date());
             secondTemp.setIsPreSacale("0");
@@ -7465,6 +7571,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualModel.setNetTime(actualModel.getGrossTime());
                 actualModel.setCreateTime(actualModel.getGrossTime());
                 actualModel.setCreateManName(actualModel.getGrossManName());
+                actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
             }else {
                 actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
                 actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
@@ -7473,6 +7580,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualModel.setNetTime(actualModel.getTareTime());
                 actualModel.setCreateTime(actualModel.getTareTime());
                 actualModel.setCreateManName(actualModel.getTareManName());
+                actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(actualModel);
 
@@ -7500,13 +7608,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         rm.setMessage("毛皮转换失败：数据已结净，请确认！！");
                         return rm;
                     }
-                    if(model.getIsPreSacale().equals("1")){
-                        rm.setMessage("毛皮转换失败：数据已匹配委托不能毛皮转换，请确认！！");
-                        return rm;
-                    }
                     if(model.getValueFlag().equals("1")) {
                         if(model.getWeightType() == null || StringUtils.isEmpty(model.getWeightType())) {
-                            rm.setMessage("毛皮转换失败：重量类型为空，请确认！！");
+//                            rm.setMessage("毛皮转换失败：重量类型为空，请确认！！");
+//                            return rm;
+                            model.setWeightType("1");
+                            meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
+                            rm.setSucceed();
+                            rm.setMessage("重量类型为空，毛皮转换成皮重!!");
+                            rm.setData(model);
+                            rm.setCode("200");
                             return rm;
                         }else {
                             if(model.getWeightType().equals("0")){
@@ -7541,5 +7652,285 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         }
     }
 
+    @Override
+    public RESTfulResult batchRailwayFirst(List<HashMap> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            UserPayload userPayload = UserPayload.getCurrUser();
+            String userId = userPayload.getUserCode();
+            String userName = userPayload.getUserName();
+            int count = 0;
+            for (HashMap model: models) {
+                String grossNo = model.get("GROSS_NO") == null ? "": model.get("GROSS_NO").toString();
+                String tareNo = model.get("TARE_NO") == null ? "": model.get("TARE_NO").toString();
+                BigDecimal tareWeight = model.get("RAILWAY_FACTORY_WEIGHT") == null ? new BigDecimal("0"): new BigDecimal(model.get("RAILWAY_FACTORY_WEIGHT").toString()).multiply(new BigDecimal(1000));
+                String scaleNo = model.get("PREDICTION_NO") == null ? "": model.get("PREDICTION_NO").toString();
+                Assert.isTrue(StringUtils.isNotEmpty(grossNo), "毛重计量编号不能为空");
+
+                MeterWorkRailwayActFirst grossModel = new MeterWorkRailwayActFirst();
+                MeterWorkRailwayActFirst tareModel = new MeterWorkRailwayActFirst();
+                if(StringUtils.isNotEmpty(scaleNo)) {
+                    PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(scaleNo);
+                    if(StringUtils.isNotEmpty(tareNo)) {
+                        grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossNo);
+                        tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(tareNo);
+                        MeterWorkRailwayActual actualModel = new MeterWorkRailwayActual();
+
+                        MeterWorkRailwayActFirst grossTemp = meterWorkRailwayActFirstMapper.selectAndMatch(grossModel.getActualFirstNo(), scale.getPredictionNo());
+                        BeanUtils.copyProperties(grossTemp, grossModel);
+                        MeterWorkRailwayActFirst tareTemp = meterWorkRailwayActFirstMapper.selectAndMatch(tareModel.getActualFirstNo(), scale.getPredictionNo());
+                        BeanUtils.copyProperties(tareTemp, tareModel);
+
+                        grossModel.setValueFlag(DbConstants.NET);
+                        grossModel.setUpdateManNo(userId);
+                        grossModel.setUpdateManName(userName);
+                        grossModel.setUpdateTime(new Date());
+                        grossModel.setWeightType("0");
+                        grossModel.setIsPreSacale("1");
+                        grossModel.setPredictionType("1");
+                        grossModel.setNote("一次批量匹配");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
+                        //更新第一次皮重数据库
+                        tareModel.setValueFlag(DbConstants.NET);
+                        tareModel.setUpdateManNo(userId);
+                        tareModel.setUpdateManName(userName);
+                        tareModel.setUpdateTime(new Date());
+                        tareModel.setWeightType("1");
+                        tareModel.setIsPreSacale("1");
+                        tareModel.setPredictionType("1");
+                        tareModel.setNote("一次批量匹配");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(tareModel);
+
+                        MeterWorkRailwayActual actualTemp = meterWorkRailwayActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), scale.getPredictionNo());
+                        BeanUtils.copyProperties(actualTemp, actualModel);
+                        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+                        String afl = formatter.format(new Date());
+                        actualModel.setActualNo(afl + meterWorkRailwayActualMapper.getNewID(afl));
+                        actualModel.setNetMode("1");
+                        actualModel.setNote("一次批量匹配洁净保存");
+                        actualModel.setUploadFlag("1");
+                        actualModel.setIsPreSacale("1");
+                        actualModel.setPredictionType("1");
+                        actualModel.setValueFlag("1");
+                        actualModel.setNetWeight(actualModel.getGrossWeight().subtract(actualModel.getTareWeight()));
+                        if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
+                            actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
+                            actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
+                            actualModel.setNetManNo(actualModel.getGrossManNo());
+                            actualModel.setNetManName(actualModel.getGrossManName());
+                            actualModel.setNetTime(actualModel.getGrossTime());
+                            actualModel.setCreateTime(actualModel.getGrossTime());
+                            actualModel.setCreateManName(actualModel.getGrossManName());
+                            actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
+                        }else {
+                            actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
+                            actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
+                            actualModel.setNetManNo(actualModel.getTareManNo());
+                            actualModel.setNetManName(actualModel.getTareManName());
+                            actualModel.setNetTime(actualModel.getTareTime());
+                            actualModel.setCreateTime(actualModel.getTareTime());
+                            actualModel.setCreateManName(actualModel.getTareManName());
+                            actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
+                        }
+                        meterWorkRailwayActualMapper.insertSelective(actualModel);
+
+                        scale.setValueFlag("2");
+                        scale.setUpdateManNo(userId);
+                        scale.setUpdateManName(userName);
+                        scale.setUpdateTime(new Date());
+                        scale.setUploadFlag("1");
+                        scale.setPredictionType("1");
+                        scale.setMeasureStation(actualModel.getNetSpot3No());
+                        scale.setMeasureStationName(actualModel.getNetSpot3Name());
+                        preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+                        count ++;
+                    }else {
+                        if(tareWeight.compareTo(new BigDecimal(0)) != 0 && tareWeight.compareTo(new BigDecimal(30000)) < 0) {
+                            grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossNo);
+                            MeterWorkRailwayActual actualModel = new MeterWorkRailwayActual();
+
+                            MeterWorkRailwayActFirst grossTemp = meterWorkRailwayActFirstMapper.selectAndMatch(grossModel.getActualFirstNo(), scale.getPredictionNo());
+                            BeanUtils.copyProperties(grossTemp, grossModel);
+                            BeanUtils.copyProperties(grossModel, tareModel);
+
+                            grossModel.setValueFlag(DbConstants.NET);
+                            grossModel.setUpdateManNo(userId);
+                            grossModel.setUpdateManName(userName);
+                            grossModel.setUpdateTime(new Date());
+                            grossModel.setWeightType("0");
+                            grossModel.setIsPreSacale("1");
+                            grossModel.setPredictionType("1");
+                            grossModel.setNote("一次批量匹配");
+                            meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
+
+                            MeterWorkRailwayActual actualTemp = meterWorkRailwayActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), scale.getPredictionNo());
+                            BeanUtils.copyProperties(actualTemp, actualModel);
+                            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+                            String afl = formatter.format(new Date());
+                            actualModel.setActualNo(afl + meterWorkRailwayActualMapper.getNewID(afl));
+                            actualModel.setTareWeight(tareWeight);
+                            actualModel.setNetMode("1");
+                            actualModel.setNote("一次批量匹配洁净保存");
+                            actualModel.setUploadFlag("1");
+                            actualModel.setIsPreSacale("1");
+                            actualModel.setPredictionType("1");
+                            actualModel.setValueFlag("1");
+                            actualModel.setNetWeight(actualModel.getGrossWeight().subtract(tareWeight));
+                            if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
+                                actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
+                                actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
+                                actualModel.setNetManNo(actualModel.getGrossManNo());
+                                actualModel.setNetManName(actualModel.getGrossManName());
+                                actualModel.setNetTime(actualModel.getGrossTime());
+                                actualModel.setCreateTime(actualModel.getGrossTime());
+                                actualModel.setCreateManName(actualModel.getGrossManName());
+                                actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
+                            }else {
+                                actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
+                                actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
+                                actualModel.setNetManNo(actualModel.getTareManNo());
+                                actualModel.setNetManName(actualModel.getTareManName());
+                                actualModel.setNetTime(actualModel.getTareTime());
+                                actualModel.setCreateTime(actualModel.getTareTime());
+                                actualModel.setCreateManName(actualModel.getTareManName());
+                                actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
+                            }
+                            meterWorkRailwayActualMapper.insertSelective(actualModel);
+
+                            scale.setValueFlag("2");
+                            scale.setUpdateManNo(userId);
+                            scale.setUpdateManName(userName);
+                            scale.setUpdateTime(new Date());
+                            scale.setUploadFlag("1");
+                            scale.setPredictionType("1");
+                            scale.setMeasureStation(actualModel.getNetSpot3No());
+                            scale.setMeasureStationName(actualModel.getNetSpot3Name());
+                            preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+
+                            count ++;
+                        }
+
+                    }
+                }else {
+                    if(StringUtils.isNotEmpty(tareNo)) {
+                        grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossNo);
+                        tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(tareNo);
+                        MeterWorkRailwayActual actualModel = new MeterWorkRailwayActual();
+
+                        grossModel.setValueFlag(DbConstants.NET);
+                        grossModel.setUpdateManNo(userId);
+                        grossModel.setUpdateManName(userName);
+                        grossModel.setUpdateTime(new Date());
+                        grossModel.setWeightType("0");
+                        grossModel.setIsPreSacale("0");
+                        grossModel.setNote("一次批量匹配");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
+                        //更新第一次皮重数据库
+                        tareModel.setValueFlag(DbConstants.NET);
+                        tareModel.setUpdateManNo(userId);
+                        tareModel.setUpdateManName(userName);
+                        tareModel.setUpdateTime(new Date());
+                        tareModel.setWeightType("1");
+                        tareModel.setIsPreSacale("0");
+                        tareModel.setNote("一次批量匹配");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(tareModel);
+
+                        MeterWorkRailwayActual actualTemp = meterWorkRailwayActualMapper.manualAdd(grossModel.getActualFirstNo(), tareModel.getActualFirstNo());
+                        BeanUtils.copyProperties(actualTemp, actualModel);
+                        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+                        String afl = formatter.format(new Date());
+                        actualModel.setActualNo(afl + meterWorkRailwayActualMapper.getNewID(afl));
+                        actualModel.setNetMode("1");
+                        actualModel.setNote("一次批量匹配洁净保存");
+                        actualModel.setUploadFlag("1");
+                        actualModel.setIsPreSacale("0");
+                        actualModel.setValueFlag("1");
+                        actualModel.setNetWeight(actualModel.getGrossWeight().subtract(actualModel.getTareWeight()));
+                        if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
+                            actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
+                            actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
+                            actualModel.setNetManNo(actualModel.getGrossManNo());
+                            actualModel.setNetManName(actualModel.getGrossManName());
+                            actualModel.setNetTime(actualModel.getGrossTime());
+                            actualModel.setCreateTime(actualModel.getGrossTime());
+                            actualModel.setCreateManName(actualModel.getGrossManName());
+                            actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
+                        }else {
+                            actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
+                            actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
+                            actualModel.setNetManNo(actualModel.getTareManNo());
+                            actualModel.setNetManName(actualModel.getTareManName());
+                            actualModel.setNetTime(actualModel.getTareTime());
+                            actualModel.setCreateTime(actualModel.getTareTime());
+                            actualModel.setCreateManName(actualModel.getTareManName());
+                            actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
+                        }
+                        meterWorkRailwayActualMapper.insertSelective(actualModel);
+                        count ++;
+                    }else {
+                        if(tareWeight.compareTo(new BigDecimal(0)) != 0 && tareWeight.compareTo(new BigDecimal(30000)) < 0) {
+                            grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossNo);
+                            MeterWorkRailwayActual actualModel = new MeterWorkRailwayActual();
+                            BeanUtils.copyProperties(grossModel, tareModel);
+
+                            grossModel.setValueFlag(DbConstants.NET);
+                            grossModel.setUpdateManNo(userId);
+                            grossModel.setUpdateManName(userName);
+                            grossModel.setUpdateTime(new Date());
+                            grossModel.setWeightType("0");
+                            grossModel.setIsPreSacale("0");
+                            grossModel.setNote("一次批量匹配");
+                            meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
+
+                            MeterWorkRailwayActual actualTemp = meterWorkRailwayActualMapper.manualAdd(grossModel.getActualFirstNo(), tareModel.getActualFirstNo());
+                            BeanUtils.copyProperties(actualTemp, actualModel);
+                            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+                            String afl = formatter.format(new Date());
+                            actualModel.setActualNo(afl + meterWorkRailwayActualMapper.getNewID(afl));
+                            actualModel.setTareWeight(tareWeight);
+                            actualModel.setNetMode("1");
+                            actualModel.setNote("一次批量匹配洁净保存");
+                            actualModel.setUploadFlag("1");
+                            actualModel.setIsPreSacale("0");
+                            actualModel.setValueFlag("1");
+                            actualModel.setNetWeight(actualModel.getGrossWeight().subtract(tareWeight));
+                            if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
+                                actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
+                                actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
+                                actualModel.setNetManNo(actualModel.getGrossManNo());
+                                actualModel.setNetManName(actualModel.getGrossManName());
+                                actualModel.setNetTime(actualModel.getGrossTime());
+                                actualModel.setCreateTime(actualModel.getGrossTime());
+                                actualModel.setCreateManName(actualModel.getGrossManName());
+                                actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
+                            }else {
+                                actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
+                                actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
+                                actualModel.setNetManNo(actualModel.getTareManNo());
+                                actualModel.setNetManName(actualModel.getTareManName());
+                                actualModel.setNetTime(actualModel.getTareTime());
+                                actualModel.setCreateTime(actualModel.getTareTime());
+                                actualModel.setCreateManName(actualModel.getTareManName());
+                                actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
+                            }
+                            meterWorkRailwayActualMapper.insertSelective(actualModel);
+
+                            count ++;
+                        }
+                    }
+                }
+            }
+            rm.setSucceed();
+            rm.setData("200");
+            rm.setMessage("共有" + count + "条数据一次批量成功");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        return rm;
+    }
+
 
 }

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

@@ -1,9 +1,12 @@
 package com.steerinfo.meterwork.meterworkrailwayactfirstbak.controller;
 
+import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
 import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
 import com.steerinfo.baseinfo.meterbaserailwayweight.mapper.MeterBaseRailwayWeightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayweight.model.MeterBaseRailwayWeight;
+import com.steerinfo.baseinfo.meterbasespotinfo.mapper.MeterBaseSpotInfoMapper;
+import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -33,7 +36,9 @@ 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 feign.Body;
 import io.micrometer.core.instrument.Meter;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -74,7 +79,11 @@ public class MeterWorkRailwayActFirstBakController extends BaseRESTfulController
     @Resource
     MeterWorkRailwayActFirstBakMapper actFirstMapper;
     @Resource
+    MeterWorkRailwayActFirstBakMapper meterWorkRailwayActFirstBakMapper;
+    @Resource
     MeterBaseRailwayWeightMapper baseRailwayWeightMapper;
+    @Resource
+    MeterBaseSpotInfoMapper meterBaseSpotInfoMapper;
 
     @ApiOperation(value = "获取列表", notes = "分页查询")
     @ApiImplicitParams({
@@ -207,13 +216,44 @@ throw new MarkerMetException(500, "操作异常！！");
     @ApiImplicitParam(name = "meterWorkRailwayActFirst", value = "详细实体meterWorkRailwayActFirst", required = true, dataType = "MeterWorkRailwayActFirst")
     //@RequiresPermissions("meterworkrailwayactfirst:create")
     @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute MeterWorkRailwayActFirstBak model) {
-        try {
-            MeterWorkRailwayActFirstBak meterWorkRailwayActFirst = meterWorkRailwayActFirstBakService.add(model);
-            return success(meterWorkRailwayActFirst);
+    public RESTfulResult add(@RequestBody MeterWorkRailwayActFirstBak model) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+            String no = meterWorkRailwayActFirstBakMapper.getNewID(afl);
+            model.setActualFirstNo(afl + no);
+//            String no = PublicMethod.IdCreate(3);
+//            model.setActualFirstNo(no);
+            model.setValueFlag("1");
+            model.setMeterWeight(model.getMeterWeight().multiply(new BigDecimal(1000)));
+            if(model.getCreateTime() == null || StringUtils.isEmpty(model.getCreateTime().toString())){
+                model.setCreateTime(new Date());
+            }
+            String userId = null;
+            String userName = null;
+            try{
+                UserPayload payload = UserPayload.getCurrUser();
+                userId = payload.getId();
+                userName = payload.getUserName();
+            }catch(Exception e) {
+                userId = "admin";
+                userName = "admins";
+            }
+            model.setCreateManNo(userId);
+            model.setCreateManName(userName);
+            HashMap<String, Object> obj = new HashMap<>();
+            obj.put("baseSpotNo", model.getBaseSpotNo());
+            List<MeterBaseSpotInfo> spotModel = meterBaseSpotInfoMapper.selectByParameters(obj);
+            if(spotModel.size() >= 1) {
+                model.setBaseSpotName(spotModel.get(0).getBaseSpotName());
+            }else {
+                throw new MarkerMetException(500, "计量点配置表未找到相应的计量点！！");
+            }
+            MeterWorkRailwayActFirstBak meterWorkCarActualFirst = meterWorkRailwayActFirstBakService.add(model);
+            return success(meterWorkCarActualFirst);
         } catch (Exception ex) {
            ex.printStackTrace();
-throw new MarkerMetException(500, "操作异常！！");
+           throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
@@ -1444,4 +1484,37 @@ throw new MarkerMetException(500, "操作异常！！");
             return failed(null, "操作异常，请确认！");
         }
     }
+
+    @ApiOperation(value = "毛皮转换")
+    @Transactional
+    @PostMapping(value = "/furConversion")
+    public RESTfulResult furConversion(@RequestBody HashMap params) {
+        try {
+            RESTfulResult rm = meterWorkRailwayActFirstBakService.furConversion(params);
+            if(!rm.isSucceed()) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            }
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
+
+    @ApiOperation(value = "将数据从MeterWorkCarRaiFirstBak复制到MeterWorkCarActualFirst")
+    @PostMapping(value = "/copyToFirst")
+    public RESTfulResult copyToFirst(@RequestBody HashMap params){
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            List<String> ids = (List<String>) params.get("ids");
+            String railwayNo = params.get("railwayNo") == null ? "": params.get("railwayNo").toString();
+            rm = meterWorkRailwayActFirstBakService.CopyToFirst(ids,railwayNo);
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        }
+        return rm;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/mapper/MeterWorkRailwayActFirstBakMapper.xml

@@ -2659,7 +2659,7 @@
             CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG,
             UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
             CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME,METER_TYPE_NO,METER_TYPE_NAME, lc_no
-    from METER_WORK_RAILWAY_ACT_FIRST
+    from METER_WORK_RAILWAY_ACT_FIRST_BAK
     where ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR}
   </select>
 
@@ -3520,7 +3520,7 @@
       or lc_no is null )
     </if>
     <if test="lcNoNull == null or lcNoNull == ''">
-       and lc_no is not null)
+      and lc_no is not null)
     </if>
     <if test="railwayNo != null and railwayNo != ''">
       and  RAILWAY_NO like '%${railwayNo}%'

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/service/IMeterWorkRailwayActFirstBakService.java

@@ -152,5 +152,10 @@ public interface IMeterWorkRailwayActFirstBakService extends IBaseService<MeterW
     //离线计量
     RESTfulResult addFirstEmergency(MeterWorkRailwayActFirstBak model)  throws Exception;
     RESTfulResult doNetEmergency(MeterWorkRailwayActualBak model)  throws Exception;
+
+    RESTfulResult furConversion(HashMap<String, Object> params);
+
+    //内倒车辆复制到一次表
+    RESTfulResult CopyToFirst(List<String> ids,String carNo) throws Exception;
 }
 

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

@@ -30,8 +30,10 @@ import com.steerinfo.meterwork.dto.StaffPerformanceAnalysis;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
+import com.steerinfo.meterwork.meterworkcaractualfirstbak.model.MeterWorkCarActualFirstBak;
 import com.steerinfo.meterwork.meterworkimage.mapper.MeterWorkImageMapper;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
+import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.service.IMeterWorkRailwayActFirstService;
 import com.steerinfo.meterwork.meterworkrailwayactfirstbak.mapper.MeterWorkRailwayActFirstBakMapper;
@@ -136,6 +138,9 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
     @Resource
     private MeterWorkImageMapper meterWorkImageMapper;
 
+    @Resource
+    private MeterWorkRailwayActFirstMapper meterWorkRailwayActFirstMapper;
+
     @Resource
     private MeterBaseRailwayHisTareDetailMapper meterBaseRailwayHisTareDetailMapper;
 
@@ -498,7 +503,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
 
     @Override
     public List<MeterWorkRailwayActFirstBak> webByLikeDesc(HashMap<String, Object> parameters) {
-        String[] lcNoTemp = parameters.get("lcNoTemp").toString().split(",");
+        String[] lcNoTemp = parameters.get("lcNoTemp") == null ? "".split(","): parameters.get("lcNoTemp").toString().split(",");
         parameters.remove("lcNoTemp");
         parameters.put("lcNoTemp", lcNoTemp);
         for (String str:
@@ -510,6 +515,18 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 parameters.put("lcNoNull", "");
             }
         }
+        String[] railwayNoList = parameters.get("railwayNoList") == null? "".split(",") :parameters.get("railwayNoList").toString().split(",");
+        parameters.remove("railwayNoList");
+        parameters.put("railwayNoList", railwayNoList);
+        for (String str:
+                railwayNoList) {
+            if(str.equals("")) {
+                parameters.put("railwayNoNull", "1");
+                break;
+            }else {
+                parameters.put("railwayNoNull", "");
+            }
+        }
         List<MeterWorkRailwayActFirstBak> rows = meterWorkRailwayActFirstBakMapper.likeByDesc(parameters);
         return rows;
     }
@@ -517,7 +534,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<String> distinctRailwayNo(HashMap<String, Object> param) {
-        String[] lcNoTemp = param.get("lcNo").toString().split(",");
+        String[] lcNoTemp = param.get("lcNo") == null? "".split(","): param.get("lcNo").toString().split(",");
         param.put("lcNoTemp", lcNoTemp);
         for (String str: lcNoTemp) {
             if(str.equals("")) {
@@ -6081,6 +6098,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 String lcNo = meterWorkRailwayActFirstBakMapper.getLcNo(afl, models.get(0).getBaseSpotNo());
                 int count = 0;
                 for (MeterWorkRailwayActFirstBak model : models) {
+                    model.setMeterWeight(null);
                     model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
                             .replaceAll("轨道衡", "")
                             .replaceAll("静轨", "")
@@ -7435,5 +7453,146 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
         return rm;
     }
 
+    @Override
+    public RESTfulResult furConversion(HashMap<String, Object> params) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+
+        try{
+            if(params.get("actualFirstNo") != null && com.steerinfo.util.StringUtils.isNotEmpty(params.get("actualFirstNo").toString())){
+                MeterWorkRailwayActFirstBak model = meterWorkRailwayActFirstBakMapper.selectByPrimaryKey(params.get("actualFirstNo").toString());
+                if(model != null) {
+                    if(model.getValueFlag().equals("2")){
+                        rm.setMessage("毛皮转换失败：数据已结净，请确认！！");
+                        return rm;
+                    }
+                    if(model.getValueFlag().equals("1")) {
+                        if(model.getWeightType() == null || StringUtils.isEmpty(model.getWeightType())) {
+//                            rm.setMessage("毛皮转换失败：重量类型为空，请确认！！");
+//                            return rm;
+                            model.setWeightType("1");
+                            meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
+                            rm.setSucceed();
+                            rm.setMessage("重量类型为空，毛皮转换成皮重!!");
+                            rm.setData(model);
+                            rm.setCode("200");
+                            return rm;
+                        }else {
+                            if(model.getWeightType().equals("0")){
+                                model.setWeightType("1");
+                            }else if (model.getWeightType().equals("1")){
+                                model.setWeightType("0");
+                            }else{
+                                rm.setMessage("毛皮转换失败：毛皮转换只针对毛重和常规皮重，请确认！！");
+                                return rm;
+                            }
+                            meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
+                            rm.setSucceed();
+                            rm.setMessage("毛皮转换成功!!");
+                            rm.setData(model);
+                            rm.setCode("200");
+                            return rm;
+                        }
+                    }else{
+                        rm.setMessage("毛皮转换失败：毛皮转换只针对有效的毛重和常规皮重，请确认！！");
+                    }
+                }else {
+                    rm.setMessage("未找到相应的一次计量数据，不能毛皮转换！！");
+                }
+            }else {
+                rm.setMessage("实绩编号不能为空！！");
+            }
+            return rm;
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常,请确认！！>>>" + e.getMessage());
+            return rm;
+        }
+    }
+
+    @Override
+    public RESTfulResult CopyToFirst(List<String> ids, String railwayNo) throws Exception {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            for (String id : ids){
+                //根据id获取对应的一次数据
+                MeterWorkRailwayActFirstBak firstModel = meterWorkRailwayActFirstBakMapper.selectByPrimaryKey(id);
+                //一次数据为空
+                if (firstModel == null) {
+                    //抛出异常
+                    //事务回滚
+                    throw new Exception("一次数据为空");
+                }
+                if (!railwayNo.equals(firstModel.getRailwayNo())){
+                    throw new Exception(id+"的车号不一致");
+                }
+                //判断是否符合要求
+                String note = isSuit(firstModel);
+                if (note.equals("1")){
+                    //复制到First正式表里面
+                    MeterWorkRailwayActFirst first = new MeterWorkRailwayActFirst();
+                    //复制一份
+                    BeanUtils.copyProperties(firstModel,first);
+                    //修改主键
+                    first.setActualFirstNo(first.getActualFirstNo()+"bak");
+                    meterWorkRailwayActFirstMapper.insert(first);
+                    firstModel.setValueFlag("0");
+                    meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(firstModel);
+                }else{
+                    throw new Exception(note);
+                }
+            }
+            rm.setSucceed();
+            rm.setMessage("复制成功");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        }
+        return rm;
+    }
+
+    private String isSuit(MeterWorkRailwayActFirstBak model){
+
+        //不能是已结净的数据
+        if ( !"1".equals(model.getValueFlag()) ){
+            return "不能是洁净数据";
+        }
+
+        //站点、站点名、创建人、创建人编号、创建时间、数据来源、重量类型、重量不能为空
+        if (model.getBaseSpotNo() == null || StringUtils.isEmpty(model.getBaseSpotNo())) {
+            return "站点编号为空";
+        }
+        if (model.getBaseSpotName() == null || StringUtils.isEmpty(model.getBaseSpotName())) {
+            return "站点名称为空";
+        }
+        if (model.getCreateManNo() == null || StringUtils.isEmpty(model.getCreateManNo())) {
+            return "计量员编号为空";
+        }
+        if (model.getCreateManName() == null || StringUtils.isEmpty(model.getCreateManName())) {
+            return "计量员名称为空";
+        }
+        if (model.getCreateTime() == null || StringUtils.isEmpty(model.getCreateTime().toString())) {
+            return "计量时间为空";
+        }
+        if (model.getDataSource() == null || StringUtils.isEmpty(model.getDataSource())) {
+            return "计量数据来源不能为空";
+        }
+        if (model.getWeightType() == null || StringUtils.isEmpty(model.getWeightType())){
+            return "计量重量类型不能为空";
+        }
+        if (model.getMeterWeight() == null){
+            return "计量重量不能为空";
+        }
+        //内倒车毛重必须有委托
+        //毛重 -> 0
+        if ("0".equals(model.getWeightType()) ){
+            //委托不能为空
+            if(model.getPredictionNo() == null){
+                return "委托不能为空";
+            }
+        }
+        return "1";
+    }
 
 }

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

@@ -15,6 +15,8 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -922,4 +924,33 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
         return rm;
     }
+
+    @ApiOperation(value = "轨道衡批量匹配界面显示")
+    @Transactional
+    @PostMapping(value = "/batchMatchActualView")
+    public RESTfulResult batchMatchActualView(@RequestBody HashMap param) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkRailwayActualService.batchMatchActualView(param);
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
+
+    @ApiOperation(value = "web端——轨道衡净重批量匹配回空皮界面")
+    @Transactional
+    @PostMapping(value = "/batchRailwayActual")
+    public RESTfulResult batchRailwayFirst(@RequestBody List<HashMap> models) {
+        try {
+            RESTfulResult rm = meterWorkRailwayActualService.batchRailwayActual(models);
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
 }

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

@@ -54,4 +54,5 @@ public interface MeterWorkRailwayActualMapper extends IBaseMapper<MeterWorkRailw
 
     List<MeterWorkRailwayActual> selectByAcatualFristNo(Map<String, Object> params);
     List<MeterWorkRailwayActual> autoPrintRailway(Map<String, Object> params);
+    List<HashMap> batchMatchActualView(Map<String, Object> params);
 }

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

@@ -2970,6 +2970,7 @@
   <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(ACTUAL_NO, LENGTH(ACTUAL_NO) - 3))),0) + 1,4,'0') ACTUAL_NO
     FROM METER_WORK_RAILWAY_ACTUAL where instr(ACTUAL_NO,#{afl,jdbcType=VARCHAR})>0
+        and ACTUAL_NO not in (select distinct B.ACTUAL_NO from METER_WORK_RAILWAY_ACTUAL B where B.ACTUAL_NO like '%bak%')
   </select>
 
   <select id="getLcNo" parameterType="java.lang.String" resultType="java.lang.String">
@@ -3876,6 +3877,9 @@
     <if test="valueFlag != null and valueFlag != ''">
       and  VALUE_FLAG = #{valueFlag}
     </if>
+    <if test="isPreSacale != null and isPreSacale">
+      and is_pre_sacale = #{isPreSacale}
+    </if>
     <if test="railwayNo != null and railwayNo != ''">
       and railway_no like '%${railwayNo}%'
     </if>
@@ -4328,4 +4332,66 @@
         and value_flag != '0'
     order by net_time desc
   </select>
+
+  <select id="batchMatchActualView" parameterType="java.util.HashMap" resultType="HashMap">
+    select A.lc_no,
+    A.actual_no actual_no,
+    A.railway_no railway_no,
+    A.prediction_no prediction_no,
+    A.matter_name,
+    A.actual_first1_no grossNo,
+    A.gross_weight/1000 grossWeight，
+    A.gross_time grossTime,
+    A.base_spot1_name grossSpot,
+    A.actual_first2_no tareNo,
+    A.tare_weight/1000  tareWeight,
+    A.tare_time tareTime,
+    A.base_spot2_name tareSpot,
+    A.net_weight/1000 netWeight,
+    A.net_time netTime,
+    A.net_spot3_name netSpot,
+    A.note note,
+    E.Lc_No tare_lc_no,
+    E.Actual_First_No tare_no,
+    E.create_time tare_time,
+    E.PREDICTION_NO tare_scale_no,
+    E.Meter_weight/1000 tare_weight,
+    E.Weight_Type tare_weight_type,
+    A.conveyance_type conveyance_type,
+    B.CARRIAGE_WEIGHT/1000 crriage_weight
+    from meter_work_railway_actual A
+    left join meter_base_railway_carriage_weight B
+    on A.conveyance_type = B.Carriage_Code
+    and B.value_flag = '1'
+    left join meter_work_railway_act_first E
+    on A.railway_no = E.railway_no
+    and E.value_flag = '1'
+    and E.meter_weight &lt; 30000
+    where A.value_flag != '0'
+<!--        and ( A.lc_no in-->
+<!--        <foreach collection="lcNoStr" item="item" open="(" separator="," close=")">-->
+<!--          #{item}-->
+<!--        </foreach>-->
+<!--        <if test="lcNoNull != null and lcNoNull != ''">-->
+<!--          or A.lc_no is null )-->
+<!--        </if>-->
+<!--        <if test="lcNoNull == null or lcNoNull == ''">-->
+<!--          and A.lc_no is not null)-->
+<!--        </if>-->
+        <choose>
+          <when test="lcNo != null and lcNo == 'kong'">
+            and A.lc_no is null
+          </when>
+          <when test=" lcNo != null and lcNo != 'kong'">
+            and A.lc_no = #{lcNo}
+          </when>
+        </choose>
+        <if test="railwayTypeNo != null and railwayTypeNo != ''">
+          and  A.RAILWAY_TYPE_NO = #{railwayTypeNo}
+        </if>
+        <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>
+    order by conveyance_type asc, netTime desc
+  </select>
 </mapper>

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

@@ -97,4 +97,6 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
 
     String subStr(String str, String flag);
 
+    RESTfulResult batchMatchActualView(HashMap<String, Object> param);
+    RESTfulResult batchRailwayActual(List<HashMap> models);
 }

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

@@ -1,6 +1,8 @@
 package com.steerinfo.meterwork.meterworkrailwayactual.service.impl;
 
 import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
+import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
+import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.mapper.MeterBaseRailwayAiweightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
 import com.steerinfo.baseinfo.meterbaserailwayweight.mapper.MeterBaseRailwayWeightMapper;
@@ -31,10 +33,12 @@ import com.steerinfo.pretrack.prerailwayscale.service.IPreRailwayScaleService;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.FieldsCollector;
+import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import io.micrometer.core.instrument.Meter;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -79,6 +83,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     @Resource
     private MeterBaseRailwayWeightMapper meterBaseRailwayWeightMapper;
 
+    @Resource
+    private MeterBaseOperationLogMapper meterBaseOperationLogMapper;
+
+
     @Resource
     private PreRailwayScaleMapper preRailwayScaleMapper;
 
@@ -321,6 +329,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actualRow.setNetTime(actualRow.getGrossTime());
                 actualRow.setCreateTime(actualRow.getGrossTime());
                 actualRow.setCreateManName(actualRow.getGrossManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
             }else {
                 actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                 actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -329,6 +338,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actualRow.setNetTime(actualRow.getTareTime());
                 actualRow.setCreateTime(actualRow.getTareTime());
                 actualRow.setCreateManName(actualRow.getTareManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -429,6 +439,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -437,6 +448,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -493,6 +505,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     actualRow.setNetTime(actualRow.getGrossTime());
                     actualRow.setCreateTime(actualRow.getGrossTime());
                     actualRow.setCreateManName(actualRow.getGrossManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                 }else {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                     actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -501,6 +514,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     actualRow.setNetTime(actualRow.getTareTime());
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
             }
@@ -559,16 +573,20 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         // 毛重
         MeterWorkRailwayActFirst grossrow = meterWorkRailwayActFirstMapper.selectAndMatch(queryrow.getActualFirst1No(), predictionNo);
         grossrow.setUpdateTime(new Date());
-        grossrow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
         grossrow.setUpdateManNo(userId);
+        grossrow.setUpdateManName(userName);
+        grossrow.setNote("洁净数据匹配委托操作");
+        grossrow.setIsPreSacale("1");
         meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossrow);
 
         // 皮重       特殊情况：标识皮重过磅，会导致没有皮重信息，就直接跳过
         try{
             MeterWorkRailwayActFirst tarerow = meterWorkRailwayActFirstMapper.selectAndMatch(queryrow.getActualFirst2No(), predictionNo);
             tarerow.setUpdateTime(new Date());
-            tarerow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
             tarerow.setUpdateManNo(userId);
+            tarerow.setUpdateManName(userName);
+            tarerow.setNote("洁净数据匹配委托操作");
+            tarerow.setIsPreSacale("1");
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(tarerow);
         }catch(Exception e) {
 
@@ -595,6 +613,20 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             scale.setMeasureStationName(mwca.getNetSpot3Name());
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
         }
+
+        MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+        logModel.setId(PublicMethod.IdCreate(2));
+        logModel.setCreateManNo(userId);
+        logModel.setCreateManName(userName);
+        logModel.setCreateTime(new Date());
+        logModel.setOperationPage("静态轨道衡-静轨净重数据维护");
+        logModel.setOperationFunction("匹配委托");
+        logModel.setOperationId(mwca.getActualNo());
+        logModel.setOperationPredictionNo(predictionNo);
+        logModel.setOperationCarnNo(mwca.getRailwayNo());
+        logModel.setOperationBeforeFix(queryrow.toString());
+        logModel.setOperationAfterFix(mwca.toString());
+        meterBaseOperationLogMapper.insertSelective(logModel);
         return mwca;
     }
 
@@ -668,6 +700,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             model.setNetTime(model.getGrossTime());
             model.setCreateTime(model.getGrossTime());
             model.setCreateManName(model.getGrossManName());
+            model.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(model.getActualFirst1No()));
         }else {
             model.setNetSpot3No(model.getBaseSpot2No());
             model.setNetSpot3Name(model.getBaseSpot2Name());
@@ -676,6 +709,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             model.setNetTime(model.getTareTime());
             model.setCreateTime(model.getTareTime());
             model.setCreateManName(model.getTareManName());
+            model.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(model.getActualFirst2No()));
         }
         int num = meterWorkRailwayActualMapper.insertSelective(model);
 
@@ -726,7 +760,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         MeterWorkRailwayActFirst grossrow = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst1No());
 //        grossrow.setValueFlag("3");
         grossrow.setUpdateTime(new Date());
-        grossrow.setUpdateManName(userName + ": 洁净数据解除委托操作");
+        grossrow.setUpdateManName(userName);
         grossrow.setUpdateManNo(userId);
         grossrow.setNote("洁净数据解除委托操作");
         grossrow.setIsPreSacale("0");
@@ -737,7 +771,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             MeterWorkRailwayActFirst tarerow = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst2No());
 //        tarerow.setValueFlag("3");
             tarerow.setUpdateTime(new Date());
-            tarerow.setUpdateManName(userName + ": 洁净数据解除委托操作");
+            tarerow.setUpdateManName(userName);
             tarerow.setUpdateManNo(userId);
             tarerow.setNote("洁净数据解除委托操作");
             tarerow.setIsPreSacale("0");
@@ -766,6 +800,20 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         mwca.setIsPreSacale("0");
         mwca.setUploadFlag("1");
         meterWorkRailwayActualMapper.updateByPrimaryKey(mwca);
+
+        MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+        logModel.setId(PublicMethod.IdCreate(2));
+        logModel.setCreateManNo(userId);
+        logModel.setCreateManName(userName);
+        logModel.setCreateTime(new Date());
+        logModel.setOperationPage("静态轨道衡-静轨净重数据维护");
+        logModel.setOperationFunction("撤销委托");
+        logModel.setOperationId(mwca.getActualNo());
+        logModel.setOperationPredictionNo(model.getPredictionNo());
+        logModel.setOperationCarnNo(mwca.getRailwayNo());
+        logModel.setOperationBeforeFix(mwcaquery.toString());
+        logModel.setOperationAfterFix(mwca.toString());
+        meterBaseOperationLogMapper.insertSelective(logModel);
         return mwca;
     }
 
@@ -1324,6 +1372,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 mwca.setNetTime(mwca.getGrossTime());
                 mwca.setCreateTime(mwca.getGrossTime());
                 mwca.setCreateManName(mwca.getGrossManName());
+                mwca.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(mwca.getActualFirst1No()));
             }else {
                 mwca.setNetSpot3No(mwca.getBaseSpot2No());
                 mwca.setNetSpot3Name(mwca.getBaseSpot2Name());
@@ -1332,6 +1381,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 mwca.setNetTime(mwca.getTareTime());
                 mwca.setCreateTime(mwca.getTareTime());
                 mwca.setCreateManName(mwca.getTareManName());
+                mwca.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(mwca.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(mwca);
             return mwca;
@@ -1963,6 +2013,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     model.setNetTime(model.getGrossTime());
                     model.setCreateTime(model.getGrossTime());
                     model.setCreateManName(model.getGrossManName());
+                    model.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(model.getActualFirst1No()));
                 }else {
                     model.setNetSpot3No(model.getBaseSpot2No());
                     model.setNetSpot3Name(model.getBaseSpot2Name());
@@ -1971,6 +2022,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     model.setNetTime(model.getTareTime());
                     model.setCreateTime(model.getTareTime());
                     model.setCreateManName(model.getTareManName());
+                    model.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(model.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(model);
                 num++;
@@ -2042,6 +2094,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     model.setNetTime(model.getGrossTime());
                     model.setCreateTime(model.getGrossTime());
                     model.setCreateManName(model.getGrossManName());
+                    model.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(model.getActualFirst1No()));
                 }else {
                     model.setNetSpot3No(model.getBaseSpot2No());
                     model.setNetSpot3Name(model.getBaseSpot2Name());
@@ -2050,6 +2103,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     model.setNetTime(model.getTareTime());
                     model.setCreateTime(model.getTareTime());
                     model.setCreateManName(model.getTareManName());
+                    model.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(model.getActualFirst2No()));
                 }
                 meterWorkRailwayActualMapper.insertSelective(model);
 
@@ -2191,6 +2245,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actualRow.setNetTime(actualRow.getGrossTime());
                 actualRow.setCreateTime(actualRow.getGrossTime());
                 actualRow.setCreateManName(actualRow.getGrossManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
             }else {
                 actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                 actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -2199,6 +2254,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actualRow.setNetTime(actualRow.getTareTime());
                 actualRow.setCreateTime(actualRow.getTareTime());
                 actualRow.setCreateManName(actualRow.getTareManName());
+                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
             }
             meterWorkRailwayActualMapper.insertSelective(actualRow);
             rm.setSucceed();
@@ -2223,9 +2279,14 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         if(carActual != null) {
             actualNoList.add(0, carActual.getActualFirst1No());
             actualNoList.add(1, carActual.getActualFirst2No());
-            String entrust = carActual.getPredictionNo() == null ? "" : carActual.getPredictionNo();
+//            String entrust = carActual.getPredictionNo() == null ? "" : carActual.getPredictionNo();
+//            String railwayNo = carActual.getRailwayNo() == null ? "": carActual.getRailwayNo();
+            HashMap<String, Object> obj = new HashMap<>();
+            obj.put("railwayNo", carActual.getRailwayNo());
+            obj.put("predictionNo", carActual.getPredictionNo());
             List<MeterWorkRailwayActFirst> firstList = meterWorkRailwayActFirstMapper.selectById(actualNoList);
-            PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(entrust);
+//            PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(entrust);
+            List<PreRailwayScale> scale = preRailwayScaleMapper.selectByScale(obj);
             HashMap<String, Object> map = new HashMap<>();
             map.put("firstList", firstList);
             map.put("scale", scale);
@@ -2600,4 +2661,167 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         }
 
     }
+
+    @Override
+    public RESTfulResult batchMatchActualView(HashMap<String, Object> param) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+//            Assert.isTrue(param.get("lcNoTemp") != null, "未勾选列次号");
+//            String[] lcNoStr = param.get("lcNoTemp").toString().split(",");
+//            param.put("lcNoStr", lcNoStr);
+//            for (String str: lcNoStr) {
+//                if(str.equals("")) {
+//                    param.put("lcNoNull", "1");
+//                    break;
+//                }else {
+//                    param.put("lcNoNull", "");
+//                }
+//            }
+            List<HashMap> data = meterWorkRailwayActualMapper.batchMatchActualView(param);
+//            Map<String, Integer> map = new HashMap<String, Integer>();
+//            for (Map<String, String> temp : data) {
+//                Integer count = map.get(temp.get("RAILWAY_NO"));
+//                map.put(temp.get("RAILWAY_NO"), (count == null) ? 1 : count + 1);
+//                Assert.isTrue(map.get(temp.get("RAILWAY_NO")) <= 2, "车号["+temp.get("RAILWAY_NO")+"]存在超过2条一次记录，请先处理后再进行批量处理！");
+//            }
+
+            rm.setData(data);
+            rm.setSucceed();
+            rm.setMessage("操作成功");
+            rm.setCode("200");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult batchRailwayActual(List<HashMap> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            UserPayload userPayload = UserPayload.getCurrUser();
+            String userId = userPayload.getUserCode();
+            String userName = userPayload.getUserName();
+            int count = 0;
+            List<String> preNoList = null;
+            for(HashMap model: models) {
+                String pre = model.get("TARE_SCALE_NO") == null ? "":model.get("TARE_SCALE_NO").toString();
+                if(StringUtils.isNotEmpty(pre)){
+                    preNoList.add(model.get("TARE_SCALE_NO") == null ? "": model.get("TARE_SCALE_NO").toString());
+                }
+            }
+            if(preNoList != null && preNoList.size() >= 1){
+                String carStr = org.apache.commons.lang3.StringUtils.join(preNoList.toArray(), ",");
+                Assert.isTrue(StringUtils.isNotEmpty(carStr), "[" + carStr + "]回空皮车号带有委托，请解绑委托在进行批量提交");
+            }
+            for(HashMap model: models) {
+                String actualNo = model.get("ACTUAL_NO") == null ? "": model.get("ACTUAL_NO").toString();
+                String scaleNo = model.get("PREDICTION_NO") == null ? "": model.get("PREDICTION_NO").toString();
+                String tareNo = model.get("TARE_NO") == null ? "": model.get("TARE_NO").toString();
+
+                MeterWorkRailwayActual actualModel = new MeterWorkRailwayActual();
+                MeterWorkRailwayActFirst tareNoModel = new MeterWorkRailwayActFirst();
+                if(StringUtils.isNotEmpty(tareNo)) {
+                    actualModel = meterWorkRailwayActualMapper.selectByPrimaryKey(actualNo);
+                    tareNoModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(tareNo);
+                    if(StringUtils.isNotEmpty(scaleNo)) {
+                        if(actualModel != null) {
+                            MeterWorkRailwayActFirst tareNoTemp = meterWorkRailwayActFirstMapper.selectAndMatch(tareNoModel.getActualFirstNo(), scaleNo);
+                            BeanUtils.copyProperties(tareNoTemp, tareNoModel);
+
+                            tareNoModel.setValueFlag(DbConstants.NET);
+                            tareNoModel.setUpdateManNo(userId);
+                            tareNoModel.setUpdateManName(userName);
+                            tareNoModel.setUpdateTime(new Date());
+                            tareNoModel.setWeightType("1");
+                            tareNoModel.setIsPreSacale("1");
+                            tareNoModel.setPredictionType("1");
+                            tareNoModel.setNote("净重批量匹配回空皮");
+                            meterWorkRailwayActFirstMapper.updateByPrimaryKey(tareNoModel);
+
+                            actualModel.setActualFirst2No(tareNoModel.getActualFirstNo());
+                            actualModel.setTareWeight(tareNoModel.getMeterWeight());
+                            actualModel.setTareMode(tareNoModel.getMeterMode());
+                            actualModel.setTareClass(tareNoModel.getMeterClass());
+                            actualModel.setTareGroup(tareNoModel.getMeterGroup());
+                            actualModel.setTareTime(tareNoModel.getCreateTime());
+                            actualModel.setTareManNo(tareNoModel.getCreateManNo());
+                            actualModel.setTareManName(tareNoModel.getCreateManName());
+                            if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
+                                actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
+                                actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
+                                actualModel.setNetManNo(actualModel.getGrossManNo());
+                                actualModel.setNetManName(actualModel.getGrossManName());
+                                actualModel.setNetTime(actualModel.getGrossTime());
+                                actualModel.setCreateTime(actualModel.getGrossTime());
+                                actualModel.setCreateManName(actualModel.getGrossManName());
+                                actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
+                            }else {
+                                actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
+                                actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
+                                actualModel.setNetManNo(actualModel.getTareManNo());
+                                actualModel.setNetManName(actualModel.getTareManName());
+                                actualModel.setNetTime(actualModel.getTareTime());
+                                actualModel.setCreateTime(actualModel.getTareTime());
+                                actualModel.setCreateManName(actualModel.getTareManName());
+                                actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
+                            }
+                            meterWorkRailwayActualMapper.updateByPrimaryKeySelective(actualModel);
+                            count ++;
+                        }
+                    }else {
+                        tareNoModel.setValueFlag(DbConstants.NET);
+                        tareNoModel.setUpdateManNo(userId);
+                        tareNoModel.setUpdateManName(userName);
+                        tareNoModel.setUpdateTime(new Date());
+                        tareNoModel.setWeightType("1");
+                        tareNoModel.setIsPreSacale("0");
+                        tareNoModel.setNote("净重批量匹配回空皮");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(tareNoModel);
+
+                        actualModel.setActualFirst2No(tareNoModel.getActualFirstNo());
+                        actualModel.setTareWeight(tareNoModel.getMeterWeight());
+                        actualModel.setTareMode(tareNoModel.getMeterMode());
+                        actualModel.setTareClass(tareNoModel.getMeterClass());
+                        actualModel.setTareGroup(tareNoModel.getMeterGroup());
+                        actualModel.setTareTime(tareNoModel.getCreateTime());
+                        actualModel.setTareManNo(tareNoModel.getCreateManNo());
+                        actualModel.setTareManName(tareNoModel.getCreateManName());
+                        if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
+                            actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
+                            actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
+                            actualModel.setNetManNo(actualModel.getGrossManNo());
+                            actualModel.setNetManName(actualModel.getGrossManName());
+                            actualModel.setNetTime(actualModel.getGrossTime());
+                            actualModel.setCreateTime(actualModel.getGrossTime());
+                            actualModel.setCreateManName(actualModel.getGrossManName());
+                            actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
+                        }else {
+                            actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
+                            actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
+                            actualModel.setNetManNo(actualModel.getTareManNo());
+                            actualModel.setNetManName(actualModel.getTareManName());
+                            actualModel.setNetTime(actualModel.getTareTime());
+                            actualModel.setCreateTime(actualModel.getTareTime());
+                            actualModel.setCreateManName(actualModel.getTareManName());
+                            actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
+                        }
+                        meterWorkRailwayActualMapper.updateByPrimaryKeySelective(actualModel);
+                        count ++;
+                    }
+                }
+            }
+            rm.setSucceed();
+            rm.setData("200");
+            rm.setMessage("共有" + count + "条数据一次批量成功");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        return rm;
+    }
 }

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

@@ -1,7 +1,9 @@
 package com.steerinfo.meterwork.meterworkrailwayactualbak.controller;
 
+import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.exception.RESTException;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.except.MarkerMetException;
@@ -830,28 +832,28 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
             if(map.get("predictionNo") != null) {
                 model.setPredictionNo(map.get("predictionNo").toString());
             }
-//            model.setBaseSpot1No(map.get("baseSpot1No").toString());
-//            model.setBaseSpot1Name(map.get("baseSpot1Name").toString());
-            model.setBaseSpot1No(meterWorkRailwayActualBakService.subStr(map.get("baseSpot1No").toString(), "0"));
-            model.setBaseSpot1Name(meterWorkRailwayActualBakService.subStr(map.get("baseSpot1No").toString(), "1"));
-//            model.setGrossManNo(map.get("grossManNo").toString());
-//            model.setGrossManName(map.get("grossManName").toString());
-            model.setGrossManNo(meterWorkRailwayActualBakService.subStr(map.get("grossManNo").toString(), "0"));
-            model.setGrossManName(meterWorkRailwayActualBakService.subStr(map.get("grossManNo").toString(), "1"));
+            model.setBaseSpot1No(map.get("baseSpot1No").toString());
+            model.setBaseSpot1Name(map.get("baseSpot1Name").toString());
+//            model.setBaseSpot1No(meterWorkRailwayActualBakService.subStr(map.get("baseSpot1No").toString(), "0"));
+//            model.setBaseSpot1Name(meterWorkRailwayActualBakService.subStr(map.get("baseSpot1No").toString(), "1"));
+            model.setGrossManNo(map.get("grossManNo").toString());
+            model.setGrossManName(map.get("grossManName").toString());
+//            model.setGrossManNo(meterWorkRailwayActualBakService.subStr(map.get("grossManNo").toString(), "0"));
+//            model.setGrossManName(meterWorkRailwayActualBakService.subStr(map.get("grossManNo").toString(), "1"));
             model.setGrossTime(grossTime);
             model.setTareTime(tareTime);
             model.setNetTime(netTime);
-//            model.setBaseSpot2No(map.get("baseSpot2No").toString());
-//            model.setBaseSpot2Name(map.get("baseSpot2Name").toString());
-            model.setBaseSpot2No(meterWorkRailwayActualBakService.subStr(map.get("baseSpot2No").toString(), "0"));
-            model.setBaseSpot2Name(meterWorkRailwayActualBakService.subStr(map.get("baseSpot2No").toString(), "1"));
+            model.setBaseSpot2No(map.get("baseSpot2No").toString());
+            model.setBaseSpot2Name(map.get("baseSpot2Name").toString());
+//            model.setBaseSpot2No(meterWorkRailwayActualBakService.subStr(map.get("baseSpot2No").toString(), "0"));
+//            model.setBaseSpot2Name(meterWorkRailwayActualBakService.subStr(map.get("baseSpot2No").toString(), "1"));
             model.setRailwayNo(map.get("railwayNo").toString());
             model.setGrossWeight(new BigDecimal(map.get("grossWeight").toString()).multiply(new BigDecimal(1000)));
             model.setTareWeight(new BigDecimal(map.get("tareWeight").toString()).multiply(new BigDecimal(1000)));
-//            model.setRailwayTypeNo(map.get("railwayTypeNo").toString());
-//            model.setRailwayTypeName(map.get("railwayTypeName").toString());
-            model.setRailwayTypeNo(meterWorkRailwayActualBakService.subStr(map.get("railwayTypeNo").toString(), "0"));
-            model.setRailwayTypeName(meterWorkRailwayActualBakService.subStr(map.get("railwayTypeNo").toString(), "1"));
+            model.setRailwayTypeNo(map.get("railwayTypeNo").toString());
+            model.setRailwayTypeName(map.get("railwayTypeName").toString());
+//            model.setRailwayTypeNo(meterWorkRailwayActualBakService.subStr(map.get("railwayTypeNo").toString(), "0"));
+//            model.setRailwayTypeName(meterWorkRailwayActualBakService.subStr(map.get("railwayTypeNo").toString(), "1"));
             rm = meterWorkRailwayActualBakService.supplementaryData(model);
         } catch (MarkerMetException e) {
             e.printStackTrace();
@@ -926,4 +928,19 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         }
         return rm;
     }
+
+    @ApiOperation(value = "将数据从MeterWorkCarActualBak复制到MeterWorkCarActual")
+    @PostMapping(value = "/copyToActual")
+    public RESTfulResult copyToActual(@RequestBody HashMap params){
+        RESTfulResult rm;
+        try {
+            List<String> ids = (List<String>) params.get("ids");
+            String railwayNo = params.get("railwayNo") == null ? "": params.get("railwayNo").toString();
+            rm = meterWorkRailwayActualBakService.CopyToActual(ids,railwayNo);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(null,e.getMessage());
+        }
+        return rm;
+    }
 }

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

@@ -42,6 +42,7 @@ public interface MeterWorkRailwayActualBakMapper extends IBaseMapper<MeterWorkRa
     MeterWorkRailwayActualBak cleanPredcition(@feign.Param(value = "actualNo") String actualNo);
 
     List<MeterWorkRailwayActualBak> distinctRailwayNo(HashMap<String, Object> obj);
+    List<MeterWorkRailwayActualBak> distinctRailwayNoTemp(HashMap<String, Object> obj);
     List<MeterWorkRailwayActualBak> distinctLcNo(HashMap<String, Object> obj);
 
     double getGrossAvg(HashMap actual);

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

@@ -3754,6 +3754,65 @@
       and net_spot3_no = #{netSpot3No}
   </select>
 
+  <!-- 查询：根据传入时间和车号，查询给定时间段去重车号 -->
+  <select id="distinctRailwayNoTemp" parameterType="java.lang.String" resultMap="BaseResultMap">
+    SELECT distinct RAILWAY_NO, net_time
+    from METER_WORK_RAILWAY_ACTUAL_BAK
+    where 1=1
+    <if test="valueFlag != null and valueFlag != ''">
+      and  VALUE_FLAG = #{valueFlag}
+    </if>
+    <if test="grossLcNo != null and grossLcNo != ''">
+      and actual_first1_no in (
+      select B.actual_first_no from meter_work_railway_act_first B where B.lc_no = #{grossLcNo}
+      )
+    </if>
+    <if test="tareLcNo != null and tareLcNo != ''">
+      and actual_first2_no in (
+      select C.actual_first_no from meter_work_railway_act_first C where C.lc_no = #{tareLcNo}
+      )
+    </if>
+    <!--and RAILWAY_NO like '%${railwayNo}%'-->
+    <if test="railwayTypeNo != null and railwayTypeNo != ''">
+      and  RAILWAY_TYPE_NO = #{railwayTypeNo}
+    </if>
+    <!--    <if test="lcNo != null and lcNo != ''">-->
+    <!--      and lc_No like '%${lcNo}%'-->
+    <!--    </if>-->
+    <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+      and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="matterNo != null and matterNo != ''">
+      and  matter_no like '%${matterNo}%'
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and  matter_name like  '%${matterName}%'
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  net_spot3_No like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  net_spot3_name like '%${baseSpotName}%'
+    </if>
+    <if test="predictionNo != null and predictionNo != ''">
+      and  prediction_no like '%${predictionNo}%'
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and  forwarding_Unit_Name like '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and  receiving_uint_name like  '%${receivingUintName}%'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and  VALUE_FLAG = #{valueFlag}
+    </if>
+    <if test="railwayNo != null and railwayNo != ''">
+      and railway_no like '%${railwayNo}%'
+    </if>
+    and value_flag != '0'
+    order by net_time desc
+  </select>
+
   <!-- 查询：根据传入时间和车号，查询给定时间段去重车号 -->
   <select id="distinctRailwayNo" parameterType="java.lang.String" resultMap="BaseResultMap">
     SELECT distinct RAILWAY_NO, net_time

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/service/IMeterWorkRailwayActualBakService.java

@@ -99,4 +99,5 @@ public interface IMeterWorkRailwayActualBakService extends IBaseService<MeterWor
 
     String subStr(String str, String flag);
 
+    RESTfulResult CopyToActual(List<String> ids, String railwayNo)throws Exception;
 }

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

@@ -1,6 +1,8 @@
 package com.steerinfo.meterwork.meterworkrailwayactualbak.service.impl;
 
 import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
+import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
+import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.mapper.MeterBaseRailwayAiweightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
 import com.steerinfo.baseinfo.meterbaserailwayweight.mapper.MeterBaseRailwayWeightMapper;
@@ -14,7 +16,9 @@ import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.meterwork.constants.DbConstants;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkcaractualbak.model.MeterWorkCarActualBak;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
+import com.steerinfo.meterwork.meterworkcaractualfirstbak.model.MeterWorkCarActualFirstBak;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.service.IMeterWorkRailwayActFirstService;
@@ -37,6 +41,7 @@ import com.steerinfo.pretrack.prerailwayscale.service.IPreRailwayScaleService;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.FieldsCollector;
+import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import io.micrometer.core.instrument.Meter;
 import org.springframework.beans.BeanUtils;
@@ -82,12 +87,21 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
     @Resource
     private MeterBaseRailwayAiweightMapper meterBaseRailwayAiweightMapper;
 
+    @Resource
+    private MeterBaseOperationLogMapper meterBaseOperationLogMapper;
+
     @Resource
     private MeterBaseRailwayWeightMapper meterBaseRailwayWeightMapper;
 
     @Resource
     private PreRailwayScaleMapper preRailwayScaleMapper;
 
+    @Resource
+    private MeterWorkRailwayActualMapper meterWorkRailwayActualMapper;
+
+    @Resource
+    private MeterWorkRailwayActFirstMapper meterWorkRailwayActFirstMapper;
+
     @Resource
     private ComBaseInfoMapper comBaseInfoMapper;
 
@@ -561,16 +575,20 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         // 毛重
         MeterWorkRailwayActFirstBak grossrow = meterWorkRailwayActFirstBakMapper.selectAndMatch(queryrow.getActualFirst1No(), predictionNo);
         grossrow.setUpdateTime(new Date());
-        grossrow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
         grossrow.setUpdateManNo(userId);
+        grossrow.setUpdateManName(userName);
+        grossrow.setNote("洁净数据匹配委托操作");
+        grossrow.setIsPreSacale("1");
         meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(grossrow);
 
         // 皮重       特殊情况：标识皮重过磅，会导致没有皮重信息，就直接跳过
         try{
             MeterWorkRailwayActFirstBak tarerow = meterWorkRailwayActFirstBakMapper.selectAndMatch(queryrow.getActualFirst2No(), predictionNo);
             tarerow.setUpdateTime(new Date());
-            tarerow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
             tarerow.setUpdateManNo(userId);
+            tarerow.setUpdateManName(userName);
+            tarerow.setNote("洁净数据匹配委托操作");
+            tarerow.setIsPreSacale("1");
             meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(tarerow);
         }catch(Exception e) {
 
@@ -597,6 +615,20 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             scale.setMeasureStationName(mwca.getNetSpot3Name());
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
         }
+
+        MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+        logModel.setId(PublicMethod.IdCreate(2));
+        logModel.setCreateManNo(userId);
+        logModel.setCreateManName(userName);
+        logModel.setCreateTime(new Date());
+        logModel.setOperationPage("轨道衡数据补录-新净重补录数据");
+        logModel.setOperationFunction("匹配委托");
+        logModel.setOperationId(mwca.getActualNo());
+        logModel.setOperationPredictionNo(predictionNo);
+        logModel.setOperationCarnNo(mwca.getRailwayNo());
+        logModel.setOperationBeforeFix(queryrow.toString());
+        logModel.setOperationAfterFix(mwca.toString());
+        meterBaseOperationLogMapper.insertSelective(logModel);
         return mwca;
     }
 
@@ -708,7 +740,6 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         if (mwcaquery == null) {
             throw new MarkerMetException(500, "不存在对应的洁净数据");
         }
-
         if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())){
             PreRailwayScale scaleTemp = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
             if(scaleTemp.getValueFlag().equals("9")) {
@@ -768,6 +799,20 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         mwca.setIsPreSacale("0");
         mwca.setUploadFlag("1");
         meterWorkRailwayActualBakMapper.updateByPrimaryKey(mwca);
+
+        MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+        logModel.setId(PublicMethod.IdCreate(2));
+        logModel.setCreateManNo(userId);
+        logModel.setCreateManName(userName);
+        logModel.setCreateTime(new Date());
+        logModel.setOperationPage("静态轨道衡-静轨净重数据维护");
+        logModel.setOperationFunction("撤销委托");
+        logModel.setOperationId(mwca.getActualNo());
+        logModel.setOperationPredictionNo(model.getPredictionNo());
+        logModel.setOperationCarnNo(mwca.getRailwayNo());
+        logModel.setOperationBeforeFix(mwcaquery.toString());
+        logModel.setOperationAfterFix(mwca.toString());
+        meterBaseOperationLogMapper.insertSelective(logModel);
         return mwca;
     }
 
@@ -1028,21 +1073,21 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
 //        List<String> list = meterWorkRailwayActualBakMapper.distinctRailwayNo(param).stream().map(MeterWorkRailwayActual::getRailwayNo).collect(Collectors.toList());
 //        return list;
 
-        String[] lcNoTemp = param.get("lcNo").toString().split(",");
-//        param.remove("lcNo");
-        param.put("lcNoTemp", lcNoTemp);
-        for (String str:
-                lcNoTemp) {
-            if(str.equals("")) {
-                param.put("lcNoNull", "1");
-                break;
-            }else {
-                param.put("lcNoNull", "");
-            }
-        }
+//        String[] lcNoTemp = param.get("lcNo").toString().split(",");
+////        param.remove("lcNo");
+//        param.put("lcNoTemp", lcNoTemp);
+//        for (String str:
+//                lcNoTemp) {
+//            if(str.equals("")) {
+//                param.put("lcNoNull", "1");
+//                break;
+//            }else {
+//                param.put("lcNoNull", "");
+//            }
+//        }
         List<String> list = new ArrayList<>();
         try{
-            list = meterWorkRailwayActualBakMapper.distinctRailwayNo(param)
+            list = meterWorkRailwayActualBakMapper.distinctRailwayNoTemp(param)
                     .stream()
                     .map(MeterWorkRailwayActualBak::getRailwayNo)
                     .distinct()
@@ -2509,7 +2554,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
 
     @Override
     public List<MeterWorkRailwayActualBak> webByLikeDesc(HashMap<String, Object> parameters) {
-        String[] lcNoTemp = parameters.get("lcNoTemp").toString().split(",");
+        String[] lcNoTemp = parameters.get("lcNoTemp")==null? "".split(","): parameters.get("lcNoTemp").toString().split(",");
         parameters.remove("lcNoTemp");
         parameters.put("lcNoTemp", lcNoTemp);
         for (String str:
@@ -2601,4 +2646,154 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         }
 
     }
+
+    @Override
+    public RESTfulResult CopyToActual(List<String> ids, String railwayNo) throws Exception{
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            for (String id : ids) {
+                //根据id获取对应的一次数据
+                MeterWorkRailwayActualBak actualBak = meterWorkRailwayActualBakMapper.selectByPrimaryKey(id);
+
+                //一次数据为空
+                if (actualBak == null) {
+                    //抛出异常
+                    //事务回滚
+                    throw new Exception("洁净数据为空");
+                }
+
+                if (!railwayNo.equals(actualBak.getRailwayNo())) {
+                    throw new Exception(id + "的车号不一致");
+                }
+
+                //判断是否符合要求
+                String note = isSuit(actualBak);
+                if (note.equals("1")) {
+                    //复制到First正式表里面
+                    MeterWorkRailwayActual actual = new MeterWorkRailwayActual();
+                    //复制一份
+                    BeanUtils.copyProperties(actualBak, actual);
+                    //修改主键
+                    actual.setActualFirst1No(actual.getActualFirst1No() + "bak");
+                    actual.setActualFirst2No(actual.getActualFirst2No() + "bak");
+                    actual.setActualNo(actual.getActualNo() + "bak");
+
+                    meterWorkRailwayActualMapper.insert(actual);
+
+                    //同时将两个一次也复制一下
+                    MeterWorkRailwayActFirstBak firstBak1 = meterWorkRailwayActFirstBakMapper.selectByPrimaryKey(actualBak.getActualFirst1No());
+                    MeterWorkRailwayActFirstBak firstBak2 = meterWorkRailwayActFirstBakMapper.selectByPrimaryKey(actualBak.getActualFirst2No());
+
+                    MeterWorkRailwayActFirst first1 = new MeterWorkRailwayActFirst();
+                    MeterWorkRailwayActFirst first2 = new MeterWorkRailwayActFirst();
+                    BeanUtils.copyProperties(firstBak1, first1);
+                    BeanUtils.copyProperties(firstBak2, first2);
+                    first1.setActualFirstNo(first1.getActualFirstNo() + "bak");
+                    first2.setActualFirstNo(first2.getActualFirstNo() + "bak");
+                    meterWorkRailwayActFirstMapper.insert(first1);
+                    meterWorkRailwayActFirstMapper.insert(first2);
+
+                    firstBak1.setValueFlag("0");
+                    firstBak2.setValueFlag("0");
+                    actualBak.setValueFlag("0");
+                    meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(firstBak1);
+                    meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(firstBak2);
+                    meterWorkRailwayActualBakMapper.updateByPrimaryKeySelective(actualBak);
+                } else {
+                    throw new Exception(note);
+                }
+            }
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("复制成功");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        }
+        return rm;
+    }
+
+        private String isSuit(MeterWorkRailwayActualBak model){
+
+            //毛重信息
+            if (model.getBaseSpot1No() == null || StringUtils.isEmpty(model.getBaseSpot1No())) {
+                return "毛重计量编号为空";
+            }
+            if (model.getBaseSpot1Name() == null || StringUtils.isEmpty(model.getBaseSpot1Name())) {
+                return "毛重计量名称为空";
+            }
+            if(model.getGrossManNo() == null || StringUtils.isEmpty(model.getGrossManNo())) {
+                return  "毛重计量员编号为空";
+            }
+            if(model.getGrossManName() == null || StringUtils.isEmpty(model.getGrossManName())) {
+                return  "毛重计量员为空";
+            }
+            if (model.getGrossTime() == null || StringUtils.isEmpty(model.getGrossTime().toString())) {
+                return "毛重时间为空";
+            }
+            if (model.getGrossWeight() == null || StringUtils.isEmpty(model.getGrossWeight().toString())) {
+                return "毛重为空";
+            }
+            //皮重信息
+            if (model.getBaseSpot2No() == null || StringUtils.isEmpty(model.getBaseSpot2No())) {
+                return "皮重计量点编号为空";
+            }
+            if (model.getBaseSpot2Name() == null || StringUtils.isEmpty(model.getBaseSpot2Name())) {
+                return "皮重计量点为空";
+            }
+            if(model.getTareManNo() == null || StringUtils.isEmpty(model.getTareManNo())) {
+                return  "皮重计量员编号为空";
+            }
+            if(model.getTareManName() == null || StringUtils.isEmpty(model.getTareManName())) {
+                return "皮重计量员名称为空";
+            }
+            if (model.getTareTime() == null || StringUtils.isEmpty(model.getTareTime().toString())) {
+                return "皮重时间为空";
+            }
+            if (model.getTareWeight() == null || StringUtils.isEmpty(model.getTareWeight().toString())) {
+                return "皮重为空";
+            }
+
+            //结净信息
+            if (model.getNetSpot3No() == null || StringUtils.isEmpty(model.getNetSpot3No())) {
+                return "净重计量点编号为空";
+            }
+            if (model.getNetSpot3Name() == null || StringUtils.isEmpty(model.getNetSpot3Name())) {
+                return "净重计量点名称为空";
+            }
+            if(model.getNetManNo() == null || StringUtils.isEmpty(model.getNetManNo())) {
+                return "净重计量员编号为空";
+            }
+            if(model.getNetManName() == null || StringUtils.isEmpty(model.getNetManName())) {
+                return  "净重计量员为空";
+            }
+            if (model.getNetTime() == null || StringUtils.isEmpty(model.getNetTime().toString())) {
+                return "净重时间为空";
+            }
+            if (model.getNetWeight() == null || StringUtils.isEmpty(model.getNetWeight().toString())) {
+                return "净重为空";
+            }
+            //创建人、创建时间
+            if(model.getCreateManName() == null || StringUtils.isEmpty(model.getCreateManName())) {
+                return  "创建人为空";
+            }
+            if (model.getCreateTime() == null || StringUtils.isEmpty(model.getCreateTime().toString())) {
+                return "创建时间为空";
+            }
+            if (model.getDataSource() == null || StringUtils.isEmpty(model.getDataSource())) {
+                return "计量数据来源为空";
+            }
+            if (model.getUploadFlag() == null || StringUtils.isEmpty(model.getUploadFlag())){
+                return "同步标志为空";
+            }
+            if (model.getValueFlag() == null || StringUtils.isEmpty(model.getValueFlag())){
+                return "数据状态为空";
+            }
+            if(model.getPredictionNo() == null){
+                return "委托编号为空";
+            }
+            return "1";
+        }
+
 }

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

@@ -7,6 +7,7 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.prerailwayscale.service.IPreRailwayScaleService;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -164,6 +165,18 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "web端--静轨一次、洁净数据界面获取委托未过期的倒序列表", notes = "不分页模糊查询")
+    @PostMapping(value = "/noPageDesc")
+    public RESTfulResult noPageDesc(@RequestBody HashMap parmas) {
+        try {
+            List<PreRailwayScale> list = preRailwayScaleService.noPageDesc(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "更新详细信息", notes = "根据url的id来指定更新对象，并根据传过来的preRailwayScale信息来更新详细信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),

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

@@ -55,4 +55,8 @@ public interface PreRailwayScaleMapper extends IBaseMapper<PreRailwayScale, Stri
     List<PreRailwayScale> likeByDesc(Map<String, Object> var1);
     List<PreRailwayScale> likeDesc(Map<String, Object> var1);
     List<PreRailwayScale> noPage(Map<String, Object> var1);
+    List<PreRailwayScale> noPageDesc(Map<String, Object> var1);
+
+    //净重数据维护界面----根据净重车号查询当前车号已匹配的委托和未使用的有效委托
+    List<PreRailwayScale> selectByScale(HashMap params);
 }

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

@@ -3096,6 +3096,25 @@
         </where>
     </select>
 
+  <select id="selectByScale" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <where> 1 = 1
+      <if test="railwayNo != null and railwayNo != ''">
+        and railway_no = #{railwayNo}
+      </if>
+
+      <if test="predictionNo != null and predictionNo != ''">
+        and (   PREDICTION_NO = #{predictionNo}
+        or (value_flag = '1' and TRUST_AVAILABILITY_TIME &gt;= SYSDATE) )
+      </if>
+      <if test="predictionNo == null or predictionNo == ''">
+        and value_flag = '1'
+        and TRUST_AVAILABILITY_TIME &gt;= SYSDATE
+      </if>
+    </where>
+    order By TRUST_DATE_TIME desc
+  </select>
+
     <select id="selectByRailwayNo" parameterType="java.lang.String" resultMap="BaseResultMap">
       <include refid="select"/>
       <where>
@@ -3134,4 +3153,46 @@
       and TRUST_AVAILABILITY_TIME >= sysDate
       order by TRUST_DATE_TIME desc
     </select>
-  </mapper>
+
+  <select id="noPageDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    <if test="railwayNo != '' and railwayNo != null">
+      and railway_No =  #{railwayNo}
+    </if>
+    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+      and FORWARDING_UNIT_NO = #{forwardingUnitNo}
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and FORWARDING_UNIT_NAME like '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintNo != null and receivingUintNo != ''">
+      and RECEIVING_UINT_NO = #{receivingUintNo}
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and RECEIVING_UINT_NAME like '%${receivingUintName}%'
+    </if>
+    <if test="materialNo != null and materialNo != ''">
+      and MATERIAL_NO = #{materialNo}
+    </if>
+    <if test="materialName != null and materialName != ''">
+      and MATERIAL_NAME like '%${materialName}%'
+    </if>
+    <if test="meterTypeNo != null and meterTypeNo != ''">
+      and METER_TYPE_NO = #{meterTypeNo}
+    </if>
+    <if test="meterTypeName != null and meterTypeName != ''">
+      and METER_TYPE_NAME = #{meterTypeName}
+    </if>
+    <if test="predictionNo != null and predictionNo != ''">
+      and prediction_no = #{predictionNo}
+    </if>
+    <if test="predictionNo == null or predictionNo == ''">
+      and value_flag in  ('0', '1') and TRUST_AVAILABILITY_TIME &gt;= SYSDATE
+    </if>
+    order By TRUST_DATE_TIME desc
+  </select>
+
+
+  </mapper>
+

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/IPreRailwayScaleService.java

@@ -49,4 +49,5 @@ public interface IPreRailwayScaleService extends IBaseService<PreRailwayScale, S
     PageList<PreRailwayScale> likeByDesc(HashMap param, Integer pageNum, Integer pageSize);
     PageList<PreRailwayScale> likeDesc(HashMap param, Integer pageNum, Integer pageSize);
     List<PreRailwayScale> noPage(HashMap param);
+    List<PreRailwayScale> noPageDesc(HashMap param);
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/impl/PreRailwayScaleServiceImpl.java

@@ -13,6 +13,7 @@ import com.steerinfo.pretrack.dto.PreRailwayScaleDto;
 import com.steerinfo.pretrack.prerailwayscale.mapper.PreRailwayScaleMapper;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.prerailwayscale.service.IPreRailwayScaleService;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.DoChinFilters;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -330,6 +331,12 @@ public class PreRailwayScaleServiceImpl extends BaseServiceImpl<PreRailwayScale,
         return rows;
     }
 
+    @Override
+    public List<PreRailwayScale> noPageDesc(HashMap param) {
+        List<PreRailwayScale> rows = preRailwayScaleMapper.noPageDesc(param);
+        return rows;
+    }
+
     @Autowired
     DataSource dataSource;
 

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.java

@@ -7,6 +7,7 @@ import feign.Param;
 import oracle.jdbc.proxy.annotation.Pre;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -40,4 +41,7 @@ public interface PreTrackScaleMapper extends IBaseMapper<PreTrackScale, String>
 
     PreTrackScale selectBypredictionNo(@Param( value = "predictionNo") String predictionNo);
     List<PreTrackScale> selectByMap(Map<String, Object> var1);
+
+    //净重数据维护界面----根据净重车号查询当前车号已匹配的委托和未使用的有效委托
+    List<PreTrackScale> selectByScale(HashMap params);
 }

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3301,6 +3301,24 @@
     </where>
   </select>
 
+  <select id="selectByScale" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <where> 1 = 1
+      <if test="carNo != null and carNo != ''">
+        and car_no = #{carNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and (   PREDICTION_NO = #{predictionNo}
+                or (value_flag = '1' and TRUST_AVAILABILITY_TIME &gt;= SYSDATE) )
+      </if>
+      <if test="predictionNo == null or predictionNo == ''">
+        and value_flag = '1'
+        and TRUST_AVAILABILITY_TIME &gt;= SYSDATE
+      </if>
+    </where>
+    order By TRUST_DATE_TIME desc
+  </select>
+
   <select id="selectByMap" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <where>