'合并仓储-采购后端总项目'

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.QmsTruckFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -17,7 +18,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("${api.version}/qms")
-public class QMSController {
+public class QMSController extends BaseRESTfulController {
 
     @Autowired
     private QmsTruckFeign qmsTruckFeign;

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.feign.TmsTrainFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.feign.TmsshipFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -22,7 +23,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("${api.version}/tms")
-public class TMSController {
+public class TMSController extends BaseRESTfulController {
     @Autowired
     private TmsTruckFeign tmsTruckFeign;
     @Autowired

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.QMSFeign;
+import com.steerinfo.dil.feign.QmsTruckFeign;
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -7,12 +9,12 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,18 +26,527 @@ import java.util.Map;
 public class WMSController extends BaseRESTfulController {
     @Autowired
     WMSFeign wmsFeign;
-
+    @Autowired
+    QMSFeign qmsFeign;
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "90", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsInboundResult( Map<String, Object> mapValue,
+    public Map<String,Object> getWmsInboundResult( Map<String, Object> mapValue,
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize){
         return wmsFeign.getWmsInboundResult(mapValue,apiId,pageNum,pageSize);
+    }
+    @PostMapping("getWmspOutboundResult")
+    @ApiOperation(value = "展示出库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "152", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String,Object> getWmspOutboundResult(@RequestBody(required = false)
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId){
+        return wmsFeign.getWmspOutboundResult(apiId,pageNum,pageSize);
+    }
+    @PostMapping("/insertWmspOutBoundResult")
+    @ApiOperation(value = "新增出单实绩并返回出库单详情")
+    public Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false)Map<String,Object> mapval){
+        Map<String,Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
+        return resTfulResult;
+    }
+    @PostMapping("/insertWmspOutboundScanResult")
+    public Map<String,Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String,Object> mapval){
+        Map<String,Object> resTfulResult = wmsFeign.insertWmspOutboundScanResult(mapval);
+        return resTfulResult;
+    }
+    @PostMapping("/updataResultStatus")
+    public Map<String,Object> updataResultStatus(@RequestParam Integer resultId){
+        Map<String,Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
+        return resTfulResult;
+    }
+    @PostMapping("/getRmsMaterial")
+    public Map<String,Object> getRmsMaterial(@RequestBody(required = false) Map<String,Object> mapval){
+        Map<String,Object> resTfulResult = wmsFeign.getRmsMaterial(mapval);
+        return resTfulResult;
+    }
+   //查询实时库存数据
+   @PostMapping("/selectGridMaterialList")
+   @ApiOperation(value = "展示实时库存数据")
+   @ApiImplicitParams({
+           @ApiImplicitParam(name = "apiId", value = "216", required = false, dataType = "BigDecimal"),
+   })
+   public Map<String,Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId) {
+       return wmsFeign.selectGridMaterialList(apiId, pageNum, pageSize);
 
+   }
+  //钢材异地库出库扫描
+  @PostMapping("/ScanResultTag")
+  public Map<String,Object> ScanResultTag(@RequestBody(required = false) Map<String,Object> mapval){
+      Map<String,Object> resTfulResult = wmsFeign.ScanResultTag(mapval);
+      return resTfulResult;
+  }
+  //钢材异地库出库展示实绩
+  @PostMapping("/getWmsOffsiteLibaryOutboundList")
+  @ApiOperation(value = "展示实时库存数据")
+  @ApiImplicitParams({
+          @ApiImplicitParam(name = "apiId", value = "164", required = false, dataType = "BigDecimal"),
+  })
+  public Map<String,Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId) {
+      return wmsFeign.getWmsOffsiteLibaryOutboundList(apiId,pageNum,pageSize);
+  }
+ //展示钢材扫描入库实绩列表
+ @ApiImplicitParams({
+         @ApiImplicitParam(name = "apiId", value = "165", required = false, dataType = "BigDecimal"),
+ })
+ @PostMapping("/getWmsOffsiteLibaryInboundList")
+ public Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId) {
+     return wmsFeign.getWmsOffsiteLibaryOutboundList(apiId,pageNum,pageSize);
+ }
+//钢材异地库扫描入库
+@PostMapping("/ScanResultTag")
+public Map<String,Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String,Object> map){
+    Map<String,Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
+    return resTfulResult;
+}
+//展示实时库存数据
+@ApiImplicitParams({
+        @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
+})
+@PostMapping("/getWmspIntransitInventory")
+public Map<String,Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                             Integer pageNum,
+                                                             Integer pageSize,
+                                                             Integer apiId) {
+        return wmsFeign.getWmspIntransitInventory(apiId,pageNum,pageSize);
+    }
+//新增倒库出库实绩
+@PostMapping("/insertOutBoundResult")
+public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Map<String,Object> map){
+        Map<String,Object> resTfulResult = wmsFeign.insertOutBoundResult(map);
+        return resTfulResult;
+    }
+  //新增倒库出库扫描实绩
+  @PostMapping("/AddWmspOutboundScanResult")
+  public Map<String,Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String,Object> mapVal){
+    Map<String,Object> resTfulResult = wmsFeign.AddWmspOutboundScanResult(mapVal);
+    return resTfulResult;
+}
+   //通过下拉框筛选数据
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getWmspRestackMakeResultList")
+    public Map<String,Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           Integer warehouseid,
+                                                           Integer gradtionNumber,
+                                                           Integer stackingId) {
+        return wmsFeign.getWmspRestackMakeResultList(apiId,pageNum,pageSize,warehouseid,stackingId,gradtionNumber);
+    }
+  //添加倒垛单实绩
+  @PostMapping("/addRestackMakeResult")
+  public Map<String,Object> addRestackMakeResult(@RequestBody(required = false) Map<String,Object> mapVal){
+     Map<String,Object> resTfulResult = wmsFeign.addRestackMakeResult(mapVal);
+     return resTfulResult;
+  }
+  //删除倒垛单
+ @PostMapping("/deleteByResultId/{resultId}")
+ public Map<String,Object> deleteByResultId(@PathVariable Integer resultId){
+     Map<String,Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
+     return resTfulResult;
+ }
+   //下发倒垛单
+    @PostMapping("/dispatchDistrubtionStatus/{resultId}")
+    public Map<String,Object> dispatchDistrubtionStatus(@PathVariable Integer resultId){
+        Map<String,Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
+        return resTfulResult;
+    }
+  //下拉框获取层次
+    @PostMapping("/selectGardationNumber")
+    public Map<String,Object> selectGardationNumber(Integer warehouseid, Integer stackingId){
+        Map<String,Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid,stackingId);
+        return resTfulResult;
+    }
+    //下拉框获取仓库名称
+    @PostMapping("/selectWarehouse")
+    public Map<String,Object> selectWarehouse(){
+        Map<String,Object> resTfulResult = wmsFeign.selectWarehouse();
+        return resTfulResult;
+    }
+    //下拉框获取仓库名称
+    @PostMapping("/selectStackingId")
+    public Map<String,Object> selectStackingId(Integer warehouseid){
+        Map<String,Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
+        return resTfulResult;
+    }
+    //展示倒垛单
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/selectRestackList")
+    public Map<String,Object> selectRestackList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        Integer apiId,
+                                                        Integer DistrubtionStatus) {
+        return wmsFeign.selectRestackList(apiId,pageNum,pageSize,DistrubtionStatus);
+    }
+  //修改倒垛单
+  @PostMapping("/addRestackMakeResult")
+  public Map<String,Object> editRestackMakeResult(@RequestBody(required = false) Map<String,Object> mapVal){
+      Map<String,Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
+      return resTfulResult;
+  }
+  //渲染倒垛后的仓库信息
+  @PostMapping("/selectAfterWarehouseByResultId/{resultId}")
+  public Map<String,Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId){
+      Map<String,Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
+      return resTfulResult;
+  }
+  //渲染倒垛后的垛位信息
+  @PostMapping("/selectAfterstackingByResultId/{resultId}")
+  public Map<String,Object> selectAfterstackingByResultId(@PathVariable Integer resultId){
+      Map<String,Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
+      return resTfulResult;
+  }
+  //PDA展示倒垛单
+  @PostMapping("/selectRestackForPDA")
+  public Map<String,Object> selectRestackForPDA(@RequestBody(required = false) Map<String,Object> map){
+      Map<String,Object> resTfulResult = wmsFeign.selectRestackForPDA(map);
+      return resTfulResult;
+  }
+  //PDA根据实绩id查找物资信息
+  @PostMapping("/selectMaterialInfoByResultId")
+  public Map<String,Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String,Object> map){
+        Map<String,Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
+        return resTfulResult;
+  }
+  //PDA根据仓库id查找倒垛单
+  @PostMapping("/selectRestackByWarehouseId")
+  public Map<String,Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String,Object> map){
+      Map<String,Object> resTfulResult = wmsFeign.selectRestackByWarehouseId(map);
+      return resTfulResult;
+  }
+  //扫描吊牌添加扫描实绩
+  @PostMapping("/ScanTagResult")
+  public Map<String,Object> ScanTagResult(@RequestBody(required = false) Map<String,Object> mal){
+      Map<String,Object> resTfulResult = wmsFeign.ScanTagResult(mal);
+      return resTfulResult;
+  }
+  //下发
+  @PostMapping("/Issue")
+  public Map<String,Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList){
+      Map<String,Object> resTfulResult = wmsFeign.Issue(mapList);
+      return resTfulResult;
+  }
+    /**
+     * 2.展示退库实绩信息
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping("/getWmsReboundResult")
+    @ApiOperation(value = "展示退库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getWmsReboundResult( Map<String, Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize){
+        return wmsFeign.getWmsReboundResult(mapValue,apiId,pageNum,pageSize);
+    }
 
+
+    @PostMapping("/getWmsIvboundResult")
+    @ApiOperation(value = "展示倒库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getWmsIvboundResult( Map<String, Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize){
+        return wmsFeign.getWmsIvboundResult(mapValue,apiId,pageNum,pageSize);
     }
+
+
+    /**
+     * 展示倒库物资实绩
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping("/getWmsIvboundMaterialt")
+    @ApiOperation(value = "展示倒库物资实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getWmsIvboundMaterial( Map<String, Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize){
+        return wmsFeign.getWmsIvboundMaterial(mapValue,apiId,pageNum,pageSize);
+    }
+
+    @PostMapping("/getInventoryCheck")
+    @ApiOperation(value = "展示库存盘点实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getInventoryCheck( Map<String, Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize){
+        return wmsFeign.getInventoryCheck(mapValue,apiId,pageNum,pageSize);
+    }
+
+    @PostMapping("/getInventoryClose")
+    @ApiOperation(value = "展示库存结转实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getInventoryClose( Map<String, Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize){
+        return wmsFeign.getInventoryClose(mapValue,apiId,pageNum,pageSize);
+    }
+
+    @PostMapping("/getSendReceive")
+    @ApiOperation(value = "展示收发存实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getSendReceive( Map<String, Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize){
+        return wmsFeign.getSendReceive(mapValue,apiId,pageNum,pageSize);
+    }
+
+    /**
+     * 展示未下发吊钢工扫描吊牌实绩
+     * @return
+     */
+    @ApiOperation(value="展示未下发吊钢工扫描吊牌实绩")
+    @PostMapping("/getTagResult")
+    public Map<String,Object> getTagResult(){
+        return wmsFeign.getTagResult();
+    }
+
+    /**
+     *  展示正常入库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @ApiOperation(value="展示正常入库吊钢工扫描吊牌实绩")
+    @PostMapping("/getIssuedTagResult")
+    public Map getIssuedTagResult(){
+        return wmsFeign.getIssuedTagResult();
+    }
+
+    /**
+     * 展示异常入库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @ApiOperation(value="展示异常入库吊钢工扫描吊牌实绩")
+    @PostMapping("/getIssuedTagNoResult")
+    public Map getIssuedTagNoResult(){
+        return wmsFeign.getIssuedTagNoResult();
+    }
+
+    /**
+     * 展示已退库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @ApiOperation(value="展示已退库吊钢工扫描吊牌实绩")
+    @PostMapping("/getReIssuedResult")
+    public Map getReIssuedResult(){
+        return wmsFeign.getIssuedResult();
+    }
+
+    /**
+     * 展示未下发退库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @ApiOperation(value="展示未下发退库吊钢工扫描吊牌实绩")
+    @PostMapping("/getReTagResult")
+    public Map getReTagResult(){
+        return wmsFeign.getReTagResult();
+    }
+
+    /**
+     * 展示已倒库入库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @ApiOperation(value="展示已倒库入库吊钢工扫描吊牌实绩")
+    @PostMapping("/getIvIssuedResult")
+    public Map getIvIssuedResult(){
+        return wmsFeign.getIvIssuedResult();
+    }
+
+    /**
+     * 展示未下发退库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @ApiOperation(value="展示未下发退库吊钢工扫描吊牌实绩")
+    @PostMapping("/getIvTagResult")
+    public Map getIvTagResult(){
+        return wmsFeign.getIvTagResult();
+    }
+
+    /**
+     * 新增入库实绩
+     * @param mapList
+     * @return
+     */
+    @ApiOperation("新增入库实绩")
+    @PostMapping("/insertInboundResult")
+    @Transactional
+    public String 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);
+        }
+        wmsFeign.insertInboundResult(mapList);
+        return stackNo;
+    }
+
+    /**
+     * 新增退库实绩
+     * @param mapList
+     * @return
+     */
+    @ApiOperation("新增退库实绩")
+    @PostMapping("/insertReboundResult")
+    @Transactional
+    public String addReboundResult(@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);
+        }
+        wmsFeign.insertReboundResult(mapList);
+        return stackNo;
+    }
+
+    /**
+     * 新增倒库入库实绩
+     * @param mapList
+     * @return
+     */
+    @ApiOperation("新增倒库入库实绩")
+    @PostMapping("/insertIvboundResult")
+    @Transactional
+    public String addIvboundResult(@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);
+        }
+        wmsFeign.insertIvboundResult(mapList);
+        return stackNo;
+    }
+    /**
+     *展示入库垛位
+     * @param DriverId
+     * @return
+     */
+    @PostMapping("/getInboundStack")
+    @ApiOperation(value = "展示入库垛位")
+    public Integer getInboundStack(Integer DriverId){
+        return wmsFeign.getInboundStack(DriverId);
+    }
+    /**
+     * 新增库存盘点
+     * @param map
+     * @return
+     */
+    @PostMapping("/inventoryCheck")
+    @ApiOperation(value = "新增库存盘点")
+    public Map<String, Object> inventoryCheck(@RequestBody(required = false) Map<String,Object> map) {
+        return wmsFeign.inventoryCheck(map);
+    }
+
+    /**
+     * 新增入库扫描吊牌实绩
+     * @param map
+     * @return
+     */
+    @ApiOperation(value = "新增入库扫描吊牌实绩")
+    @PostMapping("/insertResult")
+    @Transactional
+    public Map<String,Object> insertResult(@RequestBody(required = false)Map<String,Object>map){
+        return wmsFeign.insertResult(map);
+    }
+
+    /**
+     * 新增退库扫描吊牌实绩
+     * @param map
+     * @return
+     */
+    @ApiOperation(value = "新增退库扫描吊牌实绩")
+    @PostMapping("/insertReboundScanResult")
+    @Transactional
+    public Map<String,Object> insertReboundScanResult(@RequestBody(required = false)Map<String,Object>map){
+        return wmsFeign.insertReboundScanResult(map);
+    }
+
+    /**
+     * 新增倒库入库扫描吊牌实绩
+     * @param map
+     * @return
+     */
+    @ApiOperation(value = "新增倒库入库扫描吊牌实绩")
+    @PostMapping("/insertIvboundScanResult")
+    @Transactional
+    public Map<String,Object> insertIvboundScanResult(@RequestBody(required = false)Map<String,Object>map){
+        return wmsFeign.insertIvboundScanResult(map);
+    }
+
 }

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

@@ -0,0 +1,20 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-10-13 9:09
+ */
+@FeignClient(value = "DAL-TRICK-QMS-DEV",url = "${openfeign.QMSFeign.url}")
+public interface QMSFeign {
+    @RequestMapping(value = "/api/v1/queueTruck/qmsqueuegrids/getStackingId",method = RequestMethod.POST)
+    Map<String,Object> getStackingId(@RequestParam BigDecimal warehouseId,
+                                     @RequestParam int size);
+}

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

@@ -5,11 +5,9 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 /**
@@ -149,4 +147,5 @@ public interface QmsTruckFeign {
                                               @RequestParam("orderType")Integer orderType,
                                               @RequestParam("status")Integer status
     );
+
 }

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

@@ -1,22 +1,488 @@
 package com.steerinfo.dil.feign;
 
+import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
  * @author luobang
  * @create 2021-09-17 14:13
  */
-@FeignClient(value = "DAL-DAZHOU-WMS-DEV",url = "192.168.1.241:8081")
+@FeignClient(value = "DAL-DAZHOU-WMS-DEV",url = "${openfeign.WMSFeign.url}")
 public interface WMSFeign {
+    /**
+     * 钢材入库实绩
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
     @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResult",method = RequestMethod.POST)
-    RESTfulResult getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String,Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize);
 
+    /**
+     * 展示出库实绩
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/getWmspOutboundResult",method = RequestMethod.POST)
+    Map<String,Object> getWmspOutboundResult(@RequestBody(required = false)
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize);
+
+    /**
+     * 新增出库实绩
+     * @param mapval
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/insertWmspOutBoundResult",method = RequestMethod.POST)
+    Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval);
+
+    /**
+     * 新增出库扫描实绩
+     * @param mapval
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/insertWmspOutboundScanResult")
+    Map<String,Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval);
+
+    /**
+     * 更新出库状态
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/updataResultStatus")
+    Map<String,Object> updataResultStatus(@RequestBody(required = false)Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getRmsMaterial")
+    Map<String,Object> getRmsMaterial(@RequestBody(required = false)Map<String, Object> mapval);
+
+    /**
+     *  展示实时库存数据
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialList",method = RequestMethod.POST)
+    Map<String,Object> selectGridMaterialList(@RequestBody(required = false)
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    /**
+     * 钢材异地库出库扫描
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/ScanResultTag")
+    Map<String,Object> ScanResultTag(@RequestBody(required = false)Map<String,Object> map);
+
+    /**
+     * 获取钢材异地库出库数据
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getWmsOffsiteLibaryOutboundList",method = RequestMethod.POST)
+    Map<String,Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false)
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize);
+
+    /**
+     * 展示钢材异地库入库实绩表
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/getWmsOffsiteLibaryInboundList",method = RequestMethod.POST)
+    Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false)
+                                                       @RequestParam Integer apiId,
+                                                       @RequestParam Integer pageNum,
+                                                       @RequestParam Integer pageSize);
+
+    /**
+     *   钢材异地库入库扫描新增异地库入库实绩
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/insertOffsiteLibraryInbound")
+    Map<String,Object> insertOffsiteLibraryInbound(@RequestBody(required = false)Map<String,Object> map);
+
+    /**
+     *  //展示在途库存列表
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspintransitinventorys/getWmspIntransitInventory",method = RequestMethod.POST)
+    Map<String,Object> getWmspIntransitInventory(@RequestBody(required = false)
+                                                     @RequestParam Integer apiId,
+                                                     @RequestParam Integer pageNum,
+                                                     @RequestParam Integer pageSize);
+
+
+    /**
+     *新增倒库出库实绩
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertOutBoundResult")
+    Map<String,Object> insertOutBoundResult(@RequestBody(required = false)Map<String,Object> map);
+
+    /**
+     * //新增倒库出库扫描实绩
+     * @param mapval
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/AddWmspOutboundScanResult")
+    Map<String,Object> AddWmspOutboundScanResult(@RequestBody(required = false)Map<String,Object> mapval);
+
+    /**
+     * 通过下拉框筛选数据
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @param warehouseid
+     * @param gradtionNumber
+     * @param stackingId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/getWmspRestackMakeResultList")
+    Map<String,Object> getWmspRestackMakeResultList(@RequestBody(required = false)
+                                                    @RequestParam Integer apiId,
+                                                    @RequestParam Integer pageNum,
+                                                    @RequestParam Integer pageSize,
+                                                    @RequestParam Integer warehouseid,
+                                                    @RequestParam Integer gradtionNumber,
+                                                    @RequestParam Integer stackingId);
+
+    /**
+     *    添加倒垛单实绩
+     * @param mapval
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/addRestackMakeResult")
+    Map<String,Object> addRestackMakeResult(@RequestBody(required = false)Map<String,Object> mapval);
+
+    /**
+     *   删除倒垛单
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/deleteByResultId/{resultId}")
+    Map<String,Object> deleteByResultId(@PathVariable Integer resultId);
+
+    /**
+     * 下发倒垛单pc端
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/dispatchDistrubtionStatus/{resultId}")
+    Map<String,Object> dispatchDistrubtionStatus(@PathVariable Integer resultId);
+
+    /**
+     * 下拉框获取层次
+     * @param warehouseid
+     * @param stackingId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectGardationNumber")
+    Map<String,Object> selectGardationNumber(@RequestParam Integer warehouseid,
+                                             @RequestParam  Integer stackingId );
+
+    /**
+     *   下拉框获取垛位
+     * @param warehouseid
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectStackingId")
+    Map<String,Object> selectStackingId(@RequestParam Integer warehouseid);
+
+    /**
+     * 下拉框获取仓库名称
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectWarehouse")
+    Map<String,Object> selectWarehouse();
+
+    /**
+     *展示倒垛单
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @param DistrubtionStatus
+     * @return
+     */
+   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
+   Map<String,Object> selectRestackList(@RequestBody(required = false)
+                                                   @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);
+    /**
+     *   渲染倒垛后的仓库信息
+     * @param resultId
+     * @return
+     */
+  @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);
+
+    /**
+     * PDA展示倒垛单
+     * @param map
+     * @return
+     */
+  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
+  Map<String,Object> selectRestackForPDA(@RequestBody(required = false)Map<String,Object> map);
+    /**
+     * PDA根据实绩id查找物资信息
+     * @param map
+     * @return
+     */
+  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectMaterialInfoByResultId")
+  Map<String,Object> selectMaterialInfoByResultId(@RequestBody(required = false)Map<String,Object> map);
+    /**
+     * PDA根据仓库id查找倒垛单
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseId")
+    Map<String,Object> selectRestackByWarehouseId(@RequestBody(required = false)Map<String,Object> map);
+    /**
+     * 库管员扫描吊牌添加扫描实绩
+     * @param mal
+     * @return
+     */
+   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/ScanTagResult")
+   Map<String,Object> ScanTagResult(@RequestBody(required = false)Map<String,Object> mal);
+    /**
+     * 库管员下发倒垛单
+     * @param mapList
+     * @return
+     */
+  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/Issue")
+  Map<String,Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList);
+    /**
+     * 展示退库实绩
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsReboundResult",method = RequestMethod.POST)
+    RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize);
 
+    /**
+     * 展示倒库实绩
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsIvboundResult",method = RequestMethod.POST)
+    RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize);
+
+
+    /**
+     * 展示倒库物资实绩
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getWmsIvboundMaterial",method = RequestMethod.POST)
+    RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
+
+    /**
+     * 库存盘点实绩
+     */
+    @RequestMapping(value = "/api/v1/wms/inventoryCheck/getInventoryCheck",method = RequestMethod.POST)
+    RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
+
+
+    /**
+     * 库存结转
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inventoryClose/getInventoryClose",method = RequestMethod.POST)
+    RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
+
+    /**
+     * 收发存报表
+     */
+    @RequestMapping(value = "/api/v1/wms/sendReceive/getSendReceive",method = RequestMethod.POST)
+    RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize);
+
+    /**
+     * 展示未下发吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getTagResult",method = RequestMethod.POST)
+    Map<String,Object>  getTagResult();
+
+    /**
+     * 展示已入库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIssuedTagResult",method = RequestMethod.POST)
+    Map<String,Object>  getIssuedTagResult();
+
+    /**
+     * 展示异常入库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIssuedTagNoResult",method = RequestMethod.POST)
+    Map<String,Object>  getIssuedTagNoResult();
+
+    /**
+     * 展示退库已下发吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getReIssuedResult",method = RequestMethod.POST)
+    Map<String,Object>  getIssuedResult();
+
+    /**
+     * 展示未下发退库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getReTagResult",method = RequestMethod.POST)
+    Map<String,Object>  getReTagResult();
+
+    /**
+     * 展示已倒库入库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIvIssuedResult",method = RequestMethod.POST)
+    Map<String,Object>  getIvIssuedResult();
+
+    /**
+     * 展示倒库入库未下发退库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIvTagResult",method = RequestMethod.POST)
+    Map<String,Object>  getIvTagResult();
+
+    /**
+     * 新增入库实绩，返回选择垛位
+     * @param mapList
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/insertInboundResult",method = RequestMethod.POST)
+    String insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 新增退库实绩，返回选择垛位
+     * @param mapList
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/insertReboundResult",method = RequestMethod.POST)
+    String insertReboundResult(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 新增倒库入库实绩，返回选择垛位
+     * @param mapList
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/insertIvboundResult",method = RequestMethod.POST)
+    String insertIvboundResult(@RequestBody List<Map<String, Object>> mapList);
+    /**
+     * 行车工查看垛位
+     * @param DriverId
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundStack/getInboundStack",method = RequestMethod.POST)
+    Integer  getInboundStack(@RequestParam Integer DriverId);
+
+
+    /**
+     * 新增库存盘点
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundStack/getInboundStack",method = RequestMethod.POST)
+    Map<String,Object>  inventoryCheck(@RequestBody Map<String,Object> map);
+
+
+    /**
+     * 新增入库扫描实绩
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertResult",method = RequestMethod.POST)
+    Map<String, Object> insertResult(@RequestBody  Map<String, Object> map);
+
+
+    /**
+     * 新增退库扫描实绩
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertReboundScanResult",method = RequestMethod.POST)
+    Map<String, Object> insertReboundScanResult(@RequestBody  Map<String, Object> map);
+
+
+    /**
+     *新增倒库入库扫描实绩
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertIvboundScanResult",method = RequestMethod.POST)
+    Map<String, Object> insertIvboundScanResult(@RequestBody  Map<String, Object> map);
 }
+

src/main/resources/bootstrap.yml

@@ -39,6 +39,10 @@ openfeign:
     url: ${TMSSHIPFEIGN_URL:localhost:8090}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:localhost:8084}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:localhost:8086}
+  QMSFeign:
+    url: ${QMSFEIGN_URL:localhost:8082}
 
 
 genxml: