合并冲突、修改端口规范

pom.xml

@@ -109,8 +109,8 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>Omstruck_Order</param>
-<!--                    <param>TMSTRAIN_WEIGHT_RESULT</param>-->
+<!--                        <param>Omstruck_Order</param>-->
+<!--                        <param>TMSTRAIN_WEIGHT_RESULT</param>-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -400,7 +400,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
             count++;
         }
         if(carrierSSOId != null){
-            if("".equals(carrierSSOId)) {
+            if(!"null".equals(carrierSSOId)) {
                 mapValue.put("carrierSSOId", carrierSSOId);
                 count++;
             }
@@ -905,6 +905,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                               Integer orderType,
                                               Integer orderStatus,
                                               Integer fuelOrder,
+                                              String carrierSSOId,
                                               String con
     ) {
         int count = 0;
@@ -920,6 +921,11 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("fuelOrder", fuelOrder);
             count++;
         }
+        if(carrierSSOId != null){
+            if(!"null".equals(carrierSSOId)){
+                mapValue.put("carrierSSOId", carrierSSOId);
+            }
+        }
         //框计算
         if (con != null) {
             if (!"undefined".equals(con)) {
@@ -1335,26 +1341,35 @@ public class OmstruckOrderController extends BaseRESTfulController {
     @PostMapping("/driverConfirmation")
     public RESTfulResult driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue) {
         int result = omstruckOrderService.driverConfirmation(mapvalue);
+        if(result == 0){
+            return failed(result);
+        }
+        return success(result);
+    }
+
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("/getDriverConfirmation")
+    public RESTfulResult getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map) {
+        boolean result = omstruckOrderService.getDriverConfirmation(map);
         return success(result);
     }
 
     @ApiOperation(value = "通过运输订单Id查询订单信息给司机")
     @PostMapping("/getMessageToApp")
     public Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) {
-        if(mapvalue.get("orderId") == null && mapvalue.get("orderNumber") == null)
+        if(mapvalue.get("orderId") == null && mapvalue.get("orderNumber") == null){
             return null;
-        BigDecimal orderId = null;
+        }
         if(mapvalue.get("orderId") == null){
             //通过运输订单号查询运输订单Id
             String orderNumber = (String) mapvalue.get("orderNumber");
-            if("\n".equals(orderNumber.substring(orderNumber.length()-1)))
+            if("\n".equals(orderNumber.substring(orderNumber.length()-1))){
                 orderNumber = orderNumber.substring(0, orderNumber.length() - 1);
+            }
             Integer id = omstruckOrderMapper.getOrderIdByOrderNumber(orderNumber);
-            orderId = new BigDecimal(id);
-        }else {
-            orderId = DataChange.dataToBigDecimal(mapvalue.get("orderId"));
+            mapvalue.put("orderId", id);
         }
-        return omstruckOrderService.getMessageToApp(orderId);
+        return omstruckOrderService.getMessageToApp(mapvalue);
     }
 
     @ApiOperation(value = "通过车牌号查询所有已下发未接收的订单信息")

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

@@ -2,10 +2,12 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
+import com.steerinfo.dil.mapper.OmstruckOrderSeparateMapper;
 import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.service.impl.OmstruckOrderSeparateServiceImpl;
 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;
@@ -16,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +32,8 @@ import java.util.Map;
 @RequestMapping("/${api.version}/omstruckorderseparates")
 public class OmstruckOrderSeparateController extends BaseRESTfulController {
 
+    @Autowired
+    OmstruckOrderSeparateMapper omstruckOrderSeparateMapper;
 
     @Autowired
     OmstruckOrderSeparateServiceImpl omstruckOrderSeparateService;
@@ -66,11 +71,11 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
      */
     @PostMapping("/getOrderResult")
     public List<Map<String,Object>> getOrderResult(@RequestBody Map<String,Object> map){
-        Integer orderId = (Integer) map.get("orderId");
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         String orderNumber = (String) map.get("orderNumber");
         List<Map<String, Object>> result = null;
-        if (orderId != null) {
-            result = omstruckOrderSeparateService.getOrderResult(new BigDecimal(orderId));
+        if (orderId.intValue() != 0) {
+            result = omstruckOrderSeparateService.getOrderResult(orderId);
         }
         else {
             result = omstruckOrderSeparateService.getOrderNumberResult(orderNumber);
@@ -166,7 +171,7 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
                                            Integer pageSize,
                                            Integer type,
                                            Integer orderStatus,
-                                           Integer carrierId,
+                                           String carrierId,
                                            String  con) {
         int count = 0;
         if (orderStatus != null) {
@@ -177,7 +182,7 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
             mapValue.put("type", type);
             count++;
         }
-        if (carrierId != null) {
+        if (carrierId != null && !"undefined".equals(carrierId)) {
             mapValue.put("carrierId", carrierId);
             count++;
         }
@@ -239,4 +244,12 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         Integer result = omstruckOrderSeparateService.addSaleTruckOrder(mapValue);
         return success(result);
     }
+
+    @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
+    @PostMapping("/getCapacityAllOrder")
+    public RESTfulResult getCapacityAllOrder(String capacityNumber){
+        List<Map<String, Object>> capacityAllOrderList = omstruckOrderSeparateService.getCapacityAllOrder(capacityNumber);
+        return success(capacityAllOrderList);
+    }
+
 }

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

@@ -209,29 +209,26 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     BigDecimal selectOrderId(BigDecimal dcId);
 
     //查询采购订单数据 给司机
-    Map<String, Object> getCGOrderMessageToApp(@Param("orderId") BigDecimal orderId);
+    Map<String, Object> getCGOrderMessageToApp(Map<String, Object> map);
 
     //查询内转运输订单给APP 9 10 11
-    Map<String, Object> getNZOrderMessageToApp(@Param("orderId") BigDecimal orderId);
+    Map<String, Object> getNZOrderMessageToApp(Map<String, Object> map);
 
-    //查询采购零星物资订单给app 12
-    Map<String,Object>  getSporadicOrder(@Param("orderId") BigDecimal orderId);
-
-    //查询采购零星物资出厂订单给app 13
-    Map<String,Object> getLxOutFactoryOrder(@Param("orderId") BigDecimal orderId);
+    //查询采购零星物资订单给app 12 13
+    Map<String,Object>  getSporadicOrder(Map<String, Object> map);
 
     //查询发运计划运输订单给APP  2 3 4
-    Map<String, Object> getFYJHOrderMessageToApp(@Param("orderId") BigDecimal orderId);
+    Map<String, Object> getFYJHOrderMessageToApp(Map<String, Object> map);
 
     //查询销售运输订单给APP 1
-    Map<String, Object> getXSOrderMessageToApp(@Param("orderId") BigDecimal orderId);
+    Map<String, Object> getXSOrderMessageToApp(Map<String, Object> map);
 
 
     //通过运输订单号查询运输订单类型
     Integer getOrderTypeByOrderNumber(@Param("orderId") BigDecimal orderId);
 
     //通过车牌号查询该车牌下所有已下发 未接收 的 订单Id （4）
-    List<Integer> getOrderIdListByCapacityNumber(String capacityNumber);
+    List<Map<String, Object>> getOrderIdListByCapacityNumber(String capacityNumber);
 
     //通过车牌号查询该车牌下所有已接收的订单ID （5）
     List<Integer> getReceiveOrderIdListByCapacityNum(String capacityNumber);
@@ -259,6 +256,13 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     BigDecimal getCarrierIdBySSO(String carrierSsoId);
 
     List<Map<String, Object>> getOrderMaterialList(BigDecimal orderId);
+
     //通过订单查询趟次
     Integer getSporadicOrderTimes(BigDecimal orderId);
+
+    //查询订单是否确认
+    Integer getDriverConfirmation(BigDecimal orderId);
+
+    //查看当前订单最大路段顺序号 与当前订单路段顺序号
+    Map<String, Object> getMaxLineSeqByOrderId(BigDecimal orderId);
 }

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -75,5 +76,13 @@ public interface OmstruckOrderSeparateMapper {
     // 查询销售订单的物资件数或重量
     List<Map<String, Object>> getWeightOrNumber(BigDecimal saleOrderMaterialId);
 
+
     int updateTimes(@Param("orderPlanId") BigDecimal orderPlanId, @Param("times")int times);
+
+    //查询当前车辆之前所有已完成的订单
+    List<Map<String, Object>> getCapacityAllOrder(String capacityNumber);
+
+    //查询订单发货日期（订单类型为2）
+    Integer getDeliveryDate(Object orderId);
+
 }

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

@@ -171,8 +171,11 @@ public interface IOmstruckOrderService {
     //司机确认订单
     int driverConfirmation(Map<String, Object> map);
 
+    //查询订单是否确认
+    boolean getDriverConfirmation(Map<String, Object> map);
+
     //通过运输订单号查询订单信息给司机
-    Map<String, Object> getMessageToApp(BigDecimal orderId);
+    Map<String, Object> getMessageToApp(Map<String, Object> map);
 
     //通过车牌号查询所有已下发未接收的订单信息
     List<Map<String, Object>> getAllOrderMessagesByCapacityNum(Map<String, Object> map);

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

@@ -67,6 +67,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         Map<String,Object> totalIdMap = new HashMap<>();
         totalIdMap.put("materialId", materialId);
         totalIdMap.put("resultTotalId",resultTotalId);
+        totalIdMap.put("lineId", lineId);
         // 遍历路段顺序号子表
         int count = 0;
         BigDecimal lineType = (BigDecimal) segmentList.get(0).get("lineType");
@@ -396,6 +397,15 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
 
     @Override
     public int updateTimes(BigDecimal orderPlanId, int times) {
-        return omstruckOrderSeparateMapper.updateTimes(orderPlanId,times);
+        return omstruckOrderSeparateMapper.updateTimes(orderPlanId, times);
+    }
+    /**
+     * @Author TXF
+     * @Date 2021/12/30 16:15
+     * @param capacityNumber 车牌号
+     * @return 查询当前车辆之前所有已完成的订单号 以及 订单ID
+     **/
+    public List<Map<String, Object>> getCapacityAllOrder(String capacityNumber){
+        return omstruckOrderSeparateMapper.getCapacityAllOrder(capacityNumber);
     }
 }

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

@@ -554,9 +554,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 return 0;
             }
             omstruckOrder.setOrderStatus(new BigDecimal(5)); //5 ：已接收
-            //添加各个实绩
             //通过订单ID查询信息
             Map<String, Object> orderMessage = omstruckOrderSeparateMapper.getOrderMessagge(orderId);
+            //添加各个实绩
             omstruckOrderSeparateService.addAllSonResult(orderMessage);
             //判断订单是否是一车多单
 
@@ -574,11 +574,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrder.setOrderStatus(new BigDecimal(6));
             //添加拒绝原因
             omstruckOrder.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
-//            //将司机运力置为空闲 通过运输订单Id 查询运力ID
-//            BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByOrderOrNum(map);
-//            map.put("capacityId", capacityId);
-//            map.put("capacityStatus", 0);
-//            omstruckOrderMapper.updateCapacityByCarIdOrNum(map);
         }
         omstruckOrder.setOrderId(orderId);
         //生成接收/拒绝时间
@@ -918,15 +913,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      */
     @Override
     public List<Map<String, Object>> getTransportDispatch(Map<String, Object> map) {
-        List<Map<String, Object>> transportDispatch = omstruckOrderMapper.getTransportDispatch(map);
-        for (Map<String, Object> dispatch : transportDispatch) {
-            BigDecimal orderMaterialWeight = (BigDecimal) dispatch.get("orderMaterialWeight");
-            if(orderMaterialWeight==null){
-                BigDecimal orderMaterialNumber = (BigDecimal) dispatch.get("orderMaterialNumber");
-                dispatch.replace("orderMaterialWeight",orderMaterialNumber);
-            }
-        }
-        return transportDispatch;
+        return  omstruckOrderMapper.getTransportDispatch(map);
     }
 
     /**
@@ -1595,49 +1582,86 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     @Override
     public int driverConfirmation(Map<String, Object> map) {
         OmstruckOrder omstruckOrder = new OmstruckOrder();
+        BigDecimal orderId;
         //通过运输订单号查询运输订单Id
-        Integer orderId = omstruckOrderMapper.getOrderIdByOrderNumber((String) map.get("orderNumber"));
-        omstruckOrder.setOrderId(new BigDecimal(orderId));
+        if(map.get("orderId") == null){
+            orderId = new BigDecimal(omstruckOrderMapper.getOrderIdByOrderNumber((String) map.get("orderNumber")));
+        }else {
+            orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        }
+        Map<String, Object> seqMap = omstruckOrderMapper.getMaxLineSeqByOrderId(orderId);
+        if(seqMap != null){
+            //如果没有到最后一步之前 不允许确认
+            BigDecimal orderLineSequence = DataChange.dataToBigDecimal(seqMap.get("orderLineSequence"));
+            BigDecimal maxSegmentSqe = DataChange.dataToBigDecimal(seqMap.get("segmentSqe"));
+            int i = maxSegmentSqe.intValue() - orderLineSequence.intValue();
+            if( i != 1){
+                return 0;
+            }
+        }
+
+        omstruckOrder.setOrderId(orderId);
         //设置司机确认订单
         omstruckOrder.setDriverConfirmation(new BigDecimal(1));
         omstruckOrder.setUpdateTime(new Date());
         return omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
     }
 
+    /**
+     * 查询订单是否确认
+     * @Author TXF
+     * @Date 2022/1/4 23:36
+     * @param map {orderId}
+     * @return
+     **/
+    public boolean getDriverConfirmation(Map<String, Object> map){
+        Integer driverConfirmation = omstruckOrderMapper.getDriverConfirmation(DataChange.dataToBigDecimal(map.get("orderId")));
+        if(driverConfirmation == null){
+            return true;
+        }else {
+            return false;
+        }
+    }
+
     /**
      * 通过运输订单号查询订单信息给司机
-     * @param orderId
+     * @param map
      * @return
      */
-    public Map<String, Object> getMessageToApp(BigDecimal orderId){
-        //通过运输订单Id查询订单类型
-        Integer orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(orderId);
+    public Map<String, Object> getMessageToApp(Map<String, Object> map){
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        Integer orderType;
+        //获取订单类型
+        if(map.get("orderType") == null){
+            orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(orderId);
+        }else {
+            orderType = DataChange.dataToBigDecimal(map.get("orderType")).intValue();
+        }
         Map<String, Object> mesMap = new HashMap<>();
         switch (orderType){
             case 1:
-                mesMap = omstruckOrderMapper.getXSOrderMessageToApp(orderId);
-                break;
             case 2:
+                mesMap = omstruckOrderMapper.getXSOrderMessageToApp(map);
+                break;
             case 3:
             case 4:
-                mesMap = omstruckOrderMapper.getFYJHOrderMessageToApp(orderId);
+                mesMap = omstruckOrderMapper.getFYJHOrderMessageToApp(map);
                 break;
             case 5:
             case 6:
             case 7:
             case 8:
-                mesMap = omstruckOrderMapper.getCGOrderMessageToApp(orderId);
+                mesMap = omstruckOrderMapper.getCGOrderMessageToApp(map);
                 break;
             case 9:
             case 10:
             case 11:
-                mesMap = omstruckOrderMapper.getNZOrderMessageToApp(orderId);
+                mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
                 break;
             case 12:
-                mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
-                break;
             case 13:
-                mesMap = omstruckOrderMapper.getSporadicOrder(orderId);
+            case 15:
+                mesMap = omstruckOrderMapper.getSporadicOrder(map);
                 break;
 
         }
@@ -1654,10 +1678,17 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public List<Map<String, Object>> getAllOrderMessagesByCapacityNum(Map<String, Object> map){
         String capacityNumber = (String) map.get("capacityNumber");
         //通过车牌号查询所有未下发的订单ID
-        List<Integer> orderIdList = omstruckOrderMapper.getOrderIdListByCapacityNumber(capacityNumber);
+        List<Map<String, Object>> orderMesList = omstruckOrderMapper.getOrderIdListByCapacityNumber(capacityNumber);
         List<Map<String, Object>> mesMapList = new ArrayList<>();
-        for (Integer orderId : orderIdList) {
-            Map<String, Object> mesMap = getMessageToApp(new BigDecimal(orderId));
+        for (Map<String, Object> orderMesMap: orderMesList) {
+            //如果订单类型为2 则判断订单发货日期是否为当日 如果不是当日则不给显示
+            if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 2){
+                Integer judgeDate = omstruckOrderSeparateMapper.getDeliveryDate(orderMesMap.get("orderId"));
+                if(judgeDate == null){ // 数据为空则不是当天的订单
+                    continue;
+                }
+            }
+            Map<String, Object> mesMap = getMessageToApp(orderMesMap);
             mesMapList.add(mesMap);
         }
         return  mesMapList;

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -40,23 +40,22 @@ public class DataChange {
      * @param data
      * @return
      */
-    public static BigDecimal
-    dataToBigDecimal(Object data){
+    public static BigDecimal dataToBigDecimal(Object data){
         if (data != null){
-            if(data instanceof String){
-                String data1 = (String) data;
-                return new BigDecimal(data1);
-            }
-            if(data instanceof Integer){
-                Integer data2 = (Integer) data;
-                return new BigDecimal(data2);
-            }
-            if(data instanceof Double){
-                Double data3 = (Double) data;
-                return new BigDecimal(data3);
-            }
             if(data instanceof BigDecimal){
                 return (BigDecimal) data;
+            }else{
+                String str = String.valueOf(data);
+                BigDecimal decimal = null;
+                if(!"".equals(str)){
+                    try {
+                        decimal = new BigDecimal(str);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        return new BigDecimal(0);
+                    }
+                }
+                return decimal;
             }
         }
         return new BigDecimal(0);
@@ -156,4 +155,5 @@ public class DataChange {
         );
         return sb.toString();
     }
+
 }

src/main/resources/application-dev.yml

@@ -1,3 +1,4 @@
+#测试环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
@@ -7,3 +8,17 @@ spring:
   application:
     name: DAL-OMS-API-DEV
 
+#feign设置
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+  ImFeign:
+    url: ${IMFEIGN_URL:172.16.33.166:8018}
+
+server:
+  port: 8016
+

src/main/resources/application-prod.yml

@@ -1,8 +1,23 @@
+#正式环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: DAL-OMS-API-PROD
+    name: DAL-OMS-API-PROD
+
+#feign设置
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+  ImFeign:
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
+
+server:
+  port: 8095

src/main/resources/bootstrap.yml

@@ -17,6 +17,9 @@ eureka:
   client:
     service-url:
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
@@ -40,30 +43,6 @@ redis:
     time: 864000000
   database: 0
 
-#feign设置
-openfeign:
-  #正式环境
-  #ColumnDataFeign:
-  #url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  #TmsTruckFeign:
-  #url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-  #AmsFeign:
-  #url: ${AMSFEIGN_URL:172.16.33.166:8079}
-  #ImFeign:
-  # url: ${IMFEIGN_URL:172.16.33.166:8055}
-
-
-  #测试环境
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
-  AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
-  ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8018}
-
-
 mybatis:
   type-aliases-package: com.steerinfo.dil.model
   mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml
@@ -71,9 +50,3 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
-
-server:
-  #正式
-  # port: 8095
-  #测试
-  port: 8016

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

@@ -1271,11 +1271,17 @@
         RCON.CONSIGNEE_CONTACT_TEL "consigneeContactTel",
         to_char(APO.PUCHASE_ORDER_DELIVERY_DATE, 'yyyy-mm-dd') "puchaseOrderDeliveryDate",
         RM.MATERIAL_NAME "materialName",
-        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+        (
+            case when OOM.ORDER_MATERIAL_WEIGHT is not null
+              then OOM.ORDER_MATERIAL_WEIGHT
+              when OOM.ORDER_MATERIAL_WEIGHT is null
+              then OOM.ORDER_MATERIAL_NUMBER
+            end
+        )    "orderMaterialWeight",
         OO.ORDER_ISSUE_TIME "orderIssueTime",
         OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
         RC.CAPACITY_NUMBER "capacityNumber"
+
         from OMSTRUCK_ORDER OO
         left join AMS_PURCHASE_ORDER APO
         on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
@@ -1291,6 +1297,10 @@
         on RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
+        <if test="carrierSSOId != null">
+            left join RMS_CARRIER RCA
+                on RCA.CARRIER_ID = RC.CARRIER_ID
+        </if>
         <where>
             <if test="orderStatus != null">
                 OO.ORDER_STATUS = #{orderStatus}
@@ -1301,6 +1311,9 @@
             <if test="fuelOrder != null">
                 and OO.ORDER_TYPE in (6, 7)
             </if>
+            <if test="carrierSSOId != null">
+                and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+            </if>
         </where>
         )
         <where>
@@ -1671,13 +1684,12 @@
                 and RC.CARRIER_ID = #{carrierId}
             </if>
             <if test="orderTypee!=null">
-                and OO.ORDER_TYPE=#{orderTypee}
+                and OO.ORDER_TYPE in (1, 2)
             </if>
         </where>
         )
         <where>
             <if test="orderNumber != null">
-                and
                 <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
                     "orderNumber" like '%${item}%'
                 </foreach>
@@ -1710,7 +1722,7 @@
         <include refid="orderBy">
         </include>
         <if test="orderField == null  ">
-            order by "orderReceiveRefuseTime" desc
+            order by "orderNumber" desc
         </if>
     </select>
     <!--根据车序号查找销售订单 -->
@@ -2555,7 +2567,14 @@
                         then OOM.ORDER_MATERIAL_NUMBER
                    end
                    )
-                   AS                                                                      "weightNum"
+                   AS                                                                   "weightNum",
+                (   SELECT
+                           TWR.RESULT_NET_WEIGHT
+                    FROM TMSTRUCK_WEIGHT_RESULT TWR
+                    JOIN TMSTRUCK_TOTAL_RESULT TTR
+                        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+                    WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+                   )                                                                    "netWeight"
         FROM OMSTRUCK_ORDER_MATERIAL OOM
                  LEFT JOIN RMS_MATERIAL RM
                            ON RM.MATERIAL_ID = OOM.MATERIAL_ID
@@ -2715,7 +2734,7 @@
     </select>
 
     <!--   查询采购运输订单给APP 5 6 7 8 -->
-    <select id="getCGOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+    <select id="getCGOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT OO.ORDER_ID        "orderId",
                OO.ORDER_NUMBER    "orderNumber",
                OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
@@ -2733,11 +2752,16 @@
                  LEFT JOIN RMS_SUPPLIER RS
                            ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
         WHERE OO.ORDER_ID = #{orderId}
-          AND OO.ORDER_STATUS in (4, 5)
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5)
+        </if>
+        <if test="status != null">
+            AND OO.ORDER_STATUS = 2
+        </if>
     </select>
 
 <!--查询采购零星物资信息给app 12 -->
-    <select id="getSporadicOrder" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+    <select id="getSporadicOrder" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT  OO.ORDER_ID        "orderId",
                 OO.ORDER_NUMBER    "orderNumber",
                 OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
@@ -2756,40 +2780,50 @@
                  LEFT JOIN RMS_CONSIGNEE RC2
                            ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
         WHERE OO.ORDER_ID = #{orderId}
-          AND OO.ORDER_STATUS in (4, 5)
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5)
+        </if>
+        <if test="status != null">
+            AND OO.ORDER_STATUS = 2
+        </if>
     </select>
 
     <!--  查询内转运输订单给APP 9 10 11-->
-    <select id="getNZOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-       SELECT OO.ORDER_ID            "orderId",
-       OO.ORDER_NUMBER        "orderNumber",
-       OO.ORDER_LINE_SEQUENCE "orderLineSequence",
-       RC.CAPACITY_NUMBER     "capacityNumber",
-       rwl.warehouse_name     "loadName",
-       RW.WAREHOUSE_NAME      "unloadName",
-       OO.ORDER_TYPE          "orderType"
-  FROM OMSTRUCK_ORDER OO
-  LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
-    ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
-  LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-    ON ARP.PLAN_ID = AIP.PLAN_ID
-  LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-    ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-  LEFT JOIN AMS_PURCHASE_ORDER APO
-    ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
-  left join rms_warehouse rwl
-    on rwl.warehouse_id = AIR.REQUIREMNT_UNIT_ID
-  LEFT JOIN RMS_SUPPLIER RS
-    ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-  LEFT JOIN RMS_WAREHOUSE RW
-    ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
-  LEFT JOIN RMS_CAPACITY RC
-    ON RC.CAPACITY_ID = OO.CAPACITY_ID
- WHERE OO.ORDER_ID = #{orderId}
-   AND OO.ORDER_STATUS in (4, 5)
+    <select id="getNZOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT OO.ORDER_ID "orderId",
+        OO.ORDER_NUMBER "orderNumber",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        rwl.warehouse_name "loadName",
+        RW.WAREHOUSE_NAME "unloadName",
+        OO.ORDER_TYPE "orderType"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        left join rms_warehouse rwl
+        on rwl.warehouse_id = AIR.REQUIREMNT_UNIT_ID
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5)
+        </if>
+        <if test="status != null">
+            AND OO.ORDER_STATUS = 2
+        </if>
     </select>
     <!--  查询发运计划运输订单给APP  2 3 4 -->
-    <select id="getFYJHOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+    <select id="getFYJHOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT OO.ORDER_ID        "orderId",
                OO.ORDER_TYPE      "orderType",
                OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
@@ -2808,10 +2842,16 @@
                            ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
-        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
+        WHERE OO.ORDER_ID = #{orderId}
+                <if test="status == null">
+                    AND OO.ORDER_STATUS in (4, 5)
+                </if>
+                <if test="status != null">
+                    AND OO.ORDER_STATUS = 2
+                </if>
     </select>
     <!--  查询销售运输订单给APP 1 -->
-    <select id="getXSOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+    <select id="getXSOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT OO.ORDER_ID                          "orderId",
                OO.ORDER_TYPE                        "orderType",
                OO.ORDER_LINE_SEQUENCE               "orderLineSequence",
@@ -2836,7 +2876,13 @@
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
                  LEFT JOIN RMS_RECEIVE_ADDRESS RDA
                            ON RDA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
-        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
+        WHERE OO.ORDER_ID = #{orderId}
+          <if test="status == null">
+              AND OO.ORDER_STATUS in (4, 5)
+          </if>
+          <if test="status != null">
+              AND OO.ORDER_STATUS = 2
+          </if>
     </select>
 
 
@@ -2848,8 +2894,9 @@
     </select>
 
     <!--  通过车牌匹配所有已下发的 的订单Id -->
-    <select id="getOrderIdListByCapacityNumber" parameterType="string" resultType="int">
-        SELECT OO.ORDER_ID
+    <select id="getOrderIdListByCapacityNumber" parameterType="string" resultType="map">
+        SELECT OO.ORDER_ID "orderId",
+               OO.ORDER_TYPE    "orderType"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
@@ -2885,27 +2932,6 @@
         where ORDER_ID = #{orderId}
     </select>
 
-<!--  查询采购零星物资出厂订单给app 13  -->
-    <select id="getLxOutFactoryOrder" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-        SELECT  OO.ORDER_ID        "orderId",
-                OO.ORDER_NUMBER    "orderNumber",
-                OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
-                RC.CAPACITY_NUMBER "capacityNumber",
-                OO.ORDER_TYPE      "orderType",
-                RS.SHIPPER_NAME "loadName",
-                RC2.CONSIGNEE_COMPANY_NAME "unloadName"
-        FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                 left join AMSTRUCK_SPORADIC_ORDER ASO
-                           ON ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
-                 LEFT JOIN RMS_SHIPPER RS
-                           ON RS.SHIPPER_ID = ASO.SEND_UNIT_ID
-                 LEFT JOIN RMS_CONSIGNEE RC2
-                           ON RC2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
-        WHERE OO.ORDER_ID = #{orderId}
-          AND OO.ORDER_STATUS in (4, 5)
-    </select>
 
     <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >
         SELECT
@@ -2926,10 +2952,32 @@
         ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         WHERE OOM.ORDER_ID = #{orderId}
     </select>
+
     <select id="getSporadicOrderTimes" resultType="java.lang.Integer">
          select aso.sporadic_order_times from OMSTRUCK_ORDER oo
             left join  AMSTRUCK_SPORADIC_ORDER  aso
             on oo.ORDER_PLAN_ID=aso.sporadic_order_id
             where oo.order_id= #{orderId}
     </select>
+
+
+    <!--  查询订单是否确认  -->
+    <select id="getDriverConfirmation" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select OO.DRIVER_CONFIRMATION
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_ID = #{orderId}
+    </select>
+
+<!--  查看当前订单最大路段顺序号  -->
+    <select id="getMaxLineSeqByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        select OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+               (select max(RLS.SEGMENT_SQE)
+                    from RMS_LINE_SEGEMNT RLS
+                   where RLS.LINE_ID = RL.LINE_ID
+               )    "segmentSqe"
+        from OMSTRUCK_ORDER OO
+        join RMS_LINE RL
+            on RL.LINE_ID = OO.LINE_ID
+        where OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>

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

@@ -414,7 +414,8 @@
                 and OO.ORDER_TYPE = 14
             </if>
             <if test="carrierId != null">
-                and ASO.CARRIER_ID = #{carrierId}
+                and ASO.CARRIER_ID = (select rc.carrier_id from rms_carrier rc
+                where rc.carrier_sso_id= #{carrierId})
             </if>
         </where>
         )
@@ -474,4 +475,27 @@
         WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </select>
 
+<!--    查询当前车辆之前所有已完成的订单  -->
+    <select id="getCapacityAllOrder" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_ID     "orderId",
+               OO.ORDER_NUMBER "orderNumber"
+
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+        where CAPACITY_NUMBER = #{capacityNumber}
+                and OO.ORDER_STATUS = 2
+        order by OO.ORDER_ID desc
+    </select>
+
+<!--  查询订单发货日期 （订单类型为2） -->
+    <select id="getDeliveryDate" parameterType="object" resultType="int">
+        select OO.ORDER_ID
+        from OMSTRUCK_ORDER OO
+        join AMS_SALE_ORDER_MATERIAL ASOM
+            on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        where OO.ORDER_ID = #{orderId}
+          and TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
+    </select>
+
 </mapper>