提交

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3262,7 +3262,7 @@
  </select>
 
   <select id="manualAddPre" parameterType="java.lang.String" resultMap="BaseResultMap">
-        select T3.prediction_no PREDICTION_NO, T3.notice_no NOTICE_NO, T3.car_no CAR_NO, T3.trailer_no TRAILER_NO, T3.matter_no MATTER_NO,
+        select T3.prediction_no PREDICTION_NO, T3.notice_no NOTICE_NO, t1.car_no CAR_NO, T3.trailer_no TRAILER_NO, T3.matter_no MATTER_NO,
                T3.voucher_identity, T3.voucher_item, T3.business_group, T3.temp_conveyance, T3.conveyance_type,
                T3.resource_system, T3.group_package_amount, T3.group_package_unit, T3.package_amount,
                T3.package_unit, T3.theory_amount, T3.measure_batch,T3.measure_batch_count,T3.sender_type,
@@ -3282,7 +3282,7 @@
     </select>
 
   <select id="mathPredcition" parameterType="java.lang.String" resultMap="BaseResultMap">
-        select t.actual_no, t1.prediction_no, t1.notice_no, t1.car_no,
+        select t.actual_no, t1.prediction_no, t1.notice_no, t.car_no,
                t1.trailer_no, t1.matter_no, t1.matter_name, t1.contract_no,
                t1.batch_no, t1.customer_supplier_no, t1.customer_supplier_name,
                t1.forwarding_unit_no, t1.forwarding_unit_name, t1.receiving_uint_no,

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2484,7 +2484,7 @@
     order by  CREATE_TIME desc
   </select>
   <select id="selectAndMatch" parameterType="java.lang.String" resultMap="BaseResultMap">
-      select t.ACTUAL_FIRST_NO, t1.PREDICTION_NO, t1.NOTICE_NO, t1.CAR_NO, t1.TRAILER_NO, t1.MATTER_NO,
+      select t.ACTUAL_FIRST_NO, t1.PREDICTION_NO, t1.NOTICE_NO, t.CAR_NO, t1.TRAILER_NO, t1.MATTER_NO,
         t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
         t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
         t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.xml

@@ -420,10 +420,10 @@
     select
     t1.BASE_SPOT_NO baseSpotNo,
     t1.BASE_SPOT_NAME baseSpotName,
-    avg(t.TOTAL_NUM) avgTotal,
-    avg(t.UP_NUM) avgUp,
-    avg(t.METER_NUM) avgMeter,
-    avg(t.DOWN_NUM) avgDown
+    round(avg(t.TOTAL_NUM),2) avgTotal,
+    round(avg(t.UP_NUM),2) avgUp,
+    round(avg(t.METER_NUM),2) avgMeter,
+    round(avg(t.DOWN_NUM),2) avgDown
     from METER_WORK_CAR_METER_TIME t
     left join meter_work_car_actual_first t1
     on t.actual_first_no =t1.actual_first_no