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

src/main/resources/application-dev.yml

@@ -48,4 +48,4 @@ openfeign:
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.33.166:8038}
 server:
-  port: 8008
+  port: 8088

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

@@ -2255,33 +2255,59 @@
     </select>
 
     <select id="getInwardSaleSteelOrder" resultType="java.util.Map">
-        SELECT
-            ASO.SALE_ORDER_ID "saleOrderId",
-            ASM.SALE_MATERIAL_ID "saleMaterialId",
-            ASO.SALE_NUMBER "saleOrderNo",
-            ASM.MATERIAL_NUMBER "materialNum",
-            ASM.EAS_PRIMARY_ID "closeEntryId",
-            ASM.DELETED "deletedStatus",
-            RM.MATERIAL_ID "materialId",
-            RM.MATERIAL_NAME "materialName",
-            RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
-            RAS.ARRIVAL_NAME "sendStationName",
-            RAS2.ARRIVAL_NAME "toTheStationName",
-            TPAR.SEND_STATION_ID "sendStationId",
-            ASM.MATERIAL_WEIGHT "materialWeight",
-            rc.CONSIGNEE_COMPANY_NAME "consigneeName",
-            RS.SHIPPER_NAME "shipperName"
-        FROM
-            AMS_SALE_ORDER ASO
-                LEFT JOIN AMS_SALE_MATERIAL ASM ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
-                LEFT JOIN RMS_MATERIAL rm ON rm.MATERIAL_ID = ASM.MATERIAL_ID
-                left join TMSTRAIN_PLEASE_APPROVE_RESULT TPAR ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
-                LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS ON RAS.ARRIVAL_ID = TPAR.SEND_STATION_ID
-                LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS2 ON RAS.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
-                left join RMS_CONSIGNEE RC ON ASO.receive_id = RC.CONSIGNEE_ID
-                left join RMS_SHIPPER RS  ON RS.SHIPPER_ID = ASO.SHIPPER_ID
-        WHERE ASO.SALE_TYPE=4
+        SELECT DISTINCT
+               ASO.SALE_ORDER_ID "saleOrderId",
+               ASM.SALE_MATERIAL_ID "saleMaterialId",
+               ASO.SALE_NUMBER "saleOrderNo",
+               ASM.MATERIAL_NUMBER "materialNum",
+               ASM.EAS_PRIMARY_ID "closeEntryId",
+               ASM.DELETED "deletedStatus",
+               RM.MATERIAL_ID "materialId",
+               RM.MATERIAL_NAME "materialName",
+               RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
+               RAS.ARRIVAL_NAME "sendStationName",
+               RAS2.ARRIVAL_NAME "toTheStationName",
+               TPAR.SEND_STATION_ID "sendStationId",
+               ASM.MATERIAL_WEIGHT "materialWeight",
+               rc.CONSIGNEE_COMPANY_NAME "consigneeName",
+               RS.SHIPPER_NAME "shipperName",
+               r_cap.capacity_id "capacityId",
+               r_cap.capacity_number "capacityNo",
+               r_carrier.carrier_id "carrierId",
+               r_carrier.carrier_name "carrierName",
+               oo.ORDER_ID "orderId",
+               NVL(r_carrier.carrier_id,0) "carrierIds",
+               NVL(r_cap.capacity_id,0) "capacityIds"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN RMS_MATERIAL rm
+                           ON rm.MATERIAL_ID = ASM.MATERIAL_ID
+                 left join TMSTRAIN_PLEASE_APPROVE_RESULT TPAR
+                           ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
+                 LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
+                           ON RAS.ARRIVAL_ID = TPAR.SEND_STATION_ID
+                 LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS2
+                           ON RAS.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
+                 left join RMS_CONSIGNEE RC
+                           ON ASO.receive_id = RC.CONSIGNEE_ID
+                 left join RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                 left join omstruck_order oo
+                           on oo.order_plan_id = asom.sale_order_material_id
+                 left join ams_dispatch_sale_order adso
+                           on adso.sale_order_material_id = asom.sale_order_material_id
+                 left join rms_carrier r_carrier
+                           on r_carrier.carrier_id = adso.carrier_id
+                 left join rms_capacity r_cap
+                           on r_cap.capacity_id = oo.capacity_id
+        WHERE ASO.SALE_TYPE = 4
           AND ASO.DELETED = 0
+        order by oo.ORDER_ID desc
     </select>
 
 </mapper>