修改master

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

@@ -199,6 +199,9 @@ public class RMScontroller {
     ){
         return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
+
+
+
     @ApiOperation(value="新增物资", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
     @PostMapping(value = "/insertMaterial")
@@ -416,7 +419,12 @@ public class RMScontroller {
     public Map<String, Object> deleteTruckCalculate(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteTruckCalculate(id);
     }
-
+    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "汽车衡物资中间表id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteTruckCalculateMaterial/{id}")
+    public Map<String, Object> deleteTruckCalculateMaterial(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteTruckCalculateMaterial(id);
+    }
     @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
@@ -433,7 +441,15 @@ public class RMScontroller {
     public Map<String,Object> getTruckCalculateById(@PathVariable("id") BigDecimal id){
         return rmsFeign.getTruckCalculateById(id);
     }
-
+    @PostMapping("/getCalculateOfMaterialList")
+    @ApiOperation(value="根据id查询汽车横下的物资表")
+    public Map<String,Object> getCalculateOfMaterialList(@RequestBody(required = false)Map<String, Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         BigDecimal truckCalculateId){
+        return rmsFeign.getCalculateOfMaterialList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,truckCalculateId);
+    }
 
     @PostMapping("/getTruckCalculateList")
     @ApiOperation(value = "模糊查询汽车衡")
@@ -445,13 +461,11 @@ public class RMScontroller {
 
         return rmsFeign.getTruckCalculateList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
-
-    @ApiOperation(value="新增汽车衡信息", notes="根据rmsWarehouse对象创建")
-    @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
-
-    @PostMapping(value = "/insertWarehouse")
-    public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.insertWarehouse(map);
+    @ApiOperation(value="新增汽车衡下的物资", notes="根据rmsWarehouse对象创建")
+    @ApiImplicitParam(name = "rmsTruckCalculateMaterial", value = "详细实体rmsTruckCalculateMaterial", required = true, dataType = "rmsTruckCalculateMaterial")
+    @PostMapping(value = "/insertTruckCalculateOfMaterial")
+    public Map<String, Object> insertTruckCalculateOfMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertTruckCalculateOfMaterial(map);
     }
     @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "仓库id", value = "id", required = true, dataType = "int")

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

@@ -35,11 +35,12 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "90", required = false, dataType = "BigDecimal"),
     })
-    public Map<String, Object> getWmsInboundResult(Map<String, Object> mapValue,
+    public Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    Integer apiId,
                                                    Integer pageNum,
-                                                   Integer pageSize) {
-        return wmsFeign.getWmsInboundResult(mapValue, apiId, pageNum, pageSize);
+                                                   Integer pageSize,
+                                                   String  con) {
+        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @PostMapping("getWmspOutboundResult")
@@ -51,7 +52,7 @@ public class WMSController extends BaseRESTfulController {
                                                      Integer pageNum,
                                                      Integer pageSize,
                                                      Integer apiId,
-                                                     String con) {
+                                                     String  con) {
         return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
     }
 
@@ -164,7 +165,6 @@ public class WMSController extends BaseRESTfulController {
         return resTfulResult;
     }
     //获取扫描实绩
-    //钢材异地库扫描入库
     @PostMapping("/getScanResult")
     public Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map) {
         Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
@@ -186,8 +186,9 @@ public class WMSController extends BaseRESTfulController {
     public Map<String, Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
                                                          Integer pageNum,
                                                          Integer pageSize,
-                                                         Integer apiId) {
-        return wmsFeign.getWmspIntransitInventory(apiId, pageNum, pageSize);
+                                                         Integer apiId,
+                                                         String con) {
+        return wmsFeign.getWmspIntransitInventory(mapVal == null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
     }
 
     //新增倒库出库实绩
@@ -273,13 +274,6 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
     }
 
-//    //修改倒垛单
-//    @PostMapping("/addRestackMakeResult")
-//    public Map<String, Object> addRestackMakeResult(@RequestBody(required = false) List<Map<String, Object>> mapVal) {
-//        Map<String, Object> resTfulResult = wmsFeign.addRestackMakeResult(mapVal);
-//        return  resTfulResult;
-//    }
-
     @PostMapping("/editRestackMakeResult")
     public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
         Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
@@ -314,6 +308,8 @@ public class WMSController extends BaseRESTfulController {
         Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
         return resTfulResult;
     }
+
+
    @ApiImplicitParams({
            @ApiImplicitParam(value = "395",name = "apiId")
    })
@@ -365,8 +361,9 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult getWmsReboundResult(Map<String, Object> mapValue,
                                              Integer apiId,
                                              Integer pageNum,
-                                             Integer pageSize) {
-        return wmsFeign.getWmsReboundResult(mapValue, apiId, pageNum, pageSize);
+                                             Integer pageSize,
+                                             String con) {
+        return wmsFeign.getWmsReboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @PostMapping("/selectScanResultByIboundResultId")
@@ -374,30 +371,31 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult selectScanResultByIboundResultId( Map<String, Object> mapValue,
-                                                           Integer apiId,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer inboundId) {
+    public RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          Integer inboundId
+    ) {
 
         return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
     }
-   //根据物资信息获取原来垛位信息
-   @PostMapping("/selectInfoByMaterialCode")
-   public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
+    //根据物资信息获取原来垛位信息
+    @PostMapping("/selectInfoByMaterialCode")
+    public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
         if (mal == null) {
             mal = new HashMap<>();
         }
-       return  wmsFeign.selectInfoByMaterialCode(mal);
-   }
-   //根据仓库查询未接收的垛位
-   @PostMapping("/selectStackingInfoByWarehouseId")
-   public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
-       if (mal == null) {
-           mal = new HashMap<>();
-       }
-       return  wmsFeign.selectStackingInfoByWarehouseId(mal);
-   }
+        return  wmsFeign.selectInfoByMaterialCode(mal);
+    }
+    //根据仓库查询未接收的垛位
+    @PostMapping("/selectStackingInfoByWarehouseId")
+    public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
+        if (mal == null) {
+            mal = new HashMap<>();
+        }
+        return  wmsFeign.selectStackingInfoByWarehouseId(mal);
+    }
 
     @PostMapping("/getWmsIvboundResult")
     @ApiOperation(value = "展示倒库实绩信息")
@@ -441,8 +439,9 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult getInventoryCheck(Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
-                                           Integer pageSize) {
-        return wmsFeign.getInventoryCheck(mapValue, apiId, pageNum, pageSize);
+                                           Integer pageSize,
+                                           String  con) {
+        return wmsFeign.getInventoryCheck(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @PostMapping("/getInventoryClose")
@@ -453,8 +452,9 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult getInventoryClose(Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
-                                           Integer pageSize) {
-        return wmsFeign.getInventoryClose(mapValue, apiId, pageNum, pageSize);
+                                           Integer pageSize,
+                                           String  con) {
+        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @PostMapping("/getSendReceive")
@@ -465,8 +465,9 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult getSendReceive(Map<String, Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
-                                        Integer pageSize) {
-        return wmsFeign.getSendReceive(mapValue, apiId, pageNum, pageSize);
+                                        Integer pageSize,
+                                        String con) {
+        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     /**
@@ -556,21 +557,6 @@ public class WMSController extends BaseRESTfulController {
     @PostMapping("/insertInboundResult")
     @Transactional
     public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
-        /*
-        获取入库物资件数
-         */
-        int size = mapList.size();
-        /*
-        获取入库垛位
-         */
-//        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
-//        String stackNo = (String) map1.get("stackNo");
-//        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
-//        for (Map<String, Object> map : mapList
-//        ) {
-//            map.put("stackingId", stackId);
-//        }
-
         return wmsFeign.insertInboundResult(mapList);
     }
 
@@ -708,16 +694,6 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.updateInstruction(map);
     }
 
-//    @PostMapping("/selectScanResultByIboundResultId")
-//    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
-//    })
-//    public RESTfulResult selectScanResultByIboundResultId(Map<String, Object> mapValue,
-//                                                          Integer apiId,
-//                                                          Integer pageNum,
-//                                                          Integer pageSize) {
-//        return wmsFeign.selectScanResultByIboundResultId(mapValue, apiId, pageNum, pageSize);
 //    }
 
     @PostMapping("/getIvboundMakeResultList")
@@ -728,8 +704,9 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
                                                           Integer pageNum,
                                                           Integer pageSize,
-                                                  Integer apiId,
-                                                  String con) {
+                                                          Integer apiId,
+                                                          String con) {
+
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }

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

@@ -116,6 +116,8 @@ public interface RmsFeign {
                                        @RequestParam("pageNum") Integer pageNum,
                                        @RequestParam("pageSize") Integer pageSize,
                                        @RequestParam String con);
+
+
     //新增物资
     @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
     Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map);
@@ -213,14 +215,16 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById/{id}")
     Map<String,Object> getCapacityById(@PathVariable("id") BigDecimal id);
 
-
-    ;
     //新增汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculate")
     Map<String, Object> insertTruckCalculate(@RequestBody(required = false) Map<String, Object> map);
+
+    //新增汽车衡下的物资
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculateOfMaterial")
+    Map<String, Object> insertTruckCalculateOfMaterial(@RequestBody(required = false) Map<String, Object> map);
     //更新汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/updateTruckCalculate")
-    Map<String, Object> updateTruckCalculate(Map<String, Object> map);
+    Map<String, Object> updateTruckCalculate(@RequestBody Map<String, Object> map);
     //根据id查询汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateById/{id}")
 
@@ -230,6 +234,10 @@ public interface RmsFeign {
     //根据id删除汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculate/{id}")
     Map<String, Object> deleteTruckCalculate(@PathVariable("id") BigDecimal id);
+
+    //根据id删除汽车衡与物资中间表
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculateMaterial/{id}")
+    Map<String, Object> deleteTruckCalculateMaterial(@PathVariable("id") BigDecimal id);
     //模糊查询汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateList")
     Map<String, Object> getTruckCalculateList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -237,6 +245,13 @@ public interface RmsFeign {
                                               @RequestParam Integer pageSize,
                                               @RequestParam Integer apiId,
                                               @RequestParam String con);
+    //汽车衡物资展示表
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getCalculateOfMaterialList")
+    Map<String, Object> getCalculateOfMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam BigDecimal truckCalculateId);
 
     //新增仓库
     @PostMapping(value = "api/v1/rms/rmswarehouse/insertWarehouse")

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

@@ -28,7 +28,8 @@ public interface WMSFeign {
     Map<String,Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize);
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam String con);
 
     /**
      * 展示出库实绩
@@ -148,9 +149,9 @@ public interface WMSFeign {
      */
     @RequestMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/getWmsOffsiteLibaryInboundList",method = RequestMethod.POST)
     Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String,Object> map,
-                                                       @RequestParam Integer apiId,
-                                                       @RequestParam Integer pageNum,
-                                                       @RequestParam Integer pageSize,
+                                                      @RequestParam Integer apiId,
+                                                      @RequestParam Integer pageNum,
+                                                      @RequestParam Integer pageSize,
                                                       @RequestParam String con);
 
     /**
@@ -169,10 +170,12 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/wmspintransitinventorys/getWmspIntransitInventory",method = RequestMethod.POST)
-    Map<String,Object> getWmspIntransitInventory(@RequestBody(required = false)
+    Map<String,Object> getWmspIntransitInventory(@RequestBody(required = false)Map<String,Object>mapval,
                                                      @RequestParam Integer apiId,
                                                      @RequestParam Integer pageNum,
-                                                     @RequestParam Integer pageSize);
+                                                     @RequestParam Integer pageSize,
+                                                     @RequestParam String con);
+
 
 
     /**
@@ -209,7 +212,7 @@ public interface WMSFeign {
                                                     @RequestParam Integer warehouseid,
                                                     @RequestParam Integer stackingId,
                                                     @RequestParam Integer gradtionNumber
-                                                   );
+    );
 
     /**
      *    添加倒垛单实绩
@@ -221,7 +224,7 @@ public interface WMSFeign {
 
 
     @PostMapping("/api/v1/wms/wmsprestackdrivingresults/updateInstruction")
-     Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map);
+    Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map);
 
 
 
@@ -274,42 +277,42 @@ public interface WMSFeign {
      * @param DistrubtionStatus
      * @return
      */
-   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
-   Map<String,Object>       selectRestackList     (@RequestBody(required = false) Map<String,Object> map,
-                                                   @RequestParam Integer apiId,
-                                                   @RequestParam Integer pageNum,
-                                                   @RequestParam Integer pageSize,
-                                                   @RequestParam Integer DistrubtionStatus
-                                                  );
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
+    Map<String,Object>       selectRestackList     (@RequestBody(required = false) Map<String,Object> map,
+                                                    @RequestParam Integer apiId,
+                                                    @RequestParam Integer pageNum,
+                                                    @RequestParam Integer pageSize,
+                                                    @RequestParam Integer DistrubtionStatus
+    );
     /**
      *  修改倒垛单
      * @param mapval
      * @return
      */
-   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/editRestackMakeResult")
-   Map<String,Object> editRestackMakeResult(@RequestBody(required = false)Map<String,Object> mapval);
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/editRestackMakeResult")
+    Map<String,Object> editRestackMakeResult(@RequestBody(required = false)Map<String,Object> mapval);
     /**
      *   渲染倒垛后的仓库信息
      * @param resultId
      * @return
      */
-  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterWarehouseByResultId/{resultId}")
-  Map<String,Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId);
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterWarehouseByResultId/{resultId}")
+    Map<String,Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId);
     /**
      *  渲染倒垛后的垛位信息
      * @param resultId
      * @return
      */
-  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterstackingByResultId/{resultId}")
-  Map<String,Object> selectAfterstackingByResultId(@PathVariable Integer resultId);
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterstackingByResultId/{resultId}")
+    Map<String,Object> selectAfterstackingByResultId(@PathVariable Integer resultId);
 
     /**
      * PDA展示倒垛单
      * @param map
      * @return
      */
-  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
-  Map<String,Object> selectRestackForPDA(@RequestBody(required = false)Map<String,Object> map);
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
+    Map<String,Object> selectRestackForPDA(@RequestBody(required = false)Map<String,Object> map);
 
 
 
@@ -326,8 +329,8 @@ public interface WMSFeign {
      * @param map
      * @return
      */
-  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectMaterialInfoByResultId")
-  Map<String,Object> selectMaterialInfoByResultId(@RequestBody(required = false)Map<String,Object> map);
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectMaterialInfoByResultId")
+    Map<String,Object> selectMaterialInfoByResultId(@RequestBody(required = false)Map<String,Object> map);
     /**
      * PDA根据仓库id查找倒垛单
      * @param map
@@ -340,12 +343,12 @@ public interface WMSFeign {
      * @param mal
      * @return
      */
+
    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
    Map<String,Object> ScanTagResult(@RequestBody(required = false)Map<String,Object> mal);
 
 
 
-
     @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
     Map<String,Object> getScanResult(@RequestBody Map<String,Object> map);
     /**
@@ -353,8 +356,8 @@ public interface WMSFeign {
      * @param mapList
      * @return
      */
-  @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/Issue")
-  Map<String,Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList);
+    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/Issue")
+    Map<String,Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList);
     /**
      * 展示退库实绩
      * @param mapValue
@@ -367,7 +370,8 @@ public interface WMSFeign {
     RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize);
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam String con);
 
 
     @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
@@ -375,7 +379,9 @@ public interface WMSFeign {
                                                    @RequestParam Integer apiId,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
-                                                   @RequestParam Integer inboundId);
+                                                   @RequestParam Integer inboundId
+                                                   );
+
     //根据物资信息查找暂存的垛位
     @PostMapping("/api/v1/wms/reboundResult/selectInfoByMaterialCode")
     Map<String,Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String,Object> mal);
@@ -425,7 +431,8 @@ public interface WMSFeign {
     RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize);
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
 
 
     /**
@@ -440,7 +447,8 @@ public interface WMSFeign {
     RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize);
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
 
     /**
      * 收发存报表
@@ -449,7 +457,8 @@ public interface WMSFeign {
     RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
-                                 @RequestParam Integer pageSize);
+                                 @RequestParam Integer pageSize,
+                                 @RequestParam String con);
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩

src/main/resources/bootstrap.yml

@@ -1,26 +1,59 @@
 api.version: api/v1
 spring:
+  application:
+    name: dil-dazhou-service
   profiles:
-    include: ${SPRING_PROFILES:dev}
-  jackson:
-      date-format: yyyy-MM-dd HH:mm:ss
-      time-zone: GMT+8
-#    serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
-  messages:
-    basename: message
-    encoding: UTF-8
-  mvc:
-    static-path-pattern:
+    active: dev
+  zipkin:
+    base-url: http://${ZIPKIN_HOST:localhost}:9411
+  sleuth:
+    sampler:
+      #默认值为0.1f，现在为了测试设置100%采集
+      percentage: 1.0
+  cloud:
+    config:
+      fail-fast: false
+      discovery:
+        enabled: false
+        service-id: config-server
+    bus:
+      trace:
+        enabled: false
+      enabled: false
 
-#eureka设置
 eureka:
   client:
     service-url:
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
+    instance:
+      prefer-ip-address: true
+      status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
+      instance-id: ${spring.cloud.client.ip-address}:${server.port}
+
+    metadata-map:
+      cluster: ribbon
   instance:
+    hostname: dil-dazhou-service
+    status-page-url: http://${SWAGGER_INDEX:tgwl.steerinfo.com}/swagger-ui.html
     prefer-ip-address: true
-    status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
+#禁止调用eureka client获取注册列表信息
+ribbon:
+  eureka:
+    enabled: true
+#新版配置，否则后面dashboard无法找到hystrix.stream
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+
+feign:
+  client:
+    config:
+      default:
+        connect-timeout: 5000
+        read-timeout: 10000
 
 
 openfeign: