'提交'

src/main/java/com/steerinfo/baseinfo/meterbasehistaredata/mapper/MeterBaseHisTareDataMapper.xml

@@ -593,7 +593,7 @@
           </foreach>
         </if>
         <if test="carNo != null and carNo != ''">
-          and CAR_NO like '%${carNo}$'
+          and CAR_NO like '%${carNo}%'
         </if>
         <if test="meterWeight != null">
           and METER_WEIGHT = #{meterWeight}

src/main/java/com/steerinfo/baseinfo/meterbasematterunitmixedloadunloadtime/controller/MeterBaseMatterUnitMixedLoadUnloadTimeController.java

@@ -0,0 +1,113 @@
+package com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.controller;
+
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTime;
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTimeDeleteDto;
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.service.IMeterBaseMatterUnitMixedLoadUnloadTimeService;
+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.util.PublicMethod;
+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;
+
+/**
+ * MeterBaseMatterUnitMixedLoadUnloadTime RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-10 11:12
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-10
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseMatterUnitMixedLoadUnloadTime RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbasematterunitmixedloadunloadtimes")
+public class MeterBaseMatterUnitMixedLoadUnloadTimeController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseMatterUnitMixedLoadUnloadTimeService meterBaseMatterUnitMixedLoadUnloadTimeService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasematterunitmixedloadunloadtime:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseMatterUnitMixedLoadUnloadTime> list = meterBaseMatterUnitMixedLoadUnloadTimeService.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("meterbasematterunitmixedloadunloadtime:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseMatterUnitMixedLoadUnloadTime> list = meterBaseMatterUnitMixedLoadUnloadTimeService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseMatterUnitMixedLoadUnloadTime对象创建")
+    @ApiImplicitParam(name = "meterBaseMatterUnitMixedLoadUnloadTime", value = "详细实体meterBaseMatterUnitMixedLoadUnloadTime", required = true, dataType = "MeterBaseMatterUnitMixedLoadUnloadTime")
+    //@RequiresPermissions("meterbasematterunitmixedloadunloadtime:create")
+    @PostMapping(value = "/", produces = "application/json;charset=UTF-8")
+    public RESTfulResult add(@RequestBody MeterBaseMatterUnitMixedLoadUnloadTime model){
+        String id = PublicMethod.IdCreate(2);
+        model.setTimeNo(id);
+        return meterBaseMatterUnitMixedLoadUnloadTimeService.insertSelect(model);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasematterunitmixedloadunloadtime:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseMatterUnitMixedLoadUnloadTime meterBaseMatterUnitMixedLoadUnloadTime = meterBaseMatterUnitMixedLoadUnloadTimeService.getById(id);
+        return success(meterBaseMatterUnitMixedLoadUnloadTime);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseMatterUnitMixedLoadUnloadTime信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseMatterUnitMixedLoadUnloadTime", value = "详细实体meterBaseMatterUnitMixedLoadUnloadTime", required = true, dataType = "MeterBaseMatterUnitMixedLoadUnloadTime")
+    })
+    //@RequiresPermissions("meterbasematterunitmixedloadunloadtime:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseMatterUnitMixedLoadUnloadTime model){
+        model.setId(id);
+        int i = meterBaseMatterUnitMixedLoadUnloadTimeService.updateSelect(model);
+        return success(model);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasematterunitmixedloadunloadtime:delete")
+    @PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")//String
+    public RESTfulResult delete(@RequestBody MeterBaseMatterUnitMixedLoadUnloadTimeDeleteDto loadUnloadTimeDeleteDto){
+        MeterBaseMatterUnitMixedLoadUnloadTime meterBaseMatterUnitMixedLoadUnloadTime = new MeterBaseMatterUnitMixedLoadUnloadTime();
+        for (MeterBaseMatterUnitMixedLoadUnloadTime loadUnloadTime : loadUnloadTimeDeleteDto.getList()) {
+            meterBaseMatterUnitMixedLoadUnloadTime.setTimeNo(loadUnloadTime.getTimeNo());
+            meterBaseMatterUnitMixedLoadUnloadTime.setValidFlag("0");
+            meterBaseMatterUnitMixedLoadUnloadTime.setDeleteManName(loadUnloadTimeDeleteDto.getDeleteManName());
+            meterBaseMatterUnitMixedLoadUnloadTime.setDeleteManNo(loadUnloadTimeDeleteDto.getDeleteManNo());
+            meterBaseMatterUnitMixedLoadUnloadTime.setDeleteTime(loadUnloadTimeDeleteDto.getDeleteTime());
+            meterBaseMatterUnitMixedLoadUnloadTimeService.updateSelect(meterBaseMatterUnitMixedLoadUnloadTime);
+        }
+        return success();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasematterunitmixedloadunloadtime/mapper/MeterBaseMatterUnitMixedLoadUnloadTimeMapper.java

@@ -0,0 +1,9 @@
+package com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.mapper;
+
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTime;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterBaseMatterUnitMixedLoadUnloadTimeMapper extends IBaseMapper<MeterBaseMatterUnitMixedLoadUnloadTime, String> {
+}

src/main/java/com/steerinfo/baseinfo/meterbasematterunitmixedloadunloadtime/mapper/MeterBaseMatterUnitMixedLoadUnloadTimeMapper.xml

@@ -0,0 +1,525 @@
+<?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.meterbasematterunitmixedloadunloadtime.mapper.MeterBaseMatterUnitMixedLoadUnloadTimeMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTime">
+    <id column="TIME_NO" jdbcType="VARCHAR" property="timeNo" />
+    <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo" />
+    <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName" />
+    <result column="CUSTOMER_SUPPLIER_NO" jdbcType="VARCHAR" property="customerSupplierNo" />
+    <result column="CUSTOMER_SUPPLIER_NAME" jdbcType="VARCHAR" property="customerSupplierName" />
+    <result column="TIME_VALUE" jdbcType="DECIMAL" property="timeValue" />
+    <result column="ISLOAD_UNLOAD" jdbcType="VARCHAR" property="isloadUnload" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <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">
+    TIME_NO, MATTER_NO, MATTER_NAME, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, TIME_VALUE, 
+    ISLOAD_UNLOAD, VALID_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.TIME_NO, t.MATTER_NO, t.MATTER_NAME, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, 
+    t.TIME_VALUE, t.ISLOAD_UNLOAD, t.VALID_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_MATTER_UNIT_MIXED_LOAD_UNLOAD_TIME
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_MATTER_UNIT_MIXED_LOAD_UNLOAD_TIME t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="timeNo != null and timeNo != ''">
+        and TIME_NO = #{timeNo}
+      </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="customerSupplierNo != null and customerSupplierNo != ''">
+        and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
+      </if>
+      <if test="timeValue != null">
+        and TIME_VALUE = #{timeValue}
+      </if>
+      <if test="isloadUnload != null and isloadUnload != ''">
+        and ISLOAD_UNLOAD = #{isloadUnload}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <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="timeNo != null and timeNo != ''">
+        and TIME_NO LIKE '%${timeNo}%'
+      </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="customerSupplierNo != null and customerSupplierNo != ''">
+        and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
+      </if>
+      <if test="timeValue != null">
+        and TIME_VALUE = #{timeValue}
+      </if>
+      <if test="isloadUnload != null and isloadUnload != ''">
+        and ISLOAD_UNLOAD LIKE '%${isloadUnload}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <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_MATTER_UNIT_MIXED_LOAD_UNLOAD_TIME
+    where TIME_NO = #{timeNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_MATTER_UNIT_MIXED_LOAD_UNLOAD_TIME
+    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="customerSupplierNo != null and customerSupplierNo != ''">
+        or CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        or CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
+      </if>
+      <if test="timeValue != null">
+        or TIME_VALUE = #{timeValue}
+      </if>
+      <if test="isloadUnload != null and isloadUnload != ''">
+        or ISLOAD_UNLOAD = #{isloadUnload}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <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.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTime">
+    insert into METER_BASE_MATTER_UNIT_MIXED_LOAD_UNLOAD_TIME (TIME_NO, MATTER_NO, MATTER_NAME, 
+      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
+      TIME_VALUE, ISLOAD_UNLOAD, VALID_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 (#{timeNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR}, 
+      #{customerSupplierNo,jdbcType=VARCHAR}, #{customerSupplierName,jdbcType=VARCHAR}, 
+      #{timeValue,jdbcType=DECIMAL}, #{isloadUnload,jdbcType=VARCHAR}, #{validFlag,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.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTime">
+    insert into METER_BASE_MATTER_UNIT_MIXED_LOAD_UNLOAD_TIME
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="timeNo != null">
+        TIME_NO,
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO,
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME,
+      </if>
+      <if test="customerSupplierNo != null">
+        CUSTOMER_SUPPLIER_NO,
+      </if>
+      <if test="customerSupplierName != null">
+        CUSTOMER_SUPPLIER_NAME,
+      </if>
+      <if test="timeValue != null">
+        TIME_VALUE,
+      </if>
+      <if test="isloadUnload != null">
+        ISLOAD_UNLOAD,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <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="timeNo != null">
+        #{timeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierNo != null">
+        #{customerSupplierNo,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierName != null">
+        #{customerSupplierName,jdbcType=VARCHAR},
+      </if>
+      <if test="timeValue != null">
+        #{timeValue,jdbcType=DECIMAL},
+      </if>
+      <if test="isloadUnload != null">
+        #{isloadUnload,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <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.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTime">
+    update METER_BASE_MATTER_UNIT_MIXED_LOAD_UNLOAD_TIME
+    set MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
+      CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
+      TIME_VALUE = #{timeValue,jdbcType=DECIMAL},
+      ISLOAD_UNLOAD = #{isloadUnload,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,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 TIME_NO = #{timeNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTime">
+    update METER_BASE_MATTER_UNIT_MIXED_LOAD_UNLOAD_TIME
+    <set>
+      <if test="matterNo != null">
+        MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierNo != null">
+        CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierName != null">
+        CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
+      </if>
+      <if test="timeValue != null">
+        TIME_VALUE = #{timeValue,jdbcType=DECIMAL},
+      </if>
+      <if test="isloadUnload != null">
+        ISLOAD_UNLOAD = #{isloadUnload,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <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 TIME_NO = #{timeNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where TIME_NO = #{timeNo,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_MATTER_UNIT_MIXED_LOAD_UNLOAD_TIME 
+      (TIME_NO, 
+      MATTER_NO, MATTER_NAME, CUSTOMER_SUPPLIER_NO, 
+      CUSTOMER_SUPPLIER_NAME, TIME_VALUE, 
+      ISLOAD_UNLOAD, VALID_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.timeNo,jdbcType=VARCHAR}, 
+      #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR}, #{item.customerSupplierNo,jdbcType=VARCHAR}, 
+      #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.timeValue,jdbcType=DECIMAL}, 
+      #{item.isloadUnload,jdbcType=VARCHAR}, #{item.validFlag,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_MATTER_UNIT_MIXED_LOAD_UNLOAD_TIME
+     set
+       TIME_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.timeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
+       </foreach>
+       ,CUSTOMER_SUPPLIER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.customerSupplierNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CUSTOMER_SUPPLIER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.customerSupplierName,jdbcType=VARCHAR}
+       </foreach>
+       ,TIME_VALUE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.timeValue,jdbcType=DECIMAL}
+       </foreach>
+       ,ISLOAD_UNLOAD=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.isloadUnload,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DELETE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_NO" close="end">
+          when #{item.timeNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where TIME_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.timeNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_MATTER_UNIT_MIXED_LOAD_UNLOAD_TIME
+    where TIME_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbasematterunitmixedloadunloadtime/model/MeterBaseMatterUnitMixedLoadUnloadTime.java

@@ -0,0 +1,289 @@
+package com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="同物料发货单位混装混卸时间配置")
+public class MeterBaseMatterUnitMixedLoadUnloadTime implements IBasePO<String> {
+    /**
+     * 时间编号(TIME_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="时间编号",required=true)
+    private String timeNo;
+
+    /**
+     * 物料编号(MATTER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料编号",required=true)
+    private String matterNo;
+
+    /**
+     * 物料名称(MATTER_NAME,VARCHAR,200)
+     */
+    @ApiModelProperty(value="物料名称",required=true)
+    private String matterName;
+
+    /**
+     * 客商编号（YYYYMMDD+4位流水）(CUSTOMER_SUPPLIER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="客商编号（YYYYMMDD+4位流水）",required=true)
+    private String customerSupplierNo;
+
+    /**
+     * 客商名称(CUSTOMER_SUPPLIER_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="客商名称",required=true)
+    private String customerSupplierName;
+
+    /**
+     * 时间值，单位小时(TIME_VALUE,DECIMAL,10)
+     */
+    @ApiModelProperty(value="时间值，单位小时",required=false)
+    private BigDecimal timeValue;
+
+    /**
+     * 是否混装混卸0:混装，1:混卸(ISLOAD_UNLOAD,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否混装混卸0:混装，1:混卸",required=false)
+    private String isloadUnload;
+
+    /**
+     * 标志（0：无效；1：有效）(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="标志（0：无效；1：有效）",required=false)
+    private String validFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=true)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人姓名",required=true)
+    private String createManName;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
+    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;
+
+    /**
+     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date updateTime;
+
+    /**
+     * 删除人编号(DELETE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="删除人编号",required=false)
+    private String deleteManNo;
+
+    /**
+     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="删除人姓名",required=false)
+    private String deleteManName;
+
+    /**
+     * 删除时间（YYYY-MM-DD HH:mm:SS）(DELETE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="删除时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date deleteTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.timeNo;
+    }
+
+    @Override
+    public void setId(String timeNo) {
+        this.timeNo = timeNo == null ? null : timeNo.trim();
+    }
+
+    public String getTimeNo() {
+        return timeNo;
+    }
+
+    public void setTimeNo(String timeNo) {
+        this.timeNo = timeNo == null ? null : timeNo.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 getCustomerSupplierNo() {
+        return customerSupplierNo;
+    }
+
+    public void setCustomerSupplierNo(String customerSupplierNo) {
+        this.customerSupplierNo = customerSupplierNo == null ? null : customerSupplierNo.trim();
+    }
+
+    public String getCustomerSupplierName() {
+        return customerSupplierName;
+    }
+
+    public void setCustomerSupplierName(String customerSupplierName) {
+        this.customerSupplierName = customerSupplierName == null ? null : customerSupplierName.trim();
+    }
+
+    public BigDecimal getTimeValue() {
+        return timeValue;
+    }
+
+    public void setTimeValue(BigDecimal timeValue) {
+        this.timeValue = timeValue;
+    }
+
+    public String getIsloadUnload() {
+        return isloadUnload;
+    }
+
+    public void setIsloadUnload(String isloadUnload) {
+        this.isloadUnload = isloadUnload == null ? null : isloadUnload.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.trim();
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    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(", timeNo=").append(timeNo);
+        sb.append(", matterNo=").append(matterNo);
+        sb.append(", matterName=").append(matterName);
+        sb.append(", customerSupplierNo=").append(customerSupplierNo);
+        sb.append(", customerSupplierName=").append(customerSupplierName);
+        sb.append(", timeValue=").append(timeValue);
+        sb.append(", isloadUnload=").append(isloadUnload);
+        sb.append(", validFlag=").append(validFlag);
+        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/meterbasematterunitmixedloadunloadtime/model/MeterBaseMatterUnitMixedLoadUnloadTimeDeleteDto.java

@@ -0,0 +1,51 @@
+package com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.model;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName MDeleteDto
+ * @Description TODO
+ * @date 2023-10-11 14:50
+ * @Version 1.0
+ */
+public class MeterBaseMatterUnitMixedLoadUnloadTimeDeleteDto {
+    private List<MeterBaseMatterUnitMixedLoadUnloadTime> list;
+    private String deleteManNo;
+    private String deleteManName;
+    private Date deleteTime;
+
+    public List<MeterBaseMatterUnitMixedLoadUnloadTime> getList() {
+        return list;
+    }
+
+    public void setList(List<MeterBaseMatterUnitMixedLoadUnloadTime> list) {
+        this.list = list;
+    }
+
+    public String getDeleteManNo() {
+        return deleteManNo;
+    }
+
+    public void setDeleteManNo(String deleteManNo) {
+        this.deleteManNo = deleteManNo;
+    }
+
+    public String getDeleteManName() {
+        return deleteManName;
+    }
+
+    public void setDeleteManName(String deleteManName) {
+        this.deleteManName = deleteManName;
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasematterunitmixedloadunloadtime/service/IMeterBaseMatterUnitMixedLoadUnloadTimeService.java

@@ -0,0 +1,25 @@
+package com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.service;
+
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTime;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.IBaseService;
+
+/**
+ * MeterBaseMatterUnitMixedLoadUnloadTime服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-10 11:12
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-10
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseMatterUnitMixedLoadUnloadTime服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseMatterUnitMixedLoadUnloadTimeService extends IBaseService<MeterBaseMatterUnitMixedLoadUnloadTime, String>{
+
+    int updateSelect(MeterBaseMatterUnitMixedLoadUnloadTime model);
+
+    RESTfulResult insertSelect(MeterBaseMatterUnitMixedLoadUnloadTime model);
+}

src/main/java/com/steerinfo/baseinfo/meterbasematterunitmixedloadunloadtime/service/impl/MeterBaseMatterUnitMixedLoadUnloadTimeServiceImpl.java

@@ -0,0 +1,67 @@
+package com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.service.impl;
+
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.mapper.MeterBaseMatterUnitMixedLoadUnloadTimeMapper;
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTime;
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.service.IMeterBaseMatterUnitMixedLoadUnloadTimeService;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * MeterBaseMatterUnitMixedLoadUnloadTime服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-10 11:12
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-10
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseMatterUnitMixedLoadUnloadTime服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseMatterUnitMixedLoadUnloadTimeService")
+public class MeterBaseMatterUnitMixedLoadUnloadTimeServiceImpl extends BaseServiceImpl<MeterBaseMatterUnitMixedLoadUnloadTime, String> implements IMeterBaseMatterUnitMixedLoadUnloadTimeService {
+
+    @Autowired
+    private MeterBaseMatterUnitMixedLoadUnloadTimeMapper meterBaseMatterUnitMixedLoadUnloadTimeMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseMatterUnitMixedLoadUnloadTime, String> getMapper() {
+        return meterBaseMatterUnitMixedLoadUnloadTimeMapper;
+    }
+
+    @Override
+    public int updateSelect(MeterBaseMatterUnitMixedLoadUnloadTime model) {
+        int i = meterBaseMatterUnitMixedLoadUnloadTimeMapper.updateByPrimaryKeySelective(model);
+        return i;
+    }
+
+    @Override
+    public RESTfulResult insertSelect(MeterBaseMatterUnitMixedLoadUnloadTime model) {
+        RESTfulResult resTfulResult = new RESTfulResult();
+        HashMap <String,Object> queryCon = new HashMap<>();
+        queryCon.put("matterNo",model.getMatterNo());
+        queryCon.put("matterName",model.getMatterName());
+        queryCon.put("customerSupplierName",model.getCustomerSupplierName());
+        queryCon.put("customerSupplierNo",model.getCustomerSupplierNo());
+        queryCon.put("validFlag","1");
+        queryCon.put("isloadUnload",model.getIsloadUnload());
+        List<MeterBaseMatterUnitMixedLoadUnloadTime> lists = meterBaseMatterUnitMixedLoadUnloadTimeMapper.selectByParameters(queryCon);
+        if(lists.size()>0){
+            resTfulResult.setFailed();
+            resTfulResult.setMessage("存在相同数据！");
+            return resTfulResult;
+        }
+        int i = meterBaseMatterUnitMixedLoadUnloadTimeMapper.insertSelective(model);
+        resTfulResult.setSucceed();
+        resTfulResult.setData(model);
+        return resTfulResult;
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasescalepoint/mapper/MeterBaseScalePointMapper.xml

@@ -64,28 +64,28 @@
     <result column="USER_NAME" jdbcType="VARCHAR" property="userName" />
   </resultMap>
   <sql id="columns">
-    SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO, BASE_SPOT_NAME, WEIGH_INSTRUMENT_MODEL, 
-    WEIGH_INSTRUMENT_PARAM, MOXA_IP, MOXA_PORT, VALID_FLAG, LAST_TIME, WEIGHT_TIME, USER_NO, 
-    MONITOR_USER_NO, WEIGHT, COLLECTION_CODE, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
-    SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO, MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER, 
-    LED_WRITER, RFID_CAR, PHOTO_CAR, WGT_ERR, USER_IP, AI_WEIGHT, CAR_ERR, POWER_STATE, 
-    DVR_STATE, MOXA_STATE, PLC_STATE, LEFT_INFRARED_RAY_STATE, RIGHT_INFRARED_RAY_STATE, 
-    AMPLIFIER_STATE, LAMP_STATE, ENTRUST_STATE, VERSION, SCAN_CAR, MSG_INFO, STOP_OVER_TIME, 
-    VALID_IS_PRE, RED_GREEN_LIGHT_STATE, FRONT_INFRARED_RAY_STATE, REAR_INFRARED_RAY_STATE, 
+    SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO, BASE_SPOT_NAME, WEIGH_INSTRUMENT_MODEL,
+    WEIGH_INSTRUMENT_PARAM, MOXA_IP, MOXA_PORT, VALID_FLAG, LAST_TIME, WEIGHT_TIME, USER_NO,
+    MONITOR_USER_NO, WEIGHT, COLLECTION_CODE, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
+    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
+    SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO, MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER,
+    LED_WRITER, RFID_CAR, PHOTO_CAR, WGT_ERR, USER_IP, AI_WEIGHT, CAR_ERR, POWER_STATE,
+    DVR_STATE, MOXA_STATE, PLC_STATE, LEFT_INFRARED_RAY_STATE, RIGHT_INFRARED_RAY_STATE,
+    AMPLIFIER_STATE, LAMP_STATE, ENTRUST_STATE, VERSION, SCAN_CAR, MSG_INFO, STOP_OVER_TIME,
+    VALID_IS_PRE, RED_GREEN_LIGHT_STATE, FRONT_INFRARED_RAY_STATE, REAR_INFRARED_RAY_STATE,
     RFID_STATE, ZERO_STATE, AUTOSCALE_IP, PLC_IP, DVR_IP, USER_NAME
   </sql>
   <sql id="columns_alias">
-    t.SCALE_POINT_NO, t.SCALE_POINT_NAME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.WEIGH_INSTRUMENT_MODEL, 
-    t.WEIGH_INSTRUMENT_PARAM, t.MOXA_IP, t.MOXA_PORT, t.VALID_FLAG, t.LAST_TIME, t.WEIGHT_TIME, 
-    t.USER_NO, t.MONITOR_USER_NO, t.WEIGHT, t.COLLECTION_CODE, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, 
-    t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, 
-    t.DELETE_MAN_NAME, t.DELETE_TIME, t.SPOT_TYPE_NO, t.SPOT_TYPE_NAME, t.WEIGHT_ZERO, 
-    t.MONITOR_USER_IP, t.IS_HELP, t.IS_TAKE_OVER, t.LED_WRITER, t.RFID_CAR, t.PHOTO_CAR, 
-    t.WGT_ERR, t.USER_IP, t.AI_WEIGHT, t.CAR_ERR, t.POWER_STATE, t.DVR_STATE, t.MOXA_STATE, 
-    t.PLC_STATE, t.LEFT_INFRARED_RAY_STATE, t.RIGHT_INFRARED_RAY_STATE, t.AMPLIFIER_STATE, 
-    t.LAMP_STATE, t.ENTRUST_STATE, t.VERSION, t.SCAN_CAR, t.MSG_INFO, t.STOP_OVER_TIME, 
-    t.VALID_IS_PRE, t.RED_GREEN_LIGHT_STATE, t.FRONT_INFRARED_RAY_STATE, t.REAR_INFRARED_RAY_STATE, 
+    t.SCALE_POINT_NO, t.SCALE_POINT_NAME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.WEIGH_INSTRUMENT_MODEL,
+    t.WEIGH_INSTRUMENT_PARAM, t.MOXA_IP, t.MOXA_PORT, t.VALID_FLAG, t.LAST_TIME, t.WEIGHT_TIME,
+    t.USER_NO, t.MONITOR_USER_NO, t.WEIGHT, t.COLLECTION_CODE, t.CREATE_MAN_NO, t.CREATE_MAN_NAME,
+    t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO,
+    t.DELETE_MAN_NAME, t.DELETE_TIME, t.SPOT_TYPE_NO, t.SPOT_TYPE_NAME, t.WEIGHT_ZERO,
+    t.MONITOR_USER_IP, t.IS_HELP, t.IS_TAKE_OVER, t.LED_WRITER, t.RFID_CAR, t.PHOTO_CAR,
+    t.WGT_ERR, t.USER_IP, t.AI_WEIGHT, t.CAR_ERR, t.POWER_STATE, t.DVR_STATE, t.MOXA_STATE,
+    t.PLC_STATE, t.LEFT_INFRARED_RAY_STATE, t.RIGHT_INFRARED_RAY_STATE, t.AMPLIFIER_STATE,
+    t.LAMP_STATE, t.ENTRUST_STATE, t.VERSION, t.SCAN_CAR, t.MSG_INFO, t.STOP_OVER_TIME,
+    t.VALID_IS_PRE, t.RED_GREEN_LIGHT_STATE, t.FRONT_INFRARED_RAY_STATE, t.REAR_INFRARED_RAY_STATE,
     t.RFID_STATE, t.ZERO_STATE, t.AUTOSCALE_IP, t.PLC_IP, t.DVR_IP, t.USER_NAME
   </sql>
   <sql id="select">
@@ -95,7 +95,7 @@
     SELECT <include refid="columns_alias" /> FROM METER_BASE_SCALE_POINT t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="scalePointNo != null and scalePointNo != ''">
         and SCALE_POINT_NO = #{scalePointNo}
       </if>
@@ -279,7 +279,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="scalePointNo != null and scalePointNo != ''">
         and SCALE_POINT_NO LIKE '%${scalePointNo}%'
       </if>
@@ -468,7 +468,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_BASE_SCALE_POINT
-    where 1!=1 
+    where 1!=1
       <if test="scalePointName != null and scalePointName != ''">
         or SCALE_POINT_NAME = #{scalePointName}
       </if>
@@ -648,47 +648,47 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
-    insert into METER_BASE_SCALE_POINT (SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO, 
-      BASE_SPOT_NAME, WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM, 
-      MOXA_IP, MOXA_PORT, VALID_FLAG, 
-      LAST_TIME, WEIGHT_TIME, USER_NO, 
-      MONITOR_USER_NO, WEIGHT, COLLECTION_CODE, 
-      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
-      SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO, 
-      MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER, 
-      LED_WRITER, RFID_CAR, PHOTO_CAR, 
-      WGT_ERR, USER_IP, AI_WEIGHT, 
-      CAR_ERR, POWER_STATE, DVR_STATE, 
-      MOXA_STATE, PLC_STATE, LEFT_INFRARED_RAY_STATE, 
-      RIGHT_INFRARED_RAY_STATE, AMPLIFIER_STATE, 
-      LAMP_STATE, ENTRUST_STATE, VERSION, 
-      SCAN_CAR, MSG_INFO, STOP_OVER_TIME, 
-      VALID_IS_PRE, RED_GREEN_LIGHT_STATE, FRONT_INFRARED_RAY_STATE, 
-      REAR_INFRARED_RAY_STATE, RFID_STATE, ZERO_STATE, 
-      AUTOSCALE_IP, PLC_IP, DVR_IP, 
+    insert into METER_BASE_SCALE_POINT (SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO,
+      BASE_SPOT_NAME, WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM,
+      MOXA_IP, MOXA_PORT, VALID_FLAG,
+      LAST_TIME, WEIGHT_TIME, USER_NO,
+      MONITOR_USER_NO, WEIGHT, COLLECTION_CODE,
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
+      SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO,
+      MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER,
+      LED_WRITER, RFID_CAR, PHOTO_CAR,
+      WGT_ERR, USER_IP, AI_WEIGHT,
+      CAR_ERR, POWER_STATE, DVR_STATE,
+      MOXA_STATE, PLC_STATE, LEFT_INFRARED_RAY_STATE,
+      RIGHT_INFRARED_RAY_STATE, AMPLIFIER_STATE,
+      LAMP_STATE, ENTRUST_STATE, VERSION,
+      SCAN_CAR, MSG_INFO, STOP_OVER_TIME,
+      VALID_IS_PRE, RED_GREEN_LIGHT_STATE, FRONT_INFRARED_RAY_STATE,
+      REAR_INFRARED_RAY_STATE, RFID_STATE, ZERO_STATE,
+      AUTOSCALE_IP, PLC_IP, DVR_IP,
       USER_NAME)
-    values (#{scalePointNo,jdbcType=VARCHAR}, #{scalePointName,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, 
-      #{baseSpotName,jdbcType=VARCHAR}, #{weighInstrumentModel,jdbcType=VARCHAR}, #{weighInstrumentParam,jdbcType=VARCHAR}, 
-      #{moxaIp,jdbcType=VARCHAR}, #{moxaPort,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, 
-      #{lastTime,jdbcType=TIMESTAMP}, #{weightTime,jdbcType=TIMESTAMP}, #{userNo,jdbcType=VARCHAR}, 
-      #{monitorUserNo,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL}, #{collectionCode,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}, 
-      #{spotTypeNo,jdbcType=VARCHAR}, #{spotTypeName,jdbcType=VARCHAR}, #{weightZero,jdbcType=DECIMAL}, 
-      #{monitorUserIp,jdbcType=VARCHAR}, #{isHelp,jdbcType=VARCHAR}, #{isTakeOver,jdbcType=VARCHAR}, 
-      #{ledWriter,jdbcType=VARCHAR}, #{rfidCar,jdbcType=VARCHAR}, #{photoCar,jdbcType=VARCHAR}, 
-      #{wgtErr,jdbcType=VARCHAR}, #{userIp,jdbcType=VARCHAR}, #{aiWeight,jdbcType=VARCHAR}, 
-      #{carErr,jdbcType=VARCHAR}, #{powerState,jdbcType=VARCHAR}, #{dvrState,jdbcType=VARCHAR}, 
-      #{moxaState,jdbcType=VARCHAR}, #{plcState,jdbcType=VARCHAR}, #{leftInfraredRayState,jdbcType=VARCHAR}, 
-      #{rightInfraredRayState,jdbcType=VARCHAR}, #{amplifierState,jdbcType=VARCHAR}, 
-      #{lampState,jdbcType=VARCHAR}, #{entrustState,jdbcType=VARCHAR}, #{version,jdbcType=DECIMAL}, 
-      #{scanCar,jdbcType=VARCHAR}, #{msgInfo,jdbcType=VARCHAR}, #{stopOverTime,jdbcType=VARCHAR}, 
-      #{validIsPre,jdbcType=VARCHAR}, #{redGreenLightState,jdbcType=VARCHAR}, #{frontInfraredRayState,jdbcType=VARCHAR}, 
-      #{rearInfraredRayState,jdbcType=VARCHAR}, #{rfidState,jdbcType=VARCHAR}, #{zeroState,jdbcType=VARCHAR}, 
-      #{autoscaleIp,jdbcType=VARCHAR}, #{plcIp,jdbcType=VARCHAR}, #{dvrIp,jdbcType=VARCHAR}, 
+    values (#{scalePointNo,jdbcType=VARCHAR}, #{scalePointName,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR},
+      #{baseSpotName,jdbcType=VARCHAR}, #{weighInstrumentModel,jdbcType=VARCHAR}, #{weighInstrumentParam,jdbcType=VARCHAR},
+      #{moxaIp,jdbcType=VARCHAR}, #{moxaPort,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR},
+      #{lastTime,jdbcType=TIMESTAMP}, #{weightTime,jdbcType=TIMESTAMP}, #{userNo,jdbcType=VARCHAR},
+      #{monitorUserNo,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL}, #{collectionCode,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},
+      #{spotTypeNo,jdbcType=VARCHAR}, #{spotTypeName,jdbcType=VARCHAR}, #{weightZero,jdbcType=DECIMAL},
+      #{monitorUserIp,jdbcType=VARCHAR}, #{isHelp,jdbcType=VARCHAR}, #{isTakeOver,jdbcType=VARCHAR},
+      #{ledWriter,jdbcType=VARCHAR}, #{rfidCar,jdbcType=VARCHAR}, #{photoCar,jdbcType=VARCHAR},
+      #{wgtErr,jdbcType=VARCHAR}, #{userIp,jdbcType=VARCHAR}, #{aiWeight,jdbcType=VARCHAR},
+      #{carErr,jdbcType=VARCHAR}, #{powerState,jdbcType=VARCHAR}, #{dvrState,jdbcType=VARCHAR},
+      #{moxaState,jdbcType=VARCHAR}, #{plcState,jdbcType=VARCHAR}, #{leftInfraredRayState,jdbcType=VARCHAR},
+      #{rightInfraredRayState,jdbcType=VARCHAR}, #{amplifierState,jdbcType=VARCHAR},
+      #{lampState,jdbcType=VARCHAR}, #{entrustState,jdbcType=VARCHAR}, #{version,jdbcType=DECIMAL},
+      #{scanCar,jdbcType=VARCHAR}, #{msgInfo,jdbcType=VARCHAR}, #{stopOverTime,jdbcType=VARCHAR},
+      #{validIsPre,jdbcType=VARCHAR}, #{redGreenLightState,jdbcType=VARCHAR}, #{frontInfraredRayState,jdbcType=VARCHAR},
+      #{rearInfraredRayState,jdbcType=VARCHAR}, #{rfidState,jdbcType=VARCHAR}, #{zeroState,jdbcType=VARCHAR},
+      #{autoscaleIp,jdbcType=VARCHAR}, #{plcIp,jdbcType=VARCHAR}, #{dvrIp,jdbcType=VARCHAR},
       #{userName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
@@ -1317,55 +1317,55 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_BASE_SCALE_POINT 
-      (SCALE_POINT_NO, 
-      SCALE_POINT_NAME, BASE_SPOT_NO, BASE_SPOT_NAME, 
-      WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM, 
-      MOXA_IP, MOXA_PORT, VALID_FLAG, 
-      LAST_TIME, WEIGHT_TIME, USER_NO, 
-      MONITOR_USER_NO, WEIGHT, COLLECTION_CODE, 
-      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
-      SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO, 
-      MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER, 
-      LED_WRITER, RFID_CAR, PHOTO_CAR, 
-      WGT_ERR, USER_IP, AI_WEIGHT, 
-      CAR_ERR, POWER_STATE, DVR_STATE, 
-      MOXA_STATE, PLC_STATE, LEFT_INFRARED_RAY_STATE, 
-      RIGHT_INFRARED_RAY_STATE, AMPLIFIER_STATE, 
-      LAMP_STATE, ENTRUST_STATE, VERSION, 
-      SCAN_CAR, MSG_INFO, STOP_OVER_TIME, 
-      VALID_IS_PRE, RED_GREEN_LIGHT_STATE, 
-      FRONT_INFRARED_RAY_STATE, REAR_INFRARED_RAY_STATE, 
-      RFID_STATE, ZERO_STATE, AUTOSCALE_IP, 
+    insert into METER_BASE_SCALE_POINT
+      (SCALE_POINT_NO,
+      SCALE_POINT_NAME, BASE_SPOT_NO, BASE_SPOT_NAME,
+      WEIGH_INSTRUMENT_MODEL, WEIGH_INSTRUMENT_PARAM,
+      MOXA_IP, MOXA_PORT, VALID_FLAG,
+      LAST_TIME, WEIGHT_TIME, USER_NO,
+      MONITOR_USER_NO, WEIGHT, COLLECTION_CODE,
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
+      SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO,
+      MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER,
+      LED_WRITER, RFID_CAR, PHOTO_CAR,
+      WGT_ERR, USER_IP, AI_WEIGHT,
+      CAR_ERR, POWER_STATE, DVR_STATE,
+      MOXA_STATE, PLC_STATE, LEFT_INFRARED_RAY_STATE,
+      RIGHT_INFRARED_RAY_STATE, AMPLIFIER_STATE,
+      LAMP_STATE, ENTRUST_STATE, VERSION,
+      SCAN_CAR, MSG_INFO, STOP_OVER_TIME,
+      VALID_IS_PRE, RED_GREEN_LIGHT_STATE,
+      FRONT_INFRARED_RAY_STATE, REAR_INFRARED_RAY_STATE,
+      RFID_STATE, ZERO_STATE, AUTOSCALE_IP,
       PLC_IP, DVR_IP, USER_NAME
       )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.scalePointNo,jdbcType=VARCHAR}, 
-      #{item.scalePointName,jdbcType=VARCHAR}, #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, 
-      #{item.weighInstrumentModel,jdbcType=VARCHAR}, #{item.weighInstrumentParam,jdbcType=VARCHAR}, 
-      #{item.moxaIp,jdbcType=VARCHAR}, #{item.moxaPort,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, 
-      #{item.lastTime,jdbcType=TIMESTAMP}, #{item.weightTime,jdbcType=TIMESTAMP}, #{item.userNo,jdbcType=VARCHAR}, 
-      #{item.monitorUserNo,jdbcType=VARCHAR}, #{item.weight,jdbcType=DECIMAL}, #{item.collectionCode,jdbcType=VARCHAR}, 
-      #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, 
-      #{item.spotTypeNo,jdbcType=VARCHAR}, #{item.spotTypeName,jdbcType=VARCHAR}, #{item.weightZero,jdbcType=DECIMAL}, 
-      #{item.monitorUserIp,jdbcType=VARCHAR}, #{item.isHelp,jdbcType=VARCHAR}, #{item.isTakeOver,jdbcType=VARCHAR}, 
-      #{item.ledWriter,jdbcType=VARCHAR}, #{item.rfidCar,jdbcType=VARCHAR}, #{item.photoCar,jdbcType=VARCHAR}, 
-      #{item.wgtErr,jdbcType=VARCHAR}, #{item.userIp,jdbcType=VARCHAR}, #{item.aiWeight,jdbcType=VARCHAR}, 
-      #{item.carErr,jdbcType=VARCHAR}, #{item.powerState,jdbcType=VARCHAR}, #{item.dvrState,jdbcType=VARCHAR}, 
-      #{item.moxaState,jdbcType=VARCHAR}, #{item.plcState,jdbcType=VARCHAR}, #{item.leftInfraredRayState,jdbcType=VARCHAR}, 
-      #{item.rightInfraredRayState,jdbcType=VARCHAR}, #{item.amplifierState,jdbcType=VARCHAR}, 
-      #{item.lampState,jdbcType=VARCHAR}, #{item.entrustState,jdbcType=VARCHAR}, #{item.version,jdbcType=DECIMAL}, 
-      #{item.scanCar,jdbcType=VARCHAR}, #{item.msgInfo,jdbcType=VARCHAR}, #{item.stopOverTime,jdbcType=VARCHAR}, 
-      #{item.validIsPre,jdbcType=VARCHAR}, #{item.redGreenLightState,jdbcType=VARCHAR}, 
-      #{item.frontInfraredRayState,jdbcType=VARCHAR}, #{item.rearInfraredRayState,jdbcType=VARCHAR}, 
-      #{item.rfidState,jdbcType=VARCHAR}, #{item.zeroState,jdbcType=VARCHAR}, #{item.autoscaleIp,jdbcType=VARCHAR}, 
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.scalePointNo,jdbcType=VARCHAR},
+      #{item.scalePointName,jdbcType=VARCHAR}, #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR},
+      #{item.weighInstrumentModel,jdbcType=VARCHAR}, #{item.weighInstrumentParam,jdbcType=VARCHAR},
+      #{item.moxaIp,jdbcType=VARCHAR}, #{item.moxaPort,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR},
+      #{item.lastTime,jdbcType=TIMESTAMP}, #{item.weightTime,jdbcType=TIMESTAMP}, #{item.userNo,jdbcType=VARCHAR},
+      #{item.monitorUserNo,jdbcType=VARCHAR}, #{item.weight,jdbcType=DECIMAL}, #{item.collectionCode,jdbcType=VARCHAR},
+      #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP},
+      #{item.spotTypeNo,jdbcType=VARCHAR}, #{item.spotTypeName,jdbcType=VARCHAR}, #{item.weightZero,jdbcType=DECIMAL},
+      #{item.monitorUserIp,jdbcType=VARCHAR}, #{item.isHelp,jdbcType=VARCHAR}, #{item.isTakeOver,jdbcType=VARCHAR},
+      #{item.ledWriter,jdbcType=VARCHAR}, #{item.rfidCar,jdbcType=VARCHAR}, #{item.photoCar,jdbcType=VARCHAR},
+      #{item.wgtErr,jdbcType=VARCHAR}, #{item.userIp,jdbcType=VARCHAR}, #{item.aiWeight,jdbcType=VARCHAR},
+      #{item.carErr,jdbcType=VARCHAR}, #{item.powerState,jdbcType=VARCHAR}, #{item.dvrState,jdbcType=VARCHAR},
+      #{item.moxaState,jdbcType=VARCHAR}, #{item.plcState,jdbcType=VARCHAR}, #{item.leftInfraredRayState,jdbcType=VARCHAR},
+      #{item.rightInfraredRayState,jdbcType=VARCHAR}, #{item.amplifierState,jdbcType=VARCHAR},
+      #{item.lampState,jdbcType=VARCHAR}, #{item.entrustState,jdbcType=VARCHAR}, #{item.version,jdbcType=DECIMAL},
+      #{item.scanCar,jdbcType=VARCHAR}, #{item.msgInfo,jdbcType=VARCHAR}, #{item.stopOverTime,jdbcType=VARCHAR},
+      #{item.validIsPre,jdbcType=VARCHAR}, #{item.redGreenLightState,jdbcType=VARCHAR},
+      #{item.frontInfraredRayState,jdbcType=VARCHAR}, #{item.rearInfraredRayState,jdbcType=VARCHAR},
+      #{item.rfidState,jdbcType=VARCHAR}, #{item.zeroState,jdbcType=VARCHAR}, #{item.autoscaleIp,jdbcType=VARCHAR},
       #{item.plcIp,jdbcType=VARCHAR}, #{item.dvrIp,jdbcType=VARCHAR}, #{item.userName,jdbcType=VARCHAR}
-       from dual  
+       from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -1611,14 +1611,14 @@
        <foreach close="end" collection="list" index="index" item="item" open="case SCALE_POINT_NO" separator=" ">
           when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.userName,jdbcType=VARCHAR}
        </foreach>
-     where SCALE_POINT_NO in 
+     where SCALE_POINT_NO in
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.scalePointNo,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_BASE_SCALE_POINT
-    where SCALE_POINT_NO in 
+    where SCALE_POINT_NO in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -1827,4 +1827,4 @@
       </if>
     </where>
   </select>
-</mapper>
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/service/impl/MeterBaseTermTareDataServiceImpl.java

@@ -668,7 +668,7 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String afl = formatter.format(new Date());
         String no = meterMonitorNoteMapper.getNewID(afl);
-        note.setNoteNo(afl+no);
+        note.setNoteNo(PublicMethod.IdCreate(3));
         meterMonitorNoteMapper.insert(note);
         return note.getNoteNo();
     }
@@ -719,7 +719,7 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
         }
         MeterBaseHisTareDetail mbhtd = new MeterBaseHisTareDetail();
         String no = meterBaseHisTareDetailMapper.getNewID(afl);
-        mbhtd.setDetailNo(afl + no);
+        mbhtd.setDetailNo(PublicMethod.IdCreate(3));
         mbhtd.setActualFirstNo(oci.getDataNo()); //期限皮重主键
         mbhtd.setBaseSpotNo(oci.getBaseSpotNo());
         mbhtd.setBaseSpotName(oci.getBaseSpotName());

src/main/java/com/steerinfo/filter/SecurityFilter.java

@@ -53,7 +53,7 @@ public class SecurityFilter implements Filter {
         //本地：http://10.104.4.105:9004/v1/meterbasecars/applogin
         if(request.getRemoteAddr().equals("10.1.201.188")
                 ||request.getRemoteAddr().equals("10.104.4.105")
-                ||request.getRemoteAddr().equals("127.0.0.1")
+                //||request.getRemoteAddr().equals("127.0.0.1")
                 ||request.getRemoteAddr().equals("0:0:0:0:0:0:0:1")
                 ||request.getRemoteAddr().equals("10.104.0.1")
             ) {

src/main/java/com/steerinfo/metermonitor/metermonitornote/mapper/MeterMonitorNoteMapper.java

@@ -31,4 +31,4 @@ public interface MeterMonitorNoteMapper extends IBaseMapper<MeterMonitorNote, St
     List<MeterMonitorNote> countResetCar(Map<String, Object> params);
     List<MeterMonitorNote> allStateView(Map<String, Object> params);
     List<MeterMonitorNote> resetCarView(Map<String, Object> params);
-}
+}

src/main/java/com/steerinfo/metermonitor/metermonitornote/service/impl/MeterMonitorNoteServiceImpl.java

@@ -9,6 +9,7 @@ import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.metermonitor.metermonitornote.service.IMeterMonitorNoteService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
+import com.steerinfo.util.PublicMethod;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -91,7 +92,7 @@ public class MeterMonitorNoteServiceImpl extends BaseServiceImpl<MeterMonitorNot
             SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
             String afl = formatter.format(new Date());
             String no = meterMonitorNoteMapper.getNewID(afl);
-            model.setNoteNo(afl+no);
+            model.setNoteNo(PublicMethod.IdCreate(3));
             meterMonitorNoteMapper.insertSelective(model);
             return model.getNoteNo();
         }catch (MarkerMetException e){

src/main/java/com/steerinfo/meterwork/constants/DbTableName.java

@@ -7,6 +7,6 @@ package com.steerinfo.meterwork.constants;
  * @Date 2020/9/12
  * @Version V1.0
  */
-public class DbTableName {
+public class DbTableName { 
 
 }

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

@@ -3850,8 +3850,8 @@
     <if test="dataSource != null and dataSource != null">
       and  data_source = '${dataSource}'
     </if>
-    <if test="valueFlag != null and valueFlag != null">
-      and  value_flag = '${valueFlag}'
+    <if test="valueFlag != null and valueFlag != ''">
+      and  value_flag = #{valueFlag}
     </if>
     <if test="carNo != null and carNo != null">
       and  CAR_NO like '%${carNo}%'
@@ -3868,8 +3868,8 @@
     <if test="netSpot3Name != null and netSpot3Name != ''">
       and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
     </if>
-    <if test="isPreScale != null and isPreScale != null">
-      and  is_pre_scale like '%${isPreScale}%'
+    <if test="isPreScale != null and isPreScale != ''">
+      and  is_pre_scale = #{isPreScale}
     </if>
 
     order by net_time desc
@@ -4071,7 +4071,7 @@
         and NET_MODE LIKE '%${netMode}%'
       </if>
       <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG LIKE '%${valueFlag}%'
+        and VALUE_FLAG = #{valueFlag}
       </if>
       <if test="uploadFlag != null and uploadFlag != ''">
         and UPLOAD_FLAG LIKE '%${uploadFlag}%'
@@ -4221,7 +4221,7 @@
         and DATA_SOURCE LIKE '%${dataSource}%'
       </if>
       <if test="isPreScale != null and isPreScale != ''">
-        and IS_PRE_SCALE LIKE '%${isPreScale}%'
+        and IS_PRE_SCALE = #{isPreScale}
       </if>
     </where>
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
@@ -4683,13 +4683,13 @@
       and  A.net_spot3_name like '%${baseSpotName}%'
     </if>
     <if test="valueFlag != null and valueFlag != ''">
-      and  A.value_flag like '%${valueFlag}%'
+      and  A.value_flag = #{valueFlag}
     </if>
     <if test="validFlag != null and validFlag != ''">
       and  A.value_flag != '0'
     </if>
     <if test="isPreScale != null and isPreScale != ''">
-      and  A.is_pre_scale like '%${isPreScale}%'
+      and  A.is_pre_scale = #{isPreScale}
     </if>
     group by A.net_spot3_no,
     A.net_spot3_name,

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

@@ -1404,7 +1404,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             rm.setMessage("操作成功！！");
             return rm;
         }
-        return null;
+        return rm;
     }
 
     @Override

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

@@ -193,6 +193,22 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @PostMapping(value = "/likeByValueFlagNoPage/")
+    public RESTfulResult likeByValueFlagNoPage(@RequestBody HashMap params) {
+        try {
+            List<MeterWorkCarActualBak> list = meterWorkCarActualBakService.likeByDescNoPage(params);
+            return success(new PageList<>(list));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -869,7 +885,7 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
     public RESTfulResult supplementaryData(@RequestBody HashMap map) {
         RESTfulResult rm = failed();
         try {
-            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss");
+            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             String grossTimeTemp = map.get("grossTime").toString().replaceAll("-", "/");
             String tareTimeTemp = map.get("tareTime").toString().replaceAll("-", "/");
             String netTimeTemp = map.get("netTime").toString().replaceAll("-", "/");
@@ -907,6 +923,53 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value = "汽车衡净重数据补录批量导入", notes = "根据MeterWorkCarActual对象创建")
+    @PostMapping(value = "/supplementaryDataExport")
+    @Transactional
+    public RESTfulResult supplementaryDataExport(@RequestBody List<HashMap> list) {
+        RESTfulResult rm = failed();
+        try {
+            for (HashMap map : list) {
+                SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+                String grossTimeTemp = map.get("grossTime").toString().replaceAll("-", "/");
+                String tareTimeTemp = map.get("tareTime").toString().replaceAll("-", "/");
+                String netTimeTemp = map.get("netTime").toString().replaceAll("-", "/");
+
+                Date grossTime = simpleFormat.parse(grossTimeTemp);
+                Date tareTime = simpleFormat.parse(tareTimeTemp);
+                Date netTime = simpleFormat.parse(netTimeTemp);
+
+                MeterWorkCarActualBak model = new MeterWorkCarActualBak();
+                if(map.get("predictionNo") != null) {
+                    model.setPredictionNo(map.get("predictionNo").toString());
+                }
+                model.setBaseSpot1No(map.get("baseSpot1No").toString());
+                model.setBaseSpot1Name(map.get("baseSpot1Name").toString());
+                model.setGrossManNo(map.get("grossManNo").toString());
+                model.setGrossManName(map.get("grossManName").toString());
+                model.setGrossTime(grossTime);
+                model.setTareTime(tareTime);
+                model.setNetTime(netTime);
+                model.setBaseSpot2No(map.get("baseSpot2No").toString());
+                model.setBaseSpot2Name(map.get("baseSpot2Name").toString());
+                model.setCarNo(map.get("carNo").toString());
+                model.setGrossWeight(new BigDecimal(map.get("grossWeight").toString()));
+                model.setTareWeight(new BigDecimal(map.get("tareWeight").toString()));
+                rm = meterWorkCarActualBakService.supplementaryData(model);
+            }
+
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "根据实绩id获取一次计量信息和委托信息", notes = "根据实绩id获取一次计量信息和委托信息")
     @PostMapping(value = "/firstAndEntrustById")
     public RESTfulResult firstAndEntrustById(@RequestBody HashMap params) {

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

@@ -103,4 +103,6 @@ public interface IMeterWorkCarActualBakService extends IBaseService<MeterWorkCar
 
     //外进外发车辆复制到一次表
     void wwCopyToActual(List<String> ids,String carNo) throws Exception;
+
+    List<MeterWorkCarActualBak> likeByDescNoPage(HashMap params);
 }

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

@@ -1038,7 +1038,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             rm.setMessage("操作成功！！");
             return rm;
         }
-        return null;
+        return rm;
     }
 
     @Override
@@ -2249,7 +2249,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             mwcaf1.setBaseSpotNo(model.getBaseSpot1No());
             mwcaf1.setBaseSpotName(model.getBaseSpot1Name());
             mwcaf1.setValueFlag("2");
-            mwcaf2.setCheckFlag("0");
+            mwcaf1.setCheckFlag("0");
             mwcaf1.setDataSource("4");
             mwcaf1.setMeterMode("3");
             mwcaf1.setIsPreScale("0");
@@ -2580,6 +2580,12 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         }
     }
 
+    @Override
+    public List<MeterWorkCarActualBak> likeByDescNoPage(HashMap params) {
+        List<MeterWorkCarActualBak> rows = meterWorkCarActualBakMapper.likeByDesc(params);
+        return rows;
+    }
+
     //判断 MeterWorkCarActualBak 是否符合要求
     //true -> 符合
     //false -> 不符合

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

@@ -3306,7 +3306,7 @@
       and  A.value_flag != '0'
     </if>
     <if test="valueFlag != null and valueFlag != ''">
-      and  A.value_flag like '%${valueFlag}%'
+      and  A.value_flag = #{valueFlag}
     </if>
     group by A.base_spot_no,
     A.base_spot_name,

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

@@ -17,6 +17,8 @@ import com.steerinfo.baseinfo.meterbasemattermap.mapper.MeterBaseMatterMapMapper
 import com.steerinfo.baseinfo.meterbasemattermap.model.MeterBaseMatterMap;
 import com.steerinfo.baseinfo.meterbasematterunit.mapper.MeterBaseMatterUnitMapper;
 import com.steerinfo.baseinfo.meterbasematterunit.model.MeterBaseMatterUnit;
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.mapper.MeterBaseMatterUnitMixedLoadUnloadTimeMapper;
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTime;
 import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
 import com.steerinfo.baseinfo.meterbasespotinfo.mapper.MeterBaseSpotInfoMapper;
@@ -107,6 +109,9 @@ import java.util.stream.Collectors;
 @Service(value = "meterWorkCarActualFirstService")
 public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWorkCarActualFirst, String> implements IMeterWorkCarActualFirstService {
 
+    @Resource
+    private MeterBaseMatterUnitMixedLoadUnloadTimeMapper meterBaseMatterUnitMixedLoadUnloadTimeMapper;
+
     @Resource
     private MeterWorkCraneActualMapper craneActualMapper;
 
@@ -1194,7 +1199,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         }
         MeterBaseHisTareDetail mbhtd = new MeterBaseHisTareDetail();
         String no = meterBaseHisTareDetailMapper.getNewID(afl);
-        mbhtd.setDetailNo(afl + no);
+        mbhtd.setDetailNo(PublicMethod.IdCreate(3));
         mbhtd.setActualFirstNo(oci.getActualFirstNo());
         mbhtd.setBaseSpotNo(oci.getBaseSpotNo());
         mbhtd.setBaseSpotName(oci.getBaseSpotName());
@@ -1252,7 +1257,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         }
         MeterBaseHisTareDetail mbhtd = new MeterBaseHisTareDetail();
         String no = meterBaseHisTareDetailMapper.getNewID(afl);
-        mbhtd.setDetailNo(afl + no);
+        mbhtd.setDetailNo(PublicMethod.IdCreate(3));
         mbhtd.setActualFirstNo(oci.getActualFirstNo());
         mbhtd.setBaseSpotNo(oci.getBaseSpotNo());
         mbhtd.setBaseSpotName(oci.getBaseSpotName());
@@ -2337,6 +2342,22 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             netDb.setCreateManName(netDb.getTareManName());
         }
         meterWorkCarActualMapper.insertSelective(netDb);
+        //2023年5月24日张楠修改
+        try {
+            MeterWorkCarActualFirst meterWorkCarActualFirst1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst1No());
+            if(meterWorkCarActualFirst1!=null){
+                meterWorkCarActualFirst1.setValueFlag("2");
+                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meterWorkCarActualFirst1);
+            }
+            MeterWorkCarActualFirst meterWorkCarActualFirst2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst2No());
+            if(meterWorkCarActualFirst2!=null){
+                meterWorkCarActualFirst2.setValueFlag("2");
+                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meterWorkCarActualFirst2);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("外发结净更改状态失败{}",e);
+        }
 
         //7、修改第一次存储的计量数据状态为结净;预报编号相同时才处理（不是一车联运非互锁式）
         if (firstUpdate.getActualFirstNo() != null
@@ -2566,7 +2587,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String afl = formatter.format(new Date());
         String no = meterMonitorNoteMapper.getNewID(afl);
-        note.setNoteNo(afl + no);
+        note.setNoteNo(PublicMethod.IdCreate(3));
         meterMonitorNoteMapper.insertSelective(note);
         return note.getNoteNo();
     }
@@ -3914,17 +3935,45 @@ 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());
-            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 "委托信息不符合混装委托规则(同物料同发货单位委托创建时间不能小于4小时)，请确认!!";
+
+            /**
+             * 2023年10月11日zn
+             * 混装混卸配置查询
+             */
+            HashMap <String,Object> queryCon = new HashMap<>();
+            queryCon.put("matterNo",pts2.getMatterNo());
+            queryCon.put("matterName",pts2.getMatterName());
+            queryCon.put("customerSupplierName",pts2.getForwardingUnitName());
+            queryCon.put("customerSupplierNo",pts2.getForwardingUnitNo());
+            queryCon.put("validFlag","1");
+            queryCon.put("isloadUnload","0");
+            List<MeterBaseMatterUnitMixedLoadUnloadTime> lists = meterBaseMatterUnitMixedLoadUnloadTimeMapper.selectByParameters(queryCon);
+            if(lists!=null&&lists.size()!=0){
+                SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                String fromDate = simpleFormat.format(pts1.getTrustDateTime());
+                String toDate = simpleFormat.format(pts2.getTrustDateTime());
+                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 <= lists.get(0).getTimeValue().doubleValue()&&
+                        lists.get(0).getTimeValue().doubleValue()>0) {
+                    return "委托信息不符合混装委托规则(同物料同发货单位委托创建时间不能小于"+lists.get(0)
+                            .getTimeValue().doubleValue()+"小时)，请确认!!";
+                }
             }
+            //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 "委托信息不符合混装委托规则(同物料同发货单位委托创建时间不能小于4小时)，请确认!!";
+            //}
 
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
@@ -4184,6 +4233,35 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1){
                 return "请根据一次数据从大到小的规则，依次选择三条一次数据！！";
             }
+
+            /**
+             * 2023年10月11日zn
+             * 混装混卸配置查询
+             */
+            HashMap <String,Object> queryCon = new HashMap<>();
+            queryCon.put("matterNo",pts2.getMatterNo());
+            queryCon.put("matterName",pts2.getMatterName());
+            queryCon.put("customerSupplierName",pts2.getReceivingUintName());
+            queryCon.put("customerSupplierNo",pts2.getReceivingUintNo());
+            queryCon.put("validFlag","1");
+            queryCon.put("isloadUnload","1");
+            List<MeterBaseMatterUnitMixedLoadUnloadTime> lists = meterBaseMatterUnitMixedLoadUnloadTimeMapper.selectByParameters(queryCon);
+            if(lists!=null&&lists.size()!=0){
+                SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                String fromDate = simpleFormat.format(pts1.getTrustDateTime());
+                String toDate = simpleFormat.format(pts2.getTrustDateTime());
+                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 <= lists.get(0).getTimeValue().doubleValue()&&
+                        lists.get(0).getTimeValue().doubleValue()>0) {
+                    return "委托信息不符合混装委托规则(同物料同收货单位委托创建时间不能小于"+lists.get(0)
+                            .getTimeValue().doubleValue()+"小时)，请确认!!";
+                }
+            }
+
             SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());
             String toDate = simpleFormat.format(pts2.getCreateTime());
@@ -6289,6 +6367,34 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow02.setNetWeight(grossFirst02.getMeterWeight().subtract(tareFirst02.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow02);
 
+            //2023年6月27日张楠修改
+            //修改一次数据状态为结净
+            try {
+                MeterWorkCarActualFirst meterWorkCarActualFirst = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualRow02.getActualFirst1No());
+                if(meterWorkCarActualFirst!=null){
+                    meterWorkCarActualFirst.setValueFlag("2");
+                    meterWorkCarActualFirstMapper.updateByPrimaryKey(meterWorkCarActualFirst);
+                }
+                MeterWorkCarActualFirst meterWorkCarActualFirst1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualRow02.getActualFirst2No());
+                if(meterWorkCarActualFirst1!=null){
+                    meterWorkCarActualFirst1.setValueFlag("2");
+                    meterWorkCarActualFirstMapper.updateByPrimaryKey(meterWorkCarActualFirst1);
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+                log.error("修改一次数据出错",e);
+            }
+            try {
+                PreTrackScale preTrackScale = preTrackScaleMapper.selectByPrimaryKey(actualRow02.getPredictionNo());
+                if(preTrackScale!=null){
+                    preTrackScale.setValueFlag("2");
+                    preTrackScaleMapper.updateByPrimaryKey(preTrackScale);
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+                log.error("修改委托数据出错",e);
+            }
+
             //预约信息重置委托
             pre01.setPredictionType("5");
             pre01.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());

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

@@ -157,6 +157,22 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @PostMapping(value = "/likeByDescNoPage")
+    public RESTfulResult likeByDescNoPage(@RequestBody HashMap parmas) {
+        try {
+            List<MeterWorkCarActualFirstBak> list = meterWorkCarActualFirstBakService.likeByDescNoPage(parmas);
+            return success(success(new PageList<>(list)));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -256,6 +272,60 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         }
     }
 
+    @ApiOperation(value = "创建", notes = "根据MeterWorkCarActualFirst对象创建")
+    @ApiImplicitParam(name = "meterWorkCarActualFirst", value = "详细实体meterWorkCarActualFirst", required = true, dataType = "MeterWorkCarActualFirst")
+    @PostMapping(value = "/addExport")
+    @Transactional
+    public RESTfulResult addExport(@RequestBody List<MeterWorkCarActualFirstBak> models) {
+        try {
+            for (MeterWorkCarActualFirstBak model : models) {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+                String afl = sdf.format(new Date());
+//            String no = meterWorkCarActualFirstBakMapper.getNewID(afl);
+//            model.setActualFirstNo(sdf.format(new Date()) + 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{
+                    if((model.getCreateManNo() == null || StringUtils.isEmpty(model.getCreateManNo()))
+                            || (model.getCreateManName() == null || StringUtils.isEmpty(model.getCreateManName()))) {
+                        UserPayload payload = UserPayload.getCurrUser();
+                        userId = payload.getUserCode();
+                        userName = payload.getUserName();
+                    }else {
+                        userId = model.getCreateManNo();
+                        userName = model.getCreateManName();
+                    }
+                }catch(Exception e) {
+                    userId = "admin";
+                    userName = "admins";
+                }
+                model.setCreateManNo(userId);
+                model.setCreateManName(userName);
+                model.setIsPreScale("0");
+                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, "计量点配置表未找到相应的计量点！！");
+                }
+                MeterWorkCarActualFirstBak meterWorkCarActualFirstBak = meterWorkCarActualFirstBakService.add(model);
+            }
+            return success();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "一次数据补入", notes = "根据MeterWorkCarActualFirstBak对象创建")
     @ApiImplicitParam(name = "meterWorkCarActualFirstBak", value = "详细实体meterWorkCarActualFirstBak", required = true, dataType = "MeterWorkCarActualFirstBak")
     @PostMapping(value = "/firstDataSupplement")

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/service/IMeterWorkCarActualFirstBakService.java

@@ -154,4 +154,6 @@ public interface IMeterWorkCarActualFirstBakService extends IBaseService<MeterWo
     void wwCopyToFirst(List<String> ids,String carNo) throws Exception;
 
     RESTfulResult addFirstEmergencyList(List<MeterWorkCarActualFirstBak> model) throws Exception;
+
+    List<MeterWorkCarActualFirstBak> likeByDescNoPage(HashMap parmas);
 }

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

@@ -1060,7 +1060,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
         }
         MeterBaseHisTareDetail mbhtd = new MeterBaseHisTareDetail();
         String no = meterBaseHisTareDetailMapper.getNewID(afl);
-        mbhtd.setDetailNo(afl + no);
+        mbhtd.setDetailNo(PublicMethod.IdCreate(3));
         mbhtd.setActualFirstNo(oci.getActualFirstNo());
         mbhtd.setBaseSpotNo(oci.getBaseSpotNo());
         mbhtd.setBaseSpotName(oci.getBaseSpotName());
@@ -2354,7 +2354,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String afl = formatter.format(new Date());
         String no = meterMonitorNoteMapper.getNewID(afl);
-        note.setNoteNo(afl + no);
+        note.setNoteNo(PublicMethod.IdCreate(3));
         meterMonitorNoteMapper.insertSelective(note);
         return note.getNoteNo();
     }
@@ -5911,5 +5911,11 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
         rm.setMessage("成功");
         return rm;
     }
+
+    @Override
+    public List<MeterWorkCarActualFirstBak> likeByDescNoPage(HashMap params) {
+        List<MeterWorkCarActualFirstBak> rows = meterWorkCarActualFirstBakMapper.likeByDesc(params);
+        return rows;
+    }
 }
 

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.xml

@@ -486,7 +486,7 @@
     select t1.BASE_SPOT_NO    baseSpotNo,
           t1.BASE_SPOT_NAME  baseSpotName,
           t1.actual_first_no actualFirstNo,
-          t1.car_no carNo，
+          t1.car_no carNo,
           t1.create_time createTime,
           t.START_TIME startTime,
           t.METER_START_TIME meterStartTime,

src/main/java/com/steerinfo/meterwork/meterworkhookactual/controller/MeterWorkHookActualController.java

@@ -276,7 +276,7 @@ public class MeterWorkHookActualController extends BaseRESTfulController {
     public RESTfulResult supplementaryData(@RequestBody HashMap map) {
         RESTfulResult rm = failed();
         try {
-            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss");
+            SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             String grossTimeTemp = map.get("grossTime").toString().replaceAll("-", "/");
             String tareTimeTemp = map.get("tareTime").toString().replaceAll("-", "/");
             String netTimeTemp = map.get("netTime").toString().replaceAll("-", "/");

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

@@ -3629,7 +3629,7 @@
         and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
       </if>
       <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG LIKE '%${valueFlag}%'
+        and VALUE_FLAG = #{valueFlag}
       </if>
       <if test="railwayTypeNo != null and railwayTypeNo != ''">
         and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
@@ -3877,6 +3877,12 @@
           #{id}
         </foreach>
       </if>
+      <if test="baseSpotNoStr != null and baseSpotNoStr.size() != 0">
+        and BASE_SPOT_NO in
+        <foreach collection="baseSpotNoStr" item="id" open="(" close=")" separator=",">
+          #{id}
+        </foreach>
+      </if>
       and railway_type_no in ('001019003', '001019005')
     </where>
   </sql>
@@ -4301,7 +4307,7 @@
       </foreach>
     </if>
     <if test="valueFlag != null and valueFlag != ''">
-      and A.value_flag like '%${valueFlag}%'
+      and A.value_flag = #{valueFlag}
     </if>
     <if test="validFlag != null and validFlag != ''">
       and A.value_flag != '0'

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

@@ -1,6 +1,8 @@
 package com.steerinfo.meterwork.meterworkrailwayactfirst.service.impl;
 
 import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.mapper.MeterBaseMatterUnitMixedLoadUnloadTimeMapper;
+import com.steerinfo.baseinfo.meterbasematterunitmixedloadunloadtime.model.MeterBaseMatterUnitMixedLoadUnloadTime;
 import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.mapper.MeterBaseRailwayAiweightMapper;
@@ -85,6 +87,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Resource
     private MeterWorkRailwayActFirstMapper meterWorkRailwayActFirstMapper;
 
+    @Resource
+    MeterBaseMatterUnitMixedLoadUnloadTimeMapper meterBaseMatterUnitMixedLoadUnloadTimeMapper;
     @Resource
     private MeterWorkRailwayRecMainMapper meterWorkRailwayRecMainMapper;
 
@@ -3165,16 +3169,33 @@ 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.getTrustDateTime());
-            String toDate = simpleFormat.format(pts2.getTrustDateTime());
-            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 "委托信息不符合混装委托规则(同物料同发货单位委托创建时间不能小于4小时)，请确认!!";
+
+            /**
+             * 2023年10月11日zn
+             * 混装混卸配置查询
+              */
+            HashMap <String,Object> queryCon = new HashMap<>();
+            queryCon.put("matterNo",pts2.getMatterNo());
+            queryCon.put("matterName",pts2.getMatterName());
+            queryCon.put("customerSupplierName",pts2.getForwardingUnitName());
+            queryCon.put("customerSupplierNo",pts2.getForwardingUnitNo());
+            queryCon.put("validFlag","1");
+            queryCon.put("isloadUnload","0");
+            List<MeterBaseMatterUnitMixedLoadUnloadTime> lists = meterBaseMatterUnitMixedLoadUnloadTimeMapper.selectByParameters(queryCon);
+            if(lists!=null&&lists.size()!=0){
+                SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                String fromDate = simpleFormat.format(pts1.getTrustDateTime());
+                String toDate = simpleFormat.format(pts2.getTrustDateTime());
+                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 <= lists.get(0).getTimeValue().doubleValue()&&
+                        lists.get(0).getTimeValue().doubleValue()>0) {
+                    return "委托信息不符合混装委托规则(同物料同发货单位委托创建时间不能小于"+lists.get(0)
+                            .getTimeValue().doubleValue()+"小时)，请确认!!";
+                }
             }
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
@@ -3443,6 +3464,28 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     minutes <= 10) {
                 return "委托信息不符合混卸委托规则，请确认!!";
             }
+            /**
+             * 2023年10月11日zn
+             * 混装混卸配置查询
+             */
+            HashMap <String,Object> queryCon = new HashMap<>();
+            queryCon.put("matterNo",pts2.getMatterNo());
+            queryCon.put("matterName",pts2.getMatterName());
+            queryCon.put("customerSupplierName",pts2.getReceivingUintName());
+            queryCon.put("customerSupplierNo",pts2.getReceivingUintNo());
+            queryCon.put("validFlag","1");
+            queryCon.put("isloadUnload","1");
+            List<MeterBaseMatterUnitMixedLoadUnloadTime> lists = meterBaseMatterUnitMixedLoadUnloadTimeMapper.selectByParameters(queryCon);
+            if(lists!=null&&lists.size()!=0){
+                int hours = (int) ((to - from) / (1000 * 60 * 60));
+                if (pts1.getMatterNo().equals(pts2.getMatterNo()) &&
+                        pts1.getForwardingUnitNo().equals(pts2.getForwardingUnitNo()) &&
+                        hours <= lists.get(0).getTimeValue().doubleValue()&&
+                        lists.get(0).getTimeValue().doubleValue()>0) {
+                    return "委托信息不符合混装委托规则(同物料同收货单位委托创建时间不能小于"+lists.get(0)
+                            .getTimeValue().doubleValue()+"小时)，请确认!!";
+                }
+            }
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
                 return "未查询到相应的一次数据！！";

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

@@ -2379,17 +2379,17 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                     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 "委托信息不符合混装委托规则(同物料同发货单位委托创建时间不能小于4小时)，请确认!!";
-            }
+            //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 "委托信息不符合混装委托规则(同物料同发货单位委托创建时间不能小于4小时)，请确认!!";
+            //}
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
                 return "未查询到相应的一次数据！！";

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

@@ -4504,7 +4504,7 @@
         and NET_MODE LIKE '%${netMode}%'
       </if>
       <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG LIKE '%${valueFlag}%'
+        and VALUE_FLAG = #{valueFlag}
       </if>
       <if test="uploadFlag != null and uploadFlag != ''">
         and UPLOAD_FLAG LIKE '%${uploadFlag}%'
@@ -4776,7 +4776,7 @@
         and NET_MODE LIKE '%${netMode}%'
       </if>
       <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG LIKE '%${valueFlag}%'
+        and VALUE_FLAG = #{valueFlag}
       </if>
       <if test="uploadFlag != null and uploadFlag != ''">
         and UPLOAD_FLAG LIKE '%${uploadFlag}%'
@@ -5414,7 +5414,7 @@
       and  A.net_spot3_name like '%${baseSpotName}%'
     </if>
     <if test="valueFlag != null and valueFlag != ''">
-      and  A.value_flag like '%${valueFlag}%'
+      and  A.value_flag = #{valueFlag}
     </if>
     <if test="validFlag != null and validFlag != ''">
       and  A.value_flag != '0'

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.xml

@@ -2346,7 +2346,7 @@
 
   <select id="selectByPrimaryKeyLike" parameterType="java.lang.String" resultMap="BaseResultMap">
     <include refid="select" />
-    where ACTUAL_FIRST_NO like '%${actualFirstNo}%'
+    where ACTUAL_FIRST_NO like '${actualFirstNo}%'
   </select>
 
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/mapper/MeterWorkScheduledHelpMapper.xml

@@ -18,12 +18,12 @@
     <result column="WARM_TYPE_NAME" jdbcType="VARCHAR" property="warmTypeName" />
   </resultMap>
   <sql id="columns">
-    HELP_ID, CAR_NO, HELP_CONTENT, CREATE_TIME, END_TIME, CREATE_NO, CREATE_NAME, RESULT, 
+    HELP_ID, CAR_NO, HELP_CONTENT, CREATE_TIME, END_TIME, CREATE_NO, CREATE_NAME, RESULT,
     VALUE_FLAG, BASE_SPOT_NO, BASE_SPOT_NAME, MEASURE_TASK_NUM, WARM_TYPE, WARM_TYPE_NAME
   </sql>
   <sql id="columns_alias">
-    t.HELP_ID, t.CAR_NO, t.HELP_CONTENT, t.CREATE_TIME, t.END_TIME, t.CREATE_NO, t.CREATE_NAME, 
-    t.RESULT, t.VALUE_FLAG, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.MEASURE_TASK_NUM, t.WARM_TYPE, 
+    t.HELP_ID, t.CAR_NO, t.HELP_CONTENT, t.CREATE_TIME, t.END_TIME, t.CREATE_NO, t.CREATE_NAME,
+    t.RESULT, t.VALUE_FLAG, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.MEASURE_TASK_NUM, t.WARM_TYPE,
     t.WARM_TYPE_NAME
   </sql>
   <sql id="select">
@@ -33,7 +33,7 @@
     SELECT <include refid="columns_alias"/> FROM METER_WORK_SCHEDULED_HELP t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="helpId != null and helpId != ''">
         and HELP_ID = #{helpId}
       </if>
@@ -85,7 +85,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="helpId != null and helpId != ''">
         and HELP_ID LIKE '%${helpId}%'
       </if>
@@ -142,7 +142,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_WORK_SCHEDULED_HELP
-    where 1!=1 
+    where 1!=1
       <if test="carNo != null and carNo != ''">
         or CAR_NO = #{carNo}
       </if>
@@ -184,15 +184,15 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp">
-    insert into METER_WORK_SCHEDULED_HELP (HELP_ID, CAR_NO, HELP_CONTENT, 
-      CREATE_TIME, END_TIME, CREATE_NO, 
-      CREATE_NAME, RESULT, VALUE_FLAG, 
-      BASE_SPOT_NO, BASE_SPOT_NAME, MEASURE_TASK_NUM, 
+    insert into METER_WORK_SCHEDULED_HELP (HELP_ID, CAR_NO, HELP_CONTENT,
+      CREATE_TIME, END_TIME, CREATE_NO,
+      CREATE_NAME, RESULT, VALUE_FLAG,
+      BASE_SPOT_NO, BASE_SPOT_NAME, MEASURE_TASK_NUM,
       WARM_TYPE, WARM_TYPE_NAME)
-    values (#{helpId,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{helpContent,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{createNo,jdbcType=VARCHAR}, 
-      #{createName,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, 
-      #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, #{measureTaskNum,jdbcType=VARCHAR}, 
+    values (#{helpId,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{helpContent,jdbcType=VARCHAR},
+      #{createTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{createNo,jdbcType=VARCHAR},
+      #{createName,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR},
+      #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, #{measureTaskNum,jdbcType=VARCHAR},
       #{warmType,jdbcType=VARCHAR}, #{warmTypeName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp">
@@ -361,21 +361,21 @@
     <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_WORK_SCHEDULED_HELP 
-      (HELP_ID, 
-      CAR_NO, HELP_CONTENT, CREATE_TIME, 
-      END_TIME, CREATE_NO, CREATE_NAME, 
-      RESULT, VALUE_FLAG, BASE_SPOT_NO, 
-      BASE_SPOT_NAME, MEASURE_TASK_NUM, 
+    insert into METER_WORK_SCHEDULED_HELP
+      (HELP_ID,
+      CAR_NO, HELP_CONTENT, CREATE_TIME,
+      END_TIME, CREATE_NO, CREATE_NAME,
+      RESULT, VALUE_FLAG, BASE_SPOT_NO,
+      BASE_SPOT_NAME, MEASURE_TASK_NUM,
       WARM_TYPE, WARM_TYPE_NAME)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.helpId,jdbcType=VARCHAR}, 
-      #{item.carNo,jdbcType=VARCHAR}, #{item.helpContent,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.endTime,jdbcType=TIMESTAMP}, #{item.createNo,jdbcType=VARCHAR}, #{item.createName,jdbcType=VARCHAR}, 
-      #{item.result,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}, #{item.baseSpotNo,jdbcType=VARCHAR}, 
-      #{item.baseSpotName,jdbcType=VARCHAR}, #{item.measureTaskNum,jdbcType=VARCHAR}, 
-      #{item.warmType,jdbcType=VARCHAR}, #{item.warmTypeName,jdbcType=VARCHAR} from dual  
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.helpId,jdbcType=VARCHAR},
+      #{item.carNo,jdbcType=VARCHAR}, #{item.helpContent,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+      #{item.endTime,jdbcType=TIMESTAMP}, #{item.createNo,jdbcType=VARCHAR}, #{item.createName,jdbcType=VARCHAR},
+      #{item.result,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}, #{item.baseSpotNo,jdbcType=VARCHAR},
+      #{item.baseSpotName,jdbcType=VARCHAR}, #{item.measureTaskNum,jdbcType=VARCHAR},
+      #{item.warmType,jdbcType=VARCHAR}, #{item.warmTypeName,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -437,14 +437,14 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
           when #{item.helpId,jdbcType=VARCHAR} then #{item.warmTypeName,jdbcType=VARCHAR}
        </foreach>
-     where HELP_ID in 
+     where HELP_ID in
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.helpId,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_SCHEDULED_HELP
-    where HELP_ID in 
+    where HELP_ID in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
@@ -478,7 +478,7 @@
         and RESULT LIKE '%${result}%'
       </if>
       <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG LIKE '%${valueFlag}%'
+        and value_flag = #{valueFlag}
       </if>
       <if test="baseSpotNo != null and baseSpotNo != ''">
         and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
@@ -541,7 +541,7 @@
         and RESULT LIKE '%${result}%'
       </if>
       <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG LIKE '%${valueFlag}%'
+        and value_flag = #{valueFlag}
       </if>
       <if test="baseSpotNo != null and baseSpotNo != ''">
         and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
@@ -565,6 +565,7 @@
         and create_time &lt;= to_date(#{endTime01}, 'yyyy-MM-dd HH24:mi:ss')
       </if>
       and warm_type in ('1', '2', '3')
+      and create_time > (sysdate-30)
     </where>
     order by create_time desc
   </select>
@@ -601,7 +602,7 @@
       and WARM_TYPE LIKE '%${warmType}%'
     </if>
     <if test="valueFlag != null and valueFlag != ''">
-      and  value_flag like '%${valueFlag}%'
+      and  value_flag = #{valueFlag}
     </if>
     <if test="helpContent != null and helpContent != ''">
       and  help_content like '%${helpContent}%'
@@ -660,7 +661,7 @@
       and  base_spot_name like '%${baseSpotName}%'
     </if>
     <if test="valueFlag != null and valueFlag != ''">
-      and  value_flag like '%${valueFlag}%'
+      and  value_flag = #{valueFlag}
     </if>
     <if test="contentType != null and contentType != ''">
       <if test="contentType == 1">
@@ -702,4 +703,4 @@
     </if>
     order by create_time desc
   </select>
-</mapper>
+</mapper>

src/main/resources/application.properties

@@ -85,9 +85,9 @@ multiple.datasource.master.timeBetweenEvictionRunsMillis=60000
 multiple.datasource.master.minEvictableIdleTimeMillis=300000
 
 #设置连接池自动回收
-multiple.datasource.master.remove-abandoned=true
-multiple.datasource.master.remove-abandoned-timeout=5
-multiple.datasource.master.log-abandoned=true
+multiple.datasource.master.removeAbandoned=true
+multiple.datasource.master.removeAbandonedTimeout=5
+multiple.datasource.master.logAbandoned=true
 
 #slave1
 multiple.datasource.slave1.driver-class-name=oracle.jdbc.driver.OracleDriver