ams修改

pom.xml

@@ -113,7 +113,7 @@
                     <tables>
                         <param>AMS_DISPATCH_SALE_ORDER</param><!--销售计划-->
 <!--                        <param>AMS_SALE_PLAN_MATERIAL</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
-<!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售订单&ndash;&gt;-->
+<!--                        <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;-->
                     </tables>

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

@@ -130,7 +130,7 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
      * @param apiId
      * @return
      */
-    @ApiModelProperty(value = "展示汽运单价列表")
+    @ApiModelProperty(value = "展示采购汽运单价列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
@@ -149,6 +149,33 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
         return success(data);
     }
 
+    /**
+     * 展示汽运单价
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示销售汽运单价列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "139", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleTruckPriceList")
+    public RESTfulResult getSaleTruckPriceList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId) {
+        List<Map<String, Object>> list = amsContractTransportPriceService.getSaleTruckPriceList(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amsContractTransportPriceService.getSaleTruckPriceList(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
     /**
      * 新增汽运单价
      * @param amsContractTransportPrice

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,7 @@
 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;
@@ -56,6 +57,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     AmsDispatchSaleOrderMapper amsDispatchSaleOrderMapper;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    ESFeign esFeign;
 
     @ApiOperation(value="查询未上报销售订单信息")
     @ApiImplicitParams({
@@ -281,17 +284,44 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId,
-                                          Integer status) {
-
+                                          Integer status,
+                                          String con) {
+        int count=0;
         if (status!=null){
             mapValue.put("status",status);
+            count++;
         }
-        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);
+        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);
+
     }
     /**
      * 固定派单：通过车序号查询收货地址，截取收货地址的区域，去资源管理中查询对应的承运商,将车序号与承运商绑定
@@ -311,6 +341,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             //通过地址id查询承运商id
             List<Integer> carriers = amsSaleOrderService.getCarrier(a);
             //判断是否只有一个承运商
+            //如果收货地区为成都重庆，则有多个一个地区对应多个承运商
             if(carriers.size()==1) {
                 //新增固定派单
                 AmsDispatchSaleOrder ad = new AmsDispatchSaleOrder();
@@ -342,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);
         //分页查询数据
@@ -354,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/mapper/AmsContractTransportPriceMapper.java

@@ -110,4 +110,6 @@ public interface AmsContractTransportPriceMapper extends IBaseMapper<AmsContract
 
     @Select("select seq_AMS_TRANSPORT.nextval from dual")
     BigDecimal selectTransportId();
+    // 得到销售汽运单价
+    List<Map<String, Object>> getSaleTruckPriceList(Map<String, Object> mapValue);
 }

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

@@ -37,4 +37,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/model/AmsContractTransportPrice.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -39,10 +40,10 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
     private BigDecimal capacityId;
 
     /**
-     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     * 物资ID(MATERIAL_ID,CHAR,10)
      */
     @ApiModelProperty(value="物资ID",required=false)
-    private BigDecimal materialId;
+    private String materialId;
 
     /**
      * 吨公里（元/吨.km）(PRICE_TON_KILOMETER,DECIMAL,0)
@@ -105,9 +106,9 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
     private BigDecimal addressId;
 
     /**
-     * 类型：1为销售 2为内转(TYPE,DECIMAL,0)
+     * 类型：1为销售 2为内转 3为采购水运 4为采购汽运(TYPE,DECIMAL,0)
      */
-    @ApiModelProperty(value="类型：1为销售 2为内转",required=false)
+    @ApiModelProperty(value="类型：1为销售 2为内转 3为采购水运 4为采购汽运",required=false)
     private BigDecimal type;
 
     private static final long serialVersionUID = 1L;
@@ -162,12 +163,12 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
         this.capacityId = capacityId;
     }
 
-    public BigDecimal getMaterialId() {
+    public String getMaterialId() {
         return materialId;
     }
 
-    public void setMaterialId(BigDecimal materialId) {
-        this.materialId = materialId;
+    public void setMaterialId(String materialId) {
+        this.materialId = materialId == null ? null : materialId.trim();
     }
 
     public BigDecimal getPriceTonKilometer() {

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

@@ -3,7 +3,6 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -34,10 +33,10 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
     private BigDecimal shipperId;
 
     /**
-     * 收货单位ID(CONSIGNEE_ID,DECIMAL,38)
+     * 收货单位ID(RECEIVE_ID,DECIMAL,38)
      */
     @ApiModelProperty(value="收货单位ID",required=false)
-    private BigDecimal consigneeId;
+    private BigDecimal receiveId;
 
     /**
      * 账户余额(SALE_ACCOUNT_BALANCE,DECIMAL,0)
@@ -173,12 +172,12 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         this.shipperId = shipperId;
     }
 
-    public BigDecimal getConsigneeId() {
-        return consigneeId;
+    public BigDecimal getReceiveId() {
+        return receiveId;
     }
 
-    public void setConsigneeId(BigDecimal consigneeId) {
-        this.consigneeId = consigneeId;
+    public void setReceiveId(BigDecimal receiveId) {
+        this.receiveId = receiveId;
     }
 
     public BigDecimal getSaleAccountBalance() {
@@ -311,7 +310,7 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         sb.append(", planId=").append(planId);
         sb.append(", saleNumber=").append(saleNumber);
         sb.append(", shipperId=").append(shipperId);
-        sb.append(", consigneeId=").append(consigneeId);
+        sb.append(", receiveId=").append(receiveId);
         sb.append(", saleAccountBalance=").append(saleAccountBalance);
         sb.append(", saleCurrentOrderAmount=").append(saleCurrentOrderAmount);
         sb.append(", saleHistoricalOrderAmount=").append(saleHistoricalOrderAmount);

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

@@ -114,4 +114,6 @@ public interface IAmsContractTransportPriceService {
     int batchUpdateTransportPriceByOilPrice();
     //获取运价和吨公里数值列表
     List<Map<String, Object>> getPriceValueAndPriceTonKilometer();
+    // 销售汽运单价
+    List<Map<String, Object>> getSaleTruckPriceList(Map<String, Object> mapValue);
 }

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/impl/AmsContractTransportPriceServiceImpl.java

@@ -234,6 +234,16 @@ public class AmsContractTransportPriceServiceImpl implements IAmsContractTranspo
         return amsContractTransportPriceMapper.getPriceValueAndPriceTonKilometer();
     }
 
+    /**
+     * 销售汽运单价
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getSaleTruckPriceList(Map<String, Object> mapValue) {
+        return amsContractTransportPriceMapper.getSaleTruckPriceList(mapValue);
+    }
+
     /**
      * 修改渲染
      * @param priceId

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

@@ -45,6 +45,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         BigDecimal priceValue = amsContractTransportPrice.getPriceValue();
         //计算并插入吨公里
         BigDecimal priceTonKilometer = calculationPriceTonKilometer(lineId, priceValue);
+        amsContractTransportPrice.setType(new BigDecimal(1));
         amsContractTransportPrice.setPriceTonKilometer(priceTonKilometer);
         amsContractTransportPrice.setInsertUsername("admin");
         amsContractTransportPrice.setInsertTime(new Date());
@@ -52,7 +53,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         amsContractTransportPrice.setUpdateTime(new Date());
         amsContractTransportPrice.setInsertUpdateRemark("无");
         amsContractTransportPrice.setDeleted(new BigDecimal(0));
-        return amsContractTruckPriceMapper.insert(amsContractTransportPrice);
+        return amsContractTruckPriceMapper.insertSelective(amsContractTransportPrice);
     }
 
     //计算吨公里值

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/resources/bootstrap.yml

@@ -14,7 +14,7 @@ spring:
 
 openfeign:
   ESFeign:
-    url: ${ESFEIGN_URL:localhost:8089}
+    url: ${ESFEIGN_URL:172.16.33.161:8089}
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
 

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

@@ -6,7 +6,7 @@
     <result column="PLAN_ID" jdbcType="DECIMAL" property="planId" />
     <result column="SALE_NUMBER" jdbcType="VARCHAR" property="saleNumber" />
     <result column="SHIPPER_ID" jdbcType="DECIMAL" property="shipperId" />
-    <result column="CONSIGNEE_ID" jdbcType="DECIMAL" property="consigneeId" />
+    <result column="RECEIVE_ID" jdbcType="DECIMAL" property="receiveId" />
     <result column="SALE_ACCOUNT_BALANCE" jdbcType="DECIMAL" property="saleAccountBalance" />
     <result column="SALE_CURRENT_ORDER_AMOUNT" jdbcType="DECIMAL" property="saleCurrentOrderAmount" />
     <result column="SALE_HISTORICAL_ORDER_AMOUNT" jdbcType="DECIMAL" property="saleHistoricalOrderAmount" />
@@ -24,13 +24,13 @@
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
   </resultMap>
   <sql id="columns">
-    SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, SHIPPER_ID, CONSIGNEE_ID, SALE_ACCOUNT_BALANCE, 
+    SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE, 
     SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT, SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER, 
     SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE, SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME, 
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
   </sql>
   <sql id="columns_alias">
-    t.SALE_ORDER_ID, t.PLAN_ID, t.SALE_NUMBER, t.SHIPPER_ID, t.CONSIGNEE_ID, t.SALE_ACCOUNT_BALANCE, 
+    t.SALE_ORDER_ID, t.PLAN_ID, t.SALE_NUMBER, t.SHIPPER_ID, t.RECEIVE_ID, t.SALE_ACCOUNT_BALANCE, 
     t.SALE_CURRENT_ORDER_AMOUNT, t.SALE_HISTORICAL_ORDER_AMOUNT, t.SALE_ORDER_STATUS, 
     t.SALE_ORDER_RECEIVE_CUSTOMER, t.SALE_ORDER_ISSELF_MENTION, t.SALE_UNIT_PRICE, t.SALE_ORDER_TAX, 
     t.SALE_REMARK, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
@@ -56,8 +56,8 @@
       <if test="shipperId != null">
         and SHIPPER_ID = #{shipperId}
       </if>
-      <if test="consigneeId != null">
-        and CONSIGNEE_ID = #{consigneeId}
+      <if test="receiveId != null">
+        and RECEIVE_ID = #{receiveId}
       </if>
       <if test="saleAccountBalance != null">
         and SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
@@ -120,8 +120,8 @@
       <if test="shipperId != null">
         and SHIPPER_ID = #{shipperId}
       </if>
-      <if test="consigneeId != null">
-        and CONSIGNEE_ID = #{consigneeId}
+      <if test="receiveId != null">
+        and RECEIVE_ID = #{receiveId}
       </if>
       <if test="saleAccountBalance != null">
         and SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
@@ -186,8 +186,8 @@
     <if test="shipperId != null">
       or SHIPPER_ID = #{shipperId}
     </if>
-    <if test="consigneeId != null">
-      or CONSIGNEE_ID = #{consigneeId}
+    <if test="receiveId != null">
+      or RECEIVE_ID = #{receiveId}
     </if>
     <if test="saleAccountBalance != null">
       or SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
@@ -237,7 +237,7 @@
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
     insert into AMS_SALE_ORDER (SALE_ORDER_ID, PLAN_ID, SALE_NUMBER,
-                                SHIPPER_ID, CONSIGNEE_ID, SALE_ACCOUNT_BALANCE,
+                                SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE,
                                 SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT,
                                 SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER,
                                 SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE,
@@ -245,7 +245,7 @@
                                 INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                 INSERT_UPDATE_REMARK, DELETED)
     values (#{saleOrderId,jdbcType=DECIMAL}, #{planId,jdbcType=DECIMAL}, #{saleNumber,jdbcType=VARCHAR},
-            #{shipperId,jdbcType=DECIMAL}, #{consigneeId,jdbcType=DECIMAL}, #{saleAccountBalance,jdbcType=DECIMAL},
+            #{shipperId,jdbcType=DECIMAL}, #{receiveId,jdbcType=DECIMAL}, #{saleAccountBalance,jdbcType=DECIMAL},
             #{saleCurrentOrderAmount,jdbcType=DECIMAL}, #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
             #{saleOrderStatus,jdbcType=DECIMAL}, #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
             #{saleOrderIsselfMention,jdbcType=VARCHAR}, #{saleUnitPrice,jdbcType=DECIMAL},
@@ -268,8 +268,8 @@
       <if test="shipperId != null">
         SHIPPER_ID,
       </if>
-      <if test="consigneeId != null">
-        CONSIGNEE_ID,
+      <if test="receiveId != null">
+        RECEIVE_ID,
       </if>
       <if test="saleAccountBalance != null">
         SALE_ACCOUNT_BALANCE,
@@ -330,8 +330,8 @@
       <if test="shipperId != null">
         #{shipperId,jdbcType=DECIMAL},
       </if>
-      <if test="consigneeId != null">
-        #{consigneeId,jdbcType=DECIMAL},
+      <if test="receiveId != null">
+        #{receiveId,jdbcType=DECIMAL},
       </if>
       <if test="saleAccountBalance != null">
         #{saleAccountBalance,jdbcType=DECIMAL},
@@ -385,7 +385,7 @@
     set PLAN_ID = #{planId,jdbcType=DECIMAL},
         SALE_NUMBER = #{saleNumber,jdbcType=VARCHAR},
         SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
-        CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL},
+        RECEIVE_ID = #{receiveId,jdbcType=DECIMAL},
         SALE_ACCOUNT_BALANCE = #{saleAccountBalance,jdbcType=DECIMAL},
         SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount,jdbcType=DECIMAL},
         SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
@@ -415,8 +415,8 @@
       <if test="shipperId != null">
         SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
       </if>
-      <if test="consigneeId != null">
-        CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL},
+      <if test="receiveId != null">
+        RECEIVE_ID = #{receiveId,jdbcType=DECIMAL},
       </if>
       <if test="saleAccountBalance != null">
         SALE_ACCOUNT_BALANCE = #{saleAccountBalance,jdbcType=DECIMAL},
@@ -482,7 +482,7 @@
     insert into AMS_SALE_ORDER
     (SALE_ORDER_ID,
     PLAN_ID, SALE_NUMBER, SHIPPER_ID,
-    CONSIGNEE_ID, SALE_ACCOUNT_BALANCE,
+    RECEIVE_ID, SALE_ACCOUNT_BALANCE,
     SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT,
     SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER,
     SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE,
@@ -494,7 +494,7 @@
     select
     #{item.saleOrderId,jdbcType=DECIMAL},
     #{item.planId,jdbcType=DECIMAL}, #{item.saleNumber,jdbcType=VARCHAR}, #{item.shipperId,jdbcType=DECIMAL},
-    #{item.consigneeId,jdbcType=DECIMAL}, #{item.saleAccountBalance,jdbcType=DECIMAL},
+    #{item.receiveId,jdbcType=DECIMAL}, #{item.saleAccountBalance,jdbcType=DECIMAL},
     #{item.saleCurrentOrderAmount,jdbcType=DECIMAL}, #{item.saleHistoricalOrderAmount,jdbcType=DECIMAL},
     #{item.saleOrderStatus,jdbcType=DECIMAL}, #{item.saleOrderReceiveCustomer,jdbcType=VARCHAR},
     #{item.saleOrderIsselfMention,jdbcType=VARCHAR}, #{item.saleUnitPrice,jdbcType=DECIMAL},
@@ -523,9 +523,9 @@
     <foreach collection="list" item="item" index="index" separator=" " open="case SALE_ORDER_ID" close="end">
       when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.shipperId,jdbcType=DECIMAL}
     </foreach>
-    ,CONSIGNEE_ID=
+    ,RECEIVE_ID=
     <foreach collection="list" item="item" index="index" separator=" " open="case SALE_ORDER_ID" close="end">
-      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.consigneeId,jdbcType=DECIMAL}
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.receiveId,jdbcType=DECIMAL}
     </foreach>
     ,SALE_ACCOUNT_BALANCE=
     <foreach collection="list" item="item" index="index" separator=" " open="case SALE_ORDER_ID" close="end">
@@ -601,7 +601,6 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
   <select id="getSaleOrderInfo" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select * from(
     select a_s_order.SALE_ORDER_ID "saleOrderId",
@@ -637,7 +636,7 @@
     left join RMS_SHIPPER r_shipper
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
     left join RMS_CONSIGNEE r_consignee
-    on a_s_order.CONSIGNEE_ID=r_consignee.CONSIGNEE_ID
+    on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
     where a_s_order.SALE_ORDER_STATUS=0 and a_s_order.DELETED=0)
     <where>
       <if test="saleNumber != null">
@@ -757,7 +756,7 @@
     left join RMS_SHIPPER r_shipper
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
     left join RMS_CONSIGNEE r_consignee
-    on a_s_order.CONSIGNEE_ID=r_consignee.CONSIGNEE_ID
+    on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
     where a_s_order.SALE_ORDER_STATUS=1)
     <where>
       <if test="saleNumber != null">
@@ -958,7 +957,7 @@
     </where>
     <include refid="orderBy"></include>
   </select>
-
+<!--销售计划-->
   <select id="getSalePlanName" resultType="java.util.LinkedHashMap">
     select
       a_s_plan.PLAN_ID "id",
@@ -966,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",
@@ -974,7 +973,7 @@
       SHIPPER_NAME "label"
     from RMS_SHIPPER
   </select>
-
+<!-- 收货客户-->
   <select id="getConsigneeCompanyName" resultType="java.util.LinkedHashMap">
     select
       CONSIGNEE_ID "id",
@@ -1000,7 +999,7 @@
     select
       a_s_order.PLAN_ID "planId",
       a_s_order.SHIPPER_ID "shipperId",
-      a_s_order.CONSIGNEE_ID "consigneeId",
+      a_s_order.RECEIVE_ID "consigneeId",
       a_s_order.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
       a_s_order.SALE_ORDER_ISSELF_MENTION "saleOrderIsselfMention",
       a_s_order.SALE_REMARK "saleRemark"
@@ -1011,7 +1010,7 @@
   <update id="deleteBySaleOrderId" parameterType="java.math.BigDecimal">
     update AMS_SALE_ORDER_MATERIAL set DELETED = 1 where SALE_ORDER_ID = #{saleOrderId}
   </update>
-  
+
   <select id="getAmsSaleOrderApproved" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select * from(
     select a_s_order.SALE_ORDER_ID "saleOrderId",
@@ -1049,7 +1048,7 @@
     left join RMS_SHIPPER r_shipper
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
     left join RMS_CONSIGNEE r_consignee
-    on a_s_order.CONSIGNEE_ID=r_consignee.CONSIGNEE_ID
+    on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
     where a_s_order.SALE_ORDER_STATUS=4)
     <where>
       <if test="saleNumber != null">
@@ -1164,7 +1163,7 @@
             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}
+    where aso.sale_order_status in (2, 4) and adso.DISPATCH_STATUS = #{status} and adso.DISPATCH_TYPE=0
   </select>
 
   <!-- 通过收货地址，匹配对应的承运商-->
@@ -1172,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">

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

@@ -401,10 +401,13 @@
 
   <select id="getMaterialName" resultType="java.util.LinkedHashMap">
     select
-      MATERIAL_ID "id",
-      MATERIAL_ID "value",
-      MATERIAL_CODE "label"
+    MATERIAL_ID "id",
+    MATERIAL_ID "value",
+    MATERIAL_NAME "label"
     from RMS_MATERIAL
+    where MATERIAL_CODE like '08%'
+      and rownum &lt; 20
+
   </select>
 
   <select id="getAreaName" resultType="java.util.LinkedHashMap">

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

@@ -405,8 +405,8 @@
 
   <select id="getSalePalnIdBySaleOrderMaterialId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
     select a_s_order.PLAN_ID "planId"
-    from AMS_SALE_ORDER1 a_s_order
-           left join AMS_SALE_ORDER_MATERIAL1 order_material
+    from AMS_SALE_ORDER a_s_order
+           left join AMS_SALE_ORDER_MATERIAL order_material
                      on a_s_order.SALE_ORDER_ID=order_material.SALE_ORDER_ID
     where order_material.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId} and a_s_order.SALE_ORDER_STATUS =0
   </select>
@@ -414,9 +414,9 @@
   <select id="getAllSaleOrderMaterialNumber" parameterType="java.util.Map" resultType="java.math.BigDecimal">
     select sum(truckno_material.SALE_ORDER_MATERIAL_NUMBER) "allmaterialNumber"
     from AMS_SALE_TRUCKNO_MATERIAL truckno_material
-    left join AMS_SALE_ORDER_MATERIAL1 order_material
+    left join AMS_SALE_ORDER_MATERIAL order_material
     on truckno_material.SALE_ORDER_MATERIAL_ID=order_material.SALE_ORDER_MATERIAL_ID
-    left join AMS_SALE_ORDER1 a_s_order
+    left join AMS_SALE_ORDER a_s_order
     on a_s_order.SALE_ORDER_ID=order_material.SALE_ORDER_ID
     where a_s_order.PLAN_ID=#{planId} and truckno_material.MATERIAL_ID = #{materialId} and a_s_order.SALE_ORDER_STATUS =0
     group by