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

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

@@ -40,10 +40,37 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
-                                                   String  con) {
-        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+                                                   String startTime,
+                                                   String endTime) {
+        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime);
+    }
+    @PostMapping("getWmsInboundResultStatistics")
+    @ApiOperation(value = "展示入库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer warehouseId,
+                                                   String startTime,
+                                                   String endTime) {
+        return wmsFeign.getWmsInboundResultStatistics(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
+    }
+    @PostMapping("getWmsInboundResults")
+    @ApiOperation(value = "展示入库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsInboundResults(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   String startTime,
+                                                   String endTime) {
+        return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime);
     }
-
     @PostMapping("getWmsReservedResult")
     @ApiOperation(value = "展示预留入库实绩信息")
     @ApiImplicitParams({
@@ -53,7 +80,7 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
-                                                   String  con) {
+                                                    String con) {
         return wmsFeign.getWmsReservedResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
     @PostMapping("getWmspOutboundResult")
@@ -890,6 +917,24 @@ public class WMSController extends BaseRESTfulController {
                                                 @RequestParam(value = "quantity") Integer quantity) {
         return wmsFeign.insertStockTaking(warehouseId,materialCode,quantity);
     }
+    //修改入库转预留作业,针对预留
+    @PostMapping(value = "/insertReserved")
+    public Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
+                                             @RequestParam(value = "materialCode") String materialCode,
+                                             @RequestParam(value = "materialSpecification") String materialSpecification,
+                                             @RequestParam(value = "materialModel") String materialModel,
+                                             @RequestParam(value = "quantity") Integer quantity) {
+        return wmsFeign.insertReserved(warehouseId,materialCode,materialSpecification,materialModel,quantity);
+    }
+    //修改预留转入库作业,针对预留
+    @PostMapping(value = "/insertInbounds")
+    public Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
+                                             @RequestParam(value = "materialCode") String materialCode,
+                                             @RequestParam(value = "materialSpecification") String materialSpecification,
+                                             @RequestParam(value = "materialModel") String materialModel,
+                                             @RequestParam(value = "quantity") Integer quantity) {
+        return wmsFeign.insertInbounds(warehouseId,materialCode,materialSpecification,materialModel,quantity);
+    }
 //    查询所有的钢材物资信息
     @PostMapping(value = "/getSteelMaterialList")
     public Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
@@ -897,11 +942,36 @@ public class WMSController extends BaseRESTfulController {
                                                  @RequestParam(value = "apiId") Integer apiId) {
         return wmsFeign.getSteelMaterialList(pageNum,pageSize,apiId);
     }
+    //    查询所有的钢材物资规格型号信息
+    @PostMapping(value = "/getSteelMaterialModelList")
+    public Map<String,Object> getSteelMaterialModelList(@RequestParam(value = "pageNum") Integer pageNum,
+                                                   @RequestParam(value = "pageSize") Integer pageSize,
+                                                   @RequestParam(value = "apiId") Integer apiId,
+                                                        @RequestParam(value = "warehouseId") Integer warehouseId,
+                                                        @RequestParam(value = "status") Integer status) {
+        return wmsFeign.getSteelMaterialModelList(pageNum,pageSize,apiId,warehouseId,status);
+    }
 //    根据对应的入库实绩id修改入库状态为预留
     @PostMapping("/changeReserved")
     @ApiOperation(value = "根据对应的入库实绩id修改入库状态为预留")
     public int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         return wmsFeign.changeReserved(mapList);
     }
+
+    @PostMapping("/getWmsOutboundResultStatistics")
+    @ApiOperation(value = "展示炉号对应的出厂数量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "446", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getWmsOutboundResultStatistics(Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer warehouseId,
+                                        String con,
+                                        String startTime,
+                                        String endTime) {
+        return wmsFeign.getWmsOutboundResultStatistics(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con,startTime,endTime);
+    }
 }
 

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

@@ -28,12 +28,34 @@ public interface WMSFeign {
      * @param pageSize
      * @return
      */
+
     @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResult", method = RequestMethod.POST)
     Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam String con);
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResultStatistics", method = RequestMethod.POST)
+    Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+    /**
+     * 展示真实入库实绩
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResults", method = RequestMethod.POST)
+    Map<String, Object> getWmsInboundResults(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+
 
     /**
      * 展示预留入库实绩信息
@@ -49,7 +71,7 @@ public interface WMSFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam String con);
+                                             @RequestParam String con);
     /**
      * 展示出库实绩
      *
@@ -772,6 +794,20 @@ public interface WMSFeign {
                                          @RequestParam(value = "materialCode") String materialCode,
                                          @RequestParam(value = "quantity") Integer quantity);
 
+    @PostMapping("/api/v1/wms/wmspgridmaterials/insertReserved")
+    Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
+                                         @RequestParam(value = "materialCode") String materialCode,
+                                         @RequestParam(value = "materialSpecification") String materialSpecification,
+                                         @RequestParam(value = "materialModel") String materialModel,
+                                         @RequestParam(value = "quantity") Integer quantity);
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/insertInbounds")
+    Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
+                                      @RequestParam(value = "materialCode") String materialCode,
+                                      @RequestParam(value = "materialSpecification") String materialSpecification,
+                                      @RequestParam(value = "materialModel") String materialModel,
+                                      @RequestParam(value = "quantity") Integer quantity);
+
     @PostMapping("/api/v1/wms/wmspgridmaterials/getStockTakingList")
     Map<String,Object> getStockTakingList(@RequestParam(value = "pageNum") Integer pageNum,
                                           @RequestParam(value = "pageSize") Integer pageSize,
@@ -780,7 +816,26 @@ public interface WMSFeign {
     Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
                                           @RequestParam(value = "pageSize") Integer pageSize,
                                           @RequestParam(value = "apiId") Integer apiId);
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialModelList")
+    Map<String,Object> getSteelMaterialModelList(@RequestParam(value = "pageNum") Integer pageNum,
+                                            @RequestParam(value = "pageSize") Integer pageSize,
+                                            @RequestParam(value = "apiId") Integer apiId,
+                                                 @RequestParam(value = "warehouseId") Integer warehouseId,
+                                                 @RequestParam(value = "status") Integer status);
+
 
     @PostMapping("/api/v1/wms/inboundResult/changeReserved")
     int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList);
+
+    //出库炉号对应的数量
+    @PostMapping("/api/v1/wms/wmspoutboundresults/getWmsOutboundResultStatistics")
+    RESTfulResult getWmsOutboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize,
+                                 @RequestParam Integer warehouseId,
+                                 @RequestParam String con,
+                                 @RequestParam String startTime,
+                                 @RequestParam String endTime);
+
 }

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -22,7 +22,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign: