tijiao

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,7 @@ public class WMSController extends BaseRESTfulController {
         Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
         return resTfulResult;
     }
+
    @ApiImplicitParams({
            @ApiImplicitParam(value = "395",name = "apiId")
    })
@@ -365,8 +360,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")
@@ -378,9 +374,10 @@ public class WMSController extends BaseRESTfulController {
                                                            Integer apiId,
                                                            Integer pageNum,
                                                            Integer pageSize,
-                                                           Integer inboundId) {
+                                                           Integer inboundId,
+                                                           String con) {
 
-        return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
+        return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId,con);
     }
    //根据物资信息获取原来垛位信息
    @PostMapping("/selectInfoByMaterialCode")
@@ -441,8 +438,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 +451,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 +464,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 +556,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 +693,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 +703,8 @@ 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/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);
 
     /**
      * 展示出库实绩
@@ -169,10 +170,11 @@ 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);
 
 
     /**
@@ -344,8 +346,6 @@ public interface WMSFeign {
    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);
     /**
@@ -367,7 +367,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 +376,8 @@ public interface WMSFeign {
                                                    @RequestParam Integer apiId,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
-                                                   @RequestParam Integer inboundId);
+                                                   @RequestParam Integer inboundId,
+                                                   @RequestParam String con);
     //根据物资信息查找暂存的垛位
     @PostMapping("/api/v1/wms/reboundResult/selectInfoByMaterialCode")
     Map<String,Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String,Object> mal);
@@ -425,7 +427,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 +443,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 +453,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

@@ -46,7 +46,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:localhost:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign: