修改

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

@@ -4403,6 +4403,7 @@
           else null end tare_mode,
           A.tare_man_name,
           A.net_time,
+          A.net_spot3_name,
           A.net_man_name,
           case when A.value_flag = '0' then '作废'
           when A.value_flag = '1' then '有效'

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/service/impl/MeterWorkCarnoIdentifyServiceImpl.java

@@ -133,20 +133,20 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
                             && model.getCarNoType().equals("1")
                             && StringUtils.isNotEmpty(model.getVideoCarNo1())
-                            && model.getVideoCarNo1().equals(model.getCarNo())).count();
+                            && model.getVideoCarNo1().equals(model.getFirstCarNo())).count();
                     //球机车号使用数 - 枪机和球机同时等于一次车号识别数
                     countBallUsedIdentify = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
                             && model.getCarNoType().equals("1")
                             && StringUtils.isNotEmpty(model.getVideoCarNo2())
-                            && model.getVideoCarNo2().equals(model.getCarNo())).count()
+                            && model.getVideoCarNo2().equals(model.getFirstCarNo())).count()
                             - models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                                 && model.getBaseSpotName().equals(spot.getBaseSpotName())
                                 && model.getCarNoType().equals("1")
                                 && StringUtils.isNotEmpty(model.getVideoCarNo1())
                                 && StringUtils.isNotEmpty(model.getVideoCarNo2())
-                                && model.getVideoCarNo1().equals(model.getCarNo())
-                                && model.getVideoCarNo2().equals(model.getCarNo())).count();
+                                && model.getVideoCarNo1().equals(model.getFirstCarNo())
+                                && model.getVideoCarNo2().equals(model.getFirstCarNo())).count();
                     //扫码车号识别数
                     countScanCarIdentify = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
@@ -193,10 +193,9 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                                     (
                                         StringUtils.isNotEmpty(model.getVideoCarNo1())
                                         && StringUtils.isNotEmpty(model.getVideoCarNo2())
-                                        && model.getVideoCarNo1().equals(model.getVideoCarNo2()
-                                 ) || (StringUtils.isNotEmpty(model.getVideoCarNo1()) || StringUtils.isNotEmpty(model.getVideoCarNo2()))
-                                    ||( model.getCarNoType().equals("2")
-                                                && StringUtils.isNotEmpty(model.getRfidCarNo()))))).count();
+                                        && model.getVideoCarNo1().equals(model.getVideoCarNo2())
+                                                || (StringUtils.isNotEmpty(model.getVideoCarNo1()) || StringUtils.isNotEmpty(model.getVideoCarNo2()))
+                                    ||( model.getCarNoType().equals("2") && StringUtils.isNotEmpty(model.getRfidCarNo()))))).count();
                     //视觉识别率
                     if(countVisualIdentify != 0) {
                         countVisualIdentifyRate = Math.round(((countCarFirst-countRfidIdentify)-countVisualIdentifyTemp)/((countCarFirst-countRfidIdentify)*1.0)*100*100)/100.0; //(Math.round((*100))/100.0;

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -800,12 +800,18 @@
                A.matter_name matterName,
                A.forwarding_unit_name forwardingUnitName,
                A.receiving_uint_name receivingUintName,
-               to_char(round(A.gross_Weight/1000, 2),'FM9999999999999999.00') grossWegiht,
+               to_char(round(A.gross_Weight/1000, 2),'FM9999999999999999.00') grossWeight,
                to_char(round(A.tare_weight/1000, 2),'FM9999999999999999.00') tareWeight,
                to_char(round(A.net_weight/1000, 2),'FM9999999999999999.00') netWeight,
                to_char(round(to_number(B.theory_amount), 2),'FM9999999999999999.00') theoryAmount,
-               A.meter_type_no meterTypeNo,
-               A.meter_type_name meterTypeName,
+               case when A.meter_type_no = 'SendToOutTms' then '外发'
+                    when A.meter_type_no = 'GM2GM' then '厂内转储'
+                    when A.meter_type_no = 'PO2GM' then '外进'
+                    else null end meterTypeNo,
+                case when A.meter_type_Name = 'SendToOutTms' then '外发'
+                    when A.meter_type_Name = 'GM2GM' then '厂内转储'
+                    when A.meter_type_Name = 'PO2GM' then '外进'
+                    else null end meterTypeName,
                A.sender_remark senderRemark,
                A.gross_time grossTime,
                A.base_spot1_name baseSpot1Name,