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

pom.xml

@@ -118,7 +118,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <param>[table-name]</param>&lt;!&ndash;运力&ndash;&gt;-->
+                        <table></table>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -336,13 +337,18 @@ public class AMScontroller{
     }
 
     /**
-     * 下拉框
+     * 获取收货地址
      * @return
      */
-    @GetMapping("getAddressDeliveryAddress")
+    @PostMapping("getAddressDeliveryAddress")
     @ApiOperation(value = "得到地址下拉")
-    public Map<String, Object> getAddressDeliveryAddress(){
-        return amsFeign.getAddressDeliveryAddress();
+    @ApiImplicitParam(name = "apiId",value = "255")
+    public Map<String, Object> getAddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                         Integer apiId,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         String con){
+        return amsFeign.getAddressDeliveryAddress(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @GetMapping("getShipperId")
@@ -490,7 +496,7 @@ public class AMScontroller{
         return amsFeign.getSaleOrderReported(mapValue,pageNum,pageSize,apiId);
     }
     @PostMapping("getAmsSaleOrderApproved")
-    @ApiOperation(value = "查询汽运单价信息")
+    @ApiOperation(value = "查询财务已审批销售订单信息")
     public Map<String, Object> getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
@@ -517,7 +523,7 @@ public class AMScontroller{
     }
     @PostMapping("/addAmsSaleOrder")
     Map<String, Object> addAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.addAmsSaleOrder(mapVal);
+        return amsFeign.addAmsSaleOrder(mapVal==null?new HashMap<>():mapVal);
     }
     @PostMapping("getAmsSaleOrderBySaleOrderId")
     Map<String, Object> getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId) {
@@ -542,7 +548,6 @@ public class AMScontroller{
         }
         return amsFeign.getSaleOrderUpdateLog(saleOrderId,mapValue, pageNum, pageSize, apiId);
     }
-
     @GetMapping(value = "getSalePlanName")
     @ApiOperation(value="获取销售计划名称")
     public Map<String, Object> getSalePlanName(){return amsFeign.getSalePlanName();}
@@ -716,6 +721,23 @@ public class AMScontroller{
 
     //销售订单-固定派单-公开派单-日计划
 
+    @ApiModelProperty(value = "展示销售公司已审核的订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "105", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListBySaleCompany")
+    public Map<String,Object> getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con){
+      return   amsFeign.getSaleOrderListBySaleCompany(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+
+
 
     //展示销售公司已审核销售订单的车序号列表
     @PostMapping("/getSaleOrderList")
@@ -799,17 +821,42 @@ public class AMScontroller{
     public Map<String,Object> updateTruckRailDayPlan(@RequestBody  Map<String, Object> mapVal) {
         return amsFeign.updateTruckRailDayPlan(mapVal);
     }
+    @PostMapping("getDayPlanByDayPlanId/{dayplanId}")
+    Map<String,Object> getDayPlanByDayPlanId(@PathVariable("dayplanId") Integer dayplanId){
+        return amsFeign.getDayPlanByDayPlanId(dayplanId);
+    }
+
+    /**
+     * 修改日期计划 2021年11月20日03:18:05
+     * @param map
+     * @return
+     */
+    @PostMapping("/updateDayPlan")
+    public Map<String,Object> updateDayPlan(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.updateDayPlan(map);
+    }
+
+    /**
+     * 查询所有的承运商
+     * @return
+     */
+    @GetMapping("/getCarrierMes")
+    public  Map<String,Object> getCarrierMes() {
+        return amsFeign.getCarrierMes();
+    }
+
     //展示日计划
     @PostMapping("/getTruckRailDayPlanList")
     @ApiOperation(value = "焦炭日计划")
     public Map<String, Object> getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             Integer apiId) {
+                                             Integer apiId,
+                                                   Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRailDayPlan(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getTruckRailDayPlan(mapValue, pageNum, pageSize, apiId, status);
     }
     //展示日计划
     @PostMapping("/getSzTruckRailDayPlanList")
@@ -817,11 +864,12 @@ public class AMScontroller{
     public Map<String, Object> getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSzTruckRailDayPlan(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getSzTruckRailDayPlan(mapValue, pageNum, pageSize, apiId, status);
     }
 
     //新增钢材发往异地库计划
@@ -830,9 +878,9 @@ public class AMScontroller{
         return amsFeign.addRailOffsetDayplan(mapVal);
     }
     //删除钢材发往异地库计划
-    @PostMapping("/deleteRailOffsetDayplan/{dayPlanId}")
-    public Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayPlanId") BigDecimal dayPlanId) {
-        return amsFeign.deleteRailOffsetDayplan(dayPlanId);
+    @PostMapping("/deleteRailOffsetDayplan/{dayplanId}")
+    public Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayplanId") Integer dayplanId) {
+        return amsFeign.deleteRailOffsetDayplan(dayplanId);
     }
     //修改钢材发往异地库计划
     @PostMapping("/updateRailOffsetDayplan")
@@ -840,17 +888,51 @@ public class AMScontroller{
         return amsFeign.updateRailOffsetDayplan(mapVal);
     }
 
+    //钢材发运到异地库查询物资
+    @PostMapping("/getMaterialMesByDayPlanId")
+    public Map<String,Object> getMaterialMesByDayPlanId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        Integer apiId,
+                                                        Integer dayplanId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getMaterialMesByDayPlanId(mapValue,pageNum,pageSize,apiId,dayplanId);
+    }
+
     //展示钢材发往异地库计划
     @PostMapping("/getRailOffsetDayplan")
     @ApiOperation(value = "展示钢材发往异地库计划")
     public Map<String, Object> getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              Integer apiId) {
+                                              Integer apiId,
+                                              Integer dayplanReceiveStatus,
+                                              Integer carrierId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getRailOffsetDayplan(mapValue, pageNum, pageSize, apiId,dayplanReceiveStatus,carrierId);
+    }
+
+    @PostMapping("/getRailOffsetDayplanId")
+    @ApiOperation(value = "根据ID展示钢材发往异地库计划")
+    public Map<String, Object> getRailOffsetDayplanId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer apiId,
+                                                    Integer dayPlanId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getRailOffsetDayplan(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getRailOffsetDayplanId(mapValue, pageNum, pageSize, apiId,dayPlanId);
+    }
+
+    @ApiModelProperty(value = "下发钢材发往异地库计划")
+    @PostMapping("/issueRailOffsetDayplan")
+    public Map<String,Object> issueRailOffsetDayplan(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.issueRailOffsetDayplan(mapList);
     }
 
     ////************************************内转物流***************************************************
@@ -862,9 +944,35 @@ public class AMScontroller{
         return amsFeign.addTruckPlan(mapVal);
     }
     //删除
-    @PostMapping("/deleteTruckRequirement/{planId}")
-    public Map<String,Object> deleteTruckPlan(@PathVariable("planId") BigDecimal planId) {
-        return amsFeign.deleteTruckPlan(planId);
+    @PostMapping("/deleteTruckPlan/{planId}")
+    public Map<String,Object> deleteTruckPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.deleteTruckPlan(new BigDecimal(planId));
+    }
+
+    //接收
+    @PostMapping("/receiveInwardPlan/{planId}")
+    public Map<String,Object> receiveInwardPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.receiveInwardPlan(new BigDecimal(planId));
+    }
+
+    /**
+     * 修改渲染
+     * @param planId
+     * @return
+     */
+    @PostMapping("/selectInwardPlanToUpdate/{planId}")
+    public Map<String,Object> selectInwardPlanToUpdate(@PathVariable("planId") Integer planId) {
+        return amsFeign.selectInwardPlanToUpdate(new BigDecimal(planId));
+    }
+
+    /**
+     * 下发
+     * @param mapList
+     * @return
+     */
+    @PostMapping("/downTruckPlan")
+    public Map<String,Object> downTruckPlan(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.downTruckPlan(mapList);
     }
     /**
      * 修改运输计划/下发运输计划/承运商接收运输计划
@@ -885,17 +993,20 @@ public class AMScontroller{
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "还未知", required = false, dataType = "BigDecimal")
+            @ApiImplicitParam(name = "apiId", value = "0:257/1,2:258", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getTruckPlanList")
     public Map<String, Object> getTruckPlanList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer apiId) {
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                Integer planStatus,
+                                                Integer carrierId,
+                                                Integer planId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId);
     }
     /**
      *用车单位提出需求
@@ -910,13 +1021,31 @@ public class AMScontroller{
     public Map<String,Object> deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId) {
         return amsFeign.deleteTruckRequirement(requirementId);
     }
+    //下发用车需求
+    @PostMapping("/downRequirement")
+    public Map<String,Object> downRequirement(@RequestBody List<Map<String,Object>> requirementIds) {
+        return amsFeign.downRequirement(requirementIds);
+    }
+
+    //接收用车需求
+    @PostMapping("/receiveRequirement/{requirementId}")
+    public Map<String,Object> receiveRequirement(@PathVariable("requirementId") Integer requirementId) {
+        return amsFeign.receiveRequirement(requirementId);
+    }
     /**
-     * 修改用车需求/下发用车需求
+     * 修改用车需求
      */
     @PostMapping("/updateTruckRequirement")
     public Map<String,Object> updateTruckRequirement(@RequestBody  Map<String, Object> mapVal){
         return amsFeign.updateTruckRequirement(mapVal);
     }
+    /**
+     * 查询修改渲染
+     */
+    @PostMapping("/selectRequirement/{requirementId}")
+    public Map<String,Object> selectRequirement(@PathVariable("requirementId") Integer requirementId) {
+        return amsFeign.selectRequirement(requirementId);
+    }
 
     /**
      * 展示用车需求
@@ -930,17 +1059,19 @@ public class AMScontroller{
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "还未知", required = false, dataType = "BigDecimal")
+            @ApiImplicitParam(name = "apiId", value = "207", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getTruckRequirementList")
     public Map<String, Object> getTruckRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          Integer apiId) {
+                                          Integer apiId,
+                                          Integer requirementStatus,
+                                          String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con);
     }
 
     @ApiOperation(value="查询app端公开抢单")
@@ -955,18 +1086,20 @@ public class AMScontroller{
         return amsFeign.lockDispatchSaleOrder(dispatchId, carrierId);
     }
 
-    @ApiOperation(value="查询app端公开抢单")
+    @ApiOperation(value="查询app端承运商已抢到的单")
     @PostMapping("/getLockDispatchSaleOrderList")
     public Map<String, Object> getLockDispatchSaleOrderList(Integer carrierId) {
         return amsFeign.getLockDispatchSaleOrderList(carrierId);
     }
 
+    @ApiOperation(value="查询PC端承运商已抢到的单")
     @PostMapping("/selectDispatchSaleOrderList")
     public Map<String, Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                            Integer apiId,
                                                            Integer pageNum,
-                                                           Integer pageSize){
-        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+                                                           Integer pageSize,
+                                                           Integer carrierId){
+        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierId);
     }
 
     //获取到站名称
@@ -975,18 +1108,98 @@ public class AMScontroller{
         return amsFeign.getArriveName();
     }
 
-    @ApiModelProperty(value = "查询所有的钢材物资")
+//    @ApiModelProperty(value = "查询所有的钢材物资")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
+//    })
+//    @PostMapping("/getAllSteelMaterialMes")
+//    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+//                                                Integer pageNum,
+//                                                Integer pageSize,
+//                                                Integer apiId,
+//                                                String con) {
+//        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+//    }
+
+    @ApiModelProperty(value = "查询PC端公开抢单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
+            @ApiImplicitParam(name = "apiId", value = "242", required = false, dataType = "Integer")
     })
-    @PostMapping("/getAllSteelMaterialMes")
-    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer apiId,
-                                                String con) {
-        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    @PostMapping("/getPCDispatchSaleOrderList")
+    public Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      Integer dispatchType,
+                                                      String con) {
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType, con);
+    }
+
+    @ApiModelProperty(value = "展示批次信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "252", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getPurchaseIdByBatch")
+    public Map<String, Object> getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          Integer apiId) {
+        return amsFeign.getPurchaseIdByBatch(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+    }
+
+    @ApiModelProperty(value = "仓库模代框")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "251", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getWareHouse")
+    public Map<String, Object> getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer apiId,
+                                                    String con) {
+        return amsFeign.getWareHouse(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @ApiModelProperty(value = "车型下拉")
+    @GetMapping("/getCapacityType")
+    public Map<String,Object> getCapacityType() {
+         return amsFeign.getCapacityType();
+    }
+
+    @ApiModelProperty(value = "用车单位下拉")
+    @GetMapping("/getShipperUser")
+    public Map<String,Object> getShipperUser() {
+        return amsFeign.getShipperUser();
+    }
+
+    @ApiModelProperty(value = "承运商下拉")
+    @GetMapping("/getCarrierList")
+    public Map<String,Object> getCarrierList() {
+        return amsFeign.getCarrierList();
+    }
+
+    @ApiModelProperty(value = "到站下拉")
+    @GetMapping("/getdayPlanToTheStationId")
+    public Map<String,Object> getdayPlanToTheStationId() {
+        return amsFeign.getdayPlanToTheStationId();
+    }
+
+    @ApiModelProperty(value = "异地库下拉")
+    @GetMapping("/getOffsetWarehouse")
+    public Map<String,Object> getOffsetWarehouse() {
+        return amsFeign.getOffsetWarehouse();
+    }
+
+    @PostMapping("/finishTruckPlan/{planId}")
+    public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId){
+        return amsFeign.finishTruckPlan(planId);
     }
 }

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

@@ -4,11 +4,13 @@ import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -124,9 +126,9 @@ public class OMSController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
     })
-    @PostMapping("/driverReceiveOrRefuse/{orderId}")
-    public Map<String, Object> driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId, Integer orderReceiveStatus) {
-        return omsFeign.driverReceiveOrRefuse(orderId, orderReceiveStatus);
+    @PostMapping("/driverReceiveOrRefuse")
+    public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map) {
+        return omsFeign.driverReceiveOrRefuse(map);
     }
 
 
@@ -201,16 +203,15 @@ public class OMSController {
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
-    @PostMapping("/getTransportDispatch/{orderReceiveStatus}")
+    @PostMapping("/getTransportDispatch")
     public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              @PathVariable Integer orderReceiveStatus,
                                               Integer orderType,
                                               Integer orderStatus, Integer fuelOrder,String con){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderReceiveStatus, orderType, orderStatus, fuelOrder, con);
+                 orderType, orderStatus, fuelOrder, con);
     }
 
     /**
@@ -334,6 +335,7 @@ public class OMSController {
                                                                  @RequestParam Integer pageSize) {
         return omsFeign.getWaterSlagDayPlanAndRecivedList(map==null?new HashMap<>():map, carrierId, apiId, pageNum, pageSize);
     }
+    @ApiOperation(value="通过物资ID和发货单位ID查找采购订单号")
     @PostMapping("/selectNewOrderId")
     public Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map){
         return omsFeign.selectNewOrderId(map);
@@ -405,8 +407,9 @@ public class OMSController {
     @PostMapping("/addAppTruckOrder")
     public Map<String, Object> addAppTruckOrder(Integer dispatchId,
                                                 Integer orderType,
-                                                Integer driverCapacityId) {
-        Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType, driverCapacityId);
+                                                String capacityNumber,
+                                                Integer carrierId) {
+        Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType,capacityNumber, carrierId);
         return map;
     }
     //展示销售订单信息
@@ -491,4 +494,130 @@ public class OMSController {
         return omsFeign.selectInfoByDayPlanId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, dayPlanId, orderType);
     }
 
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping("/closeOmstruckOrder")
+    public Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId) {
+        Map<String, Object> map = omsFeign.closeOmstruckOrder(orderId);
+        return map;
+    }
+
+    @ApiOperation(value="siji")
+    @PostMapping("/getCapacityAndDriverList")
+    public Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                        Integer apiId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con);
+        return map;
+    }
+
+    //查询所有的收货单位
+    @GetMapping("/getReceivingUnit")
+    public Map<String, Object> getReceivingUnit(){
+        return omsFeign.getReceivingUnit();
+    }
+
+
+    //查询所有的发货单位（供应商）
+    @GetMapping("/getSupplier")
+    public Map<String, Object> getSupplier(){
+        return omsFeign.getSupplier();
+    }
+
+    @ApiOperation(value = "关闭订单")
+    @PostMapping("/CloseOrder")
+    public  Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map){
+        return  omsFeign.CloseOrder(map);
+    }
+
+    @ApiOperation(value = "分解内转计划（新增运输订单）")
+    @PostMapping("/addInwardOrder")
+    public Map<String,Object> addInwardOrder(@RequestBody Map<String,Object> mapValue) {
+        return omsFeign.addInwardOrder(mapValue);
+    }
+
+    @ApiOperation(value = "分派计划")
+    @PostMapping("/apportionInwardOrder")
+    public Map<String,Object> apportionInwardOrder(@RequestBody List<Map<String,Object>> mapList) {
+        return omsFeign.apportionInwardOrder(mapList);
+    }
+
+    @ApiOperation(value="分解计划查询")
+    @PostMapping("/getInwardOrderList")
+    public Map<String, Object> getInwardOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer orderStatus,
+                                                  Integer carrierId,
+                                                  String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con);
+        return map;
+    }
+
+    @ApiOperation(value = "司机APP端查询下发给自己运输订单")
+    @PostMapping("/sendOrderToApp")
+    public List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber) {
+        return omsFeign.sendOrderToApp(capacityNumber);
+    }
+
+    @ApiOperation(value = "分解异地库计划")
+    @PostMapping("/apportionInwardOffsetOrder")
+    public Map<String,Object> apportionInwardOffsetOrder(@RequestBody Map<String,Object> mapvalue) {
+        return omsFeign.apportionInwardOffsetOrder(mapvalue);
+    }
+
+    @ApiOperation(value = "查询司机的所有运输订单信息")
+    @PostMapping("/getAllOrderMessage")
+    public List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber) {
+        return omsFeign.getAllOrderMessage(capacityNumber);
+    }
+
+    @ApiOperation(value = "司机确认订单")
+    @PostMapping("/driverConfirmation")
+    public Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        return omsFeign.driverConfirmation(mapvalue);
+    }
+    @ApiOperation(value = "通过运输订单号查询订单信息给司机")
+    @PostMapping("/getMessageToApp")
+    public Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        return omsFeign.getMessageToApp(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询所有已下发未接收的订单信息")
+    @PostMapping("/getAllOrderMessagesByCapacityNum")
+    public List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue){
+        return  omsFeign.getAllOrderMessagesByCapacityNum(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("/getReceiveOrderIdListByCapacityNum")
+    public List<Integer> getReceiveOrderIdListByCapacityNum(@RequestBody(required = false) Map<String, Object> mapvalue) {
+        return omsFeign.getReceiveOrderIdListByCapacityNum(mapvalue);
+    }
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("/getAllRefuseOrderNumberByCapacity")
+    public List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue){
+        return omsFeign.getAllRefuseOrderNumberByCapacity(mapvalue);
+    }
+
+    @ApiOperation(value = "添加退货实绩关闭当前订单")
+    @PostMapping("/returnOrderCloseOrder")
+    public Map<String,Object> returnOrderCloseOrder(@RequestBody(required = false) Map<String, Object> map){
+        return omsFeign.returnOrderCloseOrder(map);
+    }
+
+    @ApiOperation(value = "根据运单id查询实绩位置")
+    @PostMapping("/getOrderResult")
+    public List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map){
+        return omsFeign.getOrderResult(map);
+    }
 }

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

@@ -15,39 +15,40 @@ import java.util.Map;
 public class RMScontroller {
     @Autowired
     RmsFeign rmsFeign;
+
     @ApiOperation(value="展示司机信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(218)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(339)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getCarDriverList")
     public Map<String, Object> getCarDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize
     ){
         return   rmsFeign.getCarDriverList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
     @ApiOperation(value="创建", notes="根据RmsCarDriver对象创建")
     @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
-    //@RequiresPermissions("rmscardriver:create")
     @PostMapping(value = "/insertCarDriver")
     public Map<String, Object> insertCarDriver(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertCarDriver(map);
     }
 
-//    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
-//            @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
-//    })
-//    @PostMapping(value = "/updateCarDriver/{id}")
-//    RESTfulResult updateCarDriver(@PathVariable("id") String id) {
-//        return rmsFeign.updateCarDriver(id);
-//    }
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
+    })
+    @PostMapping(value = "/updateCarDriver", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateCarDriver(@RequestBody Map<String, Object> map){
+        return rmsFeign.updateCarDriver(map);
+    }
+
     @ApiOperation(value="删除司机信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息删除司机信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
@@ -57,6 +58,24 @@ public class RMScontroller {
     Map<String, Object> deleteCarDriver(@PathVariable("id") BigDecimal id) {
         return rmsFeign.deleteCarDriver(id);
     }
+
+    @ApiOperation(value="获取司机详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getCarDriverById/{id}")
+    public Map<String, Object> getCarDriverById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getCarDriverById(id);
+    }
+    @PostMapping("/getCarDriverResultList")
+    @ApiOperation(value = "模糊查询司机")
+    public Map<String, Object> getCarDriverResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      String con) {
+
+        return rmsFeign.getCarDriverResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
     //获取承运商列表
     @ApiOperation(value="获取承运商列表")
     @ApiImplicitParams({
@@ -69,11 +88,15 @@ public class RMScontroller {
 
     @PostMapping("/getCarrierList")
     public Map<String, Object> getCarrierList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
     ){
-        return   rmsFeign.getCarrierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return   rmsFeign.getCarrierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
     @ApiOperation(value="新建承运商", notes="根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
@@ -87,6 +110,20 @@ public class RMScontroller {
     public Map<String, Object> deleteCarrier(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteCarrier(id);
     }
+
+    @ApiOperation(value="更新承运商", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
+    @PostMapping(value = "/updateCarrier")
+    public Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateCarrier(map);
+    }
+    @ApiOperation(value="根据id查询详细承运商信息", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
+    @PostMapping(value = "/getCarrierById/{id}")
+    public Map<String, Object> getCarrierById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getCarrierById(id);
+    }
+
     //获取物资列表
     @ApiOperation(value="获取物资列表")
     @ApiImplicitParams({
@@ -96,14 +133,14 @@ public class RMScontroller {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
-
     @PostMapping("/getMaterialList")
     public Map<String, Object> getMaterialList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
     ){
-        return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
     @ApiOperation(value="新增物资", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
@@ -117,6 +154,20 @@ public class RMScontroller {
     public Map<String, Object> deleteMaterial(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteMaterial(id);
     }
+
+    @ApiOperation(value="更新物资", notes="根据rmsMaterial对象创建")
+    @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
+    @PostMapping(value = "/updateMaterial")
+    public Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateMaterial(map);
+    }
+    @ApiOperation(value="根据id查询原料信息", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
+    @PostMapping(value = "/getMaterialById/{id}")
+    public Map<String, Object> getMaterialById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getMaterialById(id);
+    }
+
     @ApiOperation(value="获取人员信息列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -127,12 +178,15 @@ public class RMScontroller {
     })
 
     @PostMapping("/getPersonnelList")
-    public Map<String, Object> getPersonnelList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize
+    public Map<String, Object> getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+
+                                                String con
     ){
-        return   rmsFeign.getPersonnelList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+
+        return   rmsFeign.getPersonnelList(mapVal==null?new HashMap<>():mapVal, apiId, pageNum, pageSize,con);
     }
     @ApiOperation(value="新增人员信息", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
@@ -140,13 +194,28 @@ public class RMScontroller {
     public Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertPersonnel(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiOperation(value="删除", notes="根据rmsPersonnel对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
     @PostMapping(value = "/deletePersonnel/{id}")
     public Map<String, Object> deletePersonnel(@PathVariable("id")BigDecimal id){
         return rmsFeign.deletePersonnel(id);
     }
-    @ApiOperation(value="获取承运商列表")
+
+    @ApiOperation(value="更新人员信息", notes="根据rmsMaterial对象创建")
+    @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
+    @PostMapping(value = "/updatePersonnel")
+    public Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updatePersonnel(map);
+    }
+    @ApiOperation(value="根据id更新详细人员信息", notes="根据rmsPersonnel对象创建")
+    @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
+    @PostMapping(value = "/getPersonnelById/{personnelId}")
+    public Map<String, Object> getPersonnelById(@PathVariable("personnelId")BigDecimal personnelId){
+        return rmsFeign.getPersonnelById(personnelId);
+    }
+
+    @ApiOperation(value="获取托运人列表")
+
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -157,24 +226,42 @@ public class RMScontroller {
 
     @PostMapping("/getShipperList")
     public Map<String, Object> getShipperList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
     ){
-        return   rmsFeign.getShipperList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return   rmsFeign.getShipperList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
-    @ApiOperation(value="新增人员信息", notes="根据rmsShipper对象创建")
+
+    @ApiOperation(value="新增托运人信息", notes="根据rmsShipper对象创建")
     @ApiImplicitParam(name = "rmsShipper", value = "详细实体rmsShipper", required = true, dataType = "rmsShipper")
     @PostMapping(value = "/insertShipper")
     public Map<String, Object> insertShipper(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertShipper(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
-    @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
+
+
+    @ApiImplicitParam(name = "托运人id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteShipper/{id}")
     public Map<String, Object> deleteShipper(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteShipper(id);
     }
+
+    @ApiOperation(value="更新托运人信息", notes="根据rmsShipper对象创建")
+    @ApiImplicitParam(name = "rmsShipper", value = "详细实体rmsShipper", required = true, dataType = "rmsShipper")
+    @PostMapping(value = "/updateShipper")
+    public Map<String, Object> updateShipper(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateShipper(map);
+    }
+    @ApiOperation(value="根据id查询详细托运人信息", notes="根据rmsShipper对象创建")
+    @ApiImplicitParam(name = "托运人id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/getShipperById/{id}")
+    public Map<String, Object> getShipperById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getShipperById(id);
+    }
+//    获取供应商列表
+
     @ApiOperation(value="展示供应商信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -186,24 +273,39 @@ public class RMScontroller {
 
     @PostMapping("/getSupplierList")
     public Map<String, Object> getSupplierList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
     ){
-        return   rmsFeign.getSupplierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return   rmsFeign.getSupplierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
-    @ApiOperation(value="新增供应商信息", notes="根据rmsShipper对象创建")
+    @ApiOperation(value="新增供应商信息", notes="根据rmsSupplier对象创建")
     @ApiImplicitParam(name = "rmsSupplier", value = "详细实体rmsSupplier", required = true, dataType = "rmsSupplier")
     @PostMapping(value = "/insertSupplier")
     public Map<String, Object> insertSupplier(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertSupplier(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiOperation(value="删除", notes="根据rmsSupplier对象创建")
     @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteSupplier/{id}")
     public Map<String, Object> deleteSupplier(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteSupplier(id);
     }
+
+    @ApiOperation(value="更新供应商信息", notes="根据rmsSupplier对象创建")
+    @ApiImplicitParam(name = "rmsSupplier", value = "详细实体rmsSupplier", required = true, dataType = "rmsSupplier")
+    @PostMapping(value = "/updateSupplier")
+    public Map<String, Object> updateSupplier(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateSupplier(map);
+    }
+    @ApiOperation(value="根据id查询供应商信息", notes="根据rmsSupplier对象创建")
+    @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/getSupplierById/{id}")
+    public Map<String, Object> getSupplierById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getSupplierById(id);
+    }
+    //    展示运力信息
     @ApiOperation(value="展示运力信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -233,6 +335,35 @@ public class RMScontroller {
     public Map<String, Object> deleteCapacity(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteCapacity(id);
     }
+
+    @ApiOperation(value="获取运力详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getCapacityById/{id}")
+    public Map<String,Object> getCapacityById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getCapacityById(id);
+    }
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCapacity信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),
+            @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "RmsCapacity")
+    })
+    @PostMapping(value = "/updateCapacity", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateCapacity( @RequestBody Map<String, Object> map){
+
+        return rmsFeign.updateCapacity(map);
+    }
+    @PostMapping("/getCapacityResultList")
+    @ApiOperation(value = "模糊查询运力")
+    public Map<String, Object> getCapacityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     String con) {
+
+        return rmsFeign.getCapacityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+
     @ApiOperation(value="展示汽车衡列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -243,9 +374,9 @@ public class RMScontroller {
     })
     @PostMapping("/getTruckCalculateList")
     public Map<String, Object> getTruckCalculateList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize
     ){
         return   rmsFeign.getTruckCalculateList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
@@ -261,7 +392,39 @@ public class RMScontroller {
     public Map<String, Object> deleteTruckCalculate(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteTruckCalculate(id);
     }
-    @ApiOperation(value="展示原料信息", notes="分页查询")
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "rmsTruckCalculate", value = "详细实体rmsTruckCalculate", required = true, dataType = "RmsTruckCalculate")
+    })
+    @PostMapping(value = "/updateTruckCalculate", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateTruckCalculate(@RequestBody Map<String, Object> map){
+        return rmsFeign.updateTruckCalculate(map);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getTruckCalculateById/{id}")
+    public Map<String,Object> getTruckCalculateById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getTruckCalculateById(id);
+    }
+
+
+    @PostMapping("/getTruckCalculateResultList")
+    @ApiOperation(value = "模糊查询汽车衡")
+    public Map<String, Object> getTruckCalculateResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           String con) {
+
+        return rmsFeign.getTruckCalculateResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+
+
+    @ApiOperation(value="展示原料仓库信息", notes="分页查询")
+
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
@@ -269,14 +432,17 @@ public class RMScontroller {
     })
     @PostMapping(value = "/getWarehouseList")
     public Map<String, Object> getWarehouseList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize
     ){
         return   rmsFeign.getWarehouseList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
+
+
     @ApiOperation(value="新增汽车衡信息", notes="根据rmsWarehouse对象创建")
     @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
+
     @PostMapping(value = "/insertWarehouse")
     public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertWarehouse(map);
@@ -287,12 +453,210 @@ public class RMScontroller {
     public Map<String, Object> deleteWarehouse(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteWarehouse(id);
     }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "RmsWarehouse")
+    })
+    @PostMapping(value = "/updateWarehouse", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateWarehouse( @RequestBody Map<String, Object> map){
+        return rmsFeign.updateWarehouse(map);
+    }
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getWarehouseById/{id}")
+    public Map<String, Object> getWarehouseById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getWarehouseById(id);
+    }
+
+    @PostMapping("/getWarehouseResultList")
+    @ApiOperation(value = "模糊查询原料仓库")
+    public Map<String, Object> getWarehouseResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      String con) {
+
+        return rmsFeign.getWarehouseResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+    @ApiOperation(value="展示司机排班信息", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getDriverCapacityList")
+    public Map<String, Object> getDriverCapacityList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId){
+        return rmsFeign.getDriverCapacityList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="创建", notes="根据RmsDriverCapacity对象创建")
+    @ApiImplicitParam(name = "rmsDriverCapacity", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
+    @PostMapping(value = "/insertDriverCapacity")
+    public Map<String, Object> insertDriverCapacity(@RequestBody(required = false) Map<String, Object> map ){
+        return rmsFeign.insertDriverCapacity(map);
+    }
+
+
+    @ApiOperation(value="展示门岗信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+    @PostMapping("/getGatepostList")
+    public Map<String, Object> getGatepostList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
+    ){
+        return   rmsFeign.getGatepostList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
+    @ApiOperation(value="新增门岗信息", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "rmsGatepost", value = "详细实体rmsGatepost", required = true, dataType = "rmsGatepost")
+    @PostMapping(value = "/insertGatepost")
+    public Map<String, Object> insertGatepost(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertGatepost(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteGatepost/{id}")
+    public Map<String, Object> deleteGatepost(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteGatepost(id);
+    }
+
+    @ApiOperation(value="更新门岗信息", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "rmsGatepost", value = "详细实体rmsGatepost", required = true, dataType = "rmsGatepost")
+    @PostMapping(value = "/updateGatepost")
+    public Map<String, Object> updateGatepost(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateGatepost(map);
+    }
+    @ApiOperation(value="根据id查询门岗规则信息", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/getGatepostById/{id}")
+    public Map<String, Object> getGatepostById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getGatepostById(id);
+    }
+
+
     //*******************************下拉框************************
-    @GetMapping("getCapacityId")
+    @GetMapping("getCapacityTypeId")
     @ApiOperation(value = "得到下拉运力id")
-    public Map<String, Object> getCapacityId() {
-        return rmsFeign.getCapacityId();
+    public Map<String, Object> getCapacityTypeId() {
+        return rmsFeign.getCapacityTypeId();
+    }
+
+    @GetMapping(value = "getWarehouseTypeId")
+    @ApiOperation(value = "获取原料仓库类型下拉id")
+    public Map<String, Object> getWarehouseTypeId(){
+        return rmsFeign.getWarehouseTypeId();
     }
 
+    @GetMapping(value = "getPortId")
+    @ApiOperation(value = "获取港存库所属港口下拉id")
+    public Map<String, Object> getPortId(){
+        return rmsFeign.getPortId();
+    }
+
+    @GetMapping(value="getCarrierId")
+    @ApiOperation(value = "获取承运商下拉id")
+    public Map<String,Object> getCarrierId(){
+        return rmsFeign.getCarrierId();
+    }
 
+    @GetMapping("getMaterialTypeId")
+    @ApiOperation(value = "得到下拉物资类型id")
+    public Map<String, Object> getMaterialTypeId() {
+        return rmsFeign.getMaterialTypeId();
+    }
+
+    @GetMapping("getUnitOfMeasureId")
+    @ApiOperation(value = "得到下拉计量id")
+    public Map<String, Object> getUnitOfMeasureId() {
+        return rmsFeign.getUnitOfMeasureId();
+    }
+
+    @GetMapping("getShipperId")
+    @ApiOperation(value = "得到下拉托运人id")
+    public Map<String, Object> getShipperId() {
+        return rmsFeign.getShipperId();
+    }
+
+    @GetMapping("getGatepostRulesId")
+    @ApiOperation(value = "得到下拉门岗规则id")
+    public Map<String, Object> getGatepostRulesId() {
+        return rmsFeign.getGatepostRulesId();
+    }
+
+    /**
+     * @author huk
+     * @return
+     */
+    //查询所有作业环节
+    @ApiOperation(value="查询所有作业环节")
+    @PostMapping("/getLink")
+    public Map<String, Object> getlink(){
+        return  rmsFeign.getlink();
+    }
+
+    /**
+     * @author huk
+     * @return
+     */
+    //新增运输路线
+    @ApiOperation(value="新增运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @PostMapping("/insertSelective")
+    public Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal){
+        return rmsFeign.insertSelective(mapVal);
+    }
+
+
+    @ApiOperation(value="查询运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "249", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getAllLineDesk")
+    public Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer apiId,
+                                        String con,
+                                              Integer lineType){
+        return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId ,con,lineType);
+    }
+
+    @ApiOperation(value = "根据主键查询出数据以供修改")
+    @PostMapping("/getLinkToUpdate")
+    public Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId) {
+        return rmsFeign.getLinkToUpdate(lineId);
+    }
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据")
+    @PostMapping("/updateByPrimaryKeySelective")
+    public Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal) {
+        return rmsFeign.updateByPrimaryKeySelective(mapVal);
+    }
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
+    @PostMapping("/updateRmsLine")
+    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal){
+        return  rmsFeign.updateRmsLine(mapVal);
+    }
+
+    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
+    @PostMapping("/getCountNumber")
+    public Map<String, Object> getCountNumber(@RequestParam Integer lineId) {
+        return rmsFeign.getCountNumber(lineId);
+    }
 }

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

@@ -1,38 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.service.impl.SelfServiceMachineServiceImpl;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-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 java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/19 18:06
- */
-@RequestMapping("${api.version}/thd")
-@RestController
-public class SelfServiceMachineController extends BaseRESTfulController {
-
-    @Autowired
-    SelfServiceMachineServiceImpl selfServiceMachineService;
-
-    @ApiOperation(value="查询数据打印提货单接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
-    })
-    @PostMapping("/printTHD")
-    public RESTfulResult printTiHuoDan(@RequestBody(required=false) Map<String, Object> mapValue){
-        Map<String, Object> tiHuoDan = selfServiceMachineService.printTiHuoDan((String) mapValue.get("orderNumber"));
-        return success(tiHuoDan);
-    }
-
-}

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

@@ -987,9 +987,10 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  Integer status,
                                                  Integer resultType,
+                                                 Integer resultId,
                                                  String con) {
 
-        return tmsTrainFeign.getAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, resultType,con);
+        return tmsTrainFeign.getAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, resultType,resultId,con);
     }
 
     @ApiOperation(value = "通过Id查询请车作业")
@@ -1056,8 +1057,9 @@ public class TMSController extends BaseRESTfulController {
                                                         Integer pageNum,
                                                         Integer pageSize,
                                                         Integer resultType,
+                                                        Integer status,
                                                         String con) {
-        return tmsTrainFeign.getApproveAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,con);
+        return tmsTrainFeign.getApproveAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,status,con);
     }
 
     @ApiOperation(value = "通过Id查询批车作业")
@@ -1426,9 +1428,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize,String con
+                                          Integer pageSize,
+                                          Integer orderType,
+                                          String con
     ){
-        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,orderType, con);
     }
 
     @ApiOperation(value = "通过ID获取质检实绩 ")
@@ -1452,9 +1456,31 @@ public class TMSController extends BaseRESTfulController {
     //*********************************内转物流tms-train*********************************************************************
     @PostMapping("/addTrainLoadResultForConverted")
     @ApiOperation(value = "内转物流新增装车")
-    public Map<String, Object> addTrainLoadResultForConverted(Map<String, Object> tmstrainLoadingResult) {
-        Map<String, Object> mes = tmsTrainFeign.addTrainLoadResultForConverted(tmstrainLoadingResult);
-        return mes;
+    public Map<String, Object> addTrainLoadResultForConverted(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {
+        return tmsTrainFeign.addTrainLoadResultForConverted(tmstrainLoadingResult);
+    }
+
+    @ApiOperation(value = "内转新增卸车实绩")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/addTmsTrainUnloadResultForNZ")
+    public Map<String, Object> addTmsTrainUnloadResultForNZ(@RequestBody(required = false)Map<String, Object> map) {
+        return tmsTrainFeign.addTmsTrainUnloadResultForNZ(map);
+    }
+
+    @ApiOperation(value = "查询车皮物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(213)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/getMaterialAndCarByLoadingId")
+    public Map<String, Object> getMaterialAndCarByLoadingId(
+            @RequestBody(required = false) Map<String, Object> mapValue,
+            Integer apiId,
+            Integer pageNum,
+            Integer pageSize,
+            Integer loadingId,
+            Integer unloadingId) {
+        return tmsTrainFeign.getMaterialAndCarByLoadingId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, loadingId, unloadingId);
     }
 
     @PostMapping("/selectLoadByResultId/{resultId}")
@@ -1482,11 +1508,19 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getTmstrainWagonLoadForConverted(apiId, pageNum, pageSize,con);
     }
 
-    @PostMapping("/addWagonApprove")
-    @ApiOperation(value = "内转物流新增装车")
-    public Map<String, Object> addWagonApprove(Map<String, Object> tmstrainLoadingResult) {
-        Map<String, Object> mes = tmsTrainFeign.addWagonApprove(tmstrainLoadingResult);
-        return mes;
+    @PostMapping("/addWagonPleaseForNZ")
+    @ApiOperation(value = "内转物流新增请车")
+    public Map<String, Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {
+        return tmsTrainFeign.addPleaseForNZ(tmstrainLoadingResult);
+    }
+
+    @ApiOperation(value="内转新增达州站-厂内装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+        @PostMapping("/addDaZhouToDaGangLoadResult")
+    public Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map){
+        return tmsTruckFeign.addDaZhouToDaGangLoadResult(map);
     }
 
     @ApiOperation(value = "内转查询请车作业信息")
@@ -1626,7 +1660,7 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "查询计数实绩列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(364)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
@@ -1637,7 +1671,7 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageNum,
                                                Integer pageSize
     ) {
-        return tmsTruckFeign.selectCountList(mapValue, apiId, pageNum, pageSize);
+        return tmsTruckFeign.selectCountList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
     }
 
     /**
@@ -1670,7 +1704,7 @@ public class TMSController extends BaseRESTfulController {
                                                       Integer pageNum,
                                                       Integer pageSize
     ) {
-        return tmsTruckFeign.getTmstruckMonthResult(mapValue, apiId, pageNum, pageSize);
+        return tmsTruckFeign.getTmstruckMonthResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
     }
 
     /**
@@ -1713,4 +1747,38 @@ public class TMSController extends BaseRESTfulController {
     public Map<String ,Object> getEnfactoryMessageByOrderId(String orderNumber) {
         return tmsTruckFeign.getEnfactoryMessageByOrderId(orderNumber);
     }
+
+    @ApiOperation(value="查询计皮实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(363)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllTimeTaskResult")
+    public RESTfulResult getAllTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
+    ){
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
+    @PostMapping("/addSteelNzReceiptResult")
+    public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTruckFeign.addSteelNzReceiptResult(map);
+    }
+
+
+    @ApiOperation(value="更新计量实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "计量数据", required = false, dataType = "List<Map>"),
+    })
+    @PostMapping("/updateTruckWeight")
+    public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList){
+        return tmsTruckFeign.updateTruckWeight(mapList);
+    }
 }

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

@@ -0,0 +1,258 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.mapper.UniversalMapper;
+import com.steerinfo.dil.service.impl.UniversalServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+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 java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:06
+ * 通用接口
+ */
+@RequestMapping("${api.version}/uc")
+@RestController
+public class UniversalController extends BaseRESTfulController {
+
+    @Autowired
+    UniversalServiceImpl selfServiceMachineService;
+
+    @Autowired
+    UniversalMapper universalMapper;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+
+    @ApiOperation(value="查询数据打印提货单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/printTHD")
+    public RESTfulResult printTiHuoDan(@RequestBody(required=false) Map<String, Object> mapValue){
+        Map<String, Object> tiHuoDan = selfServiceMachineService.printTiHuoDan((String) mapValue.get("orderNumber"));
+        return success(tiHuoDan);
+    }
+
+
+    @ApiModelProperty(value = "模糊查询发货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "247", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/querySupplierByLike")
+    public RESTfulResult querySupplierByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index","%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.querySupplierByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.querySupplierByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "通过物资ID查询该物资的发货单位信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "247", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSupplierMesByMaterialId")
+    public RESTfulResult getSupplierMesByMaterialId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index, String materialId) {
+        if(mapValue == null)
+            mapValue = new HashMap<>();
+
+        if(!"null".equals(materialId))
+            mapValue.put("materialId",materialId);
+
+        if(index != null){
+            mapValue.put("index","%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.getSupplierMesByMaterialId(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getSupplierMesByMaterialId(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+
+    @ApiOperation(value="查询所有空闲的运力信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllCapacityByCarrierLike")
+    public RESTfulResult getAllCapacityByCarrierLike(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        String index
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index + "%");
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
+        return success(pageList);
+    }
+
+
+    @ApiOperation(value="通过订单ID查询订单下所有物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getMaterialMesByOrderId")
+    public RESTfulResult getMaterialMesByOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String orderId
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(orderId != null){
+            mapValue.put("orderId", orderId);
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allCapacity = universalMapper.getMaterialMesByOrderId(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getMaterialMesByOrderId(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
+        return success(pageList);
+    }
+
+    @ApiModelProperty(value = "模糊查询物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryAPOMaterialByLike")
+    public RESTfulResult queryMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", "%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryAPOMaterialByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryAPOMaterialByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+
+    @ApiModelProperty(value = "模糊查询卸货点")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "374", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getUnloadingMesByLike")
+    public RESTfulResult getUnloadingMesByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             Integer type,
+                                             String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(type != null){
+            mapValue.put("type", type);
+        }
+        if(index != null){
+            mapValue.put("index", "%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.getUnloadingMesByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getUnloadingMesByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+    @ApiModelProperty(value = "模糊查询物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryMaterialByLike")
+    public RESTfulResult queryMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index,
+                                             String startNum) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(startNum != null){
+            mapValue.put("startNum", startNum + "%");
+        }
+        if(index != null){
+            mapValue.put("index", "%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryMaterialByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryMaterialByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+}

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,227 +29,328 @@ public class WMSController extends BaseRESTfulController {
     WMSFeign wmsFeign;
     @Autowired
     QMSFeign qmsFeign;
+
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "90", required = false, dataType = "BigDecimal"),
     })
-    public Map<String,Object> getWmsInboundResult( Map<String, Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize){
-        return wmsFeign.getWmsInboundResult(mapValue,apiId,pageNum,pageSize);
+    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);
+    public Map<String, Object> getWmspOutboundResult(@RequestBody(required = false) Map<String,Object> map,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     String con) {
+        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
     }
+
     @PostMapping("/insertWmspOutBoundResult")
     @ApiOperation(value = "新增出单实绩并返回出库单详情")
-    public Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false)Map<String,Object> mapval){
-        Map<String,Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
+    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);
+
+    @PostMapping(value = "/deletewmspOutboundResult")
+    public Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId){
+        return wmsFeign.deleteWmspOutboundResult(resultId);
+    }
+
+    @PostMapping("/insertwmspOutboundScanResult")
+    public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
         return resTfulResult;
     }
+
+    @PostMapping("/outbountResultToSuccess")
+    public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
+        return wmsFeign.outbountResultToSuccess(resultId);
+    }
+
     @PostMapping("/updataResultStatus")
-    public Map<String,Object> updataResultStatus(@RequestParam Integer resultId){
-        Map<String,Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
+    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);
+    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("/OutScanResultTag")
-  public Map<String,Object> OutScanResultTag(@RequestBody(required = false) Map<String,Object> mapval){
-      Map<String,Object> resTfulResult = wmsFeign.OutScanResultTag(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);
+    //查询实时库存数据
+    @PostMapping("/selectGridMaterialList")
+    @ApiOperation(value = "展示实时库存数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      String con) {
+        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
+
+    }
+
+
+    //通过成品仓库网格ID查询实时库存数据
+    @PostMapping("/selectGridMaterialListByGridId")
+    @ApiOperation(value = "通过成品仓库网格ID展示实时库存数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "155", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String,Object> selectGridMaterialListByGridId(BigDecimal gridId) {
+        return wmsFeign.selectGridMaterialListByGridId(gridId);
+
+    }
+
+    //修改物资钢材表的质量是否合格字段和逻辑删除
+    @PostMapping(value = "/updateRmsMaterialSteelDemotion")
+    public Map<String,Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String,Object> map){
+        return wmsFeign.updateRmsMaterialSteelDemotion(map);
+    }
+
+    //钢材异地库出库扫描
+    @PostMapping("/OutScanResultTag")
+    public Map<String, Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.OutScanResultTag(mapval);
         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;
-}
-   //通过下拉框筛选数据
+
+    //钢材异地库出库展示实绩
+    @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,
+                                                               String con) {
+        return wmsFeign.getWmsOffsiteLibaryOutboundList(mapVal == null ? new HashMap<>() : mapVal, pageNum, pageSize, apiId, con);
+    }
+
+    //展示钢材扫描入库实绩列表
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "165", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getWmsOffsiteLibaryInboundList")
+    public Map<String, Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> map,
+                                                              Integer pageNum,
+                                                              Integer pageSize,
+                                                              Integer apiId,
+                                                              String con) {
+        return wmsFeign.getWmsOffsiteLibaryInboundList(map == null ? new HashMap<>() : map, pageNum, pageSize, apiId, con);
+    }
+
+    //钢材异地库扫描入库
+    @PostMapping("/ScanResultTag")
+    public Map<String, Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
+        return resTfulResult;
+    }
+    //获取扫描实绩
+    //钢材异地库扫描入库
+    @PostMapping("/getScanResult")
+    public Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
+        return resTfulResult;
+    }
+
+    //更新状态
+    @PostMapping("/updateStatus")
+    public Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.updateStatus(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("/deleteByResultId/{resultId}")
- public Map<String,Object> deleteByResultId(@PathVariable Integer resultId){
-     Map<String,Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
-     return resTfulResult;
- }
-   //下发倒垛单
+    public Map<String, Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                            Integer pageNum,
+                                                            Integer pageSize,
+                                                            Integer apiId,
+                                                            Integer warehouseid,
+                                                            Integer stackingId,
+                                                            Integer gradtionNumber) {
+        return wmsFeign.getWmspRestackMakeResultList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, warehouseid, stackingId, gradtionNumber);
+    }
+
+
+    @PostMapping(value = "/addRestackMakeResult")
+    public Map<String,Object> addRestackMakeResult(@RequestBody  Map<String,Object> mapval){
+        return wmsFeign.addRestackMakeResult(mapval);
+    }
+
+    //删除倒垛单
+    @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);
+    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
         return resTfulResult;
     }
-  //下拉框获取层次
+
+    //下拉框获取层次
     @GetMapping("/selectGardationNumber")
-    public Map<String,Object> selectGardationNumber(Integer warehouseid, Integer stackingId){
-        Map<String,Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid,stackingId);
+    public Map<String, Object> selectGardationNumber(Integer warehouseid, Integer stackingId) {
+        Map<String, Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid, stackingId);
         return resTfulResult;
     }
+
     //下拉框获取仓库名称
     @GetMapping("/selectWarehouse")
-    public Map<String,Object> selectWarehouse(){
-        Map<String,Object> resTfulResult = wmsFeign.selectWarehouse();
+    public Map<String, Object> selectWarehouse() {
+        Map<String, Object> resTfulResult = wmsFeign.selectWarehouse();
         return resTfulResult;
     }
+
     //下拉框获取仓库名称
     @GetMapping("/selectStackingId")
-    public Map<String,Object> selectStackingId(Integer warehouseid){
-        Map<String,Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
+    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);
+    public Map<String, Object> selectRestackList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 Integer DistrubtionStatus) {
+        return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
+    }
+
+//    //修改倒垛单
+//    @PostMapping("/addRestackMakeResult")
+//    public Map<String, Object> addRestackMakeResult(@RequestBody(required = false) List<Map<String, Object>> mapVal) {
+//        Map<String, Object> resTfulResult = wmsFeign.addRestackMakeResult(mapVal);
+//        return  resTfulResult;
+//    }
+
+    @PostMapping("/editRestackMakeResult")
+    public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
+        Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
+
         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;
-  }
+    }
+
+    //渲染倒垛后的仓库信息
+    @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;
+    }
+   @ApiImplicitParams({
+           @ApiImplicitParam(value = "395",name = "apiId")
+   })
+    @PostMapping(value = "/getRestackInfoByResultId")
+    public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId
+
+    ){
+        return  wmsFeign.getRestackInfoByResultId(mapVal==null?new HashMap<>():mapVal, pageNum, pageSize, apiId);
+    }
+
+    //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
@@ -260,29 +362,59 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @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);
+    public RESTfulResult getWmsReboundResult(Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize) {
+        return wmsFeign.getWmsReboundResult(mapValue, apiId, pageNum, pageSize);
     }
 
+    @PostMapping("/selectScanResultByIboundResultId")
+    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult selectScanResultByIboundResultId( Map<String, Object> mapValue,
+                                                           Integer apiId,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer inboundId) {
+
+        return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
+    }
+   //根据物资信息获取原来垛位信息
+   @PostMapping("/selectInfoByMaterialCode")
+   public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
+        if (mal == null) {
+            mal = new HashMap<>();
+        }
+       return  wmsFeign.selectInfoByMaterialCode(mal);
+   }
+   //根据仓库查询未接收的垛位
+   @PostMapping("/selectStackingInfoByWarehouseId")
+   public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
+       if (mal == null) {
+           mal = new HashMap<>();
+       }
+       return  wmsFeign.selectStackingInfoByWarehouseId(mal);
+   }
 
     @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);
+    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
@@ -294,11 +426,11 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @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);
+    public RESTfulResult getWmsIvboundMaterial(Map<String, Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return wmsFeign.getWmsIvboundMaterial(mapValue, apiId, pageNum, pageSize);
     }
 
     @PostMapping("/getInventoryCheck")
@@ -306,11 +438,11 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @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);
+    public RESTfulResult getInventoryCheck(Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        return wmsFeign.getInventoryCheck(mapValue, apiId, pageNum, pageSize);
     }
 
     @PostMapping("/getInventoryClose")
@@ -318,11 +450,11 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @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);
+    public RESTfulResult getInventoryClose(Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        return wmsFeign.getInventoryClose(mapValue, apiId, pageNum, pageSize);
     }
 
     @PostMapping("/getSendReceive")
@@ -330,92 +462,100 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @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);
+    public RESTfulResult getSendReceive(Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize) {
+        return wmsFeign.getSendReceive(mapValue, apiId, pageNum, pageSize);
     }
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示未下发吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示未下发吊钢工扫描吊牌实绩")
     @PostMapping("/getTagResult")
-    public Map<String,Object> getTagResult(){
+    public Map<String, Object> getTagResult() {
         return wmsFeign.getTagResult();
     }
 
     /**
-     *  展示正常入库吊钢工扫描吊牌实绩
+     * 展示正常入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示正常入库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示正常入库吊钢工扫描吊牌实绩")
     @PostMapping("/getIssuedTagResult")
-    public Map getIssuedTagResult(){
+    public Map getIssuedTagResult() {
         return wmsFeign.getIssuedTagResult();
     }
 
     /**
      * 展示异常入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示异常入库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示异常入库吊钢工扫描吊牌实绩")
     @PostMapping("/getIssuedTagNoResult")
-    public Map getIssuedTagNoResult(){
+    public Map getIssuedTagNoResult() {
         return wmsFeign.getIssuedTagNoResult();
     }
 
     /**
      * 展示已退库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示已退库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示已退库吊钢工扫描吊牌实绩")
     @PostMapping("/getReIssuedResult")
-    public Map getReIssuedResult(){
+    public Map getReIssuedResult() {
         return wmsFeign.getIssuedResult();
     }
 
     /**
      * 展示未下发退库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示未下发退库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
     @PostMapping("/getReTagResult")
-    public Map getReTagResult(){
+    public Map getReTagResult() {
         return wmsFeign.getReTagResult();
     }
 
     /**
      * 展示已倒库入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示已倒库入库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示已倒库入库吊钢工扫描吊牌实绩")
     @PostMapping("/getIvIssuedResult")
-    public Map getIvIssuedResult(){
+    public Map getIvIssuedResult() {
         return wmsFeign.getIvIssuedResult();
     }
 
     /**
      * 展示未下发退库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示未下发退库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
     @PostMapping("/getIvTagResult")
-    public Map getIvTagResult(){
+    public Map getIvTagResult() {
         return wmsFeign.getIvTagResult();
     }
 
     /**
      * 新增入库实绩
+     *
      * @param mapList
      * @return
      */
     @ApiOperation("新增入库实绩")
     @PostMapping("/insertInboundResult")
     @Transactional
-    public String addInvoice(@RequestBody List<Map<String, Object>> mapList) {
+    public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -423,19 +563,20 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
         /*
         获取入库垛位
          */
-        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;
+//        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+//        String stackNo = (String) map1.get("stackNo");
+//        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+//        for (Map<String, Object> map : mapList
+//        ) {
+//            map.put("stackingId", stackId);
+//        }
+
+        return wmsFeign.insertInboundResult(mapList);
     }
 
     /**
      * 新增退库实绩
+     *
      * @param mapList
      * @return
      */
@@ -450,12 +591,12 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
         /*
         获取入库垛位
          */
-        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);
+        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;
@@ -463,6 +604,7 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
 
     /**
      * 新增倒库入库实绩
+     *
      * @param mapList
      * @return
      */
@@ -477,80 +619,165 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
         /*
         获取入库垛位
          */
-        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);
+        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){
+    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) {
+    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){
+    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){
+    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){
+    public Map<String, Object> insertIvboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.insertIvboundScanResult(map);
     }
-/**
- *  根据实绩id查找物资唯一编码是否已经稽核完成
- */
-@PostMapping("/selectMaterialSteelIdByReusltId")
-@Transactional
-public Map<String,Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false)Map<String,Object>map){
-    return wmsFeign.selectMaterialSteelIdByReusltId(map);
-}
 
+    /**
+     * 根据实绩id查找物资唯一编码是否已经稽核完成
+     */
+    @PostMapping("/selectMaterialSteelIdByReusltId")
+    @Transactional
+    public Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map) {
+        return wmsFeign.selectMaterialSteelIdByReusltId(map);
+    }
 
+    //下发指令给行车工
+    @PostMapping("/updateInstruction")
+    public Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map) {
+        return wmsFeign.updateInstruction(map);
+    }
+
+//    @PostMapping("/selectScanResultByIboundResultId")
+//    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
+//    })
+//    public RESTfulResult selectScanResultByIboundResultId(Map<String, Object> mapValue,
+//                                                          Integer apiId,
+//                                                          Integer pageNum,
+//                                                          Integer pageSize) {
+//        return wmsFeign.selectScanResultByIboundResultId(mapValue, apiId, pageNum, pageSize);
+//    }
+
+    @PostMapping("/getIvboundMakeResultList")
+    @ApiOperation(value = "展示倒库列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                  Integer apiId,
+                                                  String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmsFeign.getIvboundMakeResultList(mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    /**
+     * 新增倒库作业
+     * @param mapValue
+     * @return
+     */
+    @PostMapping(value = "/addIvboundMakeResult")
+    public Map<String,Object> addIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
+        return wmsFeign.addIvboundMakeResult(mapValue);
+    }
+
+    /**
+     * 逻辑删除倒库作业
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/deleteIvboundMakeResult/{resultId}")
+    public Map<String,Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
+        return wmsFeign.deleteIvboundMakeResult(resultId);
+    }
+
+    /**
+     * 查询倒库作业
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/selectIvboundMakeResult/{resultId}")
+    public List<Map<String,Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId) {
+        return wmsFeign.selectIvboundMakeResult(resultId);
+    }
+
+    /**
+     * 修改倒库作业
+     * @param mapValue
+     * @return
+     */
+    @PostMapping(value = "/updateIvboundMakeResult")
+    public Map<String,Object> updateIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
+        return wmsFeign.updateIvboundMakeResult(mapValue);
+    }
+    //下发给行车工
+    @PostMapping("/IssueToCrane")
+    Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map){
+        return wmsFeign.IssueToCrane(map);
+    }
 }

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

@@ -5,6 +5,7 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -284,12 +285,18 @@ public interface AmsFeign {
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
 
+
+
     /**
      * 下拉框
      * @return
      */
-    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getAddressDeliveryAddress")
-    Map<String, Object> getAddressDeliveryAddress();
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAddressDeliveryAddress")
+    Map<String, Object> getAddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam String con);
 
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getShipperId")
     Map<String, Object> getShipperId();
@@ -446,6 +453,15 @@ public interface AmsFeign {
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId);
 
+
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompany")
+     Map<String,Object> getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @RequestParam("pageNum") Integer pageNum,
+                                                      @RequestParam("pageSize") Integer pageSize,
+                                                      @RequestParam("apiId") Integer apiId,
+                                                      @RequestParam("con") String con);
+
     /**
      * 查询财务已审批销售订单信息
      * @param mapValue
@@ -579,7 +595,8 @@ public interface AmsFeign {
     Map<String,Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                    @RequestParam("apiId") Integer apiId,
                                                    @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize);
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("carrierId") Integer carrierId);
 
     /**
      * 新增销售订单物资信息
@@ -985,6 +1002,18 @@ public interface AmsFeign {
     //删除日计划
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/deleteTruckRailDayPlan/{dayPlanId}")
     Map<String,Object> deleteTruckRailDayPlan(@PathVariable("dayPlanId") BigDecimal dayPlanId);
+    //通过计划Id查询修改数据
+    @PostMapping("/api/v1/ams/amstruckraildayplans/getDayPlanByDayPlanId/{dayplanId}")
+    Map<String,Object> getDayPlanByDayPlanId(@PathVariable("dayplanId") Integer dayplanId);
+
+    //修改日计划  2021年11月20日03:17:37
+    @PostMapping("/api/v1/ams/amstruckraildayplans/updateDayPlan")
+    public Map<String,Object> updateDayPlan(@RequestBody(required = false) Map<String, Object> map);
+
+    //查询所有承运商
+    @GetMapping("/api/v1/ams/amstruckraildayplans/getCarrierMes")
+    public  Map<String,Object> getCarrierMes();
+
     //修改日计划
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/updateTruckRailDayPlan")
     Map<String,Object> updateTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapVal);
@@ -995,9 +1024,11 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getTruckRailDayPlanList")
     Map<String, Object> getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                      @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize,
-                                      @RequestParam Integer apiId);
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("status") Integer status
+    );
     //查询日计划
     @ApiOperation(value="展示水渣日计划")
     @ApiImplicitParams({
@@ -1005,17 +1036,22 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getSzTruckRailDayPlanList")
     Map<String, Object> getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam Integer pageNum,
-                                        @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId);
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("status") Integer status);
 
     //新增钢材发往异地库日计划
     @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/addRailOffsetDayplan")
     Map<String,Object> addRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapVal);
 
     //删除钢材发往异地库计划
-    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/deleteRailOffsetDayplan/{dayPlanId}")
-    Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayPlanId") BigDecimal dayPlanId);
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/deleteRailOffsetDayplan/{dayplanId}")
+    Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayplanId") Integer dayplanId);
+
+    //接收钢材发往异地库计划
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/receiveRailOffsetDayplan/{dayplanId}")
+    Map<String,Object> receiveRailOffsetDayplan(@PathVariable("dayplanId") Integer dayplanId);
 
     //修改钢材发往异地库计划
     @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/addRailOffsetDayplan")
@@ -1030,7 +1066,9 @@ public interface AmsFeign {
     Map<String, Object> getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId);
+                                       @RequestParam Integer apiId,
+                                       @RequestParam Integer dayplanReceiveStatus,
+                                       @RequestParam Integer carrierId);
 
     /**
      *新增运输计划
@@ -1038,11 +1076,23 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amstruckinwardplan/addTruckPlan")
     Map<String,Object> addTruckPlan(@RequestBody(required = false) Map<String, Object> mapVal);
     //删除运输计划
-    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/deleteTruckRequirement/{planId}")
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/deleteTruckPlan/{planId}")
     Map<String,Object> deleteTruckPlan(@PathVariable("planId") BigDecimal planId);
-    //修改运输计划/下发运输计划/承运商接收运输计划
+    //接收运输计划
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/receiveInwardPlan/{planId}")
+    Map<String,Object> receiveInwardPlan(@PathVariable("planId") BigDecimal planId);
+    //修改渲染
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/selectInwardPlanToUpdate/{planId}")
+    Map<String,Object> selectInwardPlanToUpdate(@PathVariable("planId") BigDecimal planId);
+    //下发运输计划
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/downTruckPlan")
+    Map<String,Object> downTruckPlan(@RequestBody List<Map<String,Object>> mapList);
+    //修改运输计划
     @PostMapping(value = "/api/v1/ams/amstruckinwardplan/updateTruckPlan")
     Map<String,Object> updateTruckPlan(@RequestBody(required = false) Map<String, Object> mapVal);
+    //修改运输计划
+//    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/updateTruckPlan")
+//    Map<String,Object> updateTruckPlan(@RequestBody(required = false) Map<String, Object> mapVal);
     /**
      * 展示运输计划
      */
@@ -1052,9 +1102,12 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amstruckinwardplan/getTruckPlanList")
     Map<String, Object> getTruckPlanList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       @RequestParam Integer pageNum,
-                                       @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId);
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer planStatus,
+                                         @RequestParam Integer carrierId,
+                                         @RequestParam Integer planId);
     /**
      *新增用车需求
      */
@@ -1063,9 +1116,18 @@ public interface AmsFeign {
     //用车需求
     @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/deleteTruckRequirement/{requirementId}")
     Map<String,Object> deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId);
-    //修改用车需求/下发用车需求
+    // 接收
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/receiveRequirement/{requirementId}")
+    Map<String,Object> receiveRequirement(@PathVariable("requirementId") Integer requirementId);
+    // 修改渲染
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/selectRequirement/{requirementId}")
+    Map<String, Object> selectRequirement(@PathVariable("requirementId")Integer requirementId);
+    //修改用车需/下发用车需求
     @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/updateTruckRequirement")
     Map<String,Object> updateTruckRequirement(@RequestBody(required = false) Map<String, Object> mapVal);
+    //下发
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/downRequirement")
+    Map<String,Object> downRequirement(@RequestBody List<Map<String,Object>> requirementIds);
     /**
      * 展示用车需求
      */
@@ -1077,7 +1139,9 @@ public interface AmsFeign {
     Map<String, Object> getTruckRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                    @RequestParam Integer pageNum,
                                    @RequestParam Integer pageSize,
-                                   @RequestParam Integer apiId);
+                                   @RequestParam Integer apiId,
+                                                @RequestParam Integer requirementStatus,
+                                                @RequestParam String con);
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
@@ -1088,14 +1152,86 @@ public interface AmsFeign {
     Map<String, Object> lockDispatchSaleOrder(@RequestParam Integer dispatchId,
                                               @RequestParam Integer carrierId);
 
-    @ApiOperation(value="查询app端已抢的销售订单")
+    @ApiOperation(value="查询app端承运商已抢到的单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
     Map<String, Object> getLockDispatchSaleOrderList(@RequestParam Integer carrierId);
 
-    @PostMapping("/api/v1/ams/amssaleplans/getAllSteelMaterialMes")
-    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+//    @PostMapping("/api/v1/ams/amssaleplans/getAllSteelMaterialMes")
+//    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+//                                                      @RequestParam Integer pageNum,
+//                                                      @RequestParam Integer pageSize,
+//                                                      @RequestParam Integer apiId,
+//                                                      @RequestParam String con) ;
+
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
+    Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
                                                       @RequestParam Integer pageNum,
                                                       @RequestParam Integer pageSize,
                                                       @RequestParam Integer apiId,
+                                                      @RequestParam Integer dispatchType,
                                                       @RequestParam String con) ;
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/getPurchaseIdByBatch")
+    Map<String, Object> getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId);
+
+    @GetMapping("/api/v1/ams/amstruckinwardrequirement/getCapacityType")
+    Map<String, Object> getCapacityType();
+
+    @GetMapping("/api/v1/ams/amstruckinwardrequirement/getShipperUser")
+    Map<String, Object> getShipperUser();
+
+    @GetMapping("/api/v1/ams/amstruckinwardplan/getCarrierList")
+    Map<String, Object> getCarrierList();
+
+    @GetMapping("/api/v1/ams/amstruckinwardrequirement/getOffsetWarehouse")
+    Map<String, Object> getOffsetWarehouse();
+
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/getWareHouse")
+    Map<String, Object> getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam String con);
+
+    /**
+     * 钢材发运到异地库查询物资
+     * @param dayplanId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getMaterialMesByDayPlanId")
+    Map<String, Object> getMaterialMesByDayPlanId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer dayplanId);
+
+    /**
+     * 下发钢材发往异地库计划
+     * @param mapList
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/issueRailOffsetDayplan")
+    Map<String,Object> issueRailOffsetDayplan(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 到站下拉
+     * @return
+     */
+    @GetMapping("/api/v1/ams/amsrailoffsetdayplan/getdayPlanToTheStationId")
+    Map<String, Object> getdayPlanToTheStationId();
+
+
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getRailOffsetDayplanId")
+    Map<String, Object> getRailOffsetDayplanId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer dayPlanId);
+
+    @PostMapping("/api/v1/ams/amstruckinwardplan/finishTruckPlan/{planId}")
+    public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId);
 }

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

@@ -7,6 +7,7 @@ import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -58,9 +59,8 @@ public interface OmsFeign {
     public Map<String, Object> deleteOrder(@RequestBody(required = false) Map<String, Object> map,
                                      @RequestParam("planId") Integer planId);
 
-    @PostMapping("api/v1/oms/omstruckorders/driverReceiveOrRefuse/{orderId}")
-    public Map<String, Object> driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId,
-                                               @RequestParam("orderReceiveStatus") Integer orderReceiveStatus);
+    @PostMapping("api/v1/oms/omstruckorders/driverReceiveOrRefuse")
+    public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/oms/omstruckorders/getReceiveRefuseOrder/{orderReceiveStatus}")
     public Map<String, Object> getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -90,12 +90,11 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorders/selectOrderByOrderId/{orderId}")
     public Map<String, Object> selectOrderByOrderId(@PathVariable("orderId") Integer orderId);
 
-    @PostMapping("api/v1/oms/omstruckorders/getTransportDispatch/{orderReceiveStatus}")
+    @PostMapping("api/v1/oms/omstruckorders/getTransportDispatch")
     public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
-                                              @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
                                               @RequestParam("orderType") Integer orderType,
                                               @RequestParam("orderStatus") Integer orderStatus,
                                               @RequestParam("fuelOrder") Integer fuelOrder,
@@ -260,8 +259,6 @@ public interface OmsFeign {
 
     );
 
-
-
     @ApiOperation(value="车牌号下拉")
     @GetMapping(value = "api/v1/oms/omstruckorders/getDriverCapacity")
     Map<String, Object> getDriverCapacity();
@@ -274,6 +271,82 @@ public interface OmsFeign {
     @PostMapping(value = "api/v1/oms/omstruckorders/addAppTruckOrder")
     Map<String, Object> addAppTruckOrder(@RequestParam Integer dispatchId,
                                          @RequestParam Integer orderType,
-                                         @RequestParam Integer driverCapacityId);
+                                         @RequestParam String capacityNumber,
+                                         @RequestParam Integer carrierId);
+
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
+    Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId);
+
+    @ApiOperation(value="车牌")
+    @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityAndDriverList")
+    Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam String con);
+
+    @GetMapping("api/v1/oms/omstruckorders/getReceivingUnit")
+    public Map<String, Object> getReceivingUnit();
+
+    //查询所有的发货单位
+    @GetMapping("api/v1/oms/omstruckorders/getSupplier")
+    public Map<String, Object> getSupplier();
+
+    @PostMapping("api/v1/oms/omstruckorders/CloseOrder")
+    Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map);
+
+    // 分解内转计划
+    @PostMapping("api/v1/oms/omstruckorders/addInwardOrder")
+    Map<String, Object> addInwardOrder(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    // 分解计划查询
+    @PostMapping("api/v1/oms/omstruckorders/getInwardOrderList")
+    Map<String, Object> getInwardOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer orderStatus,
+                                           @RequestParam Integer carrierId,
+                                           @RequestParam String con);
+
+    // 分派计划
+    @PostMapping("api/v1/oms/omstruckorders/apportionInwardOrder")
+    Map<String, Object> apportionInwardOrder(@RequestBody List<Map<String, Object>> mapList);
+
+    // 司机APP端查询下发给自己运输订单
+    @PostMapping("api/v1/oms/omstruckorders/sendOrderToApp")
+    List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber);
+
+    //分解异地库计划
+    @PostMapping("api/v1/oms/omstruckorders/apportionInwardOffsetOrder")
+    Map<String, Object> apportionInwardOffsetOrder(@RequestBody Map<String, Object> mapvalue);
+
+    @ApiOperation(value = "查询司机的所有运输订单信息")
+    @PostMapping("api/v1/oms/omstruckorders/getAllOrderMessage")
+    List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber);
+    @PostMapping("api/v1/oms/omstruckorders/driverConfirmation")
+    Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @PostMapping("api/v1/oms/omstruckorders/getMessageToApp")
+    Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) ;
+
+    @PostMapping("api/v1/oms/omstruckorders/getAllOrderMessagesByCapacityNum")
+    List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @PostMapping("api/v1/oms/omstruckorders/getReceiveOrderIdListByCapacityNum")
+    List<Integer> getReceiveOrderIdListByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("api/v1/oms/omstruckorders/getAllRefuseOrderNumberByCapacity")
+    List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue);
+
+    @ApiOperation(value = "添加退货实绩关闭当前订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/returnOrderCloseOrder")
+    Map<String, Object> returnOrderCloseOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value = "根据运单id查询实绩位置")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOrderResult")
+    List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map);
 }
 

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

@@ -1,4 +1,8 @@
 package com.steerinfo.dil.feign;
+import com.steerinfo.framework.controller.RESTfulResult;
+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.*;
 
@@ -11,85 +15,135 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscardriver/getCarDriverList")
     Map<String,Object> getCarDriverList  (@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize
 
-                                           );
+    );
     //新增司机信息
     @PostMapping(value = "api/v1/rms/rmscardriver/insertCarDriver")
     Map<String, Object> insertCarDriver(@RequestBody(required = false) Map<String, Object> map);
+
+    //修改司机信息
+    @PostMapping(value = "api/v1/rms/rmscardriver/updateCarDriver")
+    Map<String, Object> updateCarDriver(Map<String, Object> map);
+    //通过id查询司机信息
+    @PostMapping(value = "api/v1/rms/rmscardriver/getCarDriverById/{id}")
+    Map<String, Object> getCarDriverById(@PathVariable("id") BigDecimal id);
     //删除司机信息
     @PostMapping(value = "api/v1/rms/rmscardriver/deleteCarDriver/{id}")
     Map<String, Object> deleteCarDriver(@PathVariable("id") BigDecimal id);
-    //获取托运人列表
+    //模糊查询司机
+    @PostMapping(value = "/api/v1/rms/rmscardriver/getCarDriverResultList")
+    Map<String, Object> getCarDriverResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("con") String con);
+
+
+    //获取承运商列表
     @PostMapping(value = "api/v1/rms/rmscarriers/getCarrierList")
-    Map<String,Object>     getCarrierList(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String,Object>     getCarrierList(@RequestBody(required = false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam String con);
 
-    );
-    //新增托运人
-    @PostMapping(value = "api/v1/rms/rmscardriver/insertCarrier")
-    Map<String, Object> insertCarrier(@RequestBody(required = false) Map<String, Object> map);
-    //删除托运人
-    @PostMapping(value = "api/v1/rms/rmscardriver/deleteCarrier/{id}")
+    //新增承运商
+    @PostMapping(value = "api/v1/rms/rmscarriers/insertCarrier")
+    Map<String,Object> insertCarrier(@RequestBody(required = false) Map<String,Object> map);
+    //删除承运商
+    @PostMapping(value = "api/v1/rms/rmscarriers/deleteCarrier/{id}")
     Map<String, Object> deleteCarrier(@PathVariable("id") BigDecimal id);
+    //    更新承运商信息
+    @PostMapping(value = "api/v1/rms/rmscarriers/updateCarrier")
+    Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取承运商信息
+    @PostMapping(value = "api/v1/rms/rmscarriers/getCarrierById/{id}")
+    Map<String, Object> getCarrierById(@PathVariable("id") BigDecimal id);
+
     //获取物资列表
     @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialList")
-    Map<String,Object>     getMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
-
-    );
+    Map<String,Object> getMaterialList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam String con);
     //新增物资
     @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
     Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map);
     //删除物资
-    @PostMapping(value = "api/v1/rms/rmscardriver/deleteMaterial/{id}")
+    @PostMapping(value = "api/v1/rms/rmsmaterial/deleteMaterial/{id}")
     Map<String, Object> deleteMaterial(@PathVariable("id") BigDecimal id);
-    //获得人员列表
-    @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelList")
-    Map<String,Object>   getPersonnelList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
+    //    更新物资信息
+    @PostMapping(value = "api/v1/rms/rmsmaterial/updateMaterial")
+    Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取物资信息
+    @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialById/{id}")
+    Map<String, Object> getMaterialById(@PathVariable("id") BigDecimal id);
+
 
-    );
     @PostMapping(value = "api/v1/rms/rmspersonnel/insertPersonnel")
     Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map);
     //删除人员信息
     @PostMapping(value = "api/v1/rms/rmspersonnel/deletePersonnel/{id}")
     Map<String, Object> deletePersonnel(@PathVariable("id") BigDecimal id);
-    //获得承运商列表
+    //    更新人员信息
+    @PostMapping(value = "api/v1/rms/rmspersonnel/updatePersonnel")
+    Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取人员信息
+    @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelById/{personnelId}")
+    Map<String, Object> getPersonnelById(@PathVariable("personnelId") BigDecimal personnelId);
+    //    模糊查询人员信息
+    @PostMapping(value = "/api/v1/rms/rmspersonnel/getPersonnelList")
+    Map<String, Object> getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                         @RequestParam("apiId")Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("con") String con);
+
+
+    //获得托运人列表
     @PostMapping(value = "api/v1/rms/rmsshippers/getShipperList")
-    Map<String,Object>   getShipperList (@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String,Object>   getShipperList (@RequestBody(required = false) Map<String,Object> mapValue,
                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
-
-    );
-    //新增承运商信息
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam String con);
+    //新增托运人信息
     @PostMapping(value = "api/v1/rms/rmsshippers/insertShipper")
     Map<String, Object> insertShipper(@RequestBody(required = false) Map<String, Object> map);
-    //删除承运商
+    //删除托运人
     @PostMapping(value = "api/v1/rms/rmsshippers/deleteShipper/{id}")
     Map<String, Object> deleteShipper(@PathVariable("id") BigDecimal id);
+    //修改托运人信息
+    @PostMapping(value = "api/v1/rms/rmsshippers/updateShipper")
+    Map<String, Object> updateShipper(@RequestBody(required = false) Map<String, Object> map);
+    //根据id获取托运人信息
+    @PostMapping(value = "api/v1/rms/rmsshippers/getShipperById/{id}")
+    Map<String, Object> getShipperById(@PathVariable("id") BigDecimal id);
+
     //展示供应商列表
     @PostMapping(value = "api/v1/rms/rmssupplier/getSupplierList")
-    Map<String,Object>   getSupplierList (@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String,Object>   getSupplierList (@RequestBody(required = false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
-
-    );
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("con") String con);
     //新增供应商信息
-    @PostMapping(value = "api/v1/rms/rmsshippers/insertSupplier")
+    @PostMapping(value = "api/v1/rms/rmssupplier/insertSupplier")
     Map<String, Object> insertSupplier(@RequestBody(required = false) Map<String, Object> map);
-    //删除承运商
-    @PostMapping(value = "api/v1/rms/rmsshippers/deleteSupplier/{id}")
+    //删除供应商
+    @PostMapping(value = "api/v1/rms/rmssupplier/deleteSupplier/{id}")
     Map<String, Object> deleteSupplier(@PathVariable("id") BigDecimal id);
+    //    更新供应商信息
+    @PostMapping(value = "api/v1/rms/rmssupplier/updateSupplier")
+    Map<String, Object> updateSupplier(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取供应商信息
+    @PostMapping(value = "api/v1/rms/rmssupplier/getSupplierById/{id}")
+    Map<String, Object> getSupplierById(@PathVariable("id") BigDecimal id);
+
+    //    获取运力列表
     @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityList")
     Map<String,Object>   getCapacityList (@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
@@ -103,6 +157,24 @@ public interface RmsFeign {
     //删除运力
     @PostMapping(value = "api/v1/rms/rmscapacity/deleteCapacity/{id}")
     Map<String, Object> deleteCapacity(@PathVariable("id") BigDecimal id);
+    //修改运力
+    @PostMapping(value = "api/v1/rms/rmscapacity/updateCapacity")
+    Map<String, Object> updateCapacity(Map<String, Object> map);
+
+
+    //模糊查询运力
+    @PostMapping(value = "/api/v1/rms/rmscapacity/getCapacityResultList")
+    Map<String, Object> getCapacityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam String con);
+
+    //根据id获取运力详细信息
+    @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById/{id}")
+    Map<String,Object> getCapacityById(@PathVariable("id") BigDecimal id);
+
+
     //查找汽车衡列表
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateList")
     Map<String,Object>   getTruckCalculateList (@RequestBody(required = false) Map<String, Object> mapValue,
@@ -113,10 +185,26 @@ public interface RmsFeign {
     //新增汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculate")
     Map<String, Object> insertTruckCalculate(@RequestBody(required = false) Map<String, Object> map);
+    //更新汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/updateTruckCalculate")
+    Map<String, Object> updateTruckCalculate(Map<String, Object> map);
+    //根据id查询汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateById/{id}")
+
+    Map<String, Object> getTruckCalculateById(@PathVariable("id") BigDecimal id);
+
+
     //根据id删除汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculate/{id}")
     Map<String, Object> deleteTruckCalculate(@PathVariable("id") BigDecimal id);
-
+    //模糊查询汽车衡
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateResultList")
+    Map<String, Object> getTruckCalculateResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    @RequestParam Integer pageNum,
+                                                    @RequestParam Integer pageSize,
+                                                    @RequestParam Integer apiId,
+                                                    @RequestParam String con);
+    //原料仓库列表
     @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseList")
     Map<String,Object>   getWarehouseList (@RequestBody(required = false) Map<String, Object> mapValue,
                                            @RequestParam("apiId") Integer apiId,
@@ -129,8 +217,142 @@ public interface RmsFeign {
     //删除仓库
     @PostMapping(value = "api/v1/rms/rmswarehouse/deleteWarehouse/{id}")
     Map<String, Object> deleteWarehouse(@PathVariable("id") BigDecimal id);
+    //修改仓库
+    @PostMapping(value="api/v1/rms/rmswarehouse/updateWarehouse")
+    Map<String, Object> updateWarehouse(Map<String, Object> map);
+    //根据id获取原料仓库详细信息
+
+    @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseById/{id}")
+    Map<String, Object> getWarehouseById(@PathVariable("id") BigDecimal id);
+
+    //模糊查询原料仓库
+    @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseResultList")
+    Map<String, Object> getWarehouseResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam String con);
+
+    //获取司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverCapacityList")
+    Map<String, Object> getDriverCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize);
+
+    //新增司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/insertDriverCapacity")
+    Map<String, Object> insertDriverCapacity(@RequestBody(required = false) Map<String, Object> map);
+
+    //更新司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/updateDriverCapacity")
+    Map<String, Object> updateDriverCapacity(@RequestBody(required = false) Map<String, Object> map);
+
+    //删除司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/deleteDriverCapacity/{id}")
+    Map<String, Object> deleteDriverCapacity(@PathVariable("id") BigDecimal id);
+
+    //根据id获取司机排队信息
+    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverCapacityById/{id}")
+    Map<String, Object> getDriverCapacityById(@PathVariable("id") BigDecimal id);
+
+
+    //获取门岗信息列表
+    @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostList")
+    Map<String,Object>     getGatepostList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam String con);
+    //新增门岗
+    @PostMapping(value = "api/v1/rms/rmsgatepost/insertGatepost")
+    Map<String,Object> insertGatepost(@RequestBody(required = false) Map<String,Object> map);
+    //删除门岗
+    @PostMapping(value = "api/v1/rms/rmsgatepost/deleteGatepost/{id}")
+    Map<String, Object> deleteGatepost(@PathVariable("id") BigDecimal id);
+    //    更新门岗信息
+    @PostMapping(value = "api/v1/rms/rmsgatepost/updateGatepost")
+    Map<String, Object> updateGatepost(@RequestBody(required = false) Map<String, Object> map);
+    //    根据id获取门岗规则信息
+    @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostById/{id}")
+    Map<String, Object> getGatepostById(@PathVariable("id") BigDecimal id);
+
+    //******************************************下拉框*******************************
+    @GetMapping(value = "api/v1/rms/rmscapacity/getCapacityTypeId")
+    Map<String, Object> getCapacityTypeId();
+
+    @GetMapping(value = "api/v1/rms/rmswarehouse/getWarehouseTypeId" )
+    Map<String, Object> getWarehouseTypeId();
+
+    @GetMapping(value= "api/v1/rms/rmswarehouse/getPortId")
+    Map<String, Object> getPortId();
+
+    @GetMapping(value = "api/v1/rms/rmscapacity/getCarrierId")
+    Map<String, Object> getCarrierId();
+
+
     //******************************************下拉框*******************************
+//    根据id下拉获取运力列表
     @GetMapping(value = "/api/v1/rms/rmscapacity/getCapacityId")
     Map<String, Object> getCapacityId();
+    //    根据id下拉框获取原料类型
+    @GetMapping(value = "api/v1/rms/rmsmaterial/getMaterialTypeId")
+    Map<String, Object> getMaterialTypeId();
+    //    根据id下拉框获取计量类型
+    @GetMapping(value = "api/v1/rms/rmsmaterial/getUnitOfMeasureId")
+    Map<String, Object> getUnitOfMeasureId();
+    //    根据id下拉框获取托运人
+    @GetMapping(value = "api/v1/rms/rmspersonnel/getShipperId")
+    Map<String, Object> getShipperId();
+
+    //获取司机下拉框
+    @GetMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverId")
+    Map<String, Object> getDriverId();
+
+    //    根据id下拉框获取门岗规则
+    @GetMapping(value = "api/v1/rms/rmsgatepost/getShipperId")
+    Map<String, Object> getGatepostRulesId();
+
+    /**
+     * @author huk
+     * @return
+     */
+    @PostMapping("/api/v1/rms/rmslinks/getLink")
+    Map<String, Object> getlink();
+
+    /**
+     * @author huk
+     * @return
+     */
+    //新增运输路线
+    @ApiOperation(value="新增运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @PostMapping("/api/v1/rms/rmslines/insertSelective")
+    Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @PostMapping(value = "/api/v1/rms/rmslines/getAllLineDesk")
+    Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize")Integer pageSize,
+                                        @RequestParam("apiId")Integer apiId,
+                                        @RequestParam("con")String con,
+                                       @RequestParam("lineType")Integer lineType);
+
+    @ApiOperation(value = "根据主键查询出数据以供修改")
+    @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")
+    Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId);
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据")
+    @PostMapping("/api/v1/rms/rmslines/updateByPrimaryKeySelective")
+    Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
+    @PostMapping("/api/v1/rms/rmslines/updateRmsLine")
+    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal);
 
+    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
+    @PostMapping("/api/v1/rms/rmslines/getCountNumber")
+    Map<String, Object> getCountNumber(@RequestParam Integer lineId);
 }

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

@@ -125,8 +125,9 @@ public interface TmsTrainFeign {
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("status") Integer status,
-                                                 @RequestParam("resultType") Integer resultType,
-                                                 @RequestParam("con") String con
+                                           @RequestParam("resultType") Integer resultType,
+                                           @RequestParam("resultId") Integer resultId,
+                                           @RequestParam("con") String con
                                                  );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getWagonPleaseById/{resultId}")
@@ -160,8 +161,9 @@ public interface TmsTrainFeign {
                                                   @RequestParam("apiId") Integer apiId,
                                                   @RequestParam("pageNum") Integer pageNum,
                                                   @RequestParam("pageSize") Integer pageSize,
-                                                        @RequestParam("resultType") Integer resultType,
-                                                        @RequestParam("con") String con
+                                                  @RequestParam("resultType") Integer resultType,
+                                                  @RequestParam("status") Integer status,
+                                                  @RequestParam("con") String con
     );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveWagonPleaseById/{resultId}")
@@ -176,19 +178,25 @@ public interface TmsTrainFeign {
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteApproveWagonPlease/{resultId}")
     public Map<String, Object> deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId);
+
     //*****************************************内转物流***************************************************
+
     @PostMapping("api/v1/trainTms/tmstrainloadingresults/addTrainLoadResultForConverted")
     Map<String,Object>  addTrainLoadResultForConverted(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
     @PostMapping ("api/v1/trainTms/tmstrainloadingresults/selectLoadByResultId/{resultId}")
     Map<String,Object> selectLoadByResultId(@PathVariable("resultId")BigDecimal resultId);
+
     @PostMapping("api/v1/trainTms/tmstrainloadingresults/getTmstrainWagonLoadForConverted")
     Map<String,Object> getTmstrainWagonLoadForConverted(@RequestBody(required=false)
                                                         @RequestParam("apiId") Integer apiId,
                                                         @RequestParam("pageNum") Integer pageNum,
                                                         @RequestParam("pageSize") Integer pageSize,
                                                         @RequestParam("con") String con);
+
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getPleasePlanByResultId/{resultId}")
     Map<String,Object> getPleasePlanByResultId(@PathVariable("resultId")BigDecimal resultId);
+
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveByResultId/{resultId}")
     Map<String,Object> getApproveByResultId(@PathVariable("resultId")BigDecimal resultId);
 
@@ -198,11 +206,25 @@ public interface TmsTrainFeign {
                                                             @RequestParam("pageNum") Integer pageNum,
                                                             @RequestParam("pageSize") Integer pageSize,
                                                             @RequestParam("con") String con);
+
     @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectTrainUnLoadResultForConverted")
-    Map<String,Object>  selectTrainUnLoadResultForConverted(@RequestParam("apiId") Integer apiId,
+    Map<String,Object>  selectTrainUnLoadResultForConverted(
+                                                            @RequestParam("apiId") Integer apiId,
                                                             @RequestParam("pageNum") Integer pageNum,
                                                             @RequestParam("pageSize") Integer pageSize,
                                                             @RequestParam("con") String con);
-    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonApprove")
-    Map<String,Object> addWagonApprove(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonPleaseForNZ")
+    Map<String,Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/addTmsTrainUnloadResultForNZ")
+    Map<String, Object> addTmsTrainUnloadResultForNZ(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getMaterialAndCarByLoadingId")
+    Map<String, Object> getMaterialAndCarByLoadingId(
+            @RequestBody(required = false) Map<String, Object> mapValue,
+            @RequestParam("apiId") Integer apiId,
+            @RequestParam("pageNum") Integer pageNum,
+            @RequestParam("pageSize") Integer pageSize,
+            @RequestParam("loadingId")Integer loadingId,
+            @RequestParam("unloadingId")Integer unloadingId);
 }

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

@@ -215,6 +215,7 @@ public interface TmsTruckFeign {
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderType") Integer orderType,
                                           @RequestParam("con")String con);
 
 
@@ -225,11 +226,13 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/updateQualityResult")
     public Map<String, Object> updateQualityResult(@RequestBody(required=false) Map<String,Object> mapValue);
 
-    @PostMapping("api/v1/truckTms/tmstruckqualityresults/selectQualityResultForConverted")
+    //查询质检实绩
+    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResult")
     Map<String,Object> selectQualityResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
                                                        @RequestParam("apiId")    Integer apiId,
                                                        @RequestParam("pageNum")  Integer pageNum,
                                                        @RequestParam("pageSize") Integer pageSize);
+
     /**
      * TmstruckTotalResult
      */
@@ -303,6 +306,24 @@ public interface TmsTruckFeign {
     @ApiOperation(value="APP通过运输订单id查询进厂实绩")
     @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryMessageByOrderId")
     Map<String, Object> getEnfactoryMessageByOrderId(@RequestParam String orderNumber);
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/getAllTimeTaskResult")
+    public RESTfulResult getAllTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con") String con);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
+    Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
+
+    @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/addSteelNzReceiptResult")
+    public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/updateTruckWeight")
+    public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList);
 }
 
 

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

@@ -3,8 +3,10 @@ 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.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -36,10 +38,11 @@ public interface WMSFeign {
      * @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);
+    Map<String,Object> getWmspOutboundResult(@RequestBody(required = false) Map<String,Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam String con);
 
     /**
      * 新增出库实绩
@@ -49,13 +52,29 @@ public interface WMSFeign {
     @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/insertWmspOutBoundResult",method = RequestMethod.POST)
     Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval);
 
+    /**
+     * 逻辑删除出库单
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/deletewmspOutboundResult")
+    Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId);
+
     /**
      * 新增出库扫描实绩
-     * @param mapval
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertwmspOutboundScanResult")
+    Map<String,Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 装卸工PDA前端点击出库
+     * @param resultId
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/insertWmspOutboundScanResult")
-    Map<String,Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval);
+    @PostMapping("/api/v1/wms/wmspoutboundresults/outbountResultToSuccess")
+    Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId);
 
     /**
      * 更新出库状态
@@ -76,10 +95,27 @@ public interface WMSFeign {
      * @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);
+    Map<String,Object> selectGridMaterialList(@RequestBody(required = false) Map<String,Object> map,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam String con);
+
+    /**
+     *  通过成品仓库网格ID查询实时库存数据
+     * @param gridId
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialListByGridId",method = RequestMethod.POST)
+    Map<String,Object> selectGridMaterialListByGridId(@RequestParam BigDecimal gridId);
+
+    /**
+     *  修改物资钢材表的质量是否合格字段和逻辑删除
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspgridmaterials/updateRmsMaterialSteelDemotion")
+    Map<String,Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String,Object> map);
 
     /**
      * 钢材异地库出库扫描
@@ -97,10 +133,11 @@ public interface WMSFeign {
      * @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);
+    Map<String,Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String,Object> map,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("con") String con);
 
     /**
      * 展示钢材异地库入库实绩表
@@ -110,10 +147,11 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/getWmsOffsiteLibaryInboundList",method = RequestMethod.POST)
-    Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false)
+    Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String,Object> map,
                                                        @RequestParam Integer apiId,
                                                        @RequestParam Integer pageNum,
-                                                       @RequestParam Integer pageSize);
+                                                       @RequestParam Integer pageSize,
+                                                      @RequestParam String con);
 
     /**
      *   钢材异地库入库扫描新增异地库入库实绩
@@ -164,13 +202,14 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/getWmspRestackMakeResultList")
-    Map<String,Object> getWmspRestackMakeResultList(@RequestBody(required = false)
+    Map<String,Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String,Object> map,
                                                     @RequestParam Integer apiId,
                                                     @RequestParam Integer pageNum,
                                                     @RequestParam Integer pageSize,
                                                     @RequestParam Integer warehouseid,
-                                                    @RequestParam Integer gradtionNumber,
-                                                    @RequestParam Integer stackingId);
+                                                    @RequestParam Integer stackingId,
+                                                    @RequestParam Integer gradtionNumber
+                                                   );
 
     /**
      *    添加倒垛单实绩
@@ -178,7 +217,13 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/addRestackMakeResult")
-    Map<String,Object> addRestackMakeResult(@RequestBody(required = false)Map<String,Object> mapval);
+    Map<String,Object> addRestackMakeResult(@RequestBody  Map<String,Object> mapval);
+
+
+    @PostMapping("/api/v1/wms/wmsprestackdrivingresults/updateInstruction")
+     Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map);
+
+
 
     /**
      *   删除倒垛单
@@ -202,7 +247,7 @@ public interface WMSFeign {
      * @param stackingId
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectGardationNumber")
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectGardationNumber")
     Map<String,Object> selectGardationNumber(@RequestParam Integer warehouseid,
                                              @RequestParam  Integer stackingId );
 
@@ -211,14 +256,14 @@ public interface WMSFeign {
      * @param warehouseid
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectStackingId")
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectStackingId")
     Map<String,Object> selectStackingId(@RequestParam Integer warehouseid);
 
     /**
      * 下拉框获取仓库名称
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectWarehouse")
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectWarehouse")
     Map<String,Object> selectWarehouse();
 
     /**
@@ -230,7 +275,7 @@ public interface WMSFeign {
      * @return
      */
    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
-   Map<String,Object> selectRestackList(@RequestBody(required = false)
+   Map<String,Object>       selectRestackList     (@RequestBody(required = false) Map<String,Object> map,
                                                    @RequestParam Integer apiId,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
@@ -265,6 +310,17 @@ public interface WMSFeign {
      */
   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
   Map<String,Object> selectRestackForPDA(@RequestBody(required = false)Map<String,Object> map);
+
+
+
+
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/getRestackInfoByResultId")
+    public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam Integer apiId
+
+    );
     /**
      * PDA根据实绩id查找物资信息
      * @param map
@@ -286,6 +342,12 @@ public interface WMSFeign {
      */
    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
    Map<String,Object> ScanTagResult(@RequestBody(required = false)Map<String,Object> mal);
+
+
+
+
+    @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
+    Map<String,Object> getScanResult(@RequestBody Map<String,Object> map);
     /**
      * 库管员下发倒垛单
      * @param mapList
@@ -301,12 +363,30 @@ public interface WMSFeign {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsReboundResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getWmsReboundResult",method = RequestMethod.POST)
     RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize);
 
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @RequestParam Integer inboundId);
+    //根据物资信息查找暂存的垛位
+    @PostMapping("/api/v1/wms/reboundResult/selectInfoByMaterialCode")
+    Map<String,Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String,Object> mal);
+
+    //根据仓库id查询未接收的垛位
+    @PostMapping("/api/v1/wms/inboundScanResult/selectStackingInfoByWarehouseId")
+    Map<String,Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String,Object> mal);
+
+    //更新垛位
+    @PostMapping("/api/v1/wms/inboundScanResult/updateStatus")
+    Map<String,Object> updateStatus(@RequestBody(required = false) Map<String,Object> mal);
     /**
      * 展示倒库实绩
      * @param mapValue
@@ -322,6 +402,8 @@ public interface WMSFeign {
                                       @RequestParam Integer pageSize);
 
 
+
+
     /**
      * 展示倒库物资实绩
      * @param mapValue
@@ -373,7 +455,7 @@ public interface WMSFeign {
      * 展示未下发吊钢工扫描吊牌实绩
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getTagResult",method = RequestMethod.POST)
+    @PostMapping(value = "/api/v1/wms/inboundScanResult/getTagResult")
     Map<String,Object>  getTagResult();
 
     /**
@@ -394,14 +476,14 @@ public interface WMSFeign {
      * 展示退库已下发吊钢工扫描吊牌实绩
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getReIssuedResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getReIssuedResult",method = RequestMethod.POST)
     Map<String,Object>  getIssuedResult();
 
     /**
      * 展示未下发退库吊钢工扫描吊牌实绩
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getReTagResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getReTagResult",method = RequestMethod.POST)
     Map<String,Object>  getReTagResult();
 
     /**
@@ -424,14 +506,14 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/inboundResult/insertInboundResult",method = RequestMethod.POST)
-    String insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
+    Map<String,Object> insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
 
     /**
      * 新增退库实绩，返回选择垛位
      * @param mapList
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/insertReboundResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/insertReboundResult",method = RequestMethod.POST)
     String insertReboundResult(@RequestBody List<Map<String, Object>> mapList);
 
     /**
@@ -490,5 +572,36 @@ public interface WMSFeign {
      */
     @PostMapping(value = "/api/vi/wms/wmsprestackscanresults/selectMaterialSteelIdByReusltId")
     Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map);
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize);
+
+    @RequestMapping(value = "/api/v1/wms/wmspivboundmakeresult/getIvboundMakeResultList",method = RequestMethod.POST)
+    RESTfulResult getIvboundMakeResultList(@RequestBody(required = false)Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/addIvboundMakeResult")
+    Map<String, Object> addIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/deleteIvboundMakeResult/{resultId}")
+    Map<String, Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/selectIvboundMakeResult/{resultId}")
+    List<Map<String, Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/updateIvboundMakeResult")
+    Map<String, Object> updateIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
+
+
+    //下发给行车工
+    @PostMapping("/api/v1/wms/reboundResult/IssueToCrane")
+    Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map);
+
 }
 

src/main/java/com/steerinfo/dil/mapper/SelfServiceMachineMapper.java

@@ -1,21 +0,0 @@
-package com.steerinfo.dil.mapper;
-
-import org.mapstruct.Mapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 自助一体机
- * @ author    :TXF
- * @ time      :2021/10/19 18:03
- */
-
-@Mapper
-public interface SelfServiceMachineMapper {
-    //通过运输订单号查询订单信息
-    Map<String, Object> getTiHuoDan(String orderNumber);
-
-    //通过运输订单号查找订单子表物资信息
-    List<Map<String, Object>> getOOMMes(String orderNumber);
-}

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -0,0 +1,43 @@
+package com.steerinfo.dil.mapper;
+
+import org.mapstruct.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 通用接口
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:03
+ */
+
+@Mapper
+public interface UniversalMapper {
+    //通过运输订单号查询订单信息
+    Map<String, Object> getTiHuoDan(String orderNumber);
+
+    //通过运输订单号查找订单子表物资信息
+    List<Map<String, Object>> getOOMMes(String orderNumber);
+
+    //模糊查询所有物资
+    List<Map<String, Object>> queryAPOMaterialByLike(Map<String, Object> map);
+
+    //模糊查询发货单位
+    List<Map<String, Object>> querySupplierByLike(Map<String, Object> map);
+
+    //模糊查询承运商的运力信息
+    List<Map<String, Object>> getAllCapacityByCarrierLike(Map<String, Object> map);
+
+    //通过运输订单ID查询物资子表（针对钢材）
+    List<Map<String, Object>> getMaterialMesByOrderId(Map<String, Object> map);
+
+    //通过物资ID查询该物资的发货单位信息
+    List<Map<String, Object>> getSupplierMesByMaterialId(Map<String, Object> map);
+
+    //模糊查询所有的卸货点信息
+    List<Map<String, Object>> getUnloadingMesByLike(Map<String, Object> map);
+
+    //模糊查询所有物资
+    List<Map<String, Object>> queryMaterialByLike(Map<String, Object> map);
+
+}

src/main/java/com/steerinfo/dil/service/SelfServiceMachineService.java → src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -7,9 +8,11 @@ import java.util.Map;
  * @ time      :2021/10/19 18:04
  */
 
-public interface SelfServiceMachineService {
+public interface UniversalService {
 
     //打印提货单
     Map<String, Object> printTiHuoDan(String orderNumber);
 
+    //查询路段顺序及当前路段顺序号
+    Map<String, Object> getNowLineMes(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/SelfServiceMachineServiceImpl.java

@@ -1,35 +0,0 @@
-package com.steerinfo.dil.service.impl;
-import com.steerinfo.dil.mapper.SelfServiceMachineMapper;
-import com.steerinfo.dil.service.SelfServiceMachineService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/19 18:05
- */
-
-@Service
-public class SelfServiceMachineServiceImpl implements SelfServiceMachineService {
-
-    @Resource
-    private SelfServiceMachineMapper selfServiceMachineMapper;
-    /**
-     * 打印提货单
-     * @param orderNumber 运输订单号
-     * @return
-     */
-    @Override
-    public Map<String, Object> printTiHuoDan(String orderNumber) {
-
-        //查询订单信息
-        Map<String, Object> tiHuoDanMap = selfServiceMachineMapper.getTiHuoDan(orderNumber);
-        //查询该订单下的所有装车信息
-        List<Map<String, Object>> oomMes = selfServiceMachineMapper.getOOMMes(orderNumber);
-        tiHuoDanMap.put("loadMes", oomMes);
-        return tiHuoDanMap;
-    }
-}

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -0,0 +1,49 @@
+package com.steerinfo.dil.service.impl;
+import com.steerinfo.dil.mapper.UniversalMapper;
+import com.steerinfo.dil.service.UniversalService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:05
+ */
+
+@Service
+public class UniversalServiceImpl implements UniversalService {
+
+    @Resource
+    private UniversalMapper universalMapper;
+    /**
+     * 打印提货单
+     * @param orderNumber 运输订单号
+     * @return
+     */
+    @Override
+    public Map<String, Object> printTiHuoDan(String orderNumber) {
+
+        //查询订单信息
+        Map<String, Object> tiHuoDanMap = universalMapper.getTiHuoDan(orderNumber);
+        //查询该订单下的所有装车信息
+        List<Map<String, Object>> oomMes = universalMapper.getOOMMes(orderNumber);
+        tiHuoDanMap.put("loadMes", oomMes);
+        return tiHuoDanMap;
+    }
+
+
+    /**
+     * 查询路段顺序及当前路段顺序号
+     * @param map
+     * @return
+     */
+    @Override
+    public Map<String, Object> getNowLineMes(Map<String, Object> map) {
+
+        return null;
+    }
+
+
+}

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

@@ -0,0 +1,38 @@
+package com.steerinfo.dil.util;
+
+import com.steerinfo.dil.feign.ColumnDataFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+@Component
+public class ColumnDataUtil {
+    @Autowired
+    ColumnDataFeign columnDataFeign;
+
+    private Set<Map<String, Object>> setListMap(List<Map<String, Object>> list, String name) {
+        Set<Map<String, Object>> setString = new HashSet<>();
+        for (Map<String, Object> map : list) {//遍历每条数据
+            Map<String, Object> map1 = new HashMap<>();
+            //map.get(name)获取每条数据中对应表头字段的数据
+            map1.put("text", map.get(name));
+            if (map.get(name) != null) {
+                map1.put("value", map.get(name));
+                setString.add(map1);
+            }
+        }
+        return setString;
+    }
+
+    public PageListAdd tableColumnData(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data) {
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            columnData.put("filters", setListMap(list, columnData.get("prop").toString()));
+        }
+        PageListAdd pageList = new PageListAdd(data);
+        pageList.setColumnData(columnDataList);
+        return pageList;
+    }
+}

src/main/resources/bootstrap.yml

@@ -27,7 +27,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:192.168.1.104:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmstrainFeign:
@@ -39,7 +39,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:localhost:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.161:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:localhost:8090}
   WMSHFeign:
@@ -49,8 +49,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:localhost:8060}
-
+    url: ${RMSFEIGN_HRL:192.168.1.115:8060}
 
 genxml:
   pth: com/a
@@ -79,7 +78,6 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
-
 server:
   port: 8080
 

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

@@ -1,47 +0,0 @@
-<?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.SelfServiceMachineMapper">
-    <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
-        select OO.ORDER_NUMBER "orderNumber",
-               RC.CAPACITY_NUMBER "capacityNumber",
-               RCA.CARRIER_NAME "carrierName",
-               RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
-
-        from OMSTRUCK_ORDER OO
-                 left join RMS_CAPACITY RC
-                           on RC.CAPACITY_ID = OO.CAPACITY_ID
-                 left join RMS_CARRIER RCA
-                           on RCA.CARRIER_ID = RC.CARRIER_ID
-                 left join AMS_SALE_ORDER ASO
-                           on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
-                 left join RMS_CONSIGNEE RCON
-                           on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
-        where OO.ORDER_NUMBER = #{orderNumber}
-    </select>
-
-<!--  查询订单子表关联的  -->
-    <select id="getOOMMes" parameterType="string" resultType="java.util.Map">
-        select
-               RM.MATERIAL_NAME                          "materialName",
-               RPP.PLATFORM_NAME                         "platformName",
-               RP.PERSONNEL_NAME                         "personnelName",
-               (
-                 select ORDER_MATERIAL_NUMBER
-                 from OMSTRUCK_ORDER_MATERIAL OOM
-                 where OOM.ORDER_ID = OO.ORDER_ID
-                  and TLR.MATERIAL_ID = OOM.MATERIAL_ID
-                   ) "orderMaterialNumber"
-        from OMSTRUCK_ORDER OO
-                 left join TMSTRUCK_TOTAL_RESULT TTR
-                           on TTR.ORDER_ID = OO.ORDER_ID
-                 left join TMSTRUCK_LOAD_RESULT TLR
-                           on TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
-                 left join RMS_PWAREHOUSE_PLATFORM RPP
-                           on RPP.PLATFORM_ID = TLR.LOADING_ID
-                 left join RMS_MATERIAL RM
-                           on RM.MATERIAL_ID = TLR.MATERIAL_ID
-                 left join RMS_PERSONNEL RP
-                           on RP.PERSONNEL_ID = TLR.LOADER_ID
-        where ORDER_NUMBER = #{orderNumber}
-    </select>
-</mapper>

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

@@ -0,0 +1,314 @@
+<?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">
+    <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_NUMBER             "orderNumber",
+               RC.CAPACITY_NUMBER          "capacityNumber",
+               RCA.CARRIER_NAME            "carrierName",
+               RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join RMS_CARRIER RCA
+                           on RCA.CARRIER_ID = RC.CARRIER_ID
+                 left join AMS_SALE_ORDER ASO
+                           on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
+                 left join RMS_CONSIGNEE RCON
+                           on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+    <select id="selectHuanPiaoDan">
+
+    </select>
+
+    <!--  查询订单子表关联的  -->
+    <select id="getOOMMes" parameterType="string" resultType="java.util.Map">
+        select RM.MATERIAL_NAME  "materialName",
+               RPP.PLATFORM_NAME "platformName",
+               RP.PERSONNEL_NAME "personnelName",
+               (
+                   select ORDER_MATERIAL_NUMBER
+                   from OMSTRUCK_ORDER_MATERIAL OOM
+                   where OOM.ORDER_ID = OO.ORDER_ID
+                     and TLR.MATERIAL_ID = OOM.MATERIAL_ID
+               )                 "orderMaterialNumber"
+        from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR
+                           on TTR.ORDER_ID = OO.ORDER_ID
+                 left join TMSTRUCK_LOAD_RESULT TLR
+                           on TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+                 left join RMS_PWAREHOUSE_PLATFORM RPP
+                           on RPP.PLATFORM_ID = TLR.LOADING_ID
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = TLR.MATERIAL_ID
+                 left join RMS_PERSONNEL RP
+                           on RP.PERSONNEL_ID = TLR.LOADER_ID
+        where ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <sql id="orderBy">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+    </sql>
+
+    <!--  模糊查询所有物资  -->
+    <select id="queryAPOMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+                SELECT DISTINCT RM.MATERIAL_ID "materialId",
+                    RM.MATERIAL_NAME "materialName",
+                    RM.MATERIAL_CODE "materialCode",
+                    RM.MATERIAL_SPECIFICATION "materialSpecification",
+                    RM.MATERIAL_MODEL "materialModel"
+                FROM AMS_PURCHASE_ORDER APO
+                    LEFT JOIN DIL_BATCH DB
+                        ON DB.BATCH_ID = APO.BATCH_ID
+                    LEFT JOIN RMS_MATERIAL RM
+                        ON RM.MATERIAL_ID = DB.MATERIAL_ID
+                <where>
+                    <if test="index != null">
+                        RM.MATERIAL_NAME LIKE #{index}
+                    </if>
+                </where>
+        )
+        <where>
+            <if test="materialName != null">
+
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                 "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialSpecification != null">
+                and
+                <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+                    "materialSpecification" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialModel != null">
+                and
+                <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+                    "materialModel" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialId" desc
+        </if>
+    </select>
+    <!--    模糊查询发货单位 -->
+    <select id="querySupplierByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RS.SUPPLIER_ID "supplierId",
+        RS.SUPPLIER_NAME "supplierName",
+        RS.SUPPLIER_ADDRESS "supplierAddress"
+        FROM RMS_SUPPLIER RS
+        <where>
+            <if test="index != null">
+                RS.SUPPLIER_NAME LIKE #{index}
+            </if>
+        </where>
+        )
+        <where>
+            <if test="supplierName != null">
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierAddress != null">
+                and
+                <foreach collection="supplierAddress" item="item" open="(" separator="or" close=")">
+                    "supplierAddress" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "supplierId" desc
+        </if>
+    </select>
+
+    <!--  获取所有的运力信息 -->
+    <select id="getAllCapacityByCarrierLike" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+
+        SELECT *
+        FROM (
+                 SELECT
+                        RC.CAPACITY_ID        "capacityId",
+                        RC.CAPACITY_NUMBER     "capacityNumber",
+                        RCA.CARRIER_NAME       "carrierName"
+                 FROM RMS_CAPACITY RC
+                          LEFT JOIN RMS_CARRIER RCA
+                                    ON RCA.CARRIER_ID = RC.CARRIER_ID
+                 WHERE RC.CAPACITY_STATUS = 0 AND RC.CAPACITY_TYPE_ID = 1
+                   <if test="index != null">
+                       and RCA.CARRIER_NAME LIKE #{index}
+                   </if>
+                   <if test="index == null">
+                       and rownum &lt; 21
+                   </if>
+             )
+    </select>
+
+<!--    通过订单ID查询物资子表信息  -->
+    <select id="getMaterialMesByOrderId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select RM.MATERIAL_NAME               "materialName",
+                        RM.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
+                        RM.MATERIAL_SPECIFICATION       "materialSpecification",
+                        RM.MATERIAL_MODEL               "materialModel",
+                        OOM.ORDER_MATERIAL_NUMBER      "orderMaterialNumber"
+
+                 from OMSTRUCK_ORDER_MATERIAL OOM
+                          left join RMS_MATERIAL RM
+                                    ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                 where OOM.ORDER_ID = #{orderId}
+             )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialTheoreticalWeight != null">
+            and
+                <foreach collection="materialTheoreticalWeight" item="item" open="(" separator="or" close=")">
+                    "materialTheoreticalWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialNumber != null">
+                and
+                <foreach collection="orderMaterialNumber" item="item" open="(" separator="or" close=")">
+                    "orderMaterialNumber" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialName" desc
+        </if>
+    </select>
+
+<!--  通过物资ID查询该物资的发货单位信息  -->
+    <select id="getSupplierMesByMaterialId" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+                 select distinct RS.SUPPLIER_ID      "supplierId",
+                                 RS.SUPPLIER_NAME    "supplierName",
+                                 RS.SUPPLIER_ADDRESS "supplierAddress"
+                 from DIL_BATCH DB
+                          left join AMS_PURCHASE_ORDER APO
+                                    on apo.BATCH_ID = DB.BATCH_ID
+                          left join RMS_SUPPLIER RS
+                                    on RS.SUPPLIER_ID = apo.SUPPLIER_UNIT_ID
+                 <where>
+                    <if test="materialId != null">
+                        DB.MATERIAL_ID = #{materialId}
+                    </if>
+                 </where>
+             )
+        <where>
+            <if test="index != null">
+                "supplierName" like #{index}
+            </if>
+        </where>
+    </select>
+
+<!--  模糊查询所有的卸货点信息  -->
+    <select id="getUnloadingMesByLike" parameterType="map" resultType="java.util.Map">
+
+        select *
+        from (
+                 select
+                        RW.WAREHOUSE_ID   "warehouseId",
+                        RW.WAREHOUSE_NAME "warehouseName"
+                 from RMS_WAREHOUSE RW
+                 <where>
+                     <if test="type != null">
+                         RW.WAREHOUSE_TYPE_ID = #{type}
+                     </if>
+                 </where>
+             )
+        <where>
+            <if test="index != null">
+                "warehouseName" like #{index}
+            </if>
+            <if test="warehouseName != null">
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "warehouseName" desc
+        </if>
+    </select>
+
+    <!--  模糊查询所有物资  -->
+    <select id="queryMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_CODE "materialCode",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel"
+        FROM RMS_MATERIAL RM
+        <where>
+            <if test="startNum != null">
+                RM.MATERIAL_CODE LIKE #{startNum}
+            </if>
+            <if test="startNum == null">
+                RM.MATERIAL_CODE LIKE '010%' OR RM.MATERIAL_CODE LIKE '0801%'
+            </if>
+        </where>
+        )
+        <where>
+            <if test="index != null">
+                "materialName" LIKE #{index}
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialSpecification != null">
+                and
+                <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+                    "materialSpecification" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialModel != null">
+                and
+                <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+                    "materialModel" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialId" desc
+        </if>
+    </select>
+</mapper>