|
@@ -1066,42 +1066,42 @@
|
|
|
|
|
|
<select id="getInwardReport" parameterType="map" resultType="java.util.Map">
|
|
|
select * from (
|
|
|
- select
|
|
|
- OO.ORDER_NUMBER "orderNumber",
|
|
|
- RC.CAPACITY_NUMBER "capacityNumber",
|
|
|
- RS.SHIPPER_NAME "shipperName",
|
|
|
- RW1.WAREHOUSE_NAME "unloadName",
|
|
|
- RW2.WAREHOUSE_NAME "loadName",
|
|
|
- RM.MATERIAL_NAME "materialName",
|
|
|
- TWR.RESULT_NET_WEIGHT "resultNetWeight",
|
|
|
- TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
|
|
|
- TWR.RESULT_TARE_WEIGHT "resultTareWeight",
|
|
|
- TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
|
|
|
- TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
|
|
|
- PI.TRUCK_CALCULATE_NUMBER "piTruckCalculateNumber",
|
|
|
- MAO.TRUCK_CALCULATE_NUMBER "maoTruckCalculateNumber"
|
|
|
- from OMSTRUCK_ORDER OO
|
|
|
- left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
|
|
|
- left join TMSTRUCK_WEIGHT_RESULT TWR on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
|
|
|
- left join RMS_TRUCK_CALCULATE PI on TWR.RESULT_TARE_PLACE_ID = PI.TRUCK_CALCULATE_ID
|
|
|
- left join RMS_TRUCK_CALCULATE MAO on TWR.RESULT_GROSS_PLACE_ID = MAO.TRUCK_CALCULATE_ID
|
|
|
- left join RMS_CAPACITY RC on OO.CAPACITY_ID = RC.CAPACITY_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 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
|
|
|
- left join RMS_MATERIAL RM on ARM.MATERIAL_ID = RM.MATERIAL_ID
|
|
|
- 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
|
|
|
- where OO.ORDER_TYPE = 11 and TWR.RESULT_NET_WEIGHT >= 0
|
|
|
- <if test="oneDate != null">
|
|
|
- and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') <= TWR.RESULT_TARE_WEIGHT_TIME
|
|
|
- </if>
|
|
|
- <if test="startDate != null">
|
|
|
- and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= TWR.RESULT_TARE_WEIGHT_TIME
|
|
|
- and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_TARE_WEIGHT_TIME
|
|
|
- </if>
|
|
|
+ select
|
|
|
+ OO.ORDER_NUMBER "orderNumber",
|
|
|
+ RC.CAPACITY_NUMBER "capacityNumber",
|
|
|
+ RS.SHIPPER_NAME "shipperName",
|
|
|
+ RW1.WAREHOUSE_NAME "unloadName",
|
|
|
+ RW2.WAREHOUSE_NAME "loadName",
|
|
|
+ RM.MATERIAL_NAME "materialName",
|
|
|
+ RTC2.TRUCK_CALCULATE_NUMBER "grossNumber",
|
|
|
+ RTC1.TRUCK_CALCULATE_NUMBER "tareNumber",
|
|
|
+ TWR.RESULT_NET_WEIGHT "resultNetWeight",
|
|
|
+ TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
|
|
|
+ TWR.RESULT_TARE_WEIGHT "resultTareWeight",
|
|
|
+ TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
|
|
|
+ TWR.RESULT_GROSS_WEIGHT "resultGrossWeight"
|
|
|
+ from OMSTRUCK_ORDER OO
|
|
|
+ left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_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 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
|
|
|
+ left join RMS_MATERIAL RM on ARM.MATERIAL_ID = RM.MATERIAL_ID
|
|
|
+ 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
|
|
|
+ where OO.ORDER_TYPE = 11 and TWR.RESULT_NET_WEIGHT >= 0
|
|
|
+ <if test="oneDate != null">
|
|
|
+ and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') <= TWR.RESULT_TARE_WEIGHT_TIME
|
|
|
+ </if>
|
|
|
+ <if test="startDate != null">
|
|
|
+ and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= TWR.RESULT_TARE_WEIGHT_TIME
|
|
|
+ and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_TARE_WEIGHT_TIME
|
|
|
+ </if>
|
|
|
)
|
|
|
<where>
|
|
|
<if test="orderNumber != null">
|
|
@@ -1139,6 +1139,18 @@
|
|
|
"materialName" like '%${item}%'
|
|
|
</foreach>
|
|
|
</if>
|
|
|
+ <if test="grossNumber != null">
|
|
|
+ and
|
|
|
+ <foreach collection="grossNumber" item="item" open="(" separator="or" close=")">
|
|
|
+ "grossNumber" like '%${item}%'
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
+ <if test="tareNumber != null">
|
|
|
+ and
|
|
|
+ <foreach collection="tareNumber" item="item" open="(" separator="or" close=")">
|
|
|
+ "tareNumber" like '%${item}%'
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
<if test="resultNetWeight != null">
|
|
|
and
|
|
|
<foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
|