Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-JOIN-API into dev

src/main/java/com/steerinfo/dil/feign/EASFeign.java

@@ -10,7 +10,7 @@ import java.util.Map;
  * @author HUJIANGUO
  * @create 2021-11-10 11:30
  */
-@FeignClient(value = "logistic",url = "172.16.33.122:44325")
+@FeignClient(value = "logistic",url = "172.16.33.166:8089")
 public interface EASFeign {
 
     @PostMapping("api/logistics/AbnormalReturn")

src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * @ time      :2021/12/3 1:14
  */
 
-@FeignClient(value = "dil-tms-truck-dev", url = "localhost:8088")
+@FeignClient(value = "dil-tms-truck-dev", url = "172.16.33.166:8088")
 public interface TmsFeign {
 
     @ApiOperation(value="更新计量实绩 ")

src/main/java/com/steerinfo/dil/mapper/TmstrainWeightResultMapper.java

@@ -3,6 +3,8 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstrainWeightResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -10,4 +12,7 @@ import org.apache.ibatis.annotations.Select;
 public interface TmstrainWeightResultMapper extends IBaseMapper<TmstrainWeightResult, BigDecimal> {
     @Select("select seq_train_weight_result.nextval from dual")
     BigDecimal selectMaxId();
+
+    //通过采购订单号和车皮号查询火运总实绩ID
+    Map<String, Object> getResultIdByPurNoAndWagonNo(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -13,6 +13,7 @@ import com.steerinfo.dil.util.DataChange;
 import io.swagger.annotations.ApiModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -73,6 +74,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      * @return
      */
     @Override
+    @Transactional
     public String receiveTmsTruckWeightResult(List<Map<String, Object>> mapList){
         //遍历列表
         StringBuilder sb = new StringBuilder();
@@ -116,8 +118,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 autoReceipt((String) map.get("orderNumber"));
             }
         }
-        //路段顺序号+1
-        utilsService.updateOrderLineSequence(map);
         //推送数据
         utilsService.pushMesToWebsocket((String) stringObjectMap.get("capacityNumber"), "计量");
         return map.get("orderNumber") + "成功";
@@ -147,7 +147,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 //添加毛重汽车衡
                 Integer tareId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultTareCalculateNumber"));
                 if(tareId == null){
-                    throw new Exception("没有此汽车衡：" + map.get("resultTareCalculateNumber"));
+                    throw new Exception("没有此计量衡：" + map.get("resultTareCalculateNumber"));
                 }
                 tmstruckWeightResult.setResultGrossPlaceId(new BigDecimal(tareId));
                 //设置毛重
@@ -155,6 +155,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 tmstruckWeightResult.setResultGrossWeight(resultTareWeight);
                 tmstruckWeightResult.setInsertTime(new Date());
                 tmstruckWeightResult.setInsertUsername("admin");
+                //更新订单中路段顺序号
+                map.put("segmentSqe", map.get("grossSegmentSqe")); //毛重路段顺序
+                utilsService.updateOrderLineSequence(map);
             }else {
                 //设置皮重汽车衡
                 Integer tareId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultTareCalculateNumber"));
@@ -184,6 +187,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 tmstruckWeightResult.setResultGrossWeightTime(sdf.parse(resultGrossWeightTime));
                 tmstruckWeightResult.setUpdateTime(new Date());
                 tmstruckWeightResult.setUpdateUsername("admin");
+                //更新订单中路段顺序号
+                map.put("segmentSqe", map.get("tareSegmentSqe")); //皮重路段顺序
+                utilsService.updateOrderLineSequence(map);
             }
         }
         return tmstruckWeightResult;
@@ -211,11 +217,15 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      * @return
      */
     public String addTrainWeightResult(Map<String, Object> map){
-        //通过****查询火运总实绩ID和物资ID --遗留问题
-        Map<String, Object> totalAndMaterialIdMap = null;
-        if(totalAndMaterialIdMap == null){
-            return "没有此车皮信息";
+        //通过采购订单号和车皮号 查询火运总实绩ID和物资ID
+        Map<String, Object> totalIdAndMateMap = tmstrainWeightResultMapper.getResultIdByPurNoAndWagonNo(map);
+        if(totalIdAndMateMap == null){
+            return "采购订单号"+ map.get("purchaseOrderNo")+"或车皮信息"+ map.get("orderNumber")+"错误";
         }
+        if(totalIdAndMateMap.get("resultTotalId") == null){
+            return "采购订单号"+ map.get("purchaseOrderNo")+"或车皮信息"+ map.get("orderNumber")+"错误";
+        }
+        map.putAll(totalIdAndMateMap);
         TmstrainWeightResult tmstrainWeightResult = null;
         try {
             tmstrainWeightResult = generateTrainWeightResult(map);
@@ -223,7 +233,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             return e.getMessage(); //捕获异常信息
         }
         tmstrainWeightResultMapper.insertSelective(tmstrainWeightResult);
-        return "" + "成功";
+        return map.get("orderNumber") + "成功";
     }
 
     /**
@@ -236,6 +246,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
         TmstrainWeightResult tmstrainWeightResult = new TmstrainWeightResult();
         tmstrainWeightResult.setResultId(tmstrainWeightResultMapper.selectMaxId());
+        //磅单号
+        tmstrainWeightResult.setResultPoundNo((String) map.get("resultPoundNo"));
         //添加火运总实绩ID
         tmstrainWeightResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
         //设置物资ID
@@ -249,9 +261,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             //添加毛重汽车衡
             Integer tareId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultTareCalculateNumber"));
             if(tareId == null){
-                throw new Exception("没有此汽车衡：" + map.get("resultTareCalculateNumber"));
+                throw new Exception("没有此计量衡：" + map.get("resultTareCalculateNumber"));
             }
-            tmstrainWeightResult.setResultTarePlaceId(new BigDecimal(tareId));
+            tmstrainWeightResult.setResultGrossPlaceId(new BigDecimal(tareId));
             //设置毛重
             BigDecimal resultTareWeight = DataChange.dataToBigDecimal(map.get("resultTareWeight"));
             tmstrainWeightResult.setResultGrossWeight(resultTareWeight);
@@ -261,13 +273,13 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             //设置皮重汽车衡
             Integer tareId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultTareCalculateNumber"));
             if(tareId == null){
-                throw new Exception("没有此皮重汽车衡：" + map.get("resultTareCalculateNumber"));
+                throw new Exception("没有此计量衡：" + map.get("resultTareCalculateNumber"));
             }
             tmstrainWeightResult.setResultTarePlaceId(new BigDecimal(tareId));
             //设置毛重汽车衡
             Integer crossId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultCrossCalculateNumber"));
             if(crossId == null){
-                throw new Exception("没有此毛重汽车衡：" + map.get("resultCrossCalculateNumber"));
+                throw new Exception("没有此计量衡：" + map.get("resultCrossCalculateNumber"));
             }
             tmstrainWeightResult.setResultGrossPlaceId(new BigDecimal(crossId));
             //毛重

src/main/java/com/steerinfo/dil/service/impl/UtilsServiceImpl.java

@@ -80,8 +80,8 @@ public class UtilsServiceImpl implements IUtilsService {
     }
 
     /**
-     * 用于更新路段顺序号 + 1
-     * @param map 运输订单号 或者是运输订单ID
+     * 用于更新路段顺序号 取实绩中的路段顺序号
+     * @param map 运输订单号 或者是运输订单ID    实绩中的路段顺序号
      * @return
      */
     public int updateOrderLineSequence(Map<String, Object> map){
@@ -90,10 +90,10 @@ public class UtilsServiceImpl implements IUtilsService {
             //如果没有传入运输订单Id则需要传入了运输订单号
             orderId = utilsMapper.getOrderIdByOrderNumber((String) map.get("orderNumber"));
         }
-        Integer lineSequence = getLineSequenceByOrderId(orderId);
+        BigDecimal segmentSqe = DataChange.dataToBigDecimal(map.get("segmentSqe"));
         Map<String, Object> mesMap = new HashMap<>();
         mesMap.put("orderId", orderId);
-        mesMap.put("orderLineSequence", lineSequence == null? 1 : lineSequence + 1);
+        mesMap.put("orderLineSequence", segmentSqe);
         return utilsMapper.updateLineSeqByOrderIdOrNum(mesMap);
     }
 

src/main/resources/com/steerinfo/dil/mapper/TmstrainWeightResultMapper.xml

@@ -0,0 +1,647 @@
+<?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.dil.mapper.TmstrainWeightResultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstrainWeightResult">
+    <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
+    <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
+    <result column="RESULT_POUND_NO" jdbcType="VARCHAR" property="resultPoundNo" />
+    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+    <result column="RESULT_GROSS_PLACE_ID" jdbcType="DECIMAL" property="resultGrossPlaceId" />
+    <result column="RESULT_GROSS_WEIGHT" jdbcType="DECIMAL" property="resultGrossWeight" />
+    <result column="RESULT_GROSS_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultGrossWeightTime" />
+    <result column="RESULT_TARE_PLACE_ID" jdbcType="DECIMAL" property="resultTarePlaceId" />
+    <result column="RESULT_TARE_WEIGHT" jdbcType="DECIMAL" property="resultTareWeight" />
+    <result column="RESULT_TARE_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultTareWeightTime" />
+    <result column="RESULT_NET_WEIGHT" jdbcType="DECIMAL" property="resultNetWeight" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+    <result column="ISDEDUCT" jdbcType="DECIMAL" property="isdeduct" />
+    <result column="ISQUALITY" jdbcType="DECIMAL" property="isquality" />
+    <result column="RESULT_IS_QUALITY" jdbcType="DECIMAL" property="resultIsQuality" />
+  </resultMap>
+  <sql id="columns">
+    RESULT_ID, RESULT_TOTAL_ID, RESULT_POUND_NO, MATERIAL_ID, RESULT_GROSS_PLACE_ID, 
+    RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME, RESULT_TARE_PLACE_ID, RESULT_TARE_WEIGHT, 
+    RESULT_TARE_WEIGHT_TIME, RESULT_NET_WEIGHT, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETE_NAME, DELETE_TIME, ISDEDUCT, ISQUALITY, 
+    RESULT_IS_QUALITY
+  </sql>
+  <sql id="columns_alias">
+    t.RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_POUND_NO, t.MATERIAL_ID, t.RESULT_GROSS_PLACE_ID, 
+    t.RESULT_GROSS_WEIGHT, t.RESULT_GROSS_WEIGHT_TIME, t.RESULT_TARE_PLACE_ID, t.RESULT_TARE_WEIGHT, 
+    t.RESULT_TARE_WEIGHT_TIME, t.RESULT_NET_WEIGHT, t.INSERT_USERNAME, t.INSERT_TIME, 
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETE_NAME, t.DELETE_TIME, 
+    t.ISDEDUCT, t.ISQUALITY, t.RESULT_IS_QUALITY
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM TMSTRAIN_WEIGHT_RESULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM TMSTRAIN_WEIGHT_RESULT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="resultPoundNo != null and resultPoundNo != ''">
+        and RESULT_POUND_NO = #{resultPoundNo}
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+      <if test="resultGrossPlaceId != null">
+        and RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId}
+      </if>
+      <if test="resultGrossWeight != null">
+        and RESULT_GROSS_WEIGHT = #{resultGrossWeight}
+      </if>
+      <if test="resultGrossWeightTime != null">
+        and TO_CHAR(RESULT_GROSS_WEIGHT_TIME,'yyyy-MM-dd') = #{resultGrossWeightTime}
+      </if>
+      <if test="resultTarePlaceId != null">
+        and RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
+      </if>
+      <if test="resultTareWeight != null">
+        and RESULT_TARE_WEIGHT = #{resultTareWeight}
+      </if>
+      <if test="resultTareWeightTime != null">
+        and TO_CHAR(RESULT_TARE_WEIGHT_TIME,'yyyy-MM-dd') = #{resultTareWeightTime}
+      </if>
+      <if test="resultNetWeight != null">
+        and RESULT_NET_WEIGHT = #{resultNetWeight}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+      <if test="isdeduct != null">
+        and ISDEDUCT = #{isdeduct}
+      </if>
+      <if test="isquality != null">
+        and ISQUALITY = #{isquality}
+      </if>
+      <if test="resultIsQuality != null">
+        and RESULT_IS_QUALITY = #{resultIsQuality}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="resultPoundNo != null and resultPoundNo != ''">
+        and RESULT_POUND_NO LIKE '%${resultPoundNo}%'
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+      <if test="resultGrossPlaceId != null">
+        and RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId}
+      </if>
+      <if test="resultGrossWeight != null">
+        and RESULT_GROSS_WEIGHT = #{resultGrossWeight}
+      </if>
+      <if test="resultGrossWeightTime != null">
+        and TO_CHAR(RESULT_GROSS_WEIGHT_TIME,'yyyy-MM-dd') = #{resultGrossWeightTime}
+      </if>
+      <if test="resultTarePlaceId != null">
+        and RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
+      </if>
+      <if test="resultTareWeight != null">
+        and RESULT_TARE_WEIGHT = #{resultTareWeight}
+      </if>
+      <if test="resultTareWeightTime != null">
+        and TO_CHAR(RESULT_TARE_WEIGHT_TIME,'yyyy-MM-dd') = #{resultTareWeightTime}
+      </if>
+      <if test="resultNetWeight != null">
+        and RESULT_NET_WEIGHT = #{resultNetWeight}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME LIKE '%${deleteName}%'
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+      <if test="isdeduct != null">
+        and ISDEDUCT = #{isdeduct}
+      </if>
+      <if test="isquality != null">
+        and ISQUALITY = #{isquality}
+      </if>
+      <if test="resultIsQuality != null">
+        and RESULT_IS_QUALITY = #{resultIsQuality}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    delete from TMSTRAIN_WEIGHT_RESULT
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from TMSTRAIN_WEIGHT_RESULT
+    where 1!=1 
+      <if test="resultTotalId != null">
+        or RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="resultPoundNo != null and resultPoundNo != ''">
+        or RESULT_POUND_NO = #{resultPoundNo}
+      </if>
+      <if test="materialId != null">
+        or MATERIAL_ID = #{materialId}
+      </if>
+      <if test="resultGrossPlaceId != null">
+        or RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId}
+      </if>
+      <if test="resultGrossWeight != null">
+        or RESULT_GROSS_WEIGHT = #{resultGrossWeight}
+      </if>
+      <if test="resultGrossWeightTime != null">
+        or TO_CHAR(RESULT_GROSS_WEIGHT_TIME,'yyyy-MM-dd') = '#{resultGrossWeightTime}'
+      </if>
+      <if test="resultTarePlaceId != null">
+        or RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
+      </if>
+      <if test="resultTareWeight != null">
+        or RESULT_TARE_WEIGHT = #{resultTareWeight}
+      </if>
+      <if test="resultTareWeightTime != null">
+        or TO_CHAR(RESULT_TARE_WEIGHT_TIME,'yyyy-MM-dd') = '#{resultTareWeightTime}'
+      </if>
+      <if test="resultNetWeight != null">
+        or RESULT_NET_WEIGHT = #{resultNetWeight}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        or DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null">
+        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
+      </if>
+      <if test="isdeduct != null">
+        or ISDEDUCT = #{isdeduct}
+      </if>
+      <if test="isquality != null">
+        or ISQUALITY = #{isquality}
+      </if>
+      <if test="resultIsQuality != null">
+        or RESULT_IS_QUALITY = #{resultIsQuality}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.TmstrainWeightResult">
+    insert into TMSTRAIN_WEIGHT_RESULT (RESULT_ID, RESULT_TOTAL_ID, RESULT_POUND_NO, 
+      MATERIAL_ID, RESULT_GROSS_PLACE_ID, RESULT_GROSS_WEIGHT, 
+      RESULT_GROSS_WEIGHT_TIME, RESULT_TARE_PLACE_ID, 
+      RESULT_TARE_WEIGHT, RESULT_TARE_WEIGHT_TIME, 
+      RESULT_NET_WEIGHT, INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETE_NAME, DELETE_TIME, ISDEDUCT, 
+      ISQUALITY, RESULT_IS_QUALITY)
+    values (#{resultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, #{resultPoundNo,jdbcType=VARCHAR}, 
+      #{materialId,jdbcType=DECIMAL}, #{resultGrossPlaceId,jdbcType=DECIMAL}, #{resultGrossWeight,jdbcType=DECIMAL}, 
+      #{resultGrossWeightTime,jdbcType=TIMESTAMP}, #{resultTarePlaceId,jdbcType=DECIMAL}, 
+      #{resultTareWeight,jdbcType=DECIMAL}, #{resultTareWeightTime,jdbcType=TIMESTAMP}, 
+      #{resultNetWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
+      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{isdeduct,jdbcType=DECIMAL}, 
+      #{isquality,jdbcType=DECIMAL}, #{resultIsQuality,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstrainWeightResult">
+    insert into TMSTRAIN_WEIGHT_RESULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        RESULT_ID,
+      </if>
+      <if test="resultTotalId != null">
+        RESULT_TOTAL_ID,
+      </if>
+      <if test="resultPoundNo != null">
+        RESULT_POUND_NO,
+      </if>
+      <if test="materialId != null">
+        MATERIAL_ID,
+      </if>
+      <if test="resultGrossPlaceId != null">
+        RESULT_GROSS_PLACE_ID,
+      </if>
+      <if test="resultGrossWeight != null">
+        RESULT_GROSS_WEIGHT,
+      </if>
+      <if test="resultGrossWeightTime != null">
+        RESULT_GROSS_WEIGHT_TIME,
+      </if>
+      <if test="resultTarePlaceId != null">
+        RESULT_TARE_PLACE_ID,
+      </if>
+      <if test="resultTareWeight != null">
+        RESULT_TARE_WEIGHT,
+      </if>
+      <if test="resultTareWeightTime != null">
+        RESULT_TARE_WEIGHT_TIME,
+      </if>
+      <if test="resultNetWeight != null">
+        RESULT_NET_WEIGHT,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+      <if test="isdeduct != null">
+        ISDEDUCT,
+      </if>
+      <if test="isquality != null">
+        ISQUALITY,
+      </if>
+      <if test="resultIsQuality != null">
+        RESULT_IS_QUALITY,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        #{resultId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTotalId != null">
+        #{resultTotalId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultPoundNo != null">
+        #{resultPoundNo,jdbcType=VARCHAR},
+      </if>
+      <if test="materialId != null">
+        #{materialId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossPlaceId != null">
+        #{resultGrossPlaceId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossWeight != null">
+        #{resultGrossWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossWeightTime != null">
+        #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultTarePlaceId != null">
+        #{resultTarePlaceId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTareWeight != null">
+        #{resultTareWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTareWeightTime != null">
+        #{resultTareWeightTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultNetWeight != null">
+        #{resultNetWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isdeduct != null">
+        #{isdeduct,jdbcType=DECIMAL},
+      </if>
+      <if test="isquality != null">
+        #{isquality,jdbcType=DECIMAL},
+      </if>
+      <if test="resultIsQuality != null">
+        #{resultIsQuality,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstrainWeightResult">
+    update TMSTRAIN_WEIGHT_RESULT
+    set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+      RESULT_POUND_NO = #{resultPoundNo,jdbcType=VARCHAR},
+      MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+      RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId,jdbcType=DECIMAL},
+      RESULT_GROSS_WEIGHT = #{resultGrossWeight,jdbcType=DECIMAL},
+      RESULT_GROSS_WEIGHT_TIME = #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+      RESULT_TARE_PLACE_ID = #{resultTarePlaceId,jdbcType=DECIMAL},
+      RESULT_TARE_WEIGHT = #{resultTareWeight,jdbcType=DECIMAL},
+      RESULT_TARE_WEIGHT_TIME = #{resultTareWeightTime,jdbcType=TIMESTAMP},
+      RESULT_NET_WEIGHT = #{resultNetWeight,jdbcType=DECIMAL},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
+      ISQUALITY = #{isquality,jdbcType=DECIMAL},
+      RESULT_IS_QUALITY = #{resultIsQuality,jdbcType=DECIMAL}
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstrainWeightResult">
+    update TMSTRAIN_WEIGHT_RESULT
+    <set>
+      <if test="resultTotalId != null">
+        RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultPoundNo != null">
+        RESULT_POUND_NO = #{resultPoundNo,jdbcType=VARCHAR},
+      </if>
+      <if test="materialId != null">
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossPlaceId != null">
+        RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossWeight != null">
+        RESULT_GROSS_WEIGHT = #{resultGrossWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossWeightTime != null">
+        RESULT_GROSS_WEIGHT_TIME = #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultTarePlaceId != null">
+        RESULT_TARE_PLACE_ID = #{resultTarePlaceId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTareWeight != null">
+        RESULT_TARE_WEIGHT = #{resultTareWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTareWeightTime != null">
+        RESULT_TARE_WEIGHT_TIME = #{resultTareWeightTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultNetWeight != null">
+        RESULT_NET_WEIGHT = #{resultNetWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isdeduct != null">
+        ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
+      </if>
+      <if test="isquality != null">
+        ISQUALITY = #{isquality,jdbcType=DECIMAL},
+      </if>
+      <if test="resultIsQuality != null">
+        RESULT_IS_QUALITY = #{resultIsQuality,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </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 TMSTRAIN_WEIGHT_RESULT 
+      (RESULT_ID, 
+      RESULT_TOTAL_ID, RESULT_POUND_NO, 
+      MATERIAL_ID, RESULT_GROSS_PLACE_ID, 
+      RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME, 
+      RESULT_TARE_PLACE_ID, RESULT_TARE_WEIGHT, 
+      RESULT_TARE_WEIGHT_TIME, RESULT_NET_WEIGHT, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, DELETE_NAME, 
+      DELETE_TIME, ISDEDUCT, ISQUALITY, 
+      RESULT_IS_QUALITY)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.resultId,jdbcType=DECIMAL}, 
+      #{item.resultTotalId,jdbcType=DECIMAL}, #{item.resultPoundNo,jdbcType=VARCHAR}, 
+      #{item.materialId,jdbcType=DECIMAL}, #{item.resultGrossPlaceId,jdbcType=DECIMAL}, 
+      #{item.resultGrossWeight,jdbcType=DECIMAL}, #{item.resultGrossWeightTime,jdbcType=TIMESTAMP}, 
+      #{item.resultTarePlaceId,jdbcType=DECIMAL}, #{item.resultTareWeight,jdbcType=DECIMAL}, 
+      #{item.resultTareWeightTime,jdbcType=TIMESTAMP}, #{item.resultNetWeight,jdbcType=DECIMAL}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR}, 
+      #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.isdeduct,jdbcType=DECIMAL}, #{item.isquality,jdbcType=DECIMAL}, 
+      #{item.resultIsQuality,jdbcType=DECIMAL} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update TMSTRAIN_WEIGHT_RESULT
+     set
+       RESULT_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_TOTAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_POUND_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPoundNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_GROSS_PLACE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultGrossPlaceId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_GROSS_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultGrossWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_GROSS_WEIGHT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultGrossWeightTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,RESULT_TARE_PLACE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTarePlaceId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_TARE_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTareWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_TARE_WEIGHT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTareWeightTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,RESULT_NET_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultNetWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,ISDEDUCT=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.isdeduct,jdbcType=DECIMAL}
+       </foreach>
+       ,ISQUALITY=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.isquality,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_IS_QUALITY=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultIsQuality,jdbcType=DECIMAL}
+       </foreach>
+     where RESULT_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.resultId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from TMSTRAIN_WEIGHT_RESULT
+    where RESULT_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+<!-- 通过采购订单号和车皮号查询火运总实绩ID和物资ID -->
+  <select id="getResultIdByPurNoAndWagonNo" parameterType="java.util.Map" resultType="java.util.Map">
+    select TTR.TOTAL_RESULT_ID "resultTotalId",
+           DB.MATERIAL_ID   "materialId"
+    from TMSTRAIN_LOADING_RESULT TLR
+        left join TMSTRAIN_TOTAL_RESULT TTR
+        on TTR.LOADING_ID = TLR.RESULT_ID
+        left join AMS_PURCHASE_ORDER APO
+            on APO.PURCHASE_ORDER_ID = TLR.PURCHASE_ORDER_RAIL_PLAN_ID
+        left join DIL_BATCH DB
+            on DB.BATCH_ID = APO.BATCH_ID
+    where TLR.RESULT_WAGON_NO = #{orderNumber} and APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
+  </select>
+
+</mapper>

src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -686,7 +686,9 @@
                 OO.ORDER_TYPE "orderTypee",
                 TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
                 TTR.RESULT_TOTAL_ID "resultTotalId",
-                RC.CAPACITY_NUMBER  "capacityNumber"
+                RC.CAPACITY_NUMBER  "capacityNumber",
+                TWR.TARE_SEGMENT_SQE "tareSegmentSqe",
+                TWR.GROSS_SEGMENT_SQE "grossSegmentSqe"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
             on OO.ORDER_ID = TTR.ORDER_ID