修改

pom.xml

@@ -147,10 +147,10 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>DIL_VERSION</param>
+<!--                        <param>DIL_VERSION</param>-->
 <!--                        <param>TMSTRUCK_LOAD_RESULT</param>-->
 <!--                        <param>TMSTRUCK_LEAVE_FACTORY_RESULT</param>-->
-<!--                        <param>TMSTRUCK_UNLOAD_RESULT</param>-->
+                        <param>TMSTRUCK_UNLOAD_RESULT</param>
 <!--                        <param>TMSTRUCK_WEIGHT_RESULT</param>-->
 
                     </tables>

src/main/java/com/steerinfo/dil/model/TmstruckUnloadResult.java

@@ -105,6 +105,12 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="路段顺序号",required=false)
     private BigDecimal segmentSqe;
 
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -245,6 +251,14 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
         this.segmentSqe = segmentSqe;
     }
 
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -267,6 +281,7 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
         sb.append(", deleteTime=").append(deleteTime);
         sb.append(", resultUnloadPlaceId=").append(resultUnloadPlaceId);
         sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", materialId=").append(materialId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -206,6 +206,14 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 10: // 采购内转（老区-厂内） 没有进厂
                 break;
             case 11:
+            case 12:
+                //更新计量实绩
+                map.put("grossPlaceId", 5);
+                i += tmstruckWeightResultService.updateWeightResult(map);
+                //发送计量委托
+                List<Integer> materialIdByOrderId = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+                map.put("materialId", materialIdByOrderId.get(0));
+                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
         }
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "车辆进厂");
         return i;
@@ -245,6 +253,10 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 10: // 采购内转（老区-厂内）
                 break;
             case 11:
+                break;
+            case 12:
+                break;
+
         }
         omsFeign.pushMesToWebsocket(map);
         return i;

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

@@ -197,6 +197,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("ended", "0");
             case 10:
             case 11:
+            case 12:
+                break;
         }
         /*访问接口发送数据*/
         return sendMesToDXMeasure(measureCommission);

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

@@ -171,9 +171,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 12:
                 i += updateUnloadResultBy(map); //更新卸货实绩
                 //判断是否还有物资，如果还有物资就执行发送计量委托
-
-
-
+                materialIdIsNorWeight(map);
+                break;
         }
         //卸货成功后推送消息给websocket
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
@@ -197,6 +196,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         if(map.get("warehouseId") != null){
             tmstruckUnloadResult.setResultUnloadPlaceId(DataChange.dataToBigDecimal(map.get("warehouseId")));
         }
+        //判断物资id是否为空
+        if (map.get("materialId") != null){
+            tmstruckUnloadResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        }
         //获得卸货时间
         tmstruckUnloadResult.setResultEndTime(new Date());
         //扫码后确认卸货所以卸货状态码为  同意
@@ -242,7 +245,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
     }
 
 
-    //零星物资判断物资是否计量
+    //零星物资判断物资是否需要多次计量，并发送计量委托
     @Override
     public int materialIdIsNorWeight(Map<String, Object> map) {
         //获取订单id
@@ -250,16 +253,18 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         List<Map<String, Object>> maps = tmstruckUnloadResultMapper.selectMaterialForUnload(orderNumber);
         for (Map<String,Object> map1:maps){
             BigDecimal materialId =(BigDecimal) map1.get("materialId");
+            BigDecimal orderId =(BigDecimal) map1.get("orderId");
             Map<String,Object> map2=new HashMap<>();
             map2.put("materialId",materialId);
-            map2.put("orderNumber",orderNumber);
+            map2.put("orderId",orderId);
+            //判断物资是否被计量
             Integer integer = tmstruckUnloadResultMapper.selectUnloadMaterialId(map2);
             if (integer==0){
                 //调用计量实绩接口,发送计量委托
-                tmstruckMeasureCommissionService.sendDXMeasureCommissionMes(map);
+                tmstruckMeasureCommissionService.addMaoMeasureCommission(map2);
             }
         }
-        return 0;
+        return 2;
     }
 
     //内转物流新增卸车实绩
@@ -289,4 +294,5 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         return i;
     }
 
+
 }

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

@@ -225,6 +225,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 10:
                 break;
             case 11:
+                break;
+            case 12:
+
                 break;
         }
         i += tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);

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

@@ -18,23 +18,24 @@
         <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
         <result column="RESULT_UNLOAD_PLACE_ID" jdbcType="DECIMAL" property="resultUnloadPlaceId" />
         <result column="SEGMENT_SQE" jdbcType="DECIMAL" property="segmentSqe" />
+        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
     </resultMap>
     <sql id="columns">
         RESULT_ID, RESULT_NUMBER, RESULT_TOTAL_ID, RESULT_START_TIME, RESULT_END_TIME, RESULT_DURATION,
     UNLOAD_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-    DELETE_NAME, DELETE_TIME, RESULT_UNLOAD_PLACE_ID, SEGMENT_SQE
+    DELETE_NAME, DELETE_TIME, RESULT_UNLOAD_PLACE_ID, SEGMENT_SQE, MATERIAL_ID
     </sql>
     <sql id="columns_alias">
         t.RESULT_ID, t.RESULT_NUMBER, t.RESULT_TOTAL_ID, t.RESULT_START_TIME, t.RESULT_END_TIME,
     t.RESULT_DURATION, t.UNLOAD_STATUS, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
     t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETE_NAME, t.DELETE_TIME, t.RESULT_UNLOAD_PLACE_ID,
-    t.SEGMENT_SQE
+    t.SEGMENT_SQE, t.MATERIAL_ID
     </sql>
     <sql id="select">
-        SELECT <include refid="columns"/> FROM TMSTRUCK_UNLOAD_RESULT
+        SELECT <include refid="columns" /> FROM TMSTRUCK_UNLOAD_RESULT
     </sql>
     <sql id="select_alias">
-        SELECT <include refid="columns_alias"/> FROM TMSTRUCK_UNLOAD_RESULT t
+        SELECT <include refid="columns_alias" /> FROM TMSTRUCK_UNLOAD_RESULT t
     </sql>
     <sql id="where">
         <where>
@@ -86,6 +87,9 @@
             <if test="segmentSqe != null">
                 and SEGMENT_SQE = #{segmentSqe}
             </if>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -138,6 +142,9 @@
             <if test="segmentSqe != null">
                 and SEGMENT_SQE = #{segmentSqe}
             </if>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -192,6 +199,9 @@
         <if test="segmentSqe != null">
             or SEGMENT_SQE = #{segmentSqe}
         </if>
+        <if test="materialId != null">
+            or MATERIAL_ID = #{materialId}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
         insert into TMSTRUCK_UNLOAD_RESULT (RESULT_ID, RESULT_NUMBER, RESULT_TOTAL_ID,
@@ -199,13 +209,13 @@
                                             UNLOAD_STATUS, INSERT_USERNAME, INSERT_TIME,
                                             UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                             DELETE_NAME, DELETE_TIME, RESULT_UNLOAD_PLACE_ID,
-                                            SEGMENT_SQE)
+                                            SEGMENT_SQE, MATERIAL_ID)
         values (#{resultId,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR}, #{resultTotalId,jdbcType=DECIMAL},
                 #{resultStartTime,jdbcType=TIMESTAMP}, #{resultEndTime,jdbcType=TIMESTAMP}, #{resultDuration,jdbcType=DECIMAL},
                 #{unloadStatus,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
                 #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
                 #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{resultUnloadPlaceId,jdbcType=DECIMAL},
-                #{segmentSqe,jdbcType=DECIMAL})
+                #{segmentSqe,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
         insert into TMSTRUCK_UNLOAD_RESULT
@@ -258,6 +268,9 @@
             <if test="segmentSqe != null">
                 SEGMENT_SQE,
             </if>
+            <if test="materialId != null">
+                MATERIAL_ID,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="resultId != null">
@@ -308,6 +321,9 @@
             <if test="segmentSqe != null">
                 #{segmentSqe,jdbcType=DECIMAL},
             </if>
+            <if test="materialId != null">
+                #{materialId,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
@@ -326,7 +342,8 @@
             DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
             DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
             RESULT_UNLOAD_PLACE_ID = #{resultUnloadPlaceId,jdbcType=DECIMAL},
-            SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL}
+            SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL},
+            MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
@@ -377,20 +394,23 @@
             <if test="segmentSqe != null">
                 SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL},
             </if>
+            <if test="materialId != null">
+                MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+            </if>
         </set>
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
     <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
-        <include refid="select"/>
+        <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"/>
+        <include refid="select" />
+        <include refid="where" />
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="whereLike"/>
+        <include refid="select" />
+        <include refid="whereLike" />
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into TMSTRUCK_UNLOAD_RESULT
@@ -402,7 +422,7 @@
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, DELETE_NAME,
         DELETE_TIME, RESULT_UNLOAD_PLACE_ID,
-        SEGMENT_SQE)
+        SEGMENT_SQE, MATERIAL_ID)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.resultId,jdbcType=DECIMAL},
@@ -413,85 +433,89 @@
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR},
         #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.resultUnloadPlaceId,jdbcType=DECIMAL},
-        #{item.segmentSqe,jdbcType=DECIMAL} from dual
+        #{item.segmentSqe,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
         update TMSTRUCK_UNLOAD_RESULT
         set
         RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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_NUMBER=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultNumber,jdbcType=VARCHAR}
         </foreach>
         ,RESULT_TOTAL_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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_START_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultStartTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_END_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEndTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_DURATION=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultDuration,jdbcType=DECIMAL}
         </foreach>
         ,UNLOAD_STATUS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.unloadStatus,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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 collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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 collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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 collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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 collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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 collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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 collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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>
         ,RESULT_UNLOAD_PLACE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultUnloadPlaceId,jdbcType=DECIMAL}
         </foreach>
         ,SEGMENT_SQE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.segmentSqe,jdbcType=DECIMAL}
         </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>
         where RESULT_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+        <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 TMSTRUCK_UNLOAD_RESULT
         where RESULT_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
             #{id}
         </foreach>
     </delete>
@@ -515,15 +539,15 @@
         select *
         from (
         select
-                TUR.RESULT_ID "resultId",
-                APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-                OO.ORDER_NUMBER "orderNumber",
-                RC.CAPACITY_NUMBER "capacityNumber",
-                RM.MATERIAL_NAME "materialName",
-                TWR.RESULT_NET_WEIGHT "resultNetWeight",
-                RW.WAREHOUSE_NAME "warehouseName",
-                TUR.RESULT_END_TIME "resultEndTime",
-                TUR.INSERT_TIME "insertTime"
+        TUR.RESULT_ID "resultId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RM.MATERIAL_NAME "materialName",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        RW.WAREHOUSE_NAME "warehouseName",
+        TUR.RESULT_END_TIME "resultEndTime",
+        TUR.INSERT_TIME "insertTime"
         from TMSTRUCK_UNLOAD_RESULT TUR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -616,7 +640,7 @@
                  left join TMSTRUCK_UNLOAD_RESULT TUR
                            on TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
                  left join RMS_CAPACITY RC
-                            on RC.CAPACITY_ID = OO.CAPACITY_ID
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
@@ -627,50 +651,50 @@
         where WAREHOUSE_NAME = #{warehouseName}
     </select>
 
-<!--  通过总实绩ID查询订单中卸货实绩  -->
+    <!--  通过总实绩ID查询订单中卸货实绩  -->
     <select id="getUnloadPointId" resultType="java.math.BigDecimal" parameterType="java.util.Map">
         select OO.UNLOAD_POINT_ID from OMSTRUCK_ORDER OO
-            left join TMSTRUCK_TOTAL_RESULT TTR
-                on OO.ORDER_ID = TTR.ORDER_ID
+                                           left join TMSTRUCK_TOTAL_RESULT TTR
+                                                     on OO.ORDER_ID = TTR.ORDER_ID
         where TTR.RESULT_TOTAL_ID = #{resultTotalId}
     </select>
 
-<!--   查询内转采购进口矿国产矿实绩 -->
+    <!--   查询内转采购进口矿国产矿实绩 -->
     <select id="getImportedDomesticNzUnloadResult" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-                 select TUR.RESULT_ID         "resultId",
-                        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-                        OO.ORDER_NUMBER       "orderNumber",
-                        RC.CAPACITY_NUMBER    "capacityNumber",
-                        RM.MATERIAL_NAME      "materialName",
-                        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-                        TWR.RESULT_NET_WEIGHT "resultNetWeight",
-                        RW.WAREHOUSE_NAME     "warehouseName",
-                        TUR.RESULT_START_TIME "resultStartTime",
-                        TUR.INSERT_TIME       "insertTime"
-                 from TMSTRUCK_UNLOAD_RESULT TUR
-                          left join TMSTRUCK_TOTAL_RESULT TTR
-                                    on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          left join TMSTRUCK_WEIGHT_RESULT TWR
-                                    on TWR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
-                          left join OMSTRUCK_ORDER OO
-                                    on OO.ORDER_ID = TTR.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 OMSTRUCK_ORDER_MATERIAL OOM
-                                    on OOM.ORDER_ID = OO.ORDER_ID
-                          left join RMS_MATERIAL RM
-                                    on OOM.MATERIAL_ID = RM.MATERIAL_ID
-                          left join RMS_CAPACITY RC
-                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
-                          left join RMS_WAREHOUSE RW
-                                    on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-                 where RESULT_START_TIME is not null
-                   and OO.ORDER_TYPE = 9
-             )
+        select TUR.RESULT_ID         "resultId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        OO.ORDER_NUMBER       "orderNumber",
+        RC.CAPACITY_NUMBER    "capacityNumber",
+        RM.MATERIAL_NAME      "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        RW.WAREHOUSE_NAME     "warehouseName",
+        TUR.RESULT_START_TIME "resultStartTime",
+        TUR.INSERT_TIME       "insertTime"
+        from TMSTRUCK_UNLOAD_RESULT TUR
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+        on TWR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER OO
+        on OO.ORDER_ID = TTR.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 OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on OOM.MATERIAL_ID = RM.MATERIAL_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join RMS_WAREHOUSE RW
+        on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+        where RESULT_START_TIME is not null
+        and OO.ORDER_TYPE = 9
+        )
         <where>
             <if test="purchaseOrderNo != null">
                 <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
@@ -735,36 +759,36 @@
         <include refid="orderBy"></include>
     </select>
 
-<!--  查询内转采购进口矿国产矿实绩(老区-厂内)  -->
+    <!--  查询内转采购进口矿国产矿实绩(老区-厂内)  -->
     <select id="getImportedDomesticNzUnload2Result" parameterType="java.util.Map" resultType="java.util.Map">
 
         SELECT *
         FROM (
-                 SELECT
-                        TUR.RESULT_ID          "resultId",
-                        OO.ORDER_NUMBER       "orderNumber",
-                        RC.CAPACITY_NUMBER    "capacityNumber",
-                        RM.MATERIAL_NAME      "materialName",
-                        TWR.RESULT_NET_WEIGHT "resultNetWeight",
-                        RW.WAREHOUSE_NAME     "warehouseName",
-                        TUR.RESULT_START_TIME "resultStartTime"
-                 FROM TMSTRUCK_UNLOAD_RESULT TUR
-                          LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                                    ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
-                          LEFT JOIN OMSTRUCK_ORDER OO
-                                    ON OO.ORDER_ID = TTR.ORDER_ID
-                          LEFT JOIN RMS_CAPACITY RC
-                                    ON RC.CAPACITY_ID = OO.CAPACITY_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 TMSTRUCK_WEIGHT_RESULT TWR
-                                    ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          LEFT JOIN RMS_WAREHOUSE RW
-                                    ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-                          WHERE TUR.RESULT_START_TIME IS NOT NULL AND OO.ORDER_TYPE = 10
-             )
+        SELECT
+        TUR.RESULT_ID          "resultId",
+        OO.ORDER_NUMBER       "orderNumber",
+        RC.CAPACITY_NUMBER    "capacityNumber",
+        RM.MATERIAL_NAME      "materialName",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        RW.WAREHOUSE_NAME     "warehouseName",
+        TUR.RESULT_START_TIME "resultStartTime"
+        FROM TMSTRUCK_UNLOAD_RESULT TUR
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_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 TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+        WHERE TUR.RESULT_START_TIME IS NOT NULL AND OO.ORDER_TYPE = 10
+        )
         <where>
             <if test="orderNumber != null">
                 <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
@@ -805,36 +829,36 @@
         <include refid="orderBy"></include>
     </select>
 
-<!--  查询内转厂内卸货实绩  -->
+    <!--  查询内转厂内卸货实绩  -->
     <select id="getInFactoryUnloadResult" parameterType="java.util.Map" resultType="java.util.Map">
 
         SELECT *
         FROM (
-                 SELECT TUR.RESULT_ID             "resultId",
-                        OO.ORDER_NUMBER           "orderNumber",
-                        RC.CAPACITY_NUMBER        "capacityNumber",
-                        RM.MATERIAL_NAME          "materialName",
-                        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
-                        TUR.RESULT_START_TIME     "resultStartTime",
-                        TUR.RESULT_END_TIME       "resultEndTime",
-                        TUR.RESULT_DURATION       "resultDuration",
-                        RW.WAREHOUSE_NAME         "warehouseName"
-                 FROM TMSTRUCK_UNLOAD_RESULT TUR
-                          LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                                    ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
-                          LEFT JOIN OMSTRUCK_ORDER OO
-                                    ON OO.ORDER_ID = TTR.ORDER_ID
-                          LEFT JOIN RMS_CAPACITY RC
-                                    ON RC.CAPACITY_ID = OO.CAPACITY_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_WAREHOUSE RW
-                                    ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-                 WHERE TUR.RESULT_START_TIME IS NOT NULL
-                   AND OO.ORDER_TYPE = 11
-             )
+        SELECT TUR.RESULT_ID             "resultId",
+        OO.ORDER_NUMBER           "orderNumber",
+        RC.CAPACITY_NUMBER        "capacityNumber",
+        RM.MATERIAL_NAME          "materialName",
+        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+        TUR.RESULT_START_TIME     "resultStartTime",
+        TUR.RESULT_END_TIME       "resultEndTime",
+        TUR.RESULT_DURATION       "resultDuration",
+        RW.WAREHOUSE_NAME         "warehouseName"
+        FROM TMSTRUCK_UNLOAD_RESULT TUR
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_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_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+        WHERE TUR.RESULT_START_TIME IS NOT NULL
+        AND OO.ORDER_TYPE = 11
+        )
         <where>
             <if test="orderNumber != null">
                 <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
@@ -953,24 +977,25 @@
         </where>
         <include refid="orderBy"></include>
     </select>
-<!-- 根据优先级查询物资   -->
+    <!-- 根据优先级查询物资   -->
     <select id="selectMaterialForUnload" resultType="java.util.Map">
-        select OOM.MATERIAL_ID "materialId"
+        select OOM.MATERIAL_ID "materialId",
+               OO.ORDER_ID "orderId"
         from OMSTRUCK_ORDER_MATERIAL OOM
-        JOIN OMSTRUCK_ORDER OO
-        ON OO.ORDER_ID=OOM.ORDER_ID
+                 JOIN OMSTRUCK_ORDER OO
+                      ON OO.ORDER_ID=OOM.ORDER_ID
         where OO.ORDER_NUMBER=#{orderNumber}
         ORDER BY OOM.MATERIAL_PRIORITY
     </select>
-<!--  根据物资是否计量 -->
+    <!--  根据物资是否计量 -->
     <select id="selectUnloadMaterialId" resultType="java.lang.Integer" parameterType="java.util.Map">
         select COUNT(*)
         from OMSTRUCK_ORDER_MATERIAL OOM
-        join OMSTRUCK_ORDER OO
-        on OO.ORDER_ID=OOM.ORDER_ID
-        join TMSTRUCK_WEIGHT_RESULT TWR
-        on TWR.MATERIAL_ID=OOM.MATERIAL_ID
-        WHERE OOM.MATERIAL_ID=#{materialId}  AND OO.ORDER_NUMBER=#{orderNumber}
+                 join OMSTRUCK_ORDER OO
+                      on OO.ORDER_ID=OOM.ORDER_ID
+                 join TMSTRUCK_WEIGHT_RESULT TWR
+                      on TWR.MATERIAL_ID=OOM.MATERIAL_ID
+        WHERE OOM.MATERIAL_ID=#{materialId}  AND OO.ORDER_ID=#{orderId}
     </select>
 
 </mapper>