Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS into dev

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

@@ -215,7 +215,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     Map<String, Object> getNZOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 
     //查询采购零星物资订单给app 12
-    Map<String,Object> getSporadicOrder(@Param("orderId") BigDecimal orderId);
+    Map<String,Object>  getSporadicOrder(@Param("orderId") BigDecimal orderId);
 
     //查询发运计划运输订单给APP  2 3 4
     Map<String, Object> getFYJHOrderMessageToApp(@Param("orderId") BigDecimal orderId);
@@ -223,6 +223,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //查询销售运输订单给APP 1
     Map<String, Object> getXSOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 
+
     //通过运输订单号查询运输订单类型
     Integer getOrderTypeByOrderNumber(@Param("orderId") BigDecimal orderId);
 

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

@@ -740,8 +740,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //新增运输订单
         omstruckOrderMapper.insertSelective(omstruckOrder);
         //更新运力状态为待运输：2
-        map.put("capacityStatus", 2);
-        omstruckOrderMapper.updateCapacityById(map);
+//        map.put("capacityStatus", 2);
+//        omstruckOrderMapper.updateCapacityById(map);
         //新增运输订单子表
         addOrderMaterial(map, omstruckOrder.getOrderId());
         //新增实绩总表关联订单 feign调用
@@ -1194,7 +1194,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             capacityMap.put("capacityNumber",capacityNumber);
             List<RmsCapacity> rmsCapacities = rmsCapacityMapper.selectByParameters(capacityMap);
             RmsCapacity rmsCapacity = rmsCapacities.get(0);
-            rmsCapacity.setCapacityStatus(new BigDecimal(2));
+//            rmsCapacity.setCapacityStatus(new BigDecimal(2));
             result +=rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
             BigDecimal capacityId = rmsCapacity.getCapacityId();
             capacityMap.clear();
@@ -1620,6 +1620,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 12:
                 mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
+                break;
+            case 13:
+                mesMap = omstruckOrderMapper.getSporadicOrder(orderId);
+                break;
 
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));

src/main/resources/bootstrap.yml

@@ -43,14 +43,14 @@ redis:
 #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: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}
 
 
     #测试环境
@@ -74,6 +74,6 @@ mybatis:
 
 server:
   #正式
-#   port: 8095
+  # port: 8095
   #测试
   port: 8016

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

@@ -2754,10 +2754,19 @@
                 OO.ORDER_NUMBER    "orderNumber",
                 OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
                 RC.CAPACITY_NUMBER "capacityNumber",
-                OO.ORDER_TYPE      "orderType"
+                OO.ORDER_TYPE      "orderType",
+                RS.SUPPLIER_NAME "consigneeCompanyName",
+                RC2.CONSIGNEE_COMPANY_NAME "receiveAddressName"
+
         FROM OMSTRUCK_ORDER OO
-        LEFT JOIN RMS_CAPACITY RC
-        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 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_SUPPLIER RS
+                           ON RS.SUPPLIER_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>
@@ -2839,6 +2848,7 @@
         WHERE OO.ORDER_ID = #{orderId}
     </select>
 
+
     <!--  通过运输订单号查询订单类型  -->
     <select id="getOrderTypeByOrderNumber" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
         SELECT OO.ORDER_TYPE

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

@@ -187,19 +187,12 @@
 <!--    通过总实绩ID和路段顺序号查询装货实绩数据-->
     <select id="getLoadMes" parameterType="map" resultType="java.util.Map">
         select TLR.RESULT_LOAD_END_TIME "pointDate",
-               (case
-                   when OO.ORDER_TYPE in (1, 4)
-                   then (select RPP.PLATFORM_NAME
-                            from RMS_PWAREHOUSE_PLATFORM RPP
-                            where RPP.PLATFORM_ID = TLR.LOADING_ID )
-                   else (select RW.WAREHOUSE_NAME from RMS_WAREHOUSE RW
-                         where RW.WAREHOUSE_ID = TLR.LOADING_ID)
-               end) "pointName"
+               RW.WAREHOUSE_NAME "pointName"
         from TMSTRUCK_LOAD_RESULT TLR
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
-        left join OMSTRUCK_ORDER OO
-            on OO.ORDER_ID = TTR.ORDER_ID
+        left join RMS_WAREHOUSE RW
+            on RW.WAREHOUSE_ID = TLR.LOADING_ID
         where TLR.RESULT_TOTAL_ID = #{resultTotalId} and TLR.SEGMENT_SQE = #{segmentSqe}
     </select>