修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -988,4 +988,17 @@ throw new MarkerMetException(500, "操作异常！！");
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "钢材产品理论量与计量数据对比-获取列表", notes = "分页模糊查询")
+    //@RequiresPermissions("meterworkcaractualfirst:view")
+    @PostMapping(value = "/netWeightAndTheoryAmount")
+    public RESTfulResult netWeightAndTheoryAmount(@RequestBody HashMap parmas) {
+        try {
+            PageList<HashMap> list = meterWorkCarActualService.netWeightAndTheoryAmount(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -65,4 +65,5 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
     
     //根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传
     List<MeterWorkCarActual> countAllState(Map<String, Object> params);
+    List<HashMap> netWeightAndTheoryAmount(Map<String, Object> params);
 }

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

@@ -4244,4 +4244,53 @@
     </if>
     order by net_time desc
   </select>
+
+  <select id="netWeightAndTheoryAmount" parameterType="java.util.HashMap" resultType="hashmap">
+    select A.car_no,
+       A.prediction_no,
+       A.matter_name,
+       to_char(round(B.gross_weight/1000,2),'FM9999999999999999.00') grossWeight,
+       to_char(round(B.tare_weight/1000,2),'FM9999999999999999.00') tareWeight,
+       to_char(round(B.net_weight/1000,2),'FM9999999999999999.00') netWeight,
+       A.theory_amount,
+       to_char(round(B.net_weight/1000,2),'FM9999999999999999.00') - A.theory_amount netWeightSubTheoryWeight,
+       A.forwarding_unit_name,
+       A.receiving_uint_name,
+       B.gross_time,
+       B.base_spot1_name,
+       B.tare_time,
+       B.base_spot2_name,
+       B.net_time,
+       B.net_spot3_name
+    from pre_track_scale A
+    left join meter_work_car_actual B
+      on A.prediction_no = B.prediction_no
+    where A.theory_amount is not null
+        and B.actual_no is not null
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  B.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and B.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="carNo != null and carNo != ''">
+      and B.car_no like '%${carNo}%'
+    </if>
+    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+      and B.FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and B.FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintNo != null and receivingUintNo != ''">
+      and B.RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and B.RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+    </if>
+    <if test="matterNo != null and matterNo != ''">
+      and B.matter_no LIKE '%${matterNo}%'
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and B.matter_name LIKE '%${matterName}%'
+    </if>
+    order by B.net_time desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/IMeterWorkCarActualService.java

@@ -106,5 +106,6 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
 
     //根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传、结净已作废
     List<HashMap> countAllSpotSate(HashMap params);
+    PageList<HashMap> netWeightAndTheoryAmount(HashMap params);
 
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -3076,4 +3076,12 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         return map;
     }
 
+    @Override
+    public PageList<HashMap> netWeightAndTheoryAmount(HashMap params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<HashMap> rows = meterWorkCarActualMapper.netWeightAndTheoryAmount(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
 }