提交代码

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

@@ -250,16 +250,16 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 }
                 try {
                     //发送短信
-                    Map<String,Object> messageMap = tmstruckLeaveFactoryResultMapper.getMessageMap(orderId);
+                    /*Map<String,Object> messageMap = tmstruckLeaveFactoryResultMapper.getMessageMap(orderId);
                     if(messageMap.get("saleOrderConsigneeTEL") != null){
                             String capacityNum = (String) messageMap.get("capacityNumber");
                             String mobile = (String)messageMap.get("saleOrderConsigneeTEL");
                             tmstruckSmsRusultService.generaSendMessage(mobile,capacityNum,orderId);
-                    }
+                    }*/
                     //销售厂外监控
-                    Map<String, Object> parem = getTruckFactoryResult(orderNumber);
+                    /*Map<String, Object> parem = getTruckFactoryResult(orderNumber);
                     parem.put("turnOf","0");
-                    otmsFeign.createTotalResult(parem);
+                    otmsFeign.createTotalResult(parem);*/
                     // 调用结算
                     bmsTruckFeign.addDetailsOrder(orderId);
                 }catch (Exception ex){

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

@@ -1939,6 +1939,9 @@
                     NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
                     OO.CAN_WORK     "canwork",
                     OO.ORDER_STATUS              "carStatus",
+                    RSA.AREA_NAME "areaName",
+                    TAR.INSERT_TIME "arrivalTime",
+                    TRR.INSERT_TIME "receiptTime",
                     DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
                     DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
                                                  2,'销售已提交',
@@ -1951,6 +1954,8 @@
                               ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
                     LEFT JOIN RMS_SHIPPER RS
                               ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                    LEFT JOIN RMS_SALE_AREA RSA
+                    ON RSA.AREA_ID=RC.AREA_ID
                     LEFT JOIN RMS_SALER RSR
                               ON RSR.SALER_ID = ASO.SALER_ID
                     LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM