Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -28,6 +28,8 @@
                      RTCMAO.TRUCK_CALCULATE_NUMBER  "grossCalculateNum",
                      RTCPI.TRUCK_CALCULATE_NUMBER   "tareCalculateNum",
                      TWR.RESULT_GROSS_WEIGHT_TIME   "resultGrossWeightTime",
+                     RM.MATERIAL_NAME                     "materialName",
+                     CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode",
                         <if test="orderTypee == 17 or orderTypee == 18">
                             RS.SUPPLIER_NAME           "supplierName",
                         </if>
@@ -43,6 +45,8 @@
                                  on RGEN.GATEPOST_ID = TER.GATEPOST_ID
                        left join OMSTRUCK_ORDER_MATERIAL OOM
                                  on OOM.ORDER_ID = OO.ORDER_ID
+                       left join RMS_MATERIAL RM
+                                 on RM.MATERIAL_ID = OOM.MATERIAL_ID
                        left join TMSTRUCK_WEIGHT_RESULT TWR
                                  on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                        left join RMS_TRUCK_CALCULATE RTCMAO --毛重汽车衡
@@ -66,6 +70,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
                        </if>
               where OO.ORDER_STATUS in (5, 8, 9, 1, 2)
                 and OO.ORDER_TYPE = #{orderTypee}
@@ -151,7 +157,10 @@
                         RTCPI.TRUCK_CALCULATE_NUMBER        "piCalculate",
                         RGEN.GATEPOST_NAME                  "enGatepostName",
                         RGOUT.GATEPOST_NAME                 "outGatepostName",
-                        RCON.CONSIGNEE_COMPANY_NAME         "receiveName"
+                        RCON.CONSIGNEE_COMPANY_NAME         "receiveName",
+                        RS.SUPPLIER_NAME                    "sendName",
+                        RM.MATERIAL_NAME                     "materialName",
+                        CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode"
                  from OMSTRUCK_ORDER OO
                           left join AMS_SALE_ORDER_MATERIAL ASOM
                                on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -159,6 +168,8 @@
                                on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
                           left join RMS_CONSIGNEE RCON
                                on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
+                          left join RMS_SUPPLIER RS
+                               on RS.SUPPLIER_ID = ASO.SHIPPER_ID
                           join TMSTRUCK_TOTAL_RESULT TTR
                                on TTR.ORDER_ID = OO.ORDER_ID
                           join TMSTRUCK_LOAD_RESULT TLR
@@ -181,6 +192,10 @@
                                on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
                           join RMS_CAPACITY RC
                                on RC.CAPACITY_ID = OO.CAPACITY_ID
+                          join OMSTRUCK_ORDER_MATERIAL OOM
+                               on OOM.ORDER_ID = OO.ORDER_ID
+                          join RMS_MATERIAL RM
+                               on RM.MATERIAL_ID = OOM.MATERIAL_ID
                           <if test="carrierSsoId != null">
                               join RMS_CARRIER RCA
                                 on RCA.CARRIER_ID = RC.CARRIER_ID
@@ -285,7 +300,12 @@
 --         计皮汽车衡
         RTC1.TRUCK_CALCULATE_NUMBER "truckTareCalculate",
 --         计毛汽车衡
-        RTC2.TRUCK_CALCULATE_NUMBER "truckCrossCalculate"
+        RTC2.TRUCK_CALCULATE_NUMBER "truckCrossCalculate",
+        RCON.CONSIGNEE_COMPANY_NAME "receiveName",
+        RS.SUPPLIER_NAME            "sendName",
+        RM.MATERIAL_NAME                     "materialName",
+        CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode"
+
         from OMSTRUCK_ORDER OO
         join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.ORDER_ID = OO.ORDER_ID
@@ -309,6 +329,16 @@
             on TLFR.GATEPOST_ID =RG.GATEPOST_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 RCON
+            on RCON.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
+        join OMSTRUCK_ORDER_MATERIAL OOM
+            on OOM.ORDER_ID = OO.ORDER_ID
+        join RMS_MATERIAL RM
+            on RM.MATERIAL_ID = OOM.MATERIAL_ID
         <if test="carrierSsoId != null">
             join RMS_CARRIER RCA
                 on RCA.CARRIER_ID = RC.CARRIER_ID
@@ -413,7 +443,12 @@
         --         计皮汽车衡
         RTC1.TRUCK_CALCULATE_NUMBER "truckTareCalculate",
         --         计毛汽车衡
-        RTC2.TRUCK_CALCULATE_NUMBER "truckCrossCalculate"
+        RTC2.TRUCK_CALCULATE_NUMBER "truckCrossCalculate",
+        RCON.CONSIGNEE_COMPANY_NAME "receiveName",
+        RS.SUPPLIER_NAME            "sendName",
+        RM.MATERIAL_NAME                     "materialName",
+        CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode"
+
         from OMSTRUCK_ORDER OO
         join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.ORDER_ID = OO.ORDER_ID
@@ -437,6 +472,16 @@
             on TLFR.GATEPOST_ID =RG.GATEPOST_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 RCON
+            on RCON.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
+        join OMSTRUCK_ORDER_MATERIAL OOM
+            on OOM.ORDER_ID = OO.ORDER_ID
+        join RMS_MATERIAL RM
+            on RM.MATERIAL_ID = OOM.MATERIAL_ID
         <if test="carrierSsoId != null">
             join RMS_CARRIER RCA
             on RCA.CARRIER_ID = RC.CARRIER_ID