xiugaiu

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

@@ -237,7 +237,7 @@ 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");

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

@@ -70,6 +70,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         String mobile1 = mobile;
         String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + driverTel + "。欲知详情，请前往达州钢铁智慧物流平台查看车辆实时轨迹。退订";
         String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content;
+        System.out.println(mobile1);
         String jsonData = null;
         JSONObject jsonObject = new JSONObject();
         jsonData = HTTPRequestUtils.send(sendUrl,jsonObject,"utf-8");

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

@@ -1345,14 +1345,14 @@
         twr.result_tare_weight_time  "tareWeightTime",
         twr.result_net_weight        "resultNetWeight",
         RC.CARRIER_NAME "carrierName",
-        RL.LINE_NAME "lineName",
         db.RESULT_FOREIGN_SHIP_NAME "shipName",
-        rw2.WAREHOUSE_NAME  "warehouseName"
+        rw2.WAREHOUSE_NAME  "unloadName",
+        rw.WAREHOUSE_NAME   "loadName",
+        decode(OO.ORDER_TYPE,15,'拼装车皮进厂',16,'一焦化采购内转') "orderType",
+        decode(oo.ORDER_TYPE,15,'达钢厂区内转',16,'达钢厂区内转') "rangeValue"
         from omstruck_order oo
         left join omstruck_order_material oom
         on oom.order_id = oo.order_id
-        LEFT JOIN RMS_LINE RL
-        ON RL.LINE_ID=OO.LINE_ID
         left join rms_material rm
         on rm.material_id = oom.material_id
         left join rms_capacity rc
@@ -1377,20 +1377,14 @@
         on ttr.order_id = oo.order_id
         left join tmstruck_weight_result twr
         on twr.result_total_id = ttr.result_total_id
-        left join rms_truck_calculate rtc1
-        on rtc1.truck_calculate_id = twr.result_tare_place_id
         left join tmstruck_load_result tlr
         on tlr.result_total_id = ttr.result_total_id
         left join rms_warehouse rw
         on rw.warehouse_id = tlr.loading_id
-        left join rms_truck_calculate rtc2
-        on rtc2.truck_calculate_id = twr.result_gross_place_id
         left join tmstruck_unload_result tur
         on tur.result_total_id = ttr.result_total_id
         left join rms_warehouse rw2
         on rw2.warehouse_id = tur.result_unload_place_id
-        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR1
-        ON TLFR1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         where
         twr.result_net_weight IS NOT NULL
         AND  OO.ORDER_STATUS = 2
@@ -1584,12 +1578,18 @@
                      twr4.result_net_weight        "resultNetWeight",
                      GREATEST(TWR4.RESULT_GROSS_WEIGHT_TIME,TWR4.RESULT_TARE_WEIGHT_TIME) "netTime",
                      RC.CARRIER_NAME "carrierName",
-                     RL.LINE_NAME "lineName"
+                     RL.LINE_NAME "lineName",
+                     rw.WAREHOUSE_NAME  "loadName",
+                     rw2.WAREHOUSE_NAME "unloadName",
+                     RTR.TRANS_RANGE_VALUE "rangeValue",
+                     DECODE(ORDER_TYPE,10,'化工园区铁专线-焦化二厂采购内转',20,'化工园区铁专线-达钢老厂采购内转') "orderType"
                        from omstruck_order oo
                        left join omstruck_order_material oom
                        on oom.order_id = oo.order_id
                        LEFT JOIN RMS_LINE RL
                         ON RL.LINE_ID=OO.LINE_ID
+                       LEFT JOIN RMS_TRANS_RANGE RTR
+                        ON RTR.TRANS_RANGE_ID = RL.TRANS_RANGE_ID
                        left join rms_material rm
                        on rm.material_id = oom.material_id
                        left join rms_capacity rc
@@ -1612,16 +1612,12 @@
                                  on ttr.order_id = oo.order_id
                        left join tmstruck_weight_result twr1
                                  on twr1.result_total_id = ttr.result_total_id
-                       left join rms_truck_calculate rtc1
-                                 on rtc1.truck_calculate_id = twr1.result_tare_place_id
                        left join tmstruck_load_result tlr
                                  on tlr.result_total_id = ttr.result_total_id
                        left join rms_warehouse rw
                                  on rw.warehouse_id = tlr.loading_id
                        left join tmstruck_weight_result twr2
                                  on twr2.result_total_id = ttr.result_total_id
-                       left join rms_truck_calculate rtc2
-                                 on rtc2.truck_calculate_id = twr2.result_gross_place_id
                        left join tmstruck_weight_result twr3
                                  on twr3.result_total_id = ttr.result_total_id
                        left join rms_truck_calculate rtc3
@@ -1681,12 +1677,17 @@
                RL.LINE_NAME "lineName",
                RC3.CARRIER_NAME "carrierName",
                GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME,TWR.RESULT_TARE_WEIGHT_TIME) "netTime",
-               DB.RESULT_FOREIGN_SHIP_NAME  "shipName"
+               DB.RESULT_FOREIGN_SHIP_NAME  "shipName",
+               RTR.TRANS_RANGE_VALUE    "rangeValue",
+               RW.WAREHOUSE_NAME        "loadName",
+               RW2.WAREHOUSE_NAME       "unloadName"
         from OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OO.ORDER_ID=OOM.ORDER_ID
         LEFT JOIN RMS_LINE RL
         ON RL.LINE_ID=OO.LINE_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = RL.TRANS_RANGE_ID
         LEFT JOIN RMS_CAPACITY RC
         ON OO.CAPACITY_ID=RC.CAPACITY_ID
         LEFT JOIN RMS_MATERIAL RM
@@ -1704,7 +1705,13 @@
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
         ON  TTR.ORDER_ID=OO.ORDER_ID
         left join TMSTRUCK_LOAD_RESULT TLR
-         ON TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
+         ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+        left join RMS_WAREHOUSE RW
+        on rw.WAREHOUSE_ID = tlr.LOADING_ID
+        left join TMSTRUCK_UNLOAD_RESULT TUR
+        ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_WAREHOUSE RW2
+        ON RW2.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         <where>
@@ -1743,19 +1750,21 @@
         greatest(TWR.RESULT_TARE_WEIGHT_TIME,TWR.RESULT_GROSS_WEIGHT_TIME) "netTime",
         TWR.RESULT_GROSS_WEIGHT_TIME "grossweightTime",
         TWR.RESULT_GROSS_WEIGHT "grossWeight",
-        RL.LINE_NAME "lineName",
+        RW1.WAREHOUSE_NAME "unloadName",
+        RW2.WAREHOUSE_NAME "loadName",
         RC2.CARRIER_NAME "carrierName",
-        RMT.MATERIAL_TYPE_NAME "materialTypeName"
+        RMT.MATERIAL_TYPE_NAME "materialTypeName",
+        RTR.TRANS_RANGE_VALUE   "rangeValue",
+        decode(ORDER_TYPE,11,'纯内转') "orderType"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
-        left join RMS_LINE RL ON OO.LINE_ID=RL.LINE_ID
         left join TMSTRUCK_WEIGHT_RESULT TWR on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
         left join RMS_CAPACITY RC on OO.CAPACITY_ID = RC.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC1 on RTC1.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
         left join RMS_TRUCK_CALCULATE RTC2 on RTC2.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
         left join AMSTRUCK_INWARD_PLAN AIP on AIP.PLAN_ID = OO.ORDER_PLAN_ID
         left join AMSTRUCK_REQUIREMENT_PLAN ARP on AIP.PLAN_ID = ARP.PLAN_ID
-        left join RMS_CARRIER RC2 ON RC2.CARRIER_ID=AIP.CARRIER_ID
+        left join RMS_CARRIER RC2 ON RC2.CARRIER_ID = AIP.CARRIER_ID
         left join AMSTRUCK_INWARD_REQUIREMENT AIR on AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         left join RMS_SHIPPER RS on AIR.REQUIREMENT_SHIPPER_ID = RS.SHIPPER_ID
         left join AMSTRUCK_REQUIREMENT_MATERIAL ARM on AIR.REQUIREMENT_ID = ARM.REQUIREMENT_ID
@@ -1763,6 +1772,7 @@
         left join RMS_WAREHOUSE RW1 on ARM.REQUIREMENT_UNLOAD_UNIT_ID = RW1.WAREHOUSE_ID
         left join RMS_WAREHOUSE RW2 on ARM.REQUIREMENT_PLATFORM_ID = RW2.WAREHOUSE_ID
         left join RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         <where>
             TWR.RESULT_NET_WEIGHT IS NOT NULL
             AND  OO.ORDER_STATUS = 2
@@ -1801,14 +1811,19 @@
         twr.result_net_weight        "resultNetWeight",
         GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME,TWR.RESULT_TARE_WEIGHT_TIME) "netTime",
         RC.CARRIER_NAME "carrierName",
-        RL.LINE_NAME "lineName",
         DB.RESULT_FOREIGN_SHIP_NAME "shipName",
-        rw2.WAREHOUSE_NAME  "warehouseName"
+        rw2.WAREHOUSE_NAME  "unloadName",
+        rw.WAREHOUSE_NAME  "loadName",
+        RL.LINE_NAME    "lineName",
+        RTR.TRANS_RANGE_VALUE   "rangeValue",
+        DECODE(OO.ORDER_TYPE,23,'厂外内转-老厂',24,'厂外内转-二厂') "orderType"
         from omstruck_order oo
         left join omstruck_order_material oom
         on oom.order_id = oo.order_id
         LEFT JOIN RMS_LINE RL
         ON RL.LINE_ID=OO.LINE_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = RL.TRANS_RANGE_ID
         left join rms_material rm
         on rm.material_id = oom.material_id
         left join rms_capacity rc
@@ -1833,14 +1848,10 @@
         on ttr.order_id = oo.order_id
         left join tmstruck_weight_result twr
         on twr.result_total_id = ttr.result_total_id
-        left join rms_truck_calculate rtc1
-        on rtc1.truck_calculate_id = twr.result_tare_place_id
         left join tmstruck_load_result tlr
         on tlr.result_total_id = ttr.result_total_id
         left join rms_warehouse rw
         on rw.warehouse_id = tlr.loading_id
-        left join rms_truck_calculate rtc2
-        on rtc2.truck_calculate_id = twr.result_gross_place_id
         left join tmstruck_unload_result tur
         on tur.result_total_id = ttr.result_total_id
         left join rms_warehouse rw2