Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -58,6 +58,12 @@ public class RMScontroller {
         return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, lineType, con);
     }
 
+    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/getGateCalculateMes")
+    public Map<String, Object> getGateCalculateMes(Integer lineId){
+        return rmsFeign.getGateCalculateMes(lineId);
+    }
+
     @ApiOperation(value = "根据主键查询出数据以供修改")
     @PostMapping("/getLinkToUpdate")
     public Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId) {

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -48,6 +48,10 @@ public interface RmsFeign {
                                         @RequestParam("lineType")Integer lineType,
                                         @RequestParam("con")String con);
 
+    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/getGateCalculateMes")
+    Map<String, Object> getGateCalculateMes(@RequestParam("lineId")Integer lineId);
+
     @ApiOperation(value = "根据主键查询出数据以供修改")
     @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")
     Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId);

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -291,11 +291,10 @@
                                     on apo.BATCH_ID = DB.BATCH_ID
                           join RMS_SUPPLIER RS
                                     on RS.SUPPLIER_ID = apo.SUPPLIER_UNIT_ID
-                 <where>
+                    where APO.DELETED = 0
                     <if test="materialId != null">
-                        DB.MATERIAL_ID = #{materialId}
+                      and  DB.MATERIAL_ID = #{materialId}
                     </if>
-                 </where>
              )
         <where>
             <if test="index != null">