'采购燃辅料'

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

@@ -25,4 +25,8 @@ public interface OmsFeign {
     //远程调用新增运输订单子表
     @PostMapping("api/v1/oms/utilscontroller/insertSelectiveOrderMaterial")
     RESTfulResult insertSelectiveOrderMaterial(@RequestBody(required = false) Map<String, Object> omstruckOrderMaterial);
+
+    //远程调用推送websocket
+    @PostMapping("api/v1/oms/omstruckorderseparates/pushMesToWebsocket")
+    void pushMesToWebsocket(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.model.TmstruckEnfactoryResult;
 import com.steerinfo.dil.service.ITmstruckEnfactoryResultService;
@@ -9,10 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * TmstruckEnfactoryResult服务实现：
@@ -45,6 +43,9 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
     @Autowired
     private RulesServiceImpl rulesService;
 
+    @Autowired
+    OmsFeign omsFeign;
+
 
     /**
      * 派单时新增进厂实绩
@@ -136,7 +137,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         int i = 0;
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
-        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber));
+        String substring = orderNumber.substring(0, orderNumber.length() - 1);
+        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(substring));
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         i += updateEnFactoryResultByPDA(map); //添加进厂实绩
         //发计毛委托 计算添加汽车衡
@@ -194,9 +196,11 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 break;
             case 11:
         }
+        omsFeign.pushMesToWebsocket(map);
         return i;
     }
 
+
     /**
      * 通过门禁进厂
      * 运输订单号 orderNumber，车牌号capacityNumber，

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.BmsShipFeign;
 import com.steerinfo.dil.feign.BmsTruckFeign;
+import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
 import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
@@ -50,6 +51,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     @Autowired
     private BmsTruckFeign bmsTruckFeign;
 
+    @Autowired
+    OmsFeign omsFeign;
+
     /**
      * 查看运输线路是否为出厂
      * @param orderNumber
@@ -140,7 +144,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     public int leaveFactoryByPDA(Map<String, Object> map){
         int i = 0;
         String orderNumber = (String) map.get("orderNumber");
-        map.putAll(tmstruckLeaveFactoryResultMapper.selectResultId(orderNumber));
+        String substring = orderNumber.substring(0, orderNumber.length() - 1);
+        map.putAll(tmstruckLeaveFactoryResultMapper.selectResultId(substring));
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         i += updateLeaveResultByPDA(map); //更新出厂实绩
         switch (orderType.intValue()){
@@ -173,6 +178,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         }
         //路段顺序号 + 1
         i += utilsService.updateOrderLineSequence(map, 1);
+        omsFeign.pushMesToWebsocket(map);
         return i;
     }
 

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.feign.WmshBoundFeign;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
@@ -52,6 +53,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Autowired
     private WMSFeign wmsFeign;
 
+    @Autowired
+    OmsFeign omsFeign;
+
     @Autowired
     private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
 

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

@@ -73,21 +73,21 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
         //生成主键
         BigDecimal maxId = tmstruckReturnResultMapper.selectMaxId();
         tmstruckReturnResult.setResultId(maxId);
-        //通过运输订单号获得 运输订单ID
-        map.putAll(tmstruckReturnResultMapper.getResultTotalIdByOrderNumber((String) map.get("orderNumber")));
+//        //通过运输订单号获得 运输订单ID
+//        map.putAll(tmstruckReturnResultMapper.getResultTotalIdByOrderNumber((String) map.get("orderNumber")));
         tmstruckReturnResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-        //调用更新退货实绩接口
-        omsFeign.updateOmsTruckOrder(map);
-        //设置首次新增时的常规字段
+//        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+//        //调用更新退货实绩接口
+//        omsFeign.updateOmsTruckOrder(map);
+//        //设置首次新增时的常规字段
         addRegularField(tmstruckReturnResult);
         //新增退货实绩
         int i = tmstruckReturnResultMapper.insertSelective(tmstruckReturnResult);
-        //逻辑删除运单
-        int i1 = utilsService.updateOrderStatus(map, 7);
-        //重新新增销售运输订单
-        int i2 = addNewOrder(orderId);
-        return i + i1 + i2;
+//        //逻辑删除运单
+//        int i1 = utilsService.updateOrderStatus(map, 7);
+//        //重新新增销售运输订单
+//        int i2 = addNewOrder(orderId);
+        return i;
     }
 
 

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.TmstruckLoadResultMapper;
 import com.steerinfo.dil.mapper.TmstruckReceiptResultMapper;
 import com.steerinfo.dil.mapper.TmstruckUnloadResultMapper;
@@ -59,6 +60,9 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
     @Autowired
     private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
 
+    @Autowired
+    OmsFeign omsFeign;
+
     /**
      * 新增卸货实绩
      * 总实绩ID、卸货点

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.feign.QmsFeign;
 import com.steerinfo.dil.mapper.RulesMapper;
 import com.steerinfo.dil.mapper.TmstruckReceiptResultMapper;
@@ -59,6 +60,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     @Autowired
     private RulesMapper rulesMapper;
 
+    @Autowired
+    OmsFeign omsFeign;
+
     @Autowired
     private TmstruckLoadResultServiceImpl tmstruckLoadResultService;
 
@@ -213,6 +217,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         i += tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
         //路段顺序号 + 1
         i += utilsService.updateOrderLineSequence(map, 1);
+        omsFeign.pushMesToWebsocket(map);
         return i;
     }
 
@@ -487,7 +492,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         int count = 0;
         for (Map<String, Object> map : mapList) {
             //通过传来的运输订单号 与 物资ID查询计重实绩ID
-            map.putAll(tmstruckWeightResultMapper.selectTotalIdByOrderNo(map));
+            Map<String, Object> stringObjectMap = tmstruckWeightResultMapper.selectTotalIdByOrderNo(map);
+            map.putAll(stringObjectMap);
             try {
                 TmstruckWeightResult tmstruckWeightResult = generateWeightResult(map);
                 count += tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);

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

@@ -341,11 +341,11 @@
         <include refid="select"/>
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </select>
-    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="ResultMapWithBLOBs">
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         <include refid="select"/>
         <include refid="where"/>
     </select>
-    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="ResultMapWithBLOBs">
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         <include refid="select"/>
         <include refid="whereLike"/>
     </select>

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

@@ -2,27 +2,27 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.TmstruckWeightResultMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstruckWeightResult">
-        <id column="WEIGHT_TASK_RESULT_ID" jdbcType="DECIMAL" property="weightTaskResultId" />
-        <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
-        <result column="RESULT_POUND_NO" jdbcType="VARCHAR" property="resultPoundNo" />
-        <result column="RESULT_GROSS_WEIGHT" jdbcType="DECIMAL" property="resultGrossWeight" />
-        <result column="RESULT_GROSS_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultGrossWeightTime" />
-        <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="RESULT_GROSS_PLACE_ID" jdbcType="DECIMAL" property="resultGrossPlaceId" />
-        <result column="RESULT_TARE_PLACE_ID" jdbcType="DECIMAL" property="resultTarePlaceId" />
-        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
-        <result column="ISDEDUCT" jdbcType="DECIMAL" property="isdeduct" />
-        <result column="ISQUALITY" jdbcType="DECIMAL" property="isquality" />
-        <result column="SEGMENT_SQE" jdbcType="DECIMAL" property="segmentSqe" />
+        <id column="WEIGHT_TASK_RESULT_ID" jdbcType="DECIMAL" property="weightTaskResultId"/>
+        <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId"/>
+        <result column="RESULT_POUND_NO" jdbcType="VARCHAR" property="resultPoundNo"/>
+        <result column="RESULT_GROSS_WEIGHT" jdbcType="DECIMAL" property="resultGrossWeight"/>
+        <result column="RESULT_GROSS_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultGrossWeightTime"/>
+        <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="RESULT_GROSS_PLACE_ID" jdbcType="DECIMAL" property="resultGrossPlaceId"/>
+        <result column="RESULT_TARE_PLACE_ID" jdbcType="DECIMAL" property="resultTarePlaceId"/>
+        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId"/>
+        <result column="ISDEDUCT" jdbcType="DECIMAL" property="isdeduct"/>
+        <result column="ISQUALITY" jdbcType="DECIMAL" property="isquality"/>
+        <result column="SEGMENT_SQE" jdbcType="DECIMAL" property="segmentSqe"/>
     </resultMap>
     <sql id="columns">
         WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID, RESULT_POUND_NO, RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME,
@@ -38,10 +38,14 @@
     t.ISDEDUCT, t.ISQUALITY, t.SEGMENT_SQE
     </sql>
     <sql id="select">
-        SELECT <include refid="columns"/> FROM TMSTRUCK_WEIGHT_RESULT
+        SELECT
+        <include refid="columns"/>
+        FROM TMSTRUCK_WEIGHT_RESULT
     </sql>
     <sql id="select_alias">
-        SELECT <include refid="columns_alias"/> FROM TMSTRUCK_WEIGHT_RESULT t
+        SELECT
+        <include refid="columns_alias"/>
+        FROM TMSTRUCK_WEIGHT_RESULT t
     </sql>
     <sql id="where">
         <where>
@@ -178,7 +182,8 @@
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
-        delete from TMSTRUCK_WEIGHT_RESULT
+        delete
+        from TMSTRUCK_WEIGHT_RESULT
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -255,11 +260,15 @@
                                             RESULT_TARE_PLACE_ID, MATERIAL_ID, ISDEDUCT,
                                             ISQUALITY, SEGMENT_SQE)
         values (#{weightTaskResultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL},
-                #{resultPoundNo,jdbcType=VARCHAR}, #{resultGrossWeight,jdbcType=DECIMAL}, #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+                #{resultPoundNo,jdbcType=VARCHAR}, #{resultGrossWeight,jdbcType=DECIMAL},
+                #{resultGrossWeightTime,jdbcType=TIMESTAMP},
                 #{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}, #{resultGrossPlaceId,jdbcType=DECIMAL},
+                #{resultNetWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
+                #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+                #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP},
+                #{resultGrossPlaceId,jdbcType=DECIMAL},
                 #{resultTarePlaceId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{isdeduct,jdbcType=DECIMAL},
                 #{isquality,jdbcType=DECIMAL}, #{segmentSqe,jdbcType=DECIMAL})
     </insert>
@@ -398,26 +407,26 @@
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
         update TMSTRUCK_WEIGHT_RESULT
-        set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
-            RESULT_POUND_NO = #{resultPoundNo,jdbcType=VARCHAR},
-            RESULT_GROSS_WEIGHT = #{resultGrossWeight,jdbcType=DECIMAL},
+        set RESULT_TOTAL_ID          = #{resultTotalId,jdbcType=DECIMAL},
+            RESULT_POUND_NO          = #{resultPoundNo,jdbcType=VARCHAR},
+            RESULT_GROSS_WEIGHT      = #{resultGrossWeight,jdbcType=DECIMAL},
             RESULT_GROSS_WEIGHT_TIME = #{resultGrossWeightTime,jdbcType=TIMESTAMP},
-            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},
-            RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId,jdbcType=DECIMAL},
-            RESULT_TARE_PLACE_ID = #{resultTarePlaceId,jdbcType=DECIMAL},
-            MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-            ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
-            ISQUALITY = #{isquality,jdbcType=DECIMAL},
-            SEGMENT_SQE = #{segmentSqe,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},
+            RESULT_GROSS_PLACE_ID    = #{resultGrossPlaceId,jdbcType=DECIMAL},
+            RESULT_TARE_PLACE_ID     = #{resultTarePlaceId,jdbcType=DECIMAL},
+            MATERIAL_ID              = #{materialId,jdbcType=DECIMAL},
+            ISDEDUCT                 = #{isdeduct,jdbcType=DECIMAL},
+            ISQUALITY                = #{isquality,jdbcType=DECIMAL},
+            SEGMENT_SQE              = #{segmentSqe,jdbcType=DECIMAL}
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
@@ -520,7 +529,8 @@
         #{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.resultGrossPlaceId,jdbcType=DECIMAL},
+        #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP},
+        #{item.resultGrossPlaceId,jdbcType=DECIMAL},
         #{item.resultTarePlaceId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL},
         #{item.isdeduct,jdbcType=DECIMAL}, #{item.isquality,jdbcType=DECIMAL}, #{item.segmentSqe,jdbcType=DECIMAL}
         from dual
@@ -530,87 +540,108 @@
         update TMSTRUCK_WEIGHT_RESULT
         set
         WEIGHT_TASK_RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.weightTaskResultId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TOTAL_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_POUND_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultPoundNo,jdbcType=VARCHAR}
         </foreach>
         ,RESULT_GROSS_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossWeight,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_GROSS_WEIGHT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossWeightTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_TARE_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTareWeight,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TARE_WEIGHT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTareWeightTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_NET_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultNetWeight,jdbcType=DECIMAL}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
         </foreach>
         ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
         </foreach>
         ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
         </foreach>
         ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
         </foreach>
         ,DELETE_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
         </foreach>
         ,DELETE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_GROSS_PLACE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossPlaceId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TARE_PLACE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTarePlaceId,jdbcType=DECIMAL}
         </foreach>
         ,MATERIAL_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
         </foreach>
         ,ISDEDUCT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.isdeduct,jdbcType=DECIMAL}
         </foreach>
         ,ISQUALITY=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.isquality,jdbcType=DECIMAL}
         </foreach>
         ,SEGMENT_SQE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
+                 close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.segmentSqe,jdbcType=DECIMAL}
         </foreach>
         where WEIGHT_TASK_RESULT_ID in
@@ -640,15 +671,15 @@
 
     <!--  通过运输订单号 查询实绩Id、总实绩ID -->
     <select id="selectTotalIdByOrderNo" parameterType="java.util.Map" resultType="java.util.Map">
-        select OO.ORDER_ID               "orderId",
-               OO.ORDER_TYPE             "orderTypee",
-               TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-               TTR.RESULT_TOTAL_ID       "resultTotalId"
+        select OO.ORDER_ID "orderId",
+        OO.ORDER_TYPE "orderTypee",
+        TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+        TTR.RESULT_TOTAL_ID "resultTotalId"
         from OMSTRUCK_ORDER OO
-                 left join TMSTRUCK_TOTAL_RESULT TTR
-                           on OO.ORDER_ID = TTR.ORDER_ID
-                 left join TMSTRUCK_WEIGHT_RESULT TWR
-                           on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on OO.ORDER_ID = TTR.ORDER_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         where OO.ORDER_NUMBER = #{orderNumber}
         <if test="materialId != null">
             and TWR.MATERIAL_ID = #{materialId}
@@ -676,7 +707,8 @@
         TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
         RS.SUPPLIER_NAME "supplierName",
-        RCON. CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        RCON. CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        OO.ORDER_ID "orderId"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -1327,7 +1359,7 @@
         </if>
     </select>
 
-<!--  通过物资名称和物资规格查询物资ID  -->
+    <!--  通过物资名称和物资规格查询物资ID  -->
     <select id="getMaterialIdByMaterialNameAndSpe" parameterType="java.util.Map" resultType="java.lang.Integer">
         select RM.MATERIAL_ID
         from RMS_MATERIAL RM
@@ -1344,69 +1376,68 @@
         </where>
     </select>
 
-<!--   通过物资Id和运输订单id 查询计量实绩Id -->
+    <!--   通过物资Id和运输订单id 查询计量实绩Id -->
     <select id="getWeightIdByMaterialIdAndOrderId" parameterType="java.util.Map" resultType="java.lang.Integer">
         select
-               TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId"
+        TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
-            on OO.ORDER_ID = TTR.ORDER_ID
+        on OO.ORDER_ID = TTR.ORDER_ID
         left join TMSTRUCK_WEIGHT_RESULT TWR
-            on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         where OO.ORDER_ID = #{orderId}
-          <if test="materialId != null">
-              and TWR.MATERIAL_ID = #{materialId}
-          </if>
-</select>
+        <if test="materialId != null">
+            and TWR.MATERIAL_ID = #{materialId}
+        </if>
+    </select>
 
-<!--    通过运输订单号和查询订单Id 和物资ID (针对单拼)  -->
+    <!--    通过运输订单号和查询订单Id 和物资ID (针对单拼)  -->
     <select id="getOrderIdAndMaterialIdByOrderNum" parameterType="string" resultType="java.util.Map">
-        select
-               OO.ORDER_ID "orderId",
+        select OO.ORDER_ID     "orderId",
                OOM.MATERIAL_ID "materialId"
         from OMSTRUCK_ORDER OO
-        left join OMSTRUCK_ORDER_MATERIAL OOM
-        on OOM.ORDER_ID = OO.ORDER_ID
+                 left join OMSTRUCK_ORDER_MATERIAL OOM
+                           on OOM.ORDER_ID = OO.ORDER_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
-<!--  查询内转到钢材到异地库计量实绩  -->
+    <!--  查询内转到钢材到异地库计量实绩  -->
     <select id="getSteelNzJiPiResult" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (
-                 SELECT TWR.WEIGHT_TASK_RESULT_ID      "weightTaskResultId",
-                        AROD.DAYPLAN_NO                "dayplanNo",
-                        OO.ORDER_NUMBER                "orderNumber",
-                        RC.CAPACITY_NUMBER             "capacityNumber",
-                        RTC.TRUCK_CALCULATE_NUMBER     "truckCalculateNumber",
-                        RM.MATERIAL_NAME               "materialName",
-                        OOM.ORDER_MATERIAL_NUMBER      "orderMaterialNumber",
-                        RM.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
-                        RS.SHIPPER_NAME                "shipperName",
-                        RW.WAREHOUSE_NAME              "warehouseName",
-                        TWR.RESULT_TARE_WEIGHT         "resultTareWeight",
-                        TWR.RESULT_TARE_WEIGHT_TIME    "resultTareWeightTime"
-                 FROM TMSTRUCK_WEIGHT_RESULT TWR
-                          LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                                    ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
-                          LEFT JOIN OMSTRUCK_ORDER OO
-                                    ON OO.ORDER_ID = TTR.ORDER_ID
-                          LEFT JOIN AMS_RAIL_OFFSET_DAYPLAN AROD
-                                    ON AROD.DAYPLAN_ID = OO.ORDER_PLAN_ID
-                          LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-                                    ON OO.ORDER_ID = OOM.ORDER_ID AND OOM.MATERIAL_ID = TWR.MATERIAL_ID
-                          LEFT JOIN RMS_MATERIAL RM
-                                    ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-                          LEFT JOIN RMS_SHIPPER RS
-                                    ON RS.SHIPPER_ID = AROD.SHIPPER_ID
-                          LEFT JOIN RMS_WAREHOUSE RW
-                                    ON RW.WAREHOUSE_ID = AROD.RECEIVING_UNIT_ID
-                          LEFT JOIN RMS_TRUCK_CALCULATE RTC
-                                    ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
-                          LEFT JOIN RMS_CAPACITY RC
-                                    ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                WHERE OO.ORDER_TYPE = 4 AND TWR.RESULT_TARE_WEIGHT IS NOT NULL
-             )
+        SELECT TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+        AROD.DAYPLAN_NO "dayplanNo",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+        RM.MATERIAL_NAME "materialName",
+        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+        RM.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
+        RS.SHIPPER_NAME "shipperName",
+        RW.WAREHOUSE_NAME "warehouseName",
+        TWR.RESULT_TARE_WEIGHT "resultTareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime"
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN AMS_RAIL_OFFSET_DAYPLAN AROD
+        ON AROD.DAYPLAN_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OO.ORDER_ID = OOM.ORDER_ID AND OOM.MATERIAL_ID = TWR.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AROD.SHIPPER_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = AROD.RECEIVING_UNIT_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTC
+        ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_TYPE = 4 AND TWR.RESULT_TARE_WEIGHT IS NOT NULL
+        )
         <where>
             <if test="dayplanNo != null">
                 <foreach collection="dayplanNo" item="item" open="(" separator="or" close=")">
@@ -1480,42 +1511,42 @@
         </if>
     </select>
 
-<!--  查询内转钢材到异地库计毛实绩  -->
+    <!--  查询内转钢材到异地库计毛实绩  -->
     <select id="getSteelNzJiMaoResult" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (
-        SELECT TWR.WEIGHT_TASK_RESULT_ID      "weightTaskResultId",
-                AROD.DAYPLAN_NO                "dayplanNo",
-                OO.ORDER_NUMBER                "orderNumber",
-                RC.CAPACITY_NUMBER             "capacityNumber",
-                RTC.TRUCK_CALCULATE_NUMBER     "truckCalculateNumber",
-                RM.MATERIAL_NAME               "materialName",
-                OOM.ORDER_MATERIAL_NUMBER      "orderMaterialNumber",
-                RM.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
-                RS.SHIPPER_NAME                "shipperName",
-                RW.WAREHOUSE_NAME              "warehouseName",
-                TWR.RESULT_GROSS_WEIGHT         "resultGrossWeight",
-                TWR.RESULT_GROSS_WEIGHT_TIME    "resultGrossWeightTime",
-                TWR.INSERT_UPDATE_REMARK        "insertUpdateRemark"
+        SELECT TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+        AROD.DAYPLAN_NO "dayplanNo",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+        RM.MATERIAL_NAME "materialName",
+        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+        RM.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
+        RS.SHIPPER_NAME "shipperName",
+        RW.WAREHOUSE_NAME "warehouseName",
+        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        TWR.INSERT_UPDATE_REMARK "insertUpdateRemark"
         FROM TMSTRUCK_WEIGHT_RESULT TWR
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-            ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
         LEFT JOIN OMSTRUCK_ORDER OO
-            ON OO.ORDER_ID = TTR.ORDER_ID
+        ON OO.ORDER_ID = TTR.ORDER_ID
         LEFT JOIN AMS_RAIL_OFFSET_DAYPLAN AROD
-            ON AROD.DAYPLAN_ID = OO.ORDER_PLAN_ID
+        ON AROD.DAYPLAN_ID = OO.ORDER_PLAN_ID
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-            ON OO.ORDER_ID = OOM.ORDER_ID AND OOM.MATERIAL_ID = TWR.MATERIAL_ID
+        ON OO.ORDER_ID = OOM.ORDER_ID AND OOM.MATERIAL_ID = TWR.MATERIAL_ID
         LEFT JOIN RMS_MATERIAL RM
-            ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         LEFT JOIN RMS_SHIPPER RS
-            ON RS.SHIPPER_ID = AROD.SHIPPER_ID
+        ON RS.SHIPPER_ID = AROD.SHIPPER_ID
         LEFT JOIN RMS_WAREHOUSE RW
-            ON RW.WAREHOUSE_ID = AROD.RECEIVING_UNIT_ID
+        ON RW.WAREHOUSE_ID = AROD.RECEIVING_UNIT_ID
         LEFT JOIN RMS_TRUCK_CALCULATE RTC
-            ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
         LEFT JOIN RMS_CAPACITY RC
-            ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_TYPE = 4 AND TWR.RESULT_GROSS_WEIGHT IS NOT NULL
         )
         <where>
@@ -1597,46 +1628,46 @@
         </if>
     </select>
 
-<!--   查询国产矿进口矿计毛实绩 -->
+    <!--   查询国产矿进口矿计毛实绩 -->
     <select id="getImportedDomesticNzJiMaoResult" parameterType="java.util.Map" resultType="java.util.Map">
 
         SELECT *
         FROM (
-                 select TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
-                        APO.PURCHASE_ORDER_NO        "purchaseOrderNo",
-                        RM.MATERIAL_NAME             "materialName",
-                        OO.ORDER_NUMBER              "orderNumber",
-                        DB.RESULT_FOREIGN_SHIP_NAME  "resultForeignShipName",
-                        RC.CAPACITY_NUMBER           "capacityNumber",
-                        RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
-                        TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
-                        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-                        RS.SUPPLIER_NAME             "supplierName",
-                        RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName"
-                 from TMSTRUCK_WEIGHT_RESULT TWR
-                          left join TMSTRUCK_TOTAL_RESULT TTR
-                                    on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          left join OMSTRUCK_ORDER OO
-                                    on TTR.ORDER_ID = OO.ORDER_ID
-                          left join AMS_PURCHASE_ORDER APO
-                                    on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
-                          left join DIL_BATCH DB
-                                    ON DB.BATCH_ID = APO.BATCH_ID
-                          left join RMS_CAPACITY RC
-                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
-                          left join RMS_TRUCK_CALCULATE RTC
-                                    on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
-                          left join OMSTRUCK_ORDER_MATERIAL OOM
-                                    on OOM.ORDER_ID = OO.ORDER_ID
-                          left join RMS_MATERIAL RM
-                                    on RM.MATERIAL_ID = OOM.MATERIAL_ID
-                          left join RMS_SUPPLIER RS
-                                    on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-                          left join RMS_CONSIGNEE RCON
-                                    on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
-                 where RESULT_GROSS_WEIGHT_TIME is not null
-                   and OO.ORDER_TYPE = 9
-             )
+        select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        RM.MATERIAL_NAME "materialName",
+        OO.ORDER_NUMBER "orderNumber",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        RS.SUPPLIER_NAME "supplierName",
+        RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        from TMSTRUCK_WEIGHT_RESULT TWR
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER OO
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join AMS_PURCHASE_ORDER APO
+        on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        left join DIL_BATCH DB
+        ON DB.BATCH_ID = APO.BATCH_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join RMS_TRUCK_CALCULATE RTC
+        on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        left join RMS_SUPPLIER RS
+        on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        left join RMS_CONSIGNEE RCON
+        on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        where RESULT_GROSS_WEIGHT_TIME is not null
+        and OO.ORDER_TYPE = 9
+        )
         <where>
             <if test="purchaseOrderNo != null">
                 <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
@@ -1698,44 +1729,44 @@
         </if>
     </select>
 
-<!--  查询国产矿进口矿计皮实绩  -->
+    <!--  查询国产矿进口矿计皮实绩  -->
     <select id="getImportedDomesticNzJiPiResult" parameterType="java.util.Map" resultType="java.util.Map">
 
         select *
         from (
-                 select TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
-                        APO.PURCHASE_ORDER_NO        "purchaseOrderNo",
-                        RM.MATERIAL_NAME             "materialName",
-                        OO.ORDER_NUMBER              "orderNumber",
-                        RC.CAPACITY_NUMBER           "capacityNumber",
-                        RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
-                        TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
-                        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-                        DB.RESULT_FOREIGN_SHIP_NAME  "resultForeignShipName",
-                        TWR.RESULT_TARE_WEIGHT       "resultTareWeight",
-                        TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
-                        TWR.RESULT_NET_WEIGHT        "resultNetWeight",
-                        TWR.RESULT_POUND_NO          "resultPoundNo"
-                 from TMSTRUCK_WEIGHT_RESULT TWR
-                          left join TMSTRUCK_TOTAL_RESULT TTR
-                                    on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          left join OMSTRUCK_ORDER OO
-                                    on TTR.ORDER_ID = OO.ORDER_ID
-                          left join AMS_PURCHASE_ORDER APO
-                                    on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
-                          left join DIL_BATCH DB
-                                    on DB.BATCH_ID = APO.BATCH_ID
-                          left join RMS_CAPACITY RC
-                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
-                          left join RMS_TRUCK_CALCULATE RTC
-                                    on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
-                          left join OMSTRUCK_ORDER_MATERIAL OOM
-                                    on OOM.ORDER_ID = OO.ORDER_ID
-                          left join RMS_MATERIAL RM
-                                    on RM.MATERIAL_ID = OOM.MATERIAL_ID
-                 where RESULT_TARE_WEIGHT_TIME is not null
-                   and OO.ORDER_TYPE = 9
-             )
+        select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        RM.MATERIAL_NAME "materialName",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        TWR.RESULT_TARE_WEIGHT "resultTareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        TWR.RESULT_POUND_NO "resultPoundNo"
+        from TMSTRUCK_WEIGHT_RESULT TWR
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER OO
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join AMS_PURCHASE_ORDER APO
+        on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        left join DIL_BATCH DB
+        on DB.BATCH_ID = APO.BATCH_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join RMS_TRUCK_CALCULATE RTC
+        on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        where RESULT_TARE_WEIGHT_TIME is not null
+        and OO.ORDER_TYPE = 9
+        )
         <where>
             <if test="purchaseOrderNo != null">
                 <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
@@ -1819,19 +1850,19 @@
     <select id="getImportedDomesticNzJiPi2Result" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-        select TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
-        APO.PURCHASE_ORDER_NO        "purchaseOrderNo",
-        RM.MATERIAL_NAME             "materialName",
-        OO.ORDER_NUMBER              "orderNumber",
-        RC.CAPACITY_NUMBER           "capacityNumber",
-        RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
-        TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
+        select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        RM.MATERIAL_NAME "materialName",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-        DB.RESULT_FOREIGN_SHIP_NAME  "resultForeignShipName",
-        TWR.RESULT_TARE_WEIGHT       "resultTareWeight",
-        TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
-        TWR.RESULT_NET_WEIGHT        "resultNetWeight",
-        TWR.RESULT_POUND_NO          "resultPoundNo"
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        TWR.RESULT_TARE_WEIGHT "resultTareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        TWR.RESULT_POUND_NO "resultPoundNo"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -1935,17 +1966,17 @@
     <select id="getImportedDomesticNzJiMao2Result" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (
-        select TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
-                APO.PURCHASE_ORDER_NO        "purchaseOrderNo",
-                RM.MATERIAL_NAME             "materialName",
-                OO.ORDER_NUMBER              "orderNumber",
-                DB.RESULT_FOREIGN_SHIP_NAME  "resultForeignShipName",
-                RC.CAPACITY_NUMBER           "capacityNumber",
-                RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
-                TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
-                TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-                RS.SUPPLIER_NAME             "supplierName",
-                RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName"
+        select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        RM.MATERIAL_NAME "materialName",
+        OO.ORDER_NUMBER "orderNumber",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        RS.SUPPLIER_NAME "supplierName",
+        RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -2031,103 +2062,103 @@
         </if>
     </select>
 
-<!--    查询内转厂内物资计量实绩 -->
+    <!--    查询内转厂内物资计量实绩 -->
     <select id="getInFactoryJiLiangResult" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-                 select TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
-                        RM.MATERIAL_NAME             "materialName",
-                        OO.ORDER_NUMBER              "orderNumber",
-                        RC.CAPACITY_NUMBER           "capacityNumber",
-                        RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
-                        TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
-                        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-                        TWR.RESULT_TARE_WEIGHT       "resultTareWeight",
-                        TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
-                        TWR.RESULT_NET_WEIGHT        "resultNetWeight",
-                        TWR.RESULT_POUND_NO          "resultPoundNo",
-                        TWR.INSERT_UPDATE_REMARK      "insertUpdateRemark"
-                 from TMSTRUCK_WEIGHT_RESULT TWR
-                          left join TMSTRUCK_TOTAL_RESULT TTR
-                                    on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          left join OMSTRUCK_ORDER OO
-                                    on TTR.ORDER_ID = OO.ORDER_ID
-                          left join RMS_CAPACITY RC
-                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
-                          left join RMS_TRUCK_CALCULATE RTC
-                                    on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
-                          left join OMSTRUCK_ORDER_MATERIAL OOM
-                                    on OOM.ORDER_ID = OO.ORDER_ID
-                          left join RMS_MATERIAL RM
-                                    on RM.MATERIAL_ID = OOM.MATERIAL_ID
-                 where RESULT_TARE_WEIGHT_TIME is not null
-                   and OO.ORDER_TYPE = 11
-             )
+        select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+        RM.MATERIAL_NAME "materialName",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        TWR.RESULT_TARE_WEIGHT "resultTareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        TWR.RESULT_POUND_NO "resultPoundNo",
+        TWR.INSERT_UPDATE_REMARK "insertUpdateRemark"
+        from TMSTRUCK_WEIGHT_RESULT TWR
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER OO
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join RMS_TRUCK_CALCULATE RTC
+        on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        where RESULT_TARE_WEIGHT_TIME is not null
+        and OO.ORDER_TYPE = 11
+        )
         <where>
-        <if test="materialName != null">
-            <foreach collection="materialName" item="item" open="(" separator="or" close=")">
-                "materialName" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="orderNumber != null">
-            and
-            <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
-                "orderNumber" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="capacityNumber != null">
-            and
-            <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
-                "capacityNumber" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="truckCalculateNumber != null">
-            and
-            <foreach collection="truckCalculateNumber" item="item" open="(" separator="or" close=")">
-                "truckCalculateNumber" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="resultGrossWeight != null">
-            and
-            <foreach collection="resultGrossWeight" item="item" open="(" separator="or" close=")">
-                "resultGrossWeight" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="resultGrossWeightTime != null">
-            and
-            <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
-                "resultGrossWeightTime" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="resultTareWeight != null">
-            and
-            <foreach collection="resultTareWeight" item="item" open="(" separator="or" close=")">
-                "resultTareWeight" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="resultPoundNo != null">
-            and
-            <foreach collection="resultPoundNo" item="item" open="(" separator="or" close=")">
-                "resultPoundNo" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="resultTareWeightTime != null">
-            and
-            <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
-                "resultTareWeightTime" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="resultNetWeight != null">
-            and
-            <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
-                "resultNetWeight" like '%${item}%'
-            </foreach>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNumber != null">
+                and
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="truckCalculateNumber != null">
+                and
+                <foreach collection="truckCalculateNumber" item="item" open="(" separator="or" close=")">
+                    "truckCalculateNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultGrossWeight != null">
+                and
+                <foreach collection="resultGrossWeight" item="item" open="(" separator="or" close=")">
+                    "resultGrossWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultGrossWeightTime != null">
+                and
+                <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
+                    "resultGrossWeightTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultTareWeight != null">
+                and
+                <foreach collection="resultTareWeight" item="item" open="(" separator="or" close=")">
+                    "resultTareWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultPoundNo != null">
+                and
+                <foreach collection="resultPoundNo" item="item" open="(" separator="or" close=")">
+                    "resultPoundNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultTareWeightTime != null">
+                and
+                <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
+                    "resultTareWeightTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultNetWeight != null">
+                and
+                <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
+                    "resultNetWeight" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "resultTareWeightTime" desc
         </if>
-    </where>
-    <include refid="orderBy"></include>
-    <if test="orderField == null  ">
-        order by "resultTareWeightTime" desc
-    </if>
     </select>
 
 </mapper>