dengyj 3 سال پیش
والد
کامیت
ff7c3bc165

+ 136 - 0
src/main/java/com/steerinfo/baseinfo/meterbaseuserprintconfig/controller/MeterBaseUserPrintConfigController.java

@@ -0,0 +1,136 @@
+package com.steerinfo.baseinfo.meterbaseuserprintconfig.controller;
+
+import com.steerinfo.baseinfo.meterbaseuserprintconfig.model.MeterBaseUserPrintConfig;
+import com.steerinfo.baseinfo.meterbaseuserprintconfig.service.IMeterBaseUserPrintConfigService;
+import com.steerinfo.baseinfo.meterbaseuserspotconfig.model.MeterBaseUserSpotConfig;
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+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;
+
+/**
+ * MeterBaseUserPrintConfig RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-01-14 04:13
+ * 类描述
+ * 修订历史:
+ * 日期:2023-01-14
+ * 作者:generator
+ * 参考:
+ * 描述:MeterBaseUserPrintConfig RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbaseuserprintconfigs")
+public class MeterBaseUserPrintConfigController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseUserPrintConfigService meterBaseUserPrintConfigService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaseuserprintconfig:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseUserPrintConfig> list = meterBaseUserPrintConfigService.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("meterbaseuserprintconfig:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseUserPrintConfig> list = meterBaseUserPrintConfigService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseUserPrintConfig对象创建")
+    @ApiImplicitParam(name = "meterBaseUserPrintConfig", value = "详细实体meterBaseUserPrintConfig", required = true, dataType = "MeterBaseUserPrintConfig")
+    //@RequiresPermissions("meterbaseuserprintconfig:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterBaseUserPrintConfig model){
+        MeterBaseUserPrintConfig meterBaseUserPrintConfig = meterBaseUserPrintConfigService.add(model);
+        return success(meterBaseUserPrintConfig);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaseuserprintconfig:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseUserPrintConfig meterBaseUserPrintConfig = meterBaseUserPrintConfigService.getById(id);
+        return success(meterBaseUserPrintConfig);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的meterBaseUserPrintConfig信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseUserPrintConfig", value = "详细实体meterBaseUserPrintConfig", required = true, dataType = "MeterBaseUserPrintConfig")
+    })
+    //@RequiresPermissions("meterbaseuserprintconfig:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseUserPrintConfig model){
+        model.setId(id);
+        MeterBaseUserPrintConfig meterBaseUserPrintConfig = meterBaseUserPrintConfigService.modify(model);
+        return success(meterBaseUserPrintConfig);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaseuserprintconfig: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);
+			  meterBaseUserPrintConfigService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="根据用户ID、物料编号、发货单位、收货单位获取列表", notes="不分页模糊查询")
+    @PostMapping(value = "/noPage")
+    public RESTfulResult noPage(@RequestParam HashMap parmas){
+        List<MeterBaseUserPrintConfig> list = meterBaseUserPrintConfigService.noPage(parmas);
+        return success(list);
+    }
+
+    @ApiOperation(value="根据用户ID、物料编号、发货单位、收货单位获取列表", notes="分页模糊查询")
+    @PostMapping(value = "/likeByDesc")
+    public RESTfulResult likeByDesc(@RequestBody HashMap parmas){
+        PageList<MeterBaseUserPrintConfig> list = meterBaseUserPrintConfigService.likeByDesc(parmas);
+        return success(list);
+    }
+
+    @ApiOperation(value="根据用户、物料、发货单位、收货单位创建对象", notes="根据sso.sys_user表物料、发货单位、收货单位的id创建MeterBaseUserPrintConfig对象")
+    @PostMapping(value = "/addModel")
+    public RESTfulResult addModel(@RequestBody MeterBaseUserPrintConfig model){
+        MeterBaseUserPrintConfig meterBaseUserPrintConfig  = meterBaseUserPrintConfigService.addModel(model);
+        return success(meterBaseUserPrintConfig);
+    }
+
+    @ApiOperation(value="修改数据配置", notes="修改数据配置")
+    @PostMapping(value = "/updateModel")
+    public RESTfulResult updateModel(@RequestBody MeterBaseUserPrintConfig model){
+        MeterBaseUserPrintConfig meterBaseUserPrintConfig = meterBaseUserPrintConfigService.updateModel(model);
+        return success(meterBaseUserPrintConfig);
+    }
+}

+ 14 - 0
src/main/java/com/steerinfo/baseinfo/meterbaseuserprintconfig/mapper/MeterBaseUserPrintConfigMapper.java

@@ -0,0 +1,14 @@
+package com.steerinfo.baseinfo.meterbaseuserprintconfig.mapper;
+
+import com.steerinfo.baseinfo.meterbaseuserprintconfig.model.MeterBaseUserPrintConfig;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+@Mapper
+public interface MeterBaseUserPrintConfigMapper extends IBaseMapper<MeterBaseUserPrintConfig, String> {
+    List<MeterBaseUserPrintConfig> likeByDesc(HashMap<String, Object> params);
+}

+ 528 - 0
src/main/java/com/steerinfo/baseinfo/meterbaseuserprintconfig/mapper/MeterBaseUserPrintConfigMapper.xml

@@ -0,0 +1,528 @@
+<?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.meterbaseuserprintconfig.mapper.MeterBaseUserPrintConfigMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbaseuserprintconfig.model.MeterBaseUserPrintConfig">
+    <id column="PRINT_ID" jdbcType="VARCHAR" property="printId" />
+    <result column="USER_ID" jdbcType="VARCHAR" property="userId" />
+    <result column="USER_NAME" jdbcType="VARCHAR" property="userName" />
+    <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="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="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+  </resultMap>
+  <sql id="columns">
+    PRINT_ID, USER_ID, USER_NAME, MATTER_NO, MATTER_NAME, FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, 
+    RECEIVING_UINT_NO, RECEIVING_UINT_NAME, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, VALUE_FLAG
+  </sql>
+  <sql id="columns_alias">
+    t.PRINT_ID, t.USER_ID, t.USER_NAME, t.MATTER_NO, t.MATTER_NAME, t.FORWARDING_UNIT_NO, 
+    t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, t.CREATE_MAN_NO, 
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, 
+    t.VALUE_FLAG
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM METER_BASE_USER_PRINT_CONFIG
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM METER_BASE_USER_PRINT_CONFIG t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="printId != null and printId != ''">
+        and PRINT_ID = #{printId}
+      </if>
+      <if test="userId != null and userId != ''">
+        and USER_ID = #{userId}
+      </if>
+      <if test="userName != null and userName != ''">
+        and USER_NAME = #{userName}
+      </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="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="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="printId != null and printId != ''">
+        and PRINT_ID LIKE '%${printId}%'
+      </if>
+      <if test="userId != null and userId != ''">
+        and USER_ID LIKE '%${userId}%'
+      </if>
+      <if test="userName != null and userName != ''">
+        and USER_NAME LIKE '%${userName}%'
+      </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="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="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_USER_PRINT_CONFIG
+    where PRINT_ID = #{printId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_USER_PRINT_CONFIG
+    where 1!=1 
+      <if test="userId != null and userId != ''">
+        or USER_ID = #{userId}
+      </if>
+      <if test="userName != null and userName != ''">
+        or USER_NAME = #{userName}
+      </if>
+      <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="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="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaseuserprintconfig.model.MeterBaseUserPrintConfig">
+    insert into METER_BASE_USER_PRINT_CONFIG (PRINT_ID, USER_ID, USER_NAME, 
+      MATTER_NO, MATTER_NAME, FORWARDING_UNIT_NO, 
+      FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      VALUE_FLAG)
+    values (#{printId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
+      #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR}, #{forwardingUnitNo,jdbcType=VARCHAR}, 
+      #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR}, #{receivingUintName,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{valueFlag,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaseuserprintconfig.model.MeterBaseUserPrintConfig">
+    insert into METER_BASE_USER_PRINT_CONFIG
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="printId != null">
+        PRINT_ID,
+      </if>
+      <if test="userId != null">
+        USER_ID,
+      </if>
+      <if test="userName != null">
+        USER_NAME,
+      </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="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="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="printId != null">
+        #{printId,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        #{userName,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="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="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaseuserprintconfig.model.MeterBaseUserPrintConfig">
+    update METER_BASE_USER_PRINT_CONFIG
+    set USER_ID = #{userId,jdbcType=VARCHAR},
+      USER_NAME = #{userName,jdbcType=VARCHAR},
+      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},
+      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},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR}
+    where PRINT_ID = #{printId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaseuserprintconfig.model.MeterBaseUserPrintConfig">
+    update METER_BASE_USER_PRINT_CONFIG
+    <set>
+      <if test="userId != null">
+        USER_ID = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        USER_NAME = #{userName,jdbcType=VARCHAR},
+      </if>
+      <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="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="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where PRINT_ID = #{printId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select" />
+    where PRINT_ID = #{printId,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_USER_PRINT_CONFIG 
+      (PRINT_ID, 
+      USER_ID, USER_NAME, MATTER_NO, 
+      MATTER_NAME, FORWARDING_UNIT_NO, 
+      FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, 
+      RECEIVING_UINT_NAME, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      VALUE_FLAG)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.printId,jdbcType=VARCHAR}, 
+      #{item.userId,jdbcType=VARCHAR}, #{item.userName,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.createManNo,jdbcType=VARCHAR}, 
+      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.valueFlag,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_USER_PRINT_CONFIG
+     set
+       PRINT_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.printId,jdbcType=VARCHAR}
+       </foreach>
+       ,USER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.userId,jdbcType=VARCHAR}
+       </foreach>
+       ,USER_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.userName,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
+       </foreach>
+       ,FORWARDING_UNIT_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.forwardingUnitNo,jdbcType=VARCHAR}
+       </foreach>
+       ,FORWARDING_UNIT_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.forwardingUnitName,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVING_UINT_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.receivingUintNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVING_UINT_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.receivingUintName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRINT_ID" separator=" ">
+          when #{item.printId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+     where PRINT_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.printId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_USER_PRINT_CONFIG
+    where PRINT_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    <if test="userId != null and userId != ''">
+      and USER_ID LIKE '%${userId}%'
+    </if>
+    <if test="userName != null and userName != ''">
+      and USER_NAME LIKE '%${userName}%'
+    </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="forwardingUintName != null and forwardingUintName != ''">
+      and FORWARDING_UINT_NAME LIKE '%${forwardingUintName}%'
+    </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>
+    order by user_id desc
+  </select>
+  
+</mapper>

+ 273 - 0
src/main/java/com/steerinfo/baseinfo/meterbaseuserprintconfig/model/MeterBaseUserPrintConfig.java

@@ -0,0 +1,273 @@
+package com.steerinfo.baseinfo.meterbaseuserprintconfig.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+@ApiModel(value="null")
+public class MeterBaseUserPrintConfig implements IBasePO<String> {
+    /**
+     * 轨道衡打印配置ID(PRINT_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="轨道衡打印配置ID",required=true)
+    private String printId;
+
+    /**
+     * 用户名编号(USER_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="用户名编号",required=false)
+    private String userId;
+
+    /**
+     * 用户名(USER_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="用户名",required=false)
+    private String userName;
+
+    /**
+     * 物料编号(MATTER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料编号",required=false)
+    private String matterNo;
+
+    /**
+     * 物料(MATTER_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="物料",required=false)
+    private String matterName;
+
+    /**
+     * 发货单位编号(FORWARDING_UNIT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="发货单位编号",required=false)
+    private String forwardingUnitNo;
+
+    /**
+     * 发货单位(FORWARDING_UNIT_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="发货单位",required=false)
+    private String forwardingUnitName;
+
+    /**
+     * 收货单位编号(RECEIVING_UINT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="收货单位编号",required=false)
+    private String receivingUintNo;
+
+    /**
+     * 收货单位(RECEIVING_UINT_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="收货单位",required=false)
+    private String receivingUintName;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人名称(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人名称",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 状态(0:无效、1:有效)(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态(0:无效、1:有效)",required=false)
+    private String valueFlag;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.printId;
+    }
+
+    @Override
+    public void setId(String printId) {
+        this.printId = printId == null ? null : printId.trim();
+    }
+
+    public String getPrintId() {
+        return printId;
+    }
+
+    public void setPrintId(String printId) {
+        this.printId = printId == null ? null : printId.trim();
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId == null ? null : userId.trim();
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.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 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 getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", printId=").append(printId);
+        sb.append(", userId=").append(userId);
+        sb.append(", userName=").append(userName);
+        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(", 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(", valueFlag=").append(valueFlag);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 30 - 0
src/main/java/com/steerinfo/baseinfo/meterbaseuserprintconfig/service/IMeterBaseUserPrintConfigService.java

@@ -0,0 +1,30 @@
+package com.steerinfo.baseinfo.meterbaseuserprintconfig.service;
+
+import com.steerinfo.baseinfo.meterbaseuserprintconfig.model.MeterBaseUserPrintConfig;
+import com.steerinfo.baseinfo.meterbaseuserspotconfig.model.MeterBaseUserSpotConfig;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterBaseUserPrintConfig服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-01-14 04:13
+ * 类描述
+ * 修订历史:
+ * 日期:2023-01-14
+ * 作者:generator
+ * 参考:
+ * 描述:MeterBaseUserPrintConfig服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseUserPrintConfigService extends IBaseService<MeterBaseUserPrintConfig, String>{
+    List<MeterBaseUserPrintConfig> noPage(HashMap<String, Object> params);
+    PageList<MeterBaseUserPrintConfig> likeByDesc(HashMap<String, Object> params);
+    MeterBaseUserPrintConfig addModel(MeterBaseUserPrintConfig model);
+    MeterBaseUserPrintConfig updateModel(MeterBaseUserPrintConfig model);
+}

+ 103 - 0
src/main/java/com/steerinfo/baseinfo/meterbaseuserprintconfig/service/impl/MeterBaseUserPrintConfigServiceImpl.java

@@ -0,0 +1,103 @@
+package com.steerinfo.baseinfo.meterbaseuserprintconfig.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.db.Page;
+import com.steerinfo.baseinfo.meterbaseuserprintconfig.mapper.MeterBaseUserPrintConfigMapper;
+import com.steerinfo.baseinfo.meterbaseuserprintconfig.model.MeterBaseUserPrintConfig;
+import com.steerinfo.baseinfo.meterbaseuserprintconfig.service.IMeterBaseUserPrintConfigService;
+import com.steerinfo.baseinfo.meterbaseuserspotconfig.model.MeterBaseUserSpotConfig;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
+import com.steerinfo.util.PublicMethod;
+import okhttp3.internal.Internal;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterBaseUserPrintConfig服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-01-14 04:13
+ * 类描述
+ * 修订历史:
+ * 日期:2023-01-14
+ * 作者:generator
+ * 参考:
+ * 描述:MeterBaseUserPrintConfig服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseUserPrintConfigService")
+public class MeterBaseUserPrintConfigServiceImpl extends BaseServiceImpl<MeterBaseUserPrintConfig, String> implements IMeterBaseUserPrintConfigService {
+
+    @Autowired(required = false)
+    private MeterBaseUserPrintConfigMapper meterBaseUserPrintConfigMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseUserPrintConfig, String> getMapper() {
+        return meterBaseUserPrintConfigMapper;
+    }
+
+    @Override
+    public List<MeterBaseUserPrintConfig> noPage(HashMap<String, Object> params) {
+        List<MeterBaseUserPrintConfig> rows = meterBaseUserPrintConfigMapper.likeByDesc(params);
+        return rows;
+    }
+
+    @Override
+    public PageList<MeterBaseUserPrintConfig> likeByDesc(HashMap<String, Object> params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<MeterBaseUserPrintConfig> rows = meterBaseUserPrintConfigMapper.likeByDesc(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public MeterBaseUserPrintConfig addModel(MeterBaseUserPrintConfig model) {
+        Assert.isTrue(model != null, "用户物料收发货单位配置信息不能为空,请重试");
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setPrintId(PublicMethod.IdCreate(3));
+        model.setCreateManNo(userId);
+        model.setCreateManName(userName);
+        model.setCreateTime(new Date());
+//        model.setValueFlag("1");
+        meterBaseUserPrintConfigMapper.insert(model);
+        return model;
+    }
+
+    @Override
+    public MeterBaseUserPrintConfig updateModel(MeterBaseUserPrintConfig model) {
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setUpdateManNo(userId);
+        model.setUpdateManName(userName);
+        model.setUpdateTime(new Date());
+        meterBaseUserPrintConfigMapper.updateByPrimaryKeySelective(model);
+        return meterBaseUserPrintConfigMapper.selectByPrimaryKey(model.getPrintId());
+    }
+}

+ 86 - 85
src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -1520,99 +1520,100 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         newFirsts.add(firstCopy);
                     }
 
-
-                    for (int i = 0; i < scales.size(); i++) {
+                    if(selectedFirsts.size() == 2) {
+                        for (int i = 0; i < scales.size(); i++) {
 //                    String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
 //                    addFirsts.get(i).setActualFirstNo(actualFirstNo);
-                        String actualFirstNo = PublicMethod.IdCreate(3);
-                        addFirsts.get(i).setActualFirstNo(actualFirstNo);
-                        addFirsts.get(i).setUpdateManName("system");
-                        addFirsts.get(i).setUpdateManName("双委托结净更新");
-                        addFirsts.get(i).setUpdateTime(new Date());
-                        addFirsts.get(i).setCreateManNo(userId);
-                        addFirsts.get(i).setCreateManName(userName);
-                        addFirsts.get(i).setCreateTime(new Date());
-                        addFirsts.get(i).setValueFlag(DbConstants.NET);
-                        addFirsts.get(i).setIsPreSacale("1");
-                        addFirsts.get(i).setPredictionType("5");
-                        addFirsts.get(i).setPredictionNo(scales.get(i).getPredictionNo());
-                        addFirsts.get(i).setPredictionCombination(selectedFirsts.get(i).getPredictionNo() + "," + addFirsts.get(i).getPredictionNo());
-                        addFirsts.get(i).setCreateTime(new Date());
-                        meterWorkRailwayActFirstMapper.insertSelective(addFirsts.get(i));
-
-                        //添加第二次皮重数据库
-                        selectedFirsts.get(i).setUpdateManName("system");
-                        selectedFirsts.get(i).setUpdateManName("双委托结净更新");
-                        selectedFirsts.get(i).setUpdateTime(new Date());
-                        selectedFirsts.get(i).setValueFlag(DbConstants.NET);
-                        selectedFirsts.get(i).setIsPreSacale("1");
-                        selectedFirsts.get(i).setPredictionType("5");
-                        selectedFirsts.get(i).setPredictionNo(scales.get(i).getPredictionNo());
-                        selectedFirsts.get(i).setPredictionCombination(selectedFirsts.get(i).getPredictionNo() + "," + addFirsts.get(i).getPredictionNo());
-                        meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(selectedFirsts.get(i));
-
-                        scales.get(i).setValueFlag("2");
-                        scales.get(i).setUploadFlag("1");
-                        scales.get(i).setUpdateManName("双委托结净更新");
-                        scales.get(i).setPredictionType("5");
-                        scales.get(i).setMeasureStation(selectedFirsts.get(i).getBaseSpotNo());
-                        scales.get(i).setMeasureStationName(selectedFirsts.get(i).getBaseSpotName());
-                        preRailwayScaleMapper.updateByPrimaryKeySelective(scales.get(i));
-                    }
-
-                    for (int i = 0; i < addFirsts.size(); i++) {
-                        MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
-                        if(selectedFirsts.get(i).getMeterWeight().compareTo(addFirsts.get(i).getMeterWeight()) > 0) {
-                            doNet(actualRow, selectedFirsts.get(i), addFirsts.get(i), selectedFirsts.get(i).getPredictionNo());
-                            addFirsts.get(i).setWeightType("0");
-                            selectedFirsts.get(i).setWeightType("1");
-                            doSaveTare(selectedFirsts.get(i));
-                        }else {
-                            doNet(actualRow, addFirsts.get(i), selectedFirsts.get(i),  addFirsts.get(i).getPredictionNo());
-                            addFirsts.get(i).setWeightType("1");
-                            selectedFirsts.get(i).setWeightType("0");
-                            doSaveTare(addFirsts.get(i));
+                            String actualFirstNo = PublicMethod.IdCreate(3);
+                            addFirsts.get(i).setActualFirstNo(actualFirstNo);
+                            addFirsts.get(i).setUpdateManName("system");
+                            addFirsts.get(i).setUpdateManName("双委托结净更新");
+                            addFirsts.get(i).setUpdateTime(new Date());
+                            addFirsts.get(i).setCreateManNo(userId);
+                            addFirsts.get(i).setCreateManName(userName);
+                            addFirsts.get(i).setCreateTime(new Date());
+                            addFirsts.get(i).setValueFlag(DbConstants.NET);
+                            addFirsts.get(i).setIsPreSacale("1");
+                            addFirsts.get(i).setPredictionType("5");
+                            addFirsts.get(i).setPredictionNo(scales.get(i).getPredictionNo());
+                            addFirsts.get(i).setPredictionCombination(selectedFirsts.get(i).getPredictionNo() + "," + addFirsts.get(i).getPredictionNo());
+                            addFirsts.get(i).setCreateTime(new Date());
+                            meterWorkRailwayActFirstMapper.insertSelective(addFirsts.get(i));
+
+                            //添加第二次皮重数据库
+                            selectedFirsts.get(i).setUpdateManName("system");
+                            selectedFirsts.get(i).setUpdateManName("双委托结净更新");
+                            selectedFirsts.get(i).setUpdateTime(new Date());
+                            selectedFirsts.get(i).setValueFlag(DbConstants.NET);
+                            selectedFirsts.get(i).setIsPreSacale("1");
+                            selectedFirsts.get(i).setPredictionType("5");
+                            selectedFirsts.get(i).setPredictionNo(scales.get(i).getPredictionNo());
+                            selectedFirsts.get(i).setPredictionCombination(selectedFirsts.get(i).getPredictionNo() + "," + addFirsts.get(i).getPredictionNo());
+                            meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(selectedFirsts.get(i));
+
+                            scales.get(i).setValueFlag("2");
+                            scales.get(i).setUploadFlag("1");
+                            scales.get(i).setUpdateManName("双委托结净更新");
+                            scales.get(i).setPredictionType("5");
+                            scales.get(i).setMeasureStation(selectedFirsts.get(i).getBaseSpotNo());
+                            scales.get(i).setMeasureStationName(selectedFirsts.get(i).getBaseSpotName());
+                            preRailwayScaleMapper.updateByPrimaryKeySelective(scales.get(i));
                         }
+
+                        for (int i = 0; i < addFirsts.size(); i++) {
+                            MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
+                            if(selectedFirsts.get(i).getMeterWeight().compareTo(addFirsts.get(i).getMeterWeight()) > 0) {
+                                doNet(actualRow, selectedFirsts.get(i), addFirsts.get(i), selectedFirsts.get(i).getPredictionNo());
+                                addFirsts.get(i).setWeightType("0");
+                                selectedFirsts.get(i).setWeightType("1");
+                                doSaveTare(selectedFirsts.get(i));
+                            }else {
+                                doNet(actualRow, addFirsts.get(i), selectedFirsts.get(i),  addFirsts.get(i).getPredictionNo());
+                                addFirsts.get(i).setWeightType("1");
+                                selectedFirsts.get(i).setWeightType("0");
+                                doSaveTare(addFirsts.get(i));
+                            }
 //                    String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
 //                    actualRow.setActualNo(sdf.format(new Date()) + no);
-                        String no = PublicMethod.IdCreate(3);
-                        actualRow.setActualNo(no);
-                        actualRow.setNote("双委托匹配结净");
-                        actualRow.setNetMode("2");
-                        actualRow.setPredictionType("5");
-                        actualRow.setPredictionCombination(selectedFirsts.get(0).getPredictionNo() + "," + addFirsts.get(1).getPredictionNo());
-                        if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
-                            actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
-                            actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
-                            actualRow.setNetManNo(actualRow.getGrossManNo());
-                            actualRow.setNetManName(actualRow.getGrossManName());
-                            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());
-                            actualRow.setNetManNo(actualRow.getTareManNo());
-                            actualRow.setNetManName(actualRow.getTareManName());
-                            actualRow.setNetTime(actualRow.getTareTime());
-                            actualRow.setCreateTime(actualRow.getTareTime());
-                            actualRow.setCreateManName(actualRow.getTareManName());
-                            actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
-                        }
-                        //是否发布 ture发布,false不发布
-                        if(needUpload) {
-                            if(actualRow.getIsPreSacale() != null && actualRow.getIsPreSacale().equals("1")) {
-                                actualRow.setValueFlag("2");
-                                actualRow.setUploadFlag("1");
+                            String no = PublicMethod.IdCreate(3);
+                            actualRow.setActualNo(no);
+                            actualRow.setNote("双委托匹配结净");
+                            actualRow.setNetMode("2");
+                            actualRow.setPredictionType("5");
+                            actualRow.setPredictionCombination(selectedFirsts.get(0).getPredictionNo() + "," + addFirsts.get(1).getPredictionNo());
+                            if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                                actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                                actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                                actualRow.setNetManNo(actualRow.getGrossManNo());
+                                actualRow.setNetManName(actualRow.getGrossManName());
+                                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());
+                                actualRow.setNetManNo(actualRow.getTareManNo());
+                                actualRow.setNetManName(actualRow.getTareManName());
+                                actualRow.setNetTime(actualRow.getTareTime());
+                                actualRow.setCreateTime(actualRow.getTareTime());
+                                actualRow.setCreateManName(actualRow.getTareManName());
+                                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
+                            }
+                            //是否发布 ture发布,false不发布
+                            if(needUpload) {
+                                if(actualRow.getIsPreSacale() != null && actualRow.getIsPreSacale().equals("1")) {
+                                    actualRow.setValueFlag("2");
+                                    actualRow.setUploadFlag("1");
+                                }
                             }
+                            meterWorkRailwayActualMapper.insertSelective(actualRow);
+                            newActuals.add(actualRow);
                         }
-                        meterWorkRailwayActualMapper.insertSelective(actualRow);
-                        newActuals.add(actualRow);
+                        meterWorkRailwayActFirstMapper.batchUpdate(addFirsts);
+                        meterWorkRailwayActFirstMapper.batchUpdate(selectedFirsts);
+                        newFirsts.addAll(addFirsts);
                     }
-                    meterWorkRailwayActFirstMapper.batchUpdate(addFirsts);
-                    meterWorkRailwayActFirstMapper.batchUpdate(selectedFirsts);
-                    newFirsts.addAll(addFirsts);
                 }
             }
             map.put("firsts", newFirsts);

+ 17 - 0
src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -130,6 +130,23 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "轨道衡打印配置获取轨道衡打印数据", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkrailwayactual:view")
+    @GetMapping(value = "/railwayPrintLikeByDesc/")
+    public RESTfulResult railwayPrintLikeByDesc(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkRailwayActual> list = meterWorkRailwayActualService.railwayPrintLikeByDesc(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常!!");
+        }
+    }
+
     @ApiOperation(value = "静轨物料车型重量范围配置限制显示-获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

+ 1 - 0
src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/IMeterWorkRailwayActualService.java

@@ -99,6 +99,7 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     RESTfulResult commonRemove(HashMap map);
 
     PageList<MeterWorkRailwayActual> likeByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize);
+    PageList<MeterWorkRailwayActual> railwayPrintLikeByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize);
     //静轨物料车型重量范围配置限制显示
     PageList<MeterWorkRailwayActual> staticLimitByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize);
     //动轨物料车型重量范围配置限制显示

+ 92 - 0
src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkrailwayactual.service.impl;
 
+import cn.hutool.db.handler.HandleHelper;
 import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
 import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
 import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
@@ -8,6 +9,8 @@ import com.steerinfo.baseinfo.meterbaserailwayaiweight.mapper.MeterBaseRailwayAi
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
 import com.steerinfo.baseinfo.meterbaserailwayweight.mapper.MeterBaseRailwayWeightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayweight.model.MeterBaseRailwayWeight;
+import com.steerinfo.baseinfo.meterbaseuserprintconfig.mapper.MeterBaseUserPrintConfigMapper;
+import com.steerinfo.baseinfo.meterbaseuserprintconfig.model.MeterBaseUserPrintConfig;
 import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.mapper.MeterBaseVehicleRangeConfigMapper;
 import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
 import com.steerinfo.baseinfo.meterbasevehiclerangeprintconfig.mapper.MeterBaseVehicleRangePrintConfigMapper;
@@ -39,6 +42,7 @@ import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import io.micrometer.core.instrument.Meter;
+import org.apache.catalina.User;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -79,6 +83,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     @Resource
     private MeterWorkRailwayReceivedMapper meterWorkRailwayReceivedMapper;
 
+    @Resource
+    private MeterBaseUserPrintConfigMapper meterBaseUserPrintConfigMapper;
+
     @Resource
     private MeterWorkRailwayRecMainMapper meterWorkRailwayRecMainMapper;
 
@@ -3037,6 +3044,91 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         return pageInfo;
     }
 
+    @Override
+    public PageList<MeterWorkRailwayActual> railwayPrintLikeByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        String userId = "";
+        String userName = "";
+        try{
+            UserPayload userPayload = UserPayload.getCurrUser();
+            userId = userPayload.getUserCode();
+            userName = userPayload.getUserName();
+        }catch(Exception e) {
+            e.printStackTrace();
+            userId = "admin";
+            userName = "admins";
+        }
+        HashMap<String, Object> map = new HashMap();
+        map.put("userId", userId);
+        map.put("userName", userName);
+        List<MeterBaseUserPrintConfig> configs = meterBaseUserPrintConfigMapper.likeByDesc(map);
+        List<MeterWorkRailwayActual> rowsTemp = meterWorkRailwayActualMapper.likeByDesc(parameters);
+        List<MeterWorkRailwayActual> rows = new ArrayList<>();
+        if(rowsTemp.size() >= 1) {
+            for(MeterWorkRailwayActual model: rowsTemp) {
+                if(configs.size() >= 1) {
+                    for(MeterBaseUserPrintConfig config: configs) {
+                        //物料、发货、收货都不为空,物料、发货、收货都判断
+                        if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                            && StringUtils.isNotEmpty(config.getReceivingUintNo())){
+                            if(model.getMatterNo().equals(config.getMatterNo()) && model.getForwardingUnitNo().equals(config.getForwardingUnitNo())
+                                    && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
+                                rows.add(model);
+                            }
+                        }
+                        //物料为空、发货、收货判断
+                        if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                                && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
+                            if(model.getForwardingUnitNo().equals(config.getForwardingUnitNo())
+                                    && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
+                                rows.add(model);
+                            }
+                        }
+                        //发货为空、物料、收货判断
+                        if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
+                                && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
+                            if(model.getMatterNo().equals(config.getMatterNo())
+                                    && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
+                                rows.add(model);
+                            }
+                        }
+                        //收货为空、物料、发货判断
+                        if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                                && StringUtils.isEmpty(config.getReceivingUintNo())) {
+                            if(model.getMatterNo().equals(config.getMatterNo())
+                                    && model.getForwardingUnitNo().equals(config.getForwardingUnitNo())) {
+                                rows.add(model);
+                            }
+                        }
+                        //物料、发货都为空, 收货判断
+                        if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
+                                && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
+                            if(model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
+                                rows.add(model);
+                            }
+                        }
+                        //物料、收货都为空, 发货货判断
+                        if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                                && StringUtils.isEmpty(config.getReceivingUintNo())) {
+                            if(model.getForwardingUnitNo().equals(config.getForwardingUnitNo())) {
+                                rows.add(model);
+                            }
+                        }
+                        //发货、收货都为空, 物料判断
+                        if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
+                                && StringUtils.isEmpty(config.getReceivingUintNo())) {
+                            if(model.getMatterNo().equals(config.getMatterNo())) {
+                                rows.add(model);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Override
     public PageList<MeterWorkRailwayActual> staticLimitByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);