Merge remote-tracking branch 'origin/master'

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

@@ -2179,6 +2179,18 @@ public class AMScontroller{
         return amsFeign.getNotice(mapValue);
     }
 
+    @ApiOperation(value = "查询日志信息", notes = "条件查询")
+    @PostMapping("/selectAllLog")
+    public RESTfulResult selectAllLog(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      Integer pageNum,
+                                      Integer pageSize,
+                                      Integer apiId){
+        if(mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return amsFeign.selectAllLog(mapValue,pageNum,pageSize,apiId);
+    }
+
     @ApiOperation(value = "查询规格型号是否正确")
     @PostMapping("/queryFormat")
     RESTfulResult queryFormat(@RequestBody List<Map<String,Object>> mapList){

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

@@ -1285,6 +1285,24 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.updateLoadingIdAndLoadSq(map);
     }
 
+    @ApiOperation(value="根据运输订单号查询装/卸点、卸货物资、装机备注信息：后台管理 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/selectLoadingIdRemark")
+    public Map<String, Object> selectLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map){
+        return tmsTruckFeign.selectLoadingIdRemark(map);
+    }
+
+    @ApiOperation(value="根据运输订单号修改装/卸点、卸货物资、装机备注等：后台管理 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/updateLoadingIdRemark")
+    public Map<String, Object> updateLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map){
+        return tmsTruckFeign.updateLoadingIdRemark(map);
+    }
+
     @ApiOperation(value = "查询所有装车实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -1587,13 +1605,20 @@ public class TMSController extends BaseRESTfulController {
 
     //****************************************TmstruckMeasureCommissionController*******************************
 
-    @ApiOperation(value = "查询计量委托 ")
+    @ApiOperation(value = "查询计量委托,apiId=521")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
     })
-    @PostMapping("/getAllMeasureCommission/{type}")
-    public Map<String, Object> getAllMeasureCommission(@PathVariable("type") Integer type) {
-        return tmsTruckFeign.getAllMeasureCommission(type);
+    @PostMapping("/getAllMeasureCommission")
+    public Map<String, Object> getAllMeasureCommission(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       String con) {
+        if(mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getAllMeasureCommission(mapValue, apiId, pageNum, pageSize, con);
     }
 
     //****************************************TmstruckQualityResultController*******************************

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

@@ -1044,6 +1044,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查仓库")
+    @GetMapping("/getWareHouseNameLike")
+    public RESTfulResult getWareHouseNameLike(@RequestParam("index") String index){
+        List<Map<String, Object>> list = universalMapper.getWareHouseNameLike(index == null ? null : "%" + index + "%");
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查物资规格型号")
     @PostMapping("/getSpecificationModelLike")
     public RESTfulResult getSpecificationModelLike(@RequestBody Map<String,Object> map) {

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

@@ -1852,6 +1852,12 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/dilnotices/getNotice")
     RESTfulResult getNotice(@RequestBody(required = false) Map<String, Object> mapValue);
 
+    @PostMapping(value = "/api/v1/ams/dilnotices/selectAllLog")
+    RESTfulResult selectAllLog(@RequestBody(required = false) Map<String, Object> mapValue,
+                               @RequestParam Integer pageNum,
+                               @RequestParam Integer pageSize,
+                               @RequestParam Integer apiId);
+
     @PostMapping(value = "/api/v1/ams/amssaleorders/queryFormat")
     RESTfulResult queryFormat(@RequestBody List<Map<String,Object>> mapList);
 

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

@@ -50,6 +50,14 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadingIdAndLoadSq")
     public Map<String, Object> updateLoadingIdAndLoadSq(@RequestBody(required=false) Map<String, Object> map);
 
+    @ApiOperation(value="根据运输订单号查询装/卸点、卸货物资、装机备注信息：后台管理 ")
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadingIdRemark")
+    Map<String, Object> selectLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map);
+
+    @ApiOperation(value="修改装/卸点、卸货物资、装机备注等：后台管理 ")
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadingIdRemark")
+    Map<String, Object> updateLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map);
+
     @PostMapping("api/v1/truckTms/tmstruckloadresults/getAllLoadResult")
     public Map<String, Object> getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
@@ -236,8 +244,12 @@ public interface TmsTruckFeign {
     TmstruckMeasureCommissionController
      */
 
-    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/getAllMeasureCommission/{type}")
-    public Map<String, Object> getAllMeasureCommission(@PathVariable("type") Integer type);
+    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/getAllMeasureCommission")
+    public Map<String, Object> getAllMeasureCommission(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("con")String con);
 
 
     /*

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -226,6 +226,8 @@ public interface UniversalMapper {
     List<Map<String, Object>> getPlaceAndAddress(String index);
     // 边输边查物资名称
     List<Map<String, Object>> getMaterialNameLike(String index);
+    // 边输边查仓库名称
+    List<Map<String, Object>> getWareHouseNameLike(String index);
     // 边输边查物资规格型号
     List<Map<String, Object>> getSpecificationModelLike(Map<String,Object> map);
 

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

@@ -1477,4 +1477,10 @@
         WHERE DROT.ORG_CODE = #{orgCode}
         AND DTCR.TABLE_NAME = #{tableName}
     </select>
+    <select id="getWareHouseNameLike" resultType="java.util.Map">
+        SELECT
+            RMS_WAREHOUSE.WAREHOUSE_ID "warehouseId",
+            RMS_WAREHOUSE.WAREHOUSE_NAME "warehouseName"
+        FROM RMS_WAREHOUSE WHERE DELETED=0 AND WAREHOUSE_NAME LIKE #{index}
+    </select>
 </mapper>