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

pom.xml

@@ -117,8 +117,8 @@
 <!--                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;销售订单&ndash;&gt;-->
 <!--                        <param>AMS_SALE_ORDER_MATERIAL</param>&lt;!&ndash;销售订单车序号表&ndash;&gt;-->
 <!--                        <param>AMS_SALE_TRUCKNO_MATERIAL</param>&lt;!&ndash;车序号物资中间表&ndash;&gt;-->
-                            <param>AMS_CONTRACT_TRANSPORT_PRICE</param>
-                            <param>TMSTRUCK_LOAD_RESULT</param>
+                            <param>AMSTRUCK_SPORADIC_ORDER</param>
+<!--                            <param>TMSTRUCK_LOAD_RESULT</param>-->
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/AmstruckSporadicOrderController.java

@@ -88,57 +88,30 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
                                                String userId,
                                                String userIds) {
 
-        if (con != null && !con.equals("undefined")) {
-            String index="get_sporadic_order_list";//设置要查询的索引名称
-            return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-        }
-        int count=0;
+
         if (orderType!=null){
             mapValue.put("orderType",orderType);
-            count++;
         }
         if (issueStatus!=null){
             mapValue.put("issueStatus",issueStatus);
-            count++;
         }
         if (dispatchStatus!=null){
             mapValue.put("dispatchStatus",dispatchStatus);
-            count++;
         }
         if (sporadicStatus!=null){
             mapValue.put("sporadicStatus",sporadicStatus);
-            count++;
         }
         if (carrierSsoId!=null){
             mapValue.put("carrierSsoId",carrierSsoId);
-            count++;
         }
         if (userId!=null){
             mapValue.put("userId",userId);
-            count++;
         }
         if (userIds!=null){
             mapValue.put("userIds",userIds);
-            count++;
         }
         List<Map<String, Object>> sporadicOrderList = null;
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            sporadicOrderList =  amstruckSporadicOrderService.getSporadicOrdersList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_sporadic_order_list");
-            //添加id
-            map1.put("indexId","sporadicOrderId");
-            sporadicOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(sporadicOrderList);
-            //删除
-            sporadicOrderList.remove(sporadicOrderList.size()-1);
-        }
-        if (sporadicOrderList == null) {
-            sporadicOrderList = amstruckSporadicOrderService.getSporadicOrdersList(mapValue);
-        }
+        sporadicOrderList = amstruckSporadicOrderService.getSporadicOrdersList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = amstruckSporadicOrderService.getSporadicOrdersList(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, sporadicOrderList,columnList);
@@ -227,7 +200,7 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
     @ApiOperation(value = "停止零星订单一车多趟")
     @PostMapping("/closeSporadicOrder")
     public RESTfulResult closeSporadicOrder(@RequestBody Map<String,Object> map) {
-        int i=amstruckSporadicOrderService.closeSporadicOrder(map);
+        int i=amstruckSporadicOrderService.closeSporadic(map);
         return success(i);
     }
 

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

@@ -21,4 +21,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //通过运输订单ID查询数据 用于websocket推送数据
     Map<String, Object> pushMesToWebsocket(Map<String, Object> map);
 
+    int selectOrderTypeByOrderId(BigDecimal orderId);
+
 }

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

@@ -33,7 +33,7 @@ public class AmstruckSporadicOrder implements IBasePO<BigDecimal> {
     private BigDecimal carrierId;
 
     /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     * 记录创建人(INSERT_USERNAME,VARCHAR,200)
      */
     @ApiModelProperty(value="记录创建人",required=false)
     private String insertUsername;
@@ -98,6 +98,12 @@ public class AmstruckSporadicOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="已运输趟次",required=false)
     private BigDecimal sporadicTransTimes;
 
+    /**
+     * 运输状态(TRANS_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输状态",required=false)
+    private BigDecimal transStatus;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -230,6 +236,14 @@ public class AmstruckSporadicOrder implements IBasePO<BigDecimal> {
         this.sporadicTransTimes = sporadicTransTimes;
     }
 
+    public BigDecimal getTransStatus() {
+        return transStatus;
+    }
+
+    public void setTransStatus(BigDecimal transStatus) {
+        this.transStatus = transStatus;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -251,6 +265,7 @@ public class AmstruckSporadicOrder implements IBasePO<BigDecimal> {
         sb.append(", sporadicOrderTimes=").append(sporadicOrderTimes);
         sb.append(", dispatchStatus=").append(dispatchStatus);
         sb.append(", sporadicTransTimes=").append(sporadicTransTimes);
+        sb.append(", transStatus=").append(transStatus);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/IAmstruckSporadicOrderService.java

@@ -50,6 +50,13 @@ public interface IAmstruckSporadicOrderService {
 
     //一车多趟运输顶单排车
     int addSporadicOrderforTimes(Map<String,Object> map);
+
+    //普通零星停止
+    int closeSporadicOrderInward(Map<String,Object> map);
+
     //一车多趟停止
     int closeSporadicOrder(Map<String,Object> map);
+
+    //停止
+    int closeSporadic(Map<String,Object> map);
 }

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

@@ -168,6 +168,8 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         if (orderTime!=null) {
             amstruckSporadicOrder.setSporadicOrderTimes(DataChange.dataToBigDecimal(orderTime));
         }
+        //设置运输状态默认为启用
+        amstruckSporadicOrder.setTransStatus(new BigDecimal(1));
         if (map.get("carrierId")!=null) {
             amstruckSporadicOrder.setCarrierId(DataChange.dataToBigDecimal(map.get("carrierId")));
         }
@@ -317,6 +319,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         List<Map<String, Object>> mapList=null;
         switch (orderType1) {
             case 12:
+                //apiId：439
                 if (mapValue.get("sporadicStatus") != null) {
                     //走查询订单id的接口
                     mapList = amstruckSporadicOrderMapper.getSporadicOrdersList(mapValue);
@@ -326,19 +329,23 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 }
                 for (Map<String, Object> map : mapList) {
                     BigDecimal type = (BigDecimal) map.get("type");
-//                    BigDecimal orderStatus =(BigDecimal) map.get("orderStatus");
+                    BigDecimal tranStatus =(BigDecimal) map.get("transStatus");
                     String orderType = "";
-//                    String status = "";
+                    String Status = "";
                     if (type.intValue() == 12) {
                         orderType += "内转零星进厂";
                     }
                     if (type.intValue() == 13) {
                         orderType += "内转零星出厂";
                     }
-//                    if (orderStatus.intValue()==4){
-//                        status += "已下发";
-//                    }
+                    if (tranStatus.intValue() == 0){
+                        Status += "禁用";
+                    }
+                    if (tranStatus.intValue() == 1){
+                        Status += "启用";
+                    }
                     map.put("orderType", orderType);
+                    map.put("Status",Status);
                 }
             case 13:
                 break;
@@ -481,6 +488,28 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
 
         return result;
     }
+    //内转零星停止
+    @Override
+    public int closeSporadicOrderInward(Map<String, Object> map) {
+        int result=0;
+        BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
+        AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
+        amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
+        amstruckSporadicOrder.setTransStatus(new BigDecimal(0));
+        result+=amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
+        //查找零星订单下的所有未接收的运输订单
+        List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
+        for (Map<String,Object> map1:stringObjectMap) {
+            //获取零星订单关联的未接收的订单
+            BigDecimal orderId =(BigDecimal) map1.get("orderId");
+            OmstruckOrder omstruckOrder=new OmstruckOrder();
+            omstruckOrder.setOrderId(orderId);
+            omstruckOrder.setOrderStatus(new BigDecimal(8));
+            result+=omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+        }
+        return result;
+
+    }
 
     //关闭零星订单,将订单吗状态设置为0  无法推送新的订单。
     @Override
@@ -503,4 +532,31 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         }
         return result;
     }
+
+    @Override
+    public int closeSporadic(Map<String, Object> map) {
+        BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
+        //查找零星订单下的所有未接收的运输订单
+        List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
+        for (Map<String,Object> map1:stringObjectMap){
+            //获取零星订单关联的未接收的订单
+            BigDecimal orderId =(BigDecimal) map1.get("orderId");
+            //根据运输订单id查找运输订单类型
+            int orderType = omstruckOrderMapper.selectOrderTypeByOrderId(orderId);
+            switch (orderType){
+                case 15:
+                case 16:
+                         //普通零星
+                         closeSporadicOrder(map);
+                         break;
+                case 12:
+                case 13:
+                         //内转零星
+                         closeSporadicOrderInward(map);
+                         break;
+
+            }
+        }
+        return 2;
+    }
 }

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

@@ -460,8 +460,7 @@
   ASO.INSERT_TIME AS "insertTime",
   OO.ORDER_TYPE AS "type",
   RM.MATERIAL_NAME "materialName",
-  ASO.SPORADIC_TRANS_TIMES "transTimes",
-  ASO.SPORADIC_ORDER_TIMES "sporadicOrderTimes"
+  ASO.TRANS_STATUS "transStatus"
   FROM AMSTRUCK_SPORADIC_ORDER ASO
   LEFT JOIN RMS_CONSIGNEE RCO
   ON ASO.RECEIVE_UNIT_ID = RCO.CONSIGNEE_ID
@@ -479,6 +478,7 @@
   WHERE OO.ORDER_TYPE in (12,13)
   AND ASO.ISSUE_STATUS = #{issueStatus}
   AND ASO.DELETED = 0
+  AND ASO.TRANS_STATUS=1
   <if test="userId!=null">
     and ASO.INSERT_USERNAME=#{userId}
   </if>

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

@@ -17,16 +17,18 @@
         <result column="SPORADIC_ORDER_TIMES" jdbcType="DECIMAL" property="sporadicOrderTimes" />
         <result column="DISPATCH_STATUS" jdbcType="DECIMAL" property="dispatchStatus" />
         <result column="SPORADIC_TRANS_TIMES" jdbcType="DECIMAL" property="sporadicTransTimes" />
+        <result column="TRANS_STATUS" jdbcType="DECIMAL" property="transStatus" />
     </resultMap>
     <sql id="columns">
         SPORADIC_ORDER_ID, SEND_UNIT_ID, RECEIVE_UNIT_ID, CARRIER_ID, INSERT_USERNAME, INSERT_TIME,
     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ISSUE_STATUS, SPORADIC_ORDER_NO,
-    SPORADIC_ORDER_TIMES, DISPATCH_STATUS, SPORADIC_TRANS_TIMES
+    SPORADIC_ORDER_TIMES, DISPATCH_STATUS, SPORADIC_TRANS_TIMES, TRANS_STATUS
     </sql>
     <sql id="columns_alias">
         t.SPORADIC_ORDER_ID, t.SEND_UNIT_ID, t.RECEIVE_UNIT_ID, t.CARRIER_ID, t.INSERT_USERNAME,
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
-    t.ISSUE_STATUS, t.SPORADIC_ORDER_NO, t.SPORADIC_ORDER_TIMES, t.DISPATCH_STATUS, t.SPORADIC_TRANS_TIMES
+    t.ISSUE_STATUS, t.SPORADIC_ORDER_NO, t.SPORADIC_ORDER_TIMES, t.DISPATCH_STATUS, t.SPORADIC_TRANS_TIMES,
+    t.TRANS_STATUS
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM AMSTRUCK_SPORADIC_ORDER
@@ -81,6 +83,9 @@
             <if test="sporadicTransTimes != null">
                 and SPORADIC_TRANS_TIMES = #{sporadicTransTimes}
             </if>
+            <if test="transStatus != null">
+                and TRANS_STATUS = #{transStatus}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -130,6 +135,9 @@
             <if test="sporadicTransTimes != null">
                 and SPORADIC_TRANS_TIMES = #{sporadicTransTimes}
             </if>
+            <if test="transStatus != null">
+                and TRANS_STATUS = #{transStatus}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -181,20 +189,23 @@
         <if test="sporadicTransTimes != null">
             or SPORADIC_TRANS_TIMES = #{sporadicTransTimes}
         </if>
+        <if test="transStatus != null">
+            or TRANS_STATUS = #{transStatus}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
         insert into AMSTRUCK_SPORADIC_ORDER (SPORADIC_ORDER_ID, SEND_UNIT_ID, RECEIVE_UNIT_ID,
                                              CARRIER_ID, INSERT_USERNAME, INSERT_TIME,
                                              UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                              DELETED, ISSUE_STATUS, SPORADIC_ORDER_NO,
-                                             SPORADIC_ORDER_TIMES, DISPATCH_STATUS, SPORADIC_TRANS_TIMES
-        )
+                                             SPORADIC_ORDER_TIMES, DISPATCH_STATUS, SPORADIC_TRANS_TIMES,
+                                             TRANS_STATUS)
         values (#{sporadicOrderId,jdbcType=DECIMAL}, #{sendUnitId,jdbcType=DECIMAL}, #{receiveUnitId,jdbcType=DECIMAL},
                 #{carrierId,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
                 #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
                 #{deleted,jdbcType=DECIMAL}, #{issueStatus,jdbcType=DECIMAL}, #{sporadicOrderNo,jdbcType=VARCHAR},
-                #{sporadicOrderTimes,jdbcType=DECIMAL}, #{dispatchStatus,jdbcType=DECIMAL}, #{sporadicTransTimes,jdbcType=DECIMAL}
-               )
+                #{sporadicOrderTimes,jdbcType=DECIMAL}, #{dispatchStatus,jdbcType=DECIMAL}, #{sporadicTransTimes,jdbcType=DECIMAL},
+                #{transStatus,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
         insert into AMSTRUCK_SPORADIC_ORDER
@@ -244,6 +255,9 @@
             <if test="sporadicTransTimes != null">
                 SPORADIC_TRANS_TIMES,
             </if>
+            <if test="transStatus != null">
+                TRANS_STATUS,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sporadicOrderId != null">
@@ -291,6 +305,9 @@
             <if test="sporadicTransTimes != null">
                 #{sporadicTransTimes,jdbcType=DECIMAL},
             </if>
+            <if test="transStatus != null">
+                #{transStatus,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
@@ -308,7 +325,8 @@
             SPORADIC_ORDER_NO = #{sporadicOrderNo,jdbcType=VARCHAR},
             SPORADIC_ORDER_TIMES = #{sporadicOrderTimes,jdbcType=DECIMAL},
             DISPATCH_STATUS = #{dispatchStatus,jdbcType=DECIMAL},
-            SPORADIC_TRANS_TIMES = #{sporadicTransTimes,jdbcType=DECIMAL}
+            SPORADIC_TRANS_TIMES = #{sporadicTransTimes,jdbcType=DECIMAL},
+            TRANS_STATUS = #{transStatus,jdbcType=DECIMAL}
         where SPORADIC_ORDER_ID = #{sporadicOrderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
@@ -356,6 +374,9 @@
             <if test="sporadicTransTimes != null">
                 SPORADIC_TRANS_TIMES = #{sporadicTransTimes,jdbcType=DECIMAL},
             </if>
+            <if test="transStatus != null">
+                TRANS_STATUS = #{transStatus,jdbcType=DECIMAL},
+            </if>
         </set>
         where SPORADIC_ORDER_ID = #{sporadicOrderId,jdbcType=DECIMAL}
     </update>
@@ -380,7 +401,8 @@
         INSERT_UPDATE_REMARK, DELETED,
         ISSUE_STATUS, SPORADIC_ORDER_NO,
         SPORADIC_ORDER_TIMES, DISPATCH_STATUS,
-        SPORADIC_TRANS_TIMES)
+        SPORADIC_TRANS_TIMES, TRANS_STATUS
+        )
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.sporadicOrderId,jdbcType=DECIMAL},
@@ -390,7 +412,8 @@
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
         #{item.issueStatus,jdbcType=DECIMAL}, #{item.sporadicOrderNo,jdbcType=VARCHAR},
         #{item.sporadicOrderTimes,jdbcType=DECIMAL}, #{item.dispatchStatus,jdbcType=DECIMAL},
-        #{item.sporadicTransTimes,jdbcType=DECIMAL} from dual
+        #{item.sporadicTransTimes,jdbcType=DECIMAL}, #{item.transStatus,jdbcType=DECIMAL}
+        from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -456,6 +479,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.sporadicTransTimes,jdbcType=DECIMAL}
         </foreach>
+        ,TRANS_STATUS=
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
+            when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.transStatus,jdbcType=DECIMAL}
+        </foreach>
         where SPORADIC_ORDER_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.sporadicOrderId,jdbcType=DECIMAL}
@@ -468,6 +495,9 @@
             #{id}
         </foreach>
     </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!-- 排序 -->
@@ -497,8 +527,7 @@
         OO.ORDER_ID "orderId",
         OO.ORDER_STATUS "orderStatus",
         RM.MATERIAL_NAME "materialName",
-        ASO.SPORADIC_TRANS_TIMES "transTimes",
-        ASO.SPORADIC_ORDER_TIMES "sporadicOrderTimes"
+        ASO.TRANS_STATUS "transStatus"
         FROM AMSTRUCK_SPORADIC_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RCO
         ON ASO.RECEIVE_UNIT_ID = RCO.CONSIGNEE_ID
@@ -516,15 +545,16 @@
         WHERE OO.ORDER_TYPE in (12,13)
         AND ASO.ISSUE_STATUS = #{issueStatus}
         AND ASO.DELETED = 0
-            <if test="userId!=null">
-             and ASO.INSERT_USERNAME=#{userId}
-            </if>
-            <if test="usersId!=null">
-             and ASO.UPDATE_USERNAME=#{usersId}
-            </if>
-             <if test="dispatchStatus != null">
-             AND ASO.DISPATCH_STATUS =  #{dispatchStatus}
-             </if>
+        and   ASO.TRANS_STATUS =1
+        <if test="userId!=null">
+            and ASO.INSERT_USERNAME=#{userId}
+        </if>
+        <if test="usersId!=null">
+            and ASO.UPDATE_USERNAME=#{usersId}
+        </if>
+        <if test="dispatchStatus != null">
+            AND ASO.DISPATCH_STATUS =  #{dispatchStatus}
+        </if>
         )
         <where>
             <if test="sporadicOrderNo != null">
@@ -664,12 +694,12 @@
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         WHERE ASO.SPORADIC_ORDER_ID = #{sporadicOrderId}
-            <if test="userId!=null">
-             and ASO.INSERT_USERNAME=#{userId}
-            </if>
-            <if test="usersId!=null">
-             and ASO.UPDATE_USERNAME=#{usersId}
-            </if>
+        <if test="userId!=null">
+            and ASO.INSERT_USERNAME=#{userId}
+        </if>
+        <if test="usersId!=null">
+            and ASO.UPDATE_USERNAME=#{usersId}
+        </if>
         )
         <where>
             <if test="materialName != null">
@@ -718,13 +748,11 @@
         where OO.ORDER_ID=#{orderId}
     </select>
 
-<!-- 根据零星订单id查找未接收的订单-->
+    <!-- 根据零星订单id查找未接收的订单-->
     <select id="selectOrderIdbySporadicOrderid" parameterType="java.lang.Integer" resultType="java.util.Map">
         select OO.ORDER_ID "orderId"
         from OMSTRUCK_ORDER OO
         where OO.ORDER_STATUS=4 AND OO.ORDER_PLAN_ID=#{sporadicOrderId}
     </select>
 
-
-
 </mapper>

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

@@ -636,5 +636,9 @@
         where OO.ORDER_ID = #{orderId}
           and rownum = 1
     </select>
-
+    <select id="selectOrderTypeByOrderId" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+     select OO.ORDER_TYPE "orderType"
+     from OMSTRUCK_ORDER OO
+     WHERE OO.ORDER_ID=#{orderId}
+    </select>
 </mapper>