liyg 2 jaren geleden
bovenliggende
commit
8401ea3ab3
1 gewijzigde bestanden met toevoegingen van 20 en 11 verwijderingen
  1. 20 11
      src/main/resources/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml

+ 20 - 11
src/main/resources/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml

@@ -138,17 +138,26 @@
         from SHIP_DYNAMICS sd where sd.RESULT_FOREIGN_SHIP_NAME=#{shipName} and sd.MATERIAL_NAME=#{materialName} and sd.LOCATION_STATUS is not null
     </select>
     <select id="getLoadData" resultType="java.util.Map">
-        select COUNT(TLT.RESULT_ID) as "num",
-               DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-               rm.MATERIAL_NAME "materialName",
-               '港口装车数据' "dataType"
-        from TMSTRAIN_LOADING_TEMP TLT
-                 LEFT JOIN WMSH_OUTBOUND_RESULT WOR
-                           ON WOR.RESULT_ID = TLT.OUTBOUNT_ID
-                 LEFT JOIN DIL_BATCH DB
-                           ON WOR.BATCH_ID = DB.BATCH_ID
-                 LEFT JOIN RMS_MATERIAL RM
-                           ON DB.MATERIAL_ID = RM.MATERIAL_ID
+        select SUM(TLT."number") as "num",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        rm.MATERIAL_NAME "materialName",
+        '港口装车数据' "dataType"
+        from  WMSH_OUTBOUND_RESULT WOR
+        LEFT JOIN (
+                SELECT RESULT_ID,
+                OUTBOUNT_ID "outboundId",
+                (case
+                when  60 > RESULT_BILLABLE_TONNAGE THEN 0.5
+                when RESULT_BILLABLE_TONNAGE >=60 THEN 1
+                end) "number"
+                FROM
+                TMSTRAIN_LOADING_TEMP
+        )	TLT
+        ON WOR.RESULT_ID = TLT."outboundId"
+        LEFT JOIN DIL_BATCH DB
+        ON WOR.BATCH_ID = DB.BATCH_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON DB.MATERIAL_ID = RM.MATERIAL_ID
         <where>
             <if test="input !=null and input.toString()!=''">
                  DB.RESULT_FOREIGN_SHIP_NAME || rm.MATERIAL_NAME like concat('%',concat(#{input},'%'))