修改汽运结算

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

@@ -34,7 +34,7 @@ public interface ITmstruckLeaveFactoryResultService {
     //新增进厂实绩 派单时新增
     int addLeaveFactory(Map<String,Object> mapValue);
 
-    Map<String, Object> getTruckFactoryResult(String nu);
+    Map<String, Object> getTruckFactoryResult(String orderNumber);
 
     // APP查询出厂信息
     List<Map<String, Object>> getLeaveFactoryList(String orderNumber);

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

@@ -105,8 +105,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     }
 
     @Override
-    public Map<String, Object> getTruckFactoryResult(String nu) {
-        return tmstruckLeaveFactoryResultMapper.getTruckFactoryResult(nu);
+    public Map<String, Object> getTruckFactoryResult(String orderNumber) {
+        return tmstruckLeaveFactoryResultMapper.getTruckFactoryResult(orderNumber);
     }
 
     /**
@@ -240,13 +240,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                             tmstruckSmsRusultService.generaSendMessage(mobile,capacityNum,orderId);
                     }
                     //销售厂外监控
-                    Map<String, Object> parem=tmstruckLeaveFactoryResultService.getTruckFactoryResult(orderNumber);
+                    Map<String, Object> parem=getTruckFactoryResult(orderNumber);
                     parem.put("turnOf","0");
                     otmsFeign.createTotalResult(parem);
                     // 调用结算
                     bmsTruckFeign.addDetailsOrder(orderId);
                 }catch (Exception ex){
-
+                    System.out.println(ex.getMessage());
                 }
                 break;
             case 2:

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

@@ -710,10 +710,8 @@
              )
         where rownum = 1
     </select>
-    <select id="getTruckFactoryResult" resultType="java.util.Map">
-                
+    <select id="getTruckFactoryResult" resultType="java.util.Map" parameterType="string">
                 SELECT   * from(
-                
                  SELECT
                     -- 出厂时间
                     to_char(TLFR.RESULT_OUT_GATE_TIME,'yyyy-mm-dd hh24:mi:ss')  "resultOutGateTime",
@@ -739,10 +737,10 @@
                     RS.SUPPLIER_NAME  "supplierName" ,
                     -- 发货单位
                     RS2.SHIPPER_NAME "shipperName"
-                   
-                    
-                    
-                    
+
+
+
+
                 FROM
                     -- 出厂实绩
                     TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
@@ -762,17 +760,17 @@
                     LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON    ASOM.SALE_ORDER_MATERIAL_ID =OO.ORDER_PLAN_ID
                     --收货地址
                     left join RMS_RECEIVE_PLACE RRP  on ASOM.SALE_SHIPPING_ADDRESS_ID=RRP.PLACE_ID
-                    
+
                     left join RMS_RECEIVE_ADDRESS RRA on RRP.ADDRESS_ID=RRA.ADDRESS_ID
                     -- 收货单位
                     LEFT JOIN RMS_SHIPPER RS2 ON ASO.SHIPPER_ID = RS2.SHIPPER_ID
-                    
+
                 WHERE
                     -- 判断出厂实绩的出厂时间不为空
                     TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
                     --   并且订单类型等于1（销售订单），2（焦炭发运计划），3（水渣发运计划）
                     AND OO.ORDER_TYPE =1 AND OO.ORDER_NUMBER=#{orderNumber}
-                    
+
                     )
     </select>