as

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

@@ -205,7 +205,21 @@ public class RMScontroller {
     ){
         return   rmsFeign.getCarrierBidAreaList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
-
+    //    处理承运商照片
+    @PostMapping("/uploadCarrier1")
+    public int uploadCarrier1(@RequestParam("file") MultipartFile multipartFile){
+        return rmsFeign.uploadCarrier1(multipartFile);
+    }
+    //    处理承运商照片
+    @PostMapping("/uploadCarrier2")
+    public int uploadCarrier2(@RequestParam("file") MultipartFile multipartFile){
+        return rmsFeign.uploadCarrier2(multipartFile);
+    }
+    //    处理承运商照片
+    @PostMapping("/uploadCarrier3")
+    public int uploadCarrier3(@RequestParam("file") MultipartFile multipartFile){
+        return rmsFeign.uploadCarrier3(multipartFile);
+    }
     //获取物资列表
     @ApiOperation(value="获取物资列表")
     @ApiImplicitParams({

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

@@ -1929,7 +1929,7 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                             String startTime, String endTime,
+                                               String startTime, String endTime,
                                                Integer orderType
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
@@ -1955,21 +1955,6 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getAllSaleReportTotal(mapValue==null?new HashMap<>():mapValue, startTime, endTime, carrierSsoId);
     }
 
-//    @ApiOperation(value="查询内转统计报表")
-//    @PostMapping("/getAllInwardResult")
-//    public Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                                Integer apiId,
-//                                                Integer pageNum,
-//                                                Integer pageSize,
-//                                                String startTime, String endTime,
-//                                                String carrierSsoId
-//    ){
-//        return tmsTruckFeign.getAllInwardResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
-//    }
-
-
-
-
     @ApiOperation(value="查询零星物资进厂统计报表")
     @PostMapping("/getSporadicSuppliesReport1")
     public Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -2002,6 +1987,16 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
     }
 
+    @ApiOperation(value="查询采购内转运输实绩")
+    @PostMapping("/getPurInwardReport")
+    public Map<String, Object> getPurInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          String endTime) {
+        return tmsTruckFeign.getPurInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
     @PostMapping("/sendMeasureCommission")
     public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
         return  tmsTruckFeign.sendMeasureCommission(map);

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

@@ -159,8 +159,8 @@ public class UniversalController extends BaseRESTfulController {
         if(index != null){
             mapValue.put("index", index);
         }
-        if (con != null&&con.equals("undefined")){
-            mapValue.put("con","%"+con+"%");
+        if (con != null&& !con.equals("undefined")){
+            mapValue.put("con",con);
         }
         if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
             carrierSsoId = null;
@@ -606,4 +606,11 @@ public class UniversalController extends BaseRESTfulController {
     public RESTfulResult getMaterialIdByOrderId(Integer orderId) {
         return success(universalService.getMaterialIdByOrderId(orderId));
     }
+
+    @ApiOperation(value = "修改路段顺序号")
+    @PostMapping("/updateLineSqe")
+    public RESTfulResult updateLineSqe(@RequestBody Map<String,Object> map) {
+        int i = universalMapper.updateLineSqe(map);
+        return success(i);
+    }
 }

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.awt.image.Kernel;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
@@ -33,16 +34,58 @@ public class WMSController extends BaseRESTfulController {
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "90", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
     })
     public Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
-                                                   String  con) {
-        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+                                                   Integer warehouseId,
+                                                   String startTime,
+                                                   String endTime) {
+        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
+    }
+    @PostMapping("getWmsInboundResultStatistics")
+    @ApiOperation(value = "展示入库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "445", 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,
+                                                   Integer warehouseId,
+                                                   String startTime,
+                                                   String endTime) {
+        return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
+    }
+    @PostMapping("getWmsReservedResult")
+    @ApiOperation(value = "展示预留入库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsReservedResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                    Integer warehouseId,
+                                                    String con) {
+        return wmsFeign.getWmsReservedResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con);
     }
-
     @PostMapping("getWmspOutboundResult")
     @ApiOperation(value = "展示出库实绩信息")
     @ApiImplicitParams({
@@ -52,8 +95,10 @@ public class WMSController extends BaseRESTfulController {
                                                      Integer pageNum,
                                                      Integer pageSize,
                                                      Integer apiId,
-                                                     String  con) {
-        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
+                                                     Integer warehouseId,
+                                                     String startTime,
+                                                     String endTime) {
+        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
 
     @PostMapping("/wmspoutboundresults/insertWmspOutBoundResult")
@@ -68,13 +113,13 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.deleteWmspOutboundResult(resultId);
     }
 
-    @PostMapping("/insertwmspOutboundScanResult")
+    @PostMapping("/wmspoutboundresults/insertwmspOutboundScanResult")
     public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
         Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
         return resTfulResult;
     }
 
-    @PostMapping("/outbountResultToSuccess")
+    @PostMapping("/wmspoutboundresults/outbountResultToSuccess")
     public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
         return wmsFeign.outbountResultToSuccess(resultId);
     }
@@ -101,11 +146,23 @@ public class WMSController extends BaseRESTfulController {
                                                       Integer pageNum,
                                                       Integer pageSize,
                                                       Integer apiId,
+                                                      String warehouseId,
+                                                      String time,
                                                       String con) {
-        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
+        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,time,con);
 
     }
+//    查询仓库中超过库龄预警的物资
+    @PostMapping("/getGridMaterialAgeList")
+    @ApiOperation(value = "查询仓库中超过库龄预警的物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getGridMaterialAgeList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                      Integer warehouseId) {
+        return wmsFeign.getGridMaterialAgeList(mapVal==null?new HashMap<>():mapVal,warehouseId);
 
+    }
 
     //通过成品仓库网格ID查询实时库存数据
     @PostMapping("/selectGridMaterialListByGridId")
@@ -369,7 +426,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsReboundResult(Map<String, Object> mapValue,
+    public RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize,
@@ -412,7 +469,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundResult(Map<String, Object> mapValue,
+    public RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize) {
@@ -434,7 +491,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundMaterial(Map<String, Object> mapValue,
+    public RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize) {
@@ -446,7 +503,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryCheck(Map<String, Object> mapValue,
+    public RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
@@ -459,12 +516,18 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryClose(Map<String, Object> mapValue,
+    public RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           String  con) {
-        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+                                           String  value) {
+        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,value);
+    }
+    //库存结转定时器
+    @PostMapping("/addInventoryClose")
+    @ApiOperation(value = "库存结转定时器")
+    public RESTfulResult addInventoryClose(){
+        return wmsFeign.addInventoryClose();
     }
 
     @PostMapping("/getSendReceive")
@@ -472,12 +535,15 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getSendReceive(Map<String, Object> mapValue,
+    public RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
-                                        String con) {
-        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+                                        String con,
+                                        String startTime,
+                                        String endTime
+                                      ) {
+        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
     }
 
     /**
@@ -566,7 +632,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增入库实绩")
     @PostMapping("/insertInboundResult")
     @Transactional
-    public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
+    public Map<String,Object> addInvoice(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         return wmsFeign.insertInboundResult(mapList);
     }
 
@@ -579,7 +645,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增退库实绩")
     @PostMapping("/insertReboundResult")
     @Transactional
-    public String addReboundResult(@RequestBody List<Map<String, Object>> mapList) {
+    public String addReboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -607,7 +673,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增倒库入库实绩")
     @PostMapping("/insertIvboundResult")
     @Transactional
-    public String addIvboundResult(@RequestBody List<Map<String, Object>> mapList) {
+    public String addIvboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -704,14 +770,14 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.updateInstruction(map);
     }
 
-//    }
+
 
     @PostMapping("/getIvboundMakeResultList")
     @ApiOperation(value = "展示倒库列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
+    public RESTfulResult getIvboundMakeResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                           Integer pageNum,
                                                           Integer pageSize,
                                                           Integer apiId,
@@ -770,6 +836,8 @@ public class WMSController extends BaseRESTfulController {
     //新增入库实绩
     @PostMapping("/inboundResult/insertInboundResult")
     public  RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList){
+
+
         return wmsFeign.addInvoice(userName,groupId,personnelWorkshopid,mapList);
     }
     //抢单
@@ -782,33 +850,157 @@ public class WMSController extends BaseRESTfulController {
     public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid){
         return wmsFeign.getNewDistribute(personnelWorkshopid);
     }
-    //    获取物资类型
-    @PostMapping(value = "/getMaterialTypeList")
-    public Map<String,Object> getMaterialTypeList(@RequestParam("warehouseid") String warehouseid,
-                                                  @RequestParam("stackingId") BigDecimal stackingId,
-                                                  @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
-                                                  @RequestParam("pageNum") Integer pageNum,
-                                                  @RequestParam("pageSize") Integer pageSize,
-                                                  @RequestParam("apiId") Integer apiId){
-        return wmsFeign.getMaterialTypeList(warehouseid,stackingId,gradtionNumber,pageNum,pageSize,apiId);
+
+
+//    @PostMapping("/createRestackMakeResult")
+//    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+//                                                  @RequestParam("beforeLevel")BigDecimal  beforeLevel,
+//                                                  @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
+//                                                  @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
+//                                                  @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+//                                                  @RequestParam("resultRemark")String resultRemark,
+//                                                  @RequestBody(required = false) List<Map<String,Object>> mps){
+//        return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
+//    }
+
+
+
+
+        //    获取物资类型
+        @PostMapping(value = "/getMaterialTypeList")
+        public Map<String, Object> getMaterialTypeList (@RequestParam("warehouseid") String warehouseid,
+                @RequestParam("stackingId") BigDecimal stackingId,
+                @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
+                @RequestParam("pageNum") Integer pageNum,
+                @RequestParam("pageSize") Integer pageSize,
+                @RequestParam("apiId") Integer apiId){
+            return wmsFeign.getMaterialTypeList(warehouseid, stackingId, gradtionNumber, pageNum, pageSize, apiId);
+        }
+
+
+    @ApiOperation("进入出库扫码页面，查询出库物资信息详情")
+    @GetMapping("/wmspoutboundresults/getInitOutboundScanResultMaterialInfo")
+    @ApiImplicitParam(name = "resultId",value = "出库实绩id",paramType = "BigDecimal",required = true)
+    public RESTfulResult getInitOutboundScanResultMaterialInfo(@RequestParam(value = "resultId",required = true) BigDecimal resultId){
+        return wmsFeign.getInitOutboundScanResultMaterialInfo(resultId);
+    }
+
+    @PostMapping("/wmspoutboundresults/deleteGridMaterial")
+    public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode){
+        return wmsFeign.deleteGridMaterial(materialOnlyCode);
     }
 
-//    创建倒垛单
     @PostMapping(value = "/createRestackMakeResult")
-    public Map<String,Object> createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
-                                                      @RequestParam("beforeLevel")BigDecimal  beforeLevel,
-                                                      @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
-                                                      @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
-                                                      @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
-                                                      @RequestParam("resultRemark")String resultRemark,
-                                                      @RequestBody(required = false) List<Map<String,Object>> mps){
-        return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
+    public Map<String, Object> createRestackMakeResult (@RequestParam("keeperId") BigDecimal keeperId,
+                                                        @RequestParam("beforeLevel") BigDecimal beforeLevel,
+                                                        @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
+                                                        @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
+                                                        @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+                                                        @RequestParam("resultRemark") String resultRemark,
+                                                        @RequestBody(required = false) List < Map < String, Object >> mps){
+        return wmsFeign.createRestackMakeResult(keeperId, beforeLevel, afterStackingId, afterWarehouseId, afterBeforeStackingId, resultRemark, mps);
     }
+
     //修改实时库存,针对倒垛
     @PostMapping(value = "/updateWmspGridMaterialForRestack")
-    public Map<String,Object> updateWmspGridMaterialForRestack(@RequestBody Map<String,Object> mapValue) {
+    public Map<String, Object> updateWmspGridMaterialForRestack (@RequestBody Map < String, Object > mapValue){
         return wmsFeign.updateWmspGridMaterialForRestack(mapValue);
     }
 
 
+    //修改实时库存,针对倒垛
+    @PostMapping(value = "/getStockTakingList")
+    public Map<String, Object> getStockTakingList (@RequestParam(value = "pageNum") Integer pageNum,
+                                                   @RequestParam(value = "pageSize") Integer pageSize,
+                                                   @RequestParam(value = "apiId") Integer apiId){
+        return wmsFeign.getStockTakingList(pageNum, pageSize, apiId);
+    }
+    //    根据倒垛单ID获得物资类型
+    @GetMapping(value = "getRestackMakeTypeResult")
+    public Map<String, Object> getRestackMakeTypeResult (@RequestParam("restackMake") String restackMake,
+                                                         @RequestParam("context") String context){
+        return wmsFeign.getRestackMakeTypeResult(restackMake, context);
+    }
+    //    改变已经稽核的吊牌信息
+    @GetMapping(value = "changeRestackMakeResult")
+    public int changeRestackMakeResult (@RequestParam("restackMake") String restackMake){
+        return wmsFeign.changeRestackMakeResult(restackMake);
+
+    }
+
+    //PDA根据仓库id查找倒垛单
+    @GetMapping(value = "selectRestackByWarehouseIds")
+    public Map<String, Object> selectRestackByWarehouseIds(@RequestParam("warehouseid") String warehouseid) {
+        return wmsFeign.selectRestackByWarehouseIds(warehouseid);
+    }
+
+    //修改实时库存,针对倒垛
+    @PostMapping(value = "/insertStockTaking")
+    public Map<String,Object> insertStockTaking(@RequestParam(value = "warehouseId") String warehouseId,
+                                                @RequestParam(value = "materialCode") String materialCode,
+                                                @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(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  Integer warehouseId,
+                                                   String con) {
+        return wmsFeign.getSteelMaterialList(mapVal ==null? new HashMap<>():mapVal,pageNum,pageSize,apiId,warehouseId,con);
+    }
+    //    查询所有的钢材物资规格型号信息
+    @PostMapping(value = "/getSteelMaterialModelList")
+    public Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        @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,
+                                                        @RequestParam(value = "con") String con) {
+        return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,con);
+    }
+//    根据对应的入库实绩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(@RequestBody(required = false) 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/RmsFeign.java

@@ -107,6 +107,15 @@ public interface RmsFeign {
     //删除承运商
     @PostMapping(value = "api/v1/rms/rmscarrier/deleteCarrier/{id}")
     Map<String, Object> deleteCarrier(@PathVariable("id") BigDecimal id);
+    //    处理承运商照片
+    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier1")
+    int uploadCarrier1(@RequestParam("file") MultipartFile multipartFile);
+    //    处理承运商照片
+    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier2")
+    int uploadCarrier2(@RequestParam("file") MultipartFile multipartFile);
+    //    处理承运商照片
+    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier3")
+    int uploadCarrier3(@RequestParam("file") MultipartFile multipartFile);
     //    更新承运商信息
     @PostMapping(value = "api/v1/rms/rmscarrier/updateCarrier")
     Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map);
@@ -591,4 +600,6 @@ public interface RmsFeign {
     @ApiOperation(value="创建", notes="查询油品名称")
     @PostMapping(value = "api/v1/rms/rmsoilprice/oilNameSelect")
     Map<String, Object> oilNameSelect();
+
+
 }

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

@@ -425,6 +425,14 @@ public interface TmsTruckFeign {
                                          @RequestParam("carrierSsoId")   String carrierSsoId
     );
 
+    //采购内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getPurInwardReport")
+    Map<String, Object> getPurInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
 
     @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
     Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);

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

@@ -2,6 +2,9 @@ package com.steerinfo.dil.feign;
 
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -26,13 +29,53 @@ 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 Integer warehouseId,
+                                            @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 Integer warehouseId,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+
+
+    /**
+     * 展示预留入库实绩信息
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsReservedResult", method = RequestMethod.POST)
+    Map<String, Object> getWmsReservedResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String con);
     /**
      * 展示出库实绩
      *
@@ -46,7 +89,9 @@ public interface WMSFeign {
                                               @RequestParam Integer apiId,
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
-                                              @RequestParam String con);
+                                              @RequestParam Integer warehouseId,
+                                              @RequestParam String  startTime,
+                                              @RequestParam String  endTime);
 
     /**
      * 新增出库实绩
@@ -109,8 +154,22 @@ public interface WMSFeign {
                                                @RequestParam Integer apiId,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
+                                               @RequestParam String warehouseId,
+                                               @RequestParam String time,
                                                @RequestParam String con);
 
+    /**
+     * 展示实时库存数据
+     *
+     * @param
+     * @param
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/getGridMaterialAgeList", method = RequestMethod.POST)
+    Map<String, Object> getGridMaterialAgeList(@RequestBody(required = false) Map<String, Object> map,
+                                               @RequestParam Integer warehouseId);
+
     /**
      * 通过成品仓库网格ID查询实时库存数据
      *
@@ -496,7 +555,11 @@ public interface WMSFeign {
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
-                                    @RequestParam String con);
+                                    @RequestParam String value);
+
+    //库存结转定时器
+    @PostMapping(value = "/api/v1/wms/inventoryClose/addInventoryClose")
+    RESTfulResult addInventoryClose();
 
     /**
      * 收发存报表
@@ -506,7 +569,10 @@ public interface WMSFeign {
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize,
-                                 @RequestParam String con);
+                                 @RequestParam String con,
+                                 @RequestParam String startTime,
+                                 @RequestParam String endTime
+                                 );
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩
@@ -698,7 +764,23 @@ public interface WMSFeign {
 
     //抢单
     @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
-    public RESTfulResult getNewDistribute(@RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
+
+    public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
+
+
+//
+//    @PostMapping("/api/v1/wms/wmsprestackmakeresults/createRestackMakeResult")
+//    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+//                                                  @RequestParam("beforeLevel")BigDecimal  beforeLevel,
+//                                                  @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
+//                                                  @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
+//                                                  @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+//                                                  @RequestParam("resultRemark")String resultRemark,
+//                                                  @RequestBody(required = false) List<Map<String,Object>> mps);
+    @GetMapping("/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseIds")
+    public  Map<String, Object> selectRestackByWarehouseIds(@RequestParam(required = true) String warehouseid);
+    @GetMapping("/api/v1/wms/wmsprestackmaketyperesults/getRestackMakeTypeResult")
+    public Map<String, Object> getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,@RequestParam("context")String context);
 
     @PostMapping(value = "/api/v1/wms/wmspgridmaterials/getMaterialTypeList")
     Map<String, Object> getMaterialTypeList(@RequestParam("warehouseid") String warehouseid,
@@ -714,11 +796,74 @@ public interface WMSFeign {
                                                 @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
                                                 @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
                                                 @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
-                                                @RequestParam("resultRemark") String resultRemark,
-                                                @RequestBody(required = false) List<Map<String, Object>> mps);
+                                                @RequestParam("resultRemark")String resultRemark,
+                                                @RequestBody(required = false) List<Map<String,Object>> mps);
+    @GetMapping("/api/v1/wms/wmspoutboundresults/getInitOutboundScanResultMaterialInfo")
+    public RESTfulResult getInitOutboundScanResultMaterialInfo(@RequestParam(value = "resultId",required = true) BigDecimal resultId);
+    @PostMapping("/api/v1/wms/wmspoutboundresults/deleteGridMaterial")
+    public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode);
+
+
+
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/changeRestackMakeResult")
+    int changeRestackMakeResult(@RequestParam("restackMake") String restackMake);
 
     @PostMapping("/api/v1/wms/wmspgridmaterials/updateWmspGridMaterialForRestack")
     Map<String,Object> updateWmspGridMaterialForRestack(@RequestBody Map<String,Object> map);
 
+    @PostMapping("/api/v1/wms/wmspgridmaterials/insertStockTaking")
+    Map<String,Object> insertStockTaking(@RequestParam(value = "warehouseId") String warehouseId,
+                                         @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,
+                                          @RequestParam(value = "apiId") Integer apiId);
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialList")
+    Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String con);
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialModelList")
+    Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @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,
+                                                 @RequestParam(value = "con") String con);
+
+
+    @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/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -14,6 +14,8 @@ import java.util.Map;
 
 @Mapper
 public interface UniversalMapper {
+     int updateLineSqe(Map<String, Object> map);
+
     //通过运输订单号查询订单信息
     Map<String, Object> getTiHuoDan(String orderNumber);
 

src/main/java/com/steerinfo/dil/util/test.java

@@ -0,0 +1,4 @@
+package com.steerinfo.dil.util;
+
+public class test {
+}

src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
     password: root123
-    username: dagang
+    username: DAGANG
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api
@@ -32,8 +32,8 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.33.162:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
-    url: ${JOINFEIGN_URL:localhost:8006}
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
 server:
   port: 8019

src/main/resources/application-prod.yml

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

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

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.UniversalMapper">
+    <update id="updateLineSqe" parameterType="java.util.Map">
+        update omstruck_order oo
+        set oo.order_line_sequence = #{orderLineSqe}
+        where oo.order_id = #{orderId}
+    </update>
     <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
         select OO.ORDER_NUMBER             "orderNumber",
                RC.CAPACITY_NUMBER          "capacityNumber",
@@ -163,12 +168,11 @@
             <if test="index != null">
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
             </if>
-        )
-        <where>
             <if test="con != null">
-                "capacityNumber" like #{con} or "carrierName" like #{con} or
-                "remark" like #{con}
+                and instr(RC.INSERT_UPDATE_REMARK, #{con}) > 0
             </if>
+        )
+        <where>
             <if test="capacityNumber != null">
                 <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
                     "capacityNumber" like '%${item}%'