qianduantijiao

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

@@ -1738,4 +1738,11 @@ public class AMScontroller{
     }
 
 
+    @ApiOperation(value = "查询内转物流运输单价")
+    @PostMapping("/getInwardPriceBy")
+    public Map<String,Object>getInwardPriceBy(@RequestBody(required = false)Map<String,Object>mapvalue){
+
+        return amsFeign.getInwardPriceBy(mapvalue);
+    }
+
 }

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

@@ -1567,4 +1567,8 @@ public interface AmsFeign {
                                                       @RequestParam("pageSize") Integer pageSize,
                                                       @RequestParam("apiId") Integer apiId,
                                                       @RequestParam("deleted") Integer deleted);
+    //根据物资查询运输物资单价
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
+    Map<String, Object> getInwardPriceBy(@RequestBody(required = false)Map<String, Object> mapvalue);
+
 }

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

@@ -320,6 +320,7 @@
                         RW.WAREHOUSE_ID   "warehouseId",
                         RW.WAREHOUSE_NAME "warehouseName"
                  from RMS_WAREHOUSE RW
+                 where RW.DELETED = 0
                  <where>
                      <if test="type != null">
                          RW.WAREHOUSE_TYPE_ID = #{type}
@@ -767,7 +768,6 @@
         WHERE
             AIR.REQUIREMENT_STATUS = 2
           AND AIR.DELETED = 0
->>>>>>> 2575cdbb9e23d44b2db153432ead44f438969766
     </select>
     <select id="getTransRange" resultType="java.util.Map">
         SELECT