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

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

@@ -63,4 +63,21 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
         return success(result);
     }
 
+    @ApiOperation(value="展示pc端司机已经抢到的订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId()", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/selectDispatchSaleOrderList")
+    public RESTfulResult selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize){
+
+        List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String, Object>> amsSaleOrder1 = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        return success(pageList);
+    }
+
 }

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

@@ -1,6 +1,9 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ColumnDataFeign;
+import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.mapper.AmsDispatchSaleOrderMapper;
+import com.steerinfo.dil.mapper.AmsSaleOrderMapper;
 import com.steerinfo.dil.model.AmsDispatchSaleOrder;
 import com.steerinfo.dil.model.AmsSaleOrder;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
@@ -8,6 +11,7 @@ import com.steerinfo.dil.service.impl.AmsDispatchSaleOrderServiceImpl;
 import com.steerinfo.dil.service.impl.AmsSaleOrderMaterialServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -49,9 +53,12 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     AmsDispatchSaleOrderServiceImpl amsDispatchSaleOrderService;
     @Autowired
     ColumnDataFeign columnDataFeign;
-
+    @Autowired
+    AmsDispatchSaleOrderMapper amsDispatchSaleOrderMapper;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    ESFeign esFeign;
 
     @ApiOperation(value="查询未上报销售订单信息")
     @ApiImplicitParams({
@@ -276,13 +283,45 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     public RESTfulResult getSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          Integer apiId) {
-        List<Map<String, Object>> list = amsSaleOrderService.getSaleOrderList(mapValue);
-        PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = amsSaleOrderService.getSaleOrderList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
-        return success(data);
+                                          Integer apiId,
+                                          Integer status,
+                                          String con) {
+        int count=0;
+        if (status!=null){
+            mapValue.put("status",status);
+            count++;
+        }
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_sale_orderlist";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allSaleOrderList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == count){
+            //将查询结果存入索引中
+            allSaleOrderList =  amsSaleOrderService.getSaleOrderList(mapValue);
+            Map<String, Object> map1 = new HashMap<>();
+            //添加索引
+            map1.put("index","get_sale_orderlist");
+            //添加id
+            map1.put("indexId","saleOrderId");
+            allSaleOrderList.add(map1);
+            //新建索引
+            esFeign.insertIndex(allSaleOrderList);
+            //删除
+            allSaleOrderList.remove(allSaleOrderList.size()-1);
+        }
+        if(allSaleOrderList== null)
+            allSaleOrderList =  amsSaleOrderService.getSaleOrderList(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSaleOrderList,saleOrderList);
+        return success(pageList);
+
     }
     /**
      * 固定派单：通过车序号查询收货地址，截取收货地址的区域，去资源管理中查询对应的承运商,将车序号与承运商绑定
@@ -294,28 +333,29 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         }
         for (Map<String,Object> m:mapValue
         ) {
-//Integer id=amsSaleOrderMaterialService.selectByCxh(m);
-            Integer id=Integer.parseInt(m.get("orderMaterialId").toString()) ;
+         //Integer id=amsSaleOrderMaterialService.selectByCxh(m);
+            Integer id = Integer.parseInt(m.get("orderMaterialId").toString()) ;
             System.out.println(id);
             //通过主键Id获取地址id
             Integer a=amsSaleOrderMaterialService.selectById(new BigDecimal(id));
             //通过地址id查询承运商id
             List<Integer> carriers = amsSaleOrderService.getCarrier(a);
             //判断是否只有一个承运商
+            //如果收货地区为成都重庆，则有多个一个地区对应多个承运商
             if(carriers.size()==1) {
                 //新增固定派单
                 AmsDispatchSaleOrder ad = new AmsDispatchSaleOrder();
-                ad.setDispatchId(amsDispatchSaleOrderService.selectMaxId());
+                ad.setDispatchId(DataChange.dataToBigDecimal(m.get("dispatchId")));
                 ad.setSaleOrderMaterialId(new BigDecimal(id));
                 ad.setCarrierId(new BigDecimal(carriers.get(0)));
                 ad.setDispatchDealTime(new Date());
                 ad.setDispatchTime(new Date());
                 //成交类型（0：定向派单；1：公开抢单）
                 ad.setDispatchType(new BigDecimal(0));
-                //销售订单车序号状态（0：自由；1：锁定）
-                ad.setDispatchStatus(new BigDecimal(1));
-                amsDispatchSaleOrderService.insert(ad);
-                return success("插入成功");
+                //销售订单车序号状态（0：已下发；1：未下发）
+                ad.setDispatchStatus(new BigDecimal(0));
+                int i = amsDispatchSaleOrderMapper.updateByPrimaryKeySelective(ad);
+                return success(i);
             }
         }
         return success();
@@ -333,7 +373,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     public RESTfulResult getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
-                                                 Integer apiId) {
+                                                 Integer apiId,
+                                                 Integer status) {
+        mapValue.put("status",status);
         List<Map<String, Object>> list = amsSaleOrderMaterialService.getSaleMaterial(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
@@ -345,21 +387,23 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     /**
      * 公开派单：新增公开派单
      */
-    @PostMapping("/addOpenAmsDispatchSaleOrder/{saleOrderMaterialId}")
-    public RESTfulResult addOpenAmsDispatchSaleOrder(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderMaterialId){
-        if(saleOrderMaterialId==null){
+    @PostMapping("/addOpenAmsDispatchSaleOrder/{orderMaterialId}")
+    public RESTfulResult addOpenAmsDispatchSaleOrder(@PathVariable("orderMaterialId") BigDecimal orderMaterialId){
+        if(orderMaterialId==null){
             return failed();
         }
         //新增公开派单
         AmsDispatchSaleOrder ad = new AmsDispatchSaleOrder();
-        ad.setDispatchId(amsDispatchSaleOrderService.selectMaxId());
-        ad.setSaleOrderMaterialId(saleOrderMaterialId);
+        Integer id = amsDispatchSaleOrderMapper.selectDispatchIdBySaleOrderMaterialId(orderMaterialId.intValue());
+        ad.setDispatchId(DataChange.dataToBigDecimal(id));
+        ad.setSaleOrderMaterialId(orderMaterialId);
         //成交类型（0：定向派单；1：公开抢单）
         ad.setDispatchType(new BigDecimal(1));
-        //销售订单车序号状态（0：自由；1：锁定）
-        ad.setDispatchStatus(new BigDecimal(0));
-        amsDispatchSaleOrderService.insert(ad);
-        return success("插入成功");
+        //销售订单车序号状态（0：已下发；1：未下发）
+        ad.setDispatchStatus(new BigDecimal(1));
+        //更新公开派单状态
+        amsDispatchSaleOrderMapper.updateByPrimaryKeySelective(ad);
+        return success("更新成功");
 
     }
 

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

@@ -70,17 +70,17 @@ public class AmsSalePlanController extends BaseRESTfulController {
 
     /**
      * 新增销售计划
-     * @param amsSalePlan
+     * @param map
      * @return
      */
     @ApiOperation(value="新增销售计划")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "amsSalePlan", value = "销售计划对象", required = false, dataType = "AmsSalePlan")
+            @ApiImplicitParam(name = "amsSalePlan", value = "销售计划", required = false, dataType = "AmsSalePlan")
     })
     @PostMapping(value = "/addAmsSalePlan")
-    public RESTfulResult addAmsSalePlan(@RequestBody(required = false) AmsSalePlan amsSalePlan){
-
-        int i = amsSalePlanService.addAmsSalePlan(amsSalePlan);
+    public RESTfulResult addAmsSalePlan(@RequestBody(required = false) Map<String,Object> map){
+        System.out.println(map);
+        int i = amsSalePlanService.addAmsSalePlan(map);
         return success(i);
     }
 

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

@@ -25,4 +25,10 @@ public interface AmsDispatchSaleOrderMapper extends IBaseMapper<AmsDispatchSaleO
 
     // 查询app端已抢的销售订单
     List<Map<String, Object>> getLockDispatchSaleOrderList(BigDecimal carrierId);
+
+    //根据车序号查找对应的固定派单id
+    Integer selectDispatchIdBySaleOrderMaterialId(Integer saleOrderMaterialId);
+
+    //pc端，展示已经接收到了承运商的订单
+    List<Map<String,Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> map);
 }

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

@@ -36,4 +36,5 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     List<Map<String,Object>> getSaleOrderList(Map<String,Object> mapValue);
 
     List<Integer>  getCarrier(Integer param);
+
 }

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

@@ -50,4 +50,8 @@ public interface IAmsDispatchSaleOrderService{
      * @return
      */
     List<Map<String, Object>> getLockDispatchSaleOrderList(Integer carrierId);
+
+
+    //pc端，展示已经接收到了承运商的订单
+    List<Map<String,Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> map);
 }

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

@@ -50,4 +50,6 @@ public interface IAmsSaleOrderService{
     List<Map<String,Object>> getSaleOrderList(Map<String,Object> mapValue);
     //获得承运商
     List<Integer> getCarrier(Integer integer);
+
+
 }

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

@@ -23,7 +23,7 @@ public interface IAmsSalePlanService{
     //查询所有销售计划信息
     List<Map<String, Object>> getSalePlanInfo(Map<String,Object> map);
     //新增销售计划
-    int addAmsSalePlan(AmsSalePlan amsSalePlan);
+    int addAmsSalePlan(Map<String, Object> map);
     //获得物资编码
     List<Map<String, Object>> getMaterialName();
     //获得销售片区名称

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

@@ -85,21 +85,38 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
             String allMaterialNumber = "";
             String allMaterialTheoreticalWeight = "";
             for (Map<String,Object> materialMap : materialMessages) {
-                String materialName = (String) materialMap.get("materialName");
-                allMaterialName += materialName + "/";
-                String materialTheoreticalWeight = materialMap.get("materialTheoreticalWeight").toString();
-                if (materialTheoreticalWeight != null) {
-                    allMaterialTheoreticalWeight += materialTheoreticalWeight + "/";
+                if (materialMap != null) {
+                    String materialName = (String) materialMap.get("materialName");
+                    allMaterialName += materialName + "/";
+                    String materialTheoreticalWeight = materialMap.get("materialTheoreticalWeight").toString();
+                    if (materialTheoreticalWeight != null) {
+                        allMaterialTheoreticalWeight += materialTheoreticalWeight + "/";
+                    }
+                    String saleOrderMaterialNumber = materialMap.get("saleOrderMaterialNumber").toString();
+                    allMaterialNumber += saleOrderMaterialNumber + "/";
                 }
-                String saleOrderMaterialNumber =  materialMap.get("saleOrderMaterialNumber").toString();
-                allMaterialNumber += saleOrderMaterialNumber + "/";
             }
-            String subMaterialName = allMaterialName.substring(0,allMaterialName.length() - 2);
-            String subMaterialNumber = allMaterialNumber.substring(0,allMaterialNumber.length() - 2);
-            String subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0,allMaterialTheoreticalWeight.length() - 2);
-//            // 将已经清空的map里面put进一个map和一个list<Map>
-//            map.put("materialMessages",materialMessages);
-//            map.put("saleMap",saleMap);
+            String subMaterialName = null;
+            String subMaterialNumber = null;
+            String subMaterialTheoreticalWeight = null;
+            if (allMaterialName.length() >= 2) {
+                subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 2);
+            }
+            if (allMaterialName.length() < 2) {
+                subMaterialName = allMaterialName;
+            }
+            if (allMaterialNumber.length() >= 2) {
+                subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 2);
+            }
+            if (allMaterialNumber.length() < 2) {
+                subMaterialName = allMaterialNumber;
+            }
+            if (allMaterialTheoreticalWeight.length() >= 2) {
+                subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 2);
+            }
+            if (allMaterialTheoreticalWeight.length() < 2) {
+                subMaterialName = allMaterialTheoreticalWeight;
+            }
             map.put("allMaterialName",subMaterialName);
             map.put("allMaterialNumber",subMaterialNumber);
             map.put("allMaterialTheoreticalWeight",subMaterialTheoreticalWeight);
@@ -118,7 +135,7 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
         AmsDispatchSaleOrder amsDispatchSaleOrder = amsDispatchSaleOrderMapper.selectByPrimaryKey(dispatchId);
         amsDispatchSaleOrder.setDispatchDealTime(new Date());
         amsDispatchSaleOrder.setCarrierId(carrierId);
-        amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(1));
+        amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(0));
         amsDispatchSaleOrder.setUpdateTime(new Date());
         int result = amsDispatchSaleOrderMapper.updateByPrimaryKeySelective(amsDispatchSaleOrder);
         return result;
@@ -190,4 +207,9 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
         }
         return mapList;
     }
+
+    @Override
+    public List<Map<String, Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> map) {
+        return amsDispatchSaleOrderMapper.getLockDispatchSaleOrderListForPc(map);
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.AmsSalePlanMapper;
+import com.steerinfo.dil.mapper.AmsSalePlanMaterialMapper;
 import com.steerinfo.dil.model.AmsSalePlan;
 import com.steerinfo.dil.service.IAmsSalePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,9 @@ public class AmsSalePlanServiceImpl implements IAmsSalePlanService {
     @Autowired
     private AmsSalePlanMapper amsSalePlanMapper;
 
+    @Autowired
+    private AmsSalePlanMaterialMapper amsSalePlanMaterialMapper;
+
     @Override
     public int deleteAmsSalePlan(BigDecimal planId) {
         AmsSalePlan amsSalePlan = amsSalePlanMapper.selectByPrimaryKey(planId);
@@ -54,8 +58,10 @@ public class AmsSalePlanServiceImpl implements IAmsSalePlanService {
     }
 
     @Override
-    public int addAmsSalePlan(AmsSalePlan amsSalePlan) {
+    public int addAmsSalePlan(Map<String, Object> map) {
+        //新增销售计划
         long id;
+        AmsSalePlan amsSalePlan = new AmsSalePlan();
         if(amsSalePlanMapper.selectMaxId()==null){
             id = 1;
         }else {
@@ -76,6 +82,11 @@ public class AmsSalePlanServiceImpl implements IAmsSalePlanService {
         amsSalePlan.setUpdateUsername("admin");
         amsSalePlan.setUpdateTime(new Date());
         amsSalePlan.setDeleted(new BigDecimal(0));
+        //新增
+        int i = amsSalePlanMapper.insert(amsSalePlan);
+        if(i==1){
+
+        }
         return amsSalePlanMapper.insert(amsSalePlan);
     }
 

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

@@ -402,6 +402,12 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <!--根据车序号查找公开派单主键    -->
+    <select id="selectDispatchIdBySaleOrderMaterialId" resultType="java.lang.Integer" parameterType="java.lang.Integer">
+        select  ADSO.DISPATCH_ID "dispatchId"
+        from AMS_DISPATCH_SALE_ORDER ADSO
+        where ADSO.SALE_ORDER_MATERIAL_ID=#{saleOrderMaterialId}
+    </select>
     <!-- 展示所有公开抢单的销售订单的车序号 -->
     <select id="getOpenDispatchSaleOrder" parameterType="java.util.Map" resultType="java.util.Map">
         select asom.sale_order_id                as "saleOrderId",
@@ -440,7 +446,7 @@
                  LEFT JOIN RMS_RECEIVE_ADDRESS RRA
                            ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
         WHERE ADSO.DISPATCH_TYPE = 1
-          AND ADSO.DISPATCH_STATUS = 0
+          AND ADSO.DISPATCH_STATUS = 1
     </select>
 
     <select id="getMaterialMessages" parameterType="DECIMAL" resultType="java.util.Map">
@@ -482,7 +488,34 @@
                            ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
                  LEFT JOIN RMS_CARRIER RCA
                            ON RCA.CARRIER_ID = ADSO.CARRIER_ID
-        WHERE ADSO.DISPATCH_STATUS = 1
+        WHERE ADSO.DISPATCH_STATUS = 0
           AND ADSO.CARRIER_ID = #{carrierId}
     </select>
+<!-- pc端公开抢单界面显示   -->
+    <select id="getLockDispatchSaleOrderListForPc" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ADSO.DISPATCH_ID                  AS "dispatchId",
+               ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "saleOrderMaterialTruckNo",
+               ASO.SALE_NUMBER                   AS "saleNumber",
+               ADSO.DISPATCH_DEAL_TIME           AS "dispatchDealTime",
+               RSH.SHIPPER_NAME                  AS "shipperName",
+               RC.CONSIGNEE_COMPANY_NAME         AS "consigneeCompanyName",
+               RRA.ADDRESS_DELIVERY_ADDRESS      AS "addressDeliveryAddress",
+               ASOM.SALE_ORDER_CONSIGNEE         AS "saleOrderConsignee",
+               ASOM.SALE_ORDER_CONSIGNEE_TEL     AS "saleOrderConsigneeTel",
+               RCA.CARRIER_NAME                  AS "carrierName"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_CONSIGNEE RC
+                           ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+                 LEFT JOIN RMS_CARRIER RCA
+                           ON RCA.CARRIER_ID = ADSO.CARRIER_ID
+        WHERE ADSO.DISPATCH_STATUS = 0 and ADSO.DISPATCH_TYPE=1
+    </select>
 </mapper>

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

@@ -957,7 +957,7 @@
     </where>
     <include refid="orderBy"></include>
   </select>
-
+<!--销售计划-->
   <select id="getSalePlanName" resultType="java.util.LinkedHashMap">
     select
       a_s_plan.PLAN_ID "id",
@@ -965,7 +965,7 @@
       a_s_plan.PLAN_NAME "label"
     from AMS_SALE_PLAN a_s_plan
   </select>
-
+<!-- 收货客户-->
   <select id="getShipperName" resultType="java.util.LinkedHashMap">
     select
       SHIPPER_ID "id",
@@ -973,7 +973,7 @@
       SHIPPER_NAME "label"
     from RMS_SHIPPER
   </select>
-
+<!-- 收货客户-->
   <select id="getConsigneeCompanyName" resultType="java.util.LinkedHashMap">
     select
       CONSIGNEE_ID "id",
@@ -1146,22 +1146,24 @@
   </select>
   <!-- 展示所有销售公司已审核的销售订单 -->
   <select id="getSaleOrderList" parameterType="java.util.Map" resultType="java.util.Map">
-    select asom.SALE_ORDER_MATERIAL_ID          "orderMaterialId",
-           asom.sale_order_id                as "saleOrderId",
-           asom.sale_order_material_truck_no as "saleOrderMaterialTruckNo",
-           asom.sale_order_material_id,
-           rra.address_delivery_address      as "addressDeliveryAddress",
-           asom.sale_date_of_receipt         as "saleDateOfReceipt",
-           asom.sale_order_consignee         as "saleOrderConsignee",
-           asom.sale_order_consignee_tel     as "saleOrderConsigneeTel"
+    select
+      adso.DISPATCH_ID "dispatchId",
+      asom.SALE_ORDER_MATERIAL_ID "orderMaterialId",
+      asom.sale_order_id as "saleOrderId",
+      aso.SALE_NUMBER "saleNumber",
+      asom.sale_order_material_truck_no as "saleOrderMaterialTruckNo",
+      asom.sale_order_material_id,
+      rra.address_delivery_address as "addressDeliveryAddress",
+      asom.sale_date_of_receipt as "saleDateOfReceipt",
+      asom.sale_order_consignee as "saleOrderConsignee",
+      asom.sale_order_consignee_tel as "saleOrderConsigneeTel"
     from ams_sale_order aso
-           join ams_sale_order_material asom on aso.sale_order_id = asom.sale_order_id
-           left join rms_receive_address rra on asom.sale_shipping_address_id = rra.address_id
-    where asom.sale_order_material_id not in (select adso.sale_order_material_id
-                                              from ams_dispatch_sale_order adso
-                                              group by adso.sale_order_material_id)
-              and aso.sale_order_status = 2
-              or aso.sale_order_status = 4
+           join ams_sale_order_material asom
+               on aso.sale_order_id =asom.sale_order_id
+            left join AMS_DISPATCH_SALE_ORDER adso
+                on adso.SALE_ORDER_MATERIAL_ID = asom.SALE_ORDER_MATERIAL_ID
+           left join rms_receive_address rra on asom.sale_shipping_address_id=rra.address_id
+    where aso.sale_order_status in (2, 4) and adso.DISPATCH_STATUS = #{status} and adso.DISPATCH_TYPE=0
   </select>
 
   <!-- 通过收货地址，匹配对应的承运商-->
@@ -1169,4 +1171,10 @@
     select rc.carrier_id from rms_receive_address rra join rms_carrier rc on rra.address_town = rc.carrier_bid_area
     WHERE rra.address_id = #{param}
   </select>
+ <!-- 获取到站id -->
+<!--  <select id="selectReciveId" resultType="java.util.LinkedHashMap">-->
+<!--    select -->
+<!--    from-->
+<!--    where-->
+<!--  </select>-->
 </mapper>

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

@@ -498,19 +498,19 @@
   <!-- 展示所有未分派车辆的销售订单的车序号 -->
   <select id="getSaleMaterial" parameterType="java.util.Map" resultType="java.util.Map">
     select asom.sale_order_id as "saleOrderId",
+           ASO.SALE_NUMBER "saleNumber",
            asom.sale_order_material_truck_no as "saleOrderMaterialTruckNo",
            rra.address_delivery_address as "addressDeliveryAddress",
            asom.sale_date_of_receipt as "saleDateOfReceipt",
            asom.sale_order_consignee as "saleOrderConsignee",
            asom.sale_order_consignee_tel as "saleOrderConsigneeTel",
            rc.carrier_name as "carrierName"
-    from ams_sale_order_material asom
+           from ams_sale_order_material asom
            left join ams_dispatch_sale_order adso on asom.sale_order_material_id=adso.sale_order_material_id
            left join rms_carrier rc on adso.carrier_id=rc.carrier_id
            left join rms_receive_address rra on asom.sale_shipping_address_id=rra.address_id
-    where asom.sale_order_material_id not in (select asom.sale_order_material_id
-                                              from ams_sale_order_material asom
-                                                     join omstruck_order oo on asom.sale_order_material_id = oo.order_plan_id)
+           left join AMS_SALE_ORDER ASO ON  asom.SALE_ORDER_ID=ASO.SALE_ORDER_ID
+         where adso.DISPATCH_STATUS=#{status} and adso.DISPATCH_TYPE=1
   </select>
   <!-- 展示所有未分派车辆的销售订单的车序号 -->
   <select id="selectById" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">