修改司机接单生成实绩

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

@@ -58,14 +58,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         int result = 0;
         //通过总实绩Id 查询关联的线路子表顺序
         List<Map<String, Object>> segmentList = omstruckOrderSeparateMapper.getLineMesByOrderId(lineId);
-        //通过订单ID查询物资信息
-        List<Integer> materialIdList = omstruckOrderSeparateMapper.getMaterialIdByTotalId(resultTotalId);
-        BigDecimal materialId = null;
-        if(materialIdList.size() == 1){
-            materialId = new BigDecimal(materialIdList.get(0));
-        }
         Map<String,Object> totalIdMap = new HashMap<>();
-        totalIdMap.put("materialId", materialId);
         totalIdMap.put("resultTotalId",resultTotalId);
         totalIdMap.put("lineId", lineId);
         // 遍历路段顺序号子表

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:

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

@@ -2750,7 +2750,8 @@
                OO.ORDER_NUMBER    "orderNumber",
                OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
                RC.CAPACITY_NUMBER "capacityNumber",
-               RS.SUPPLIER_NAME   "loadName",
+               RS.SUPPLIER_NAME   "shipperName",
+               RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName",
                RW.WAREHOUSE_NAME  "unloadName",
                OO.ORDER_TYPE      "orderType"
         FROM OMSTRUCK_ORDER OO
@@ -2762,6 +2763,8 @@
                            ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
                  LEFT JOIN RMS_SUPPLIER RS
                            ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                 LEFT JOIN RMS_CONSIGNEE RCON
+                           ON RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
         WHERE OO.ORDER_ID = #{orderId}
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5)