入库

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 io.swagger.models.auth.In;
 import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -88,6 +89,14 @@ public class AMScontroller{
         return amsFeign.receptionPurPlan(planId);
     }
 
+    //停用运输计划
+    @PostMapping("/changePlanStatus/{planId}")
+    public Map<String,Object>changePlanStatus(@PathVariable("planId") BigDecimal planId){
+        return amsFeign.changePlanStatus(planId);
+    }
+
+
+
     @ApiOperation(value = "逻辑删除运输计划 状态：3")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
@@ -331,11 +340,12 @@ public class AMScontroller{
     public Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              Integer apiId) {
+                                              Integer apiId,
+                                              String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId, con);
     }
 
     /**
@@ -946,6 +956,11 @@ public class AMScontroller{
     public Map<String,Object> addTruckPlan(@RequestBody  Map<String, Object> mapVal) {
         return amsFeign.addTruckPlan(mapVal);
     }
+    //新增采购内转需求
+    @PostMapping("/addPurInwardRequirement")
+    public Map<String,Object>addPurInwardRequirement(@RequestBody Map<String,Object>mapval){
+        return amsFeign.addPurInwardRequirement(mapval);
+    }
     //删除
     @PostMapping("/deleteTruckPlan/{planId}")
     public Map<String,Object> deleteTruckPlan(@PathVariable("planId") Integer planId) {
@@ -1077,6 +1092,22 @@ public class AMScontroller{
         return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con);
     }
 
+    @PostMapping("/getPurRequirementList")
+    public Map<String, Object> getPurRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       Integer requirementStatus,
+                                                       String con,
+                                                       String userId,
+                                                       String carrierSsoId,
+                                                       String enableStatus,
+                                                       String planStatus) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus);
+    }
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping("/getDispatchSaleOrderList")
     public Map<String, Object> getDispatchSaleOrderList() {
@@ -1218,14 +1249,18 @@ public class AMScontroller{
     })
     @PostMapping("/getSporadicOrdersList")
     public RESTfulResult getSporadicOrdersList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer orderType,
-                                            Integer issueStatus,
-                                            String con,
-                                            Integer dispatchStatus) {
-        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus);
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               Integer issueStatus,
+                                               String con,
+                                               Integer dispatchStatus,
+                                               Integer sporadicStatus,
+                                               String carrierSsoId,
+                                               String userId,
+                                               String userIds) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId,userIds);
     }
 
     @ApiModelProperty(value = "查看物资详情")
@@ -1250,18 +1285,35 @@ public class AMScontroller{
         return amsFeign.deleteSporadicOrders(sporadicOrderId);
     }
 
+
+
+
     @ApiOperation(value="下发零星物资订单")
     @PostMapping("/issueSporadicOrders")
     public Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList) {
         return amsFeign.issueSporadicOrders(mapList);
     }
 
+    @ApiOperation(value="停止零星订单一车多趟")
+    @PostMapping("/closeSporadicOrder")
+    public Map<String, Object> closeSporadicOrder(@RequestBody Map<String, Object> map) {
+        return amsFeign.closeSporadicOrder(map);
+    }
+
+
+    @ApiOperation(value="内转零星物流添加运输计划")
+    @PostMapping("/addInwardSporadicOrder")
+    public Map<String, Object> addInwardSporadicOrder(@RequestBody Map<String, Object> map) {
+        return amsFeign.addInwardSporadicOrder(map);
+    }
+
     @ApiOperation(value="新增零星物资进出厂（以及销售钢材退货）")
     @PostMapping("/addSporadicOrders")
     public Map<String, Object> addSporadicOrders(@RequestBody Map<String,Object> mapValue) {
         return amsFeign.addSporadicOrders(mapValue);
     }
 
+
     @ApiOperation(value="零星一车多趟新增订单")
     @PostMapping("/addSporadicOrderTimes")
     public Map<String, Object> addSporadicOrderTimes(@RequestBody Map<String,Object> mapValue) {
@@ -1485,8 +1537,27 @@ public class AMScontroller{
         return amsFeign.dispatchTruckOrderBySale(mapValue);
     }
 
+    @ApiOperation(value="展示销售焦炭订单")
+    @PostMapping("/getCokeSaleOrderList")
+    public RESTfulResult getCokeSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         String con) {
+        return amsFeign.getCokeSaleOrderList(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId, con);
+    }
 
+    @ApiOperation(value="承运商直接选择车牌号派发运输订单")
+    @PostMapping("/dispatchTruckOrderByCarrier")
+    public Map<String,Object> dispatchTruckOrderByCarrier(@RequestBody Map<String,Object> mapValue){
+        return amsFeign.dispatchTruckOrderByCarrier(mapValue);
+    }
 
+    @ApiOperation(value="关闭销售订单")
+    @PostMapping("closeSaleOrder")
+    public Map<String,Object> closeSaleOrder(@RequestParam Integer saleOrderId){
+        return amsFeign.closeSaleOrder(saleOrderId);
+    }
 
 
     @ApiOperation(value="新增公告信息", notes="根据DilNotice对象创建")
@@ -1536,4 +1607,10 @@ public class AMScontroller{
     public Map<String,Object> getNoticeTypeId(){
         return amsFeign.getNoticeTypeId();
     }
+
+    @ApiOperation(value="抢单/接收订单锁定")
+    @PostMapping("/lockDispatchSaleOrderList")
+    public Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.lockDispatchSaleOrderList(mapValue);
+    }
 }

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

@@ -98,6 +98,12 @@ public class OMSController {
         return omsFeign.addPurOrder(mapValue);
     }
 
+    //采购内转派单
+    @ApiOperation(value = "采购内转派单")
+    @PostMapping("/addPurInwardOrder")
+    public Map<String,Object> addPurInwardOrder(@RequestBody(required = false) Map<String,Object>mapValue) {
+        return omsFeign.addPurInwardOrder(mapValue);
+    }
 
     @ApiOperation(value = "修改分派计划")
     @PostMapping("/updateOrder")
@@ -105,14 +111,12 @@ public class OMSController {
         return omsFeign.updateOrder(map);
     }
 
-
     @ApiOperation(value = "派单")
     @PostMapping("/dispatchOrder")
     public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
         return omsFeign.dispatchOrder(mapValue);
     }
 
-
     @ApiOperation(value = "销售派单")
     @PostMapping("/dispatchOrderForSale")
     public Map<String, Object> dispatchorderForSale(@RequestBody(required = false) Map<String, Object> map) {
@@ -120,7 +124,6 @@ public class OMSController {
     }
 
 
-
     @ApiOperation(value = "逻辑删除运单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
@@ -139,7 +142,11 @@ public class OMSController {
     public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map) {
         return omsFeign.driverReceiveOrRefuse(map);
     }
-
+    @ApiOperation(value="撤销订单")
+    @PostMapping("/undoOrder")
+    public Map<String, Object> undoOrder(@RequestBody Map<String,Object> map) {
+        return omsFeign.undoOrder(map);
+    }
 
     @ApiOperation(value="司机接单信息")
     @ApiImplicitParams({
@@ -509,6 +516,13 @@ public class OMSController {
         return map;
     }
 
+    @ApiOperation(value="根据运单id修改运力")
+    @PostMapping("/updateCapacityId")
+    public Map<String, Object> updateCapacityId(@RequestBody Map<String,Object> map) {
+       return omsFeign.updateCapacityId(map);
+
+    }
+
     @ApiOperation(value="siji")
     @PostMapping("/getCapacityAndDriverList")
     public Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -571,6 +585,23 @@ public class OMSController {
         return map;
     }
 
+    @ApiOperation(value="采购内转运单")
+    @PostMapping("/getPurInwardOrderList")
+    public Map<String, Object> getPurInwardOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer orderStatus,
+                                                  String carrierId,
+                                                  String con,
+                                                     Integer planEnableStatus) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getPurInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,planEnableStatus);
+        return map;
+    }
+
     @ApiOperation(value = "司机APP端查询下发给自己运输订单")
     @PostMapping("/sendOrderToApp")
     public List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber) {
@@ -646,8 +677,11 @@ public class OMSController {
                                                  Integer type,
                                                  Integer orderStatus,
                                                  String carrierId,
-                                                 String  con) {
-        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con);
+                                                 String  con,
+                                                 String userId,
+                                                 String usersId,
+                                                       Integer type1) {
+        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con,userId,usersId,type1);
     }
 
     @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")
@@ -689,4 +723,16 @@ public class OMSController {
     public Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map) {
         return omsFeign.getDriverConfirmation(map);
     }
+
+    @ApiOperation(value = "一键删除多个订单")
+    @PostMapping("/deleteOrders")
+    public Map<String, Object>  deleteOrders(@RequestBody(required = false) Map<String, Object> map){
+        return omsFeign.deleteOrders(map);
+    }
+
+    @ApiOperation(value = "装卸工查询自己所有装了货的订单信息")
+    @PostMapping("/getAllLoadUnloadResult")
+    public Map<String, Object> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> mapValue){
+        return omsFeign.getAllLoadUnloadResult(mapValue);
+    }
 }

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

@@ -1061,4 +1061,9 @@ public class RMScontroller {
         return rmsFeign.getConsigneeFarId(state);
     }
 
+    @PostMapping("/isInHere")
+    public Integer isInHere(@RequestParam String personnelJobNumber) {
+        return rmsFeign.isInHere(personnelJobNumber);
+    }
+
 }

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

@@ -1165,8 +1165,11 @@ public class TMSController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer status,
-                                          Integer orderType, String con){
-        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con);
+                                          Integer orderType,
+                                          String con,
+                                          String userId,
+                                          String userIds){
+        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, orderType, con,userId,userIds);
     }
 
     @ApiOperation(value = "新增采购汽车装车实绩")
@@ -1239,9 +1242,11 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageNum,
                                                Integer pageSize,
                                                Integer orderType,
-                                               String con
+                                               String con,
+                                               String userId,
+                                               String userIds
     ){
-        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
     }
 
     @ApiOperation(value="通过运输订单id查询物资信息")
@@ -1301,11 +1306,14 @@ public class TMSController extends BaseRESTfulController {
     })
     @PostMapping("/getAllJiMaoResult")
     public Map<String, Object> getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                                 Integer orderType,String con){
-        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer orderType,
+                                                 String con,
+                                                 String userId,
+                                                 String userIds){
+        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
     }
 
     @ApiOperation(value = "查询计皮实绩")
@@ -1318,12 +1326,14 @@ public class TMSController extends BaseRESTfulController {
     })
     @PostMapping("/getAllJiPiResult")
     public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer orderType,
-                                                String con) {
-        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer orderType,
+                                                String con,
+                                                String userId,
+                                                String userIds) {
+        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
     }
 
 
@@ -1357,13 +1367,15 @@ public class TMSController extends BaseRESTfulController {
     })
     @PostMapping("/getUnloadResult")
     public Map<String, Object> getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         Integer apiId,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                         Integer orderType,
-                                               String con
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               String con,
+                                               String userId,
+                                               String userIds
     ){
-        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
     }
 
     @ApiOperation(value = "添加卸货实绩")
@@ -1421,9 +1433,13 @@ public class TMSController extends BaseRESTfulController {
                                                      Integer apiId,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer orderType,String con
+                                                     Integer orderType,
+                                                     String con,
+                                                     String carrierSsoId,
+                                                     String userId,
+                                                     String userIds
     ){
-        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con, carrierSsoId,userId,userIds);
     }
 
 
@@ -1924,35 +1940,76 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
+                                             String startTime, String endTime,
                                                Integer orderType
     ){
-        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType);
+        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
     }
-    @ApiOperation(value="查询辅料燃料统计报表")
+    @ApiOperation(value="查询销售统计报表")
     @PostMapping("/getAllSaleReport")
     public Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize, String carrierSsoId
+                                          Integer pageSize,
+                                          String startTime, String endTime,
+                                          String carrierSsoId
     ){
-        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
     }
+
+    @ApiOperation(value="查询销售统计报表筛选过后的总净重")
+    @PostMapping("/getAllSaleReportTotal")
+    public Map<String, Object> getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                String startTime, String endTime,
+                                                String carrierSsoId
+    ){
+        return tmsTruckFeign.getAllSaleReportTotal(mapValue==null?new HashMap<>():mapValue, startTime, endTime, carrierSsoId);
+    }
+
+//    @ApiOperation(value="查询内转统计报表")
+//    @PostMapping("/getAllInwardResult")
+//    public Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                Integer apiId,
+//                                                Integer pageNum,
+//                                                Integer pageSize,
+//                                                String startTime, String endTime,
+//                                                String carrierSsoId
+//    ){
+//        return tmsTruckFeign.getAllInwardResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
+//    }
+
+
+
+
     @ApiOperation(value="查询零星物资进厂统计报表")
     @PostMapping("/getSporadicSuppliesReport1")
     public Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
                                                 Integer apiId,
                                                 Integer pageNum,
-                                                Integer pageSize, String carrierSsoId
+                                                Integer pageSize,
+                                                String startTime, String endTime,
+                                                String carrierSsoId,
+                                               String userId,
+                                               String userIds,
+                                               String con,
+                                               Integer orderType
     ){
-        return tmsTruckFeign.getSporadicSuppliesReport1(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+        return tmsTruckFeign.getSporadicSuppliesReport1(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
     }
     @ApiOperation(value="查询零星物资出厂统计报表")
     @PostMapping("/getSporadicSuppliesReport2")
     public Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize, String carrierSsoId
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          String endTime,
+                                                          String carrierSsoId,
+                                                          String userId,
+                                                          String userIds,
+                                                          String con,
+                                                          Integer orderType
     ){
-        return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+        return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
     }
 }

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

@@ -73,11 +73,10 @@ public class UniversalController extends BaseRESTfulController {
         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);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId,columnList);
         return success(data);
     }
 
@@ -99,11 +98,10 @@ public class UniversalController extends BaseRESTfulController {
         if(index != null){
             mapValue.put("index","%" + index + "%");
         }
-        List<Map<String, Object>> list = universalMapper.queryAllSupplierByLike(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.queryAllSupplierByLike(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
 
@@ -130,16 +128,15 @@ public class UniversalController extends BaseRESTfulController {
         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);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
 
 
-    @ApiOperation(value="查询所有空闲的运力信息")
+    @ApiOperation(value="查询所有运力信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
@@ -152,28 +149,30 @@ public class UniversalController extends BaseRESTfulController {
                                         Integer pageNum,
                                         Integer pageSize,
                                         String carrierSsoId,
-                                        String index
+                                        String index,
+                                        String con
     ){
         if(mapValue == null){
             mapValue = new HashMap<>();
         }
         if(index != null){
-            mapValue.put("index","%" + index + "%");
+            mapValue.put("index", index);
+        }
+        if (con != null&&con.equals("undefined")){
+            mapValue.put("con","%"+con+"%");
         }
         if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
             carrierSsoId = null;
         }
-        BigDecimal carrierId = null;
         if (carrierSsoId != null) {
-          carrierId = universalMapper.getCarrierIdBySSO(carrierSsoId);
+          BigDecimal carrierId = universalMapper.getCarrierIdBySSO(carrierSsoId);
+          mapValue.put("carrierId",carrierId);
         }
-        mapValue.put("carrierId",carrierId);
         //不分页筛选数据
-        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);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, capacity);
         return success(pageList);
     }
 
@@ -199,11 +198,10 @@ public class UniversalController extends BaseRESTfulController {
             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);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, capacity);
         return success(pageList);
     }
 
@@ -237,7 +235,7 @@ public class UniversalController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/queryAPOMaterialByLike")
-    public RESTfulResult queryMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+    public RESTfulResult queryAPOMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
                                              Integer apiId,
@@ -246,14 +244,13 @@ public class UniversalController extends BaseRESTfulController {
         if(mapValue == null) {
             mapValue = new HashMap<>();
         }
-        if(index != null){
-            mapValue.put("index", "%" + index + "%");
+        if(index != null && !"".equals(index) &&!"null".equals(index)){
+            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);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
 
@@ -279,13 +276,12 @@ public class UniversalController extends BaseRESTfulController {
             mapValue.put("type", type);
         }
         if(index != null){
-            mapValue.put("index", "%" + index + "%");
+            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);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
 
@@ -300,23 +296,18 @@ public class UniversalController extends BaseRESTfulController {
                                              Integer pageNum,
                                              Integer pageSize,
                                              Integer apiId,
-                                             String index,
-                                             String startNum) {
+                                             String index) {
 
         if(mapValue == null) {
             mapValue = new HashMap<>();
         }
-        if(startNum != null){
-            mapValue.put("startNum", startNum + "%");
-        }
         if(index != null){
-            mapValue.put("index", "%" + index + "%");
+            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);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
 
@@ -337,13 +328,12 @@ public class UniversalController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         if(index != null){
-            mapValue.put("index", "%" + index + "%");
+            mapValue.put("index", index);
         }
-        List<Map<String, Object>> list = universalMapper.getBatchAndOrderMes(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.getBatchAndOrderMes(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
 
@@ -370,13 +360,12 @@ public class UniversalController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         if(index != null){
-            mapValue.put("index","%" + index + "%");
+            mapValue.put("index", index);
         }
-        List<Map<String, Object>> list = universalMapper.queryConsigneeByLike(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.queryConsigneeByLike(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
 
@@ -396,20 +385,18 @@ public class UniversalController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         if(index != null){
-            mapValue.put("index","%" + index + "%");
+            mapValue.put("index", index);
         }
-        List<Map<String, Object>> list = universalMapper.selectAllMaterialName(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.selectAllMaterialName(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
 
     @ApiModelProperty(value = "返回sha1加密字符串")
-    @PostMapping("/sha1DigestUtils")
-    public String sha1DigestUtils(String text)
-    {
+    @RequestMapping(value = "/sha1DigestUtils", method = {RequestMethod.GET,RequestMethod.POST})
+    public String sha1DigestUtils(String text){
         return universalService.sha1DigestUtils(text);
     }
 
@@ -442,11 +429,10 @@ public class UniversalController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("index",index);
-        List<Map<String, Object>> list = universalMapper.getCarrierListByLike(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.getCarrierListByLike(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
 
@@ -496,11 +482,10 @@ public class UniversalController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("index",index);
-        List<Map<String, Object>> list = universalMapper.getConsigneeListByLike(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.getConsigneeListByLike(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
 
@@ -511,5 +496,15 @@ public class UniversalController extends BaseRESTfulController {
         return saleStatus;
     }
 
+    @ApiOperation("查询所有的汽车衡")
+    @GetMapping("/getAllCalculateMes")
+    public List<Map<String, Object>> getAllCalculateMes() {
+        return universalMapper.getAllCalculateMes();
+    }
 
+    @ApiOperation("查询所有的焦炭子类")
+    @GetMapping("/getAllMaterialCoke")
+    public List<Map<String, Object>> getAllMaterialCoke() {
+        return universalMapper.getAllMaterialCoke();
+    }
 }

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

@@ -56,7 +56,7 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
     }
 
-    @PostMapping("/insertWmspOutBoundResult")
+    @PostMapping("/wmspoutboundresults/insertWmspOutBoundResult")
     @ApiOperation(value = "新增出单实绩并返回出库单详情")
     public Map<String, Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval) {
         Map<String, Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
@@ -646,7 +646,7 @@ public class WMSController extends BaseRESTfulController {
      * @return
      */
     @ApiOperation(value = "新增入库扫描吊牌实绩")
-    @PostMapping("/insertResult")
+    @PostMapping("/inboundScanResult/insertResult")
     @Transactional
     public Map<String, Object> insertResult(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.insertResult(map);
@@ -756,4 +756,19 @@ public class WMSController extends BaseRESTfulController {
     Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map){
         return wmsFeign.IssueToCrane(map);
     }
+    //新增入库实绩
+    @PostMapping("/inboundResult/insertInboundResult")
+    public  RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList){
+        return wmsFeign.addInvoice(userName,groupId,personnelWorkshopid,mapList);
+    }
+    //抢单
+    @PostMapping("/wmspinbounddistributes/grabDistribute")
+    public  RESTfulResult grabDistribute( @RequestBody Map<String,Object> mapValue){
+        return wmsFeign.grabDistribute(mapValue);
+    }
+
+    @GetMapping("/wmspinbounddistributes/getNewDistribute")
+    public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid){
+        return wmsFeign.getNewDistribute(personnelWorkshopid);
+    }
 }

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

@@ -283,7 +283,8 @@ public interface AmsFeign {
     Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId);
+                                       @RequestParam Integer apiId, @RequestParam String con
+                                             );
 
 
 
@@ -903,9 +904,15 @@ public interface AmsFeign {
     @PostMapping ("api/v1/ams/amstruckpurplans/getPurPlanById/{planId}")
     public Map<String, Object> getPurPlanById(@PathVariable("planId")Integer planId);
 
+    @PostMapping ("api/v1/ams/amstruckinwardplan/changePlanStatus/{planId}")
+    public Map<String, Object> changePlanStatus(@PathVariable("planId")BigDecimal planId);
+
+
     @PostMapping("api/v1/ams/amstruckpurplans/addPurPlan")
     public Map<String, Object> addPurPlan(@RequestBody Map<String, Object> map);
 
+
+
     @PostMapping("api/v1/ams/amstruckpurplans/sendPurPlan/{planId}")
     public Map<String, Object> sendPurPlan(@PathVariable("planId")Integer planId);
 
@@ -1246,7 +1253,11 @@ public interface AmsFeign {
                                               @RequestParam Integer orderType,
                                               @RequestParam Integer issueStatus,
                                               @RequestParam String con,
-                                              @RequestParam Integer dispatchStatus);
+                                              @RequestParam Integer dispatchStatus,
+                                              @RequestParam Integer sporadicStatus,
+                                              @RequestParam String carrierSsoId,
+                                              @RequestParam String userId,
+                                              @RequestParam String userIds);
 
     @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
     RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -1262,6 +1273,14 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amstrucksporadicorders/issueSporadicOrders")
     Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList);
 
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/closeSporadicOrder")
+    Map<String, Object> closeSporadicOrder(@RequestBody Map<String, Object> map);
+
+
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/addInwardSporadicOrder")
+    Map<String, Object> addInwardSporadicOrder(@RequestBody Map<String, Object> map);
+
     @PostMapping("/api/v1/ams/amstrucksporadicorders/addSporadicOrders")
     Map<String, Object> addSporadicOrders(@RequestBody Map<String, Object> mapValue);
 
@@ -1423,4 +1442,39 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchTruckOrderBySale")
     Map<String, Object> dispatchTruckOrderBySale(Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/ams/amssaleorders/getCokeSaleOrderList")
+    RESTfulResult getCokeSaleOrderList(@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/ams/amssaleordermaterials/dispatchTruckOrderByCarrier")
+    Map<String, Object> dispatchTruckOrderByCarrier(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/closeSaleOrder")
+    Map<String, Object> closeSaleOrder(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/lockDispatchSaleOrderList")
+    Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String, Object> mapValue);
+
+    //新增采购内转需求
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/addPurInwardRequirement")
+    Map<String, Object> addPurInwardRequirement(@RequestBody  Map<String, Object> mapval);
+
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getPurRequirementList")
+    Map<String, Object> getPurRequirementList(@RequestBody Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer requirementStatus,
+                                              @RequestParam String con,
+                                              @RequestParam String userId,
+                                              @RequestParam String carrierSsoId,
+                                              @RequestParam String enableStatus,
+                                              @RequestParam String planStatus);
+
+
+
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import oracle.jdbc.proxy.annotation.Post;
@@ -63,6 +64,11 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorders/driverReceiveOrRefuse")
     public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/oms/omstruckorders/undoOrder")
+    Map<String, Object> undoOrder(@RequestBody Map<String, Object> map);
+
+
+
     @PostMapping("api/v1/oms/omstruckorders/getReceiveRefuseOrder/{orderReceiveStatus}")
     public Map<String, Object> getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
                                                @RequestParam("apiId") Integer apiId,
@@ -279,6 +285,12 @@ public interface OmsFeign {
     @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
     Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId);
 
+
+    @ApiOperation(value="根据运单id修改运力")
+    @PostMapping(value = "api/v1/oms/omstruckorders/updateCapacityId")
+    Map<String, Object> updateCapacityId(@RequestBody Map<String,Object> map);
+
+
     @ApiOperation(value="车牌")
     @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityAndDriverList")
     Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -363,7 +375,10 @@ public interface OmsFeign {
                                                        @RequestParam("orderStatus") Integer orderStatus,
                                                        @RequestParam("carrierId") String carrierId,
                                                        @RequestParam("type") Integer type,
-                                                       @RequestParam("con") String con
+                                                       @RequestParam("con") String con,
+                                                       @RequestParam("userId") String userId,
+                                                       @RequestParam("usersId") String usersId,
+                                                       @RequestParam("type1")Integer type1
                                                        );
 
     @ApiOperation(value = "根据运输订单id修改运力id")
@@ -393,5 +408,29 @@ public interface OmsFeign {
     @ApiOperation(value = "查询订单是否确认")
     @PostMapping("api/v1/oms/omstruckorders/getDriverConfirmation")
     Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map);
+
+    @ApiOperation(value = "一键删除多个订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/deleteOrders")
+    Map<String, Object> deleteOrders(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("api/v1/oms/omstruckorders/addPurInwardOrder")
+    Map<String, Object> addPurInwardOrder(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    //采购内转运输订单
+    @PostMapping("api/v1/oms/omstruckorders/getPurInwardOrderList")
+    Map<String, Object> getPurInwardOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer orderStatus,
+                                           @RequestParam String carrierId,
+                                           @RequestParam String con,
+                                              @RequestParam Integer planEnableStatus);
+
+
+    @ApiOperation(value = "装卸工查询自己所有装了货的订单信息")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getAllLoadUnloadResult")
+    Map<String, Object> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> mapValue);
 }
 

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

@@ -575,4 +575,8 @@ public interface RmsFeign {
     @ApiOperation(value = "边输边查收货客户父节点")
     @PostMapping(value = "api/v1/rms/rmsconsignee/getConsigneeFarId")
     Map<String, Object> getConsigneeFarId(@RequestParam("state") String state);
+
+    @ApiOperation(value = "边输边查收货客户父节点")
+    @PostMapping(value = "api/v1/rms/rmspersonnel/isInHere")
+    Integer isInHere(@RequestParam String personnelJobNumber);
 }

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

@@ -51,7 +51,10 @@ public interface TmsTruckFeign {
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("status") Integer status ,
                                           @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con") String con);
+                                          @RequestParam("con")   String con,
+                                          @RequestParam("userId") String userId,
+                                          @RequestParam("userIds") String userIds
+    );
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadResultForConverted")
     public Map<String,Object> selectLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -96,11 +99,13 @@ public interface TmsTruckFeign {
     })
     @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getAllEnFactoryResult")
     public Map<String, Object> getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType")Integer orderType,
-                                               @RequestParam("con")      String con
+                                                     @RequestParam("apiId")     Integer apiId,
+                                                     @RequestParam("pageNum")   Integer pageNum,
+                                                     @RequestParam("pageSize")  Integer pageSize,
+                                                     @RequestParam("orderType") Integer orderType,
+                                                     @RequestParam("con")       String con,
+                                                     @RequestParam("userId")    String userId,
+                                                     @RequestParam("userIds")   String userIds
     );
     @GetMapping("api/v1/truckTms/tmstruckenfactoryresults/getMaterial")
     public Map<String , Object> getMaterial(@RequestParam("orderId")  Integer orderId);
@@ -127,20 +132,24 @@ public interface TmsTruckFeign {
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiMaoResult")
     public Map<String, Object> getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("apiId") Integer apiId,
+                                                 @RequestParam("pageNum") Integer pageNum,
+                                                 @RequestParam("pageSize") Integer pageSize,
                                                  @RequestParam("orderType") Integer orderType,
-                                                 @RequestParam("con")     String con
+                                                 @RequestParam("con")     String con,
+                                                 @RequestParam("userId")  String userId,
+                                                 @RequestParam("userIds") String userIds
                                                  );
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
     public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize,
                                                 @RequestParam("orderType") Integer orderType,
-                                                @RequestParam("con") String con);
+                                                @RequestParam("con") String con,
+                                                @RequestParam("userId")String userId,
+                                                @RequestParam("userIds")String userIds);
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
     public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
@@ -155,11 +164,13 @@ public interface TmsTruckFeign {
 
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/getUnloadResult")
     public Map<String, Object> getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         @RequestParam("apiId") Integer apiId,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("orderType") Integer orderType,
-                                         @RequestParam("con")      String con
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("orderType") Integer orderType,
+                                               @RequestParam("con")      String con,
+                                               @RequestParam("userId") String userId,
+                                               @RequestParam("userIds") String userIds
     );
 
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
@@ -192,7 +203,10 @@ public interface TmsTruckFeign {
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
                                                @RequestParam("orderType") Integer orderType,
-                                               @RequestParam("con") String con
+                                               @RequestParam("con") String con,
+                                               @RequestParam("carrierSsoId")String carrierSsoId,
+                                               @RequestParam("userId") String userId,
+                                               @RequestParam("userIds") String userIds
     );
 
     @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")
@@ -344,6 +358,8 @@ public interface TmsTruckFeign {
                                       @RequestParam("apiId") Integer apiId,
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("startTime") String startTime,
+                                      @RequestParam("endTime")   String endTime,
                                       @RequestParam("orderType") Integer orderType
     );
 
@@ -360,22 +376,55 @@ public interface TmsTruckFeign {
                                       @RequestParam("apiId") Integer apiId,
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
                                       @RequestParam("carrierSsoId")   String carrierSsoId
     );
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")
+    Map<String, Object> getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
+                                         @RequestParam("carrierSsoId")   String carrierSsoId
+    );
+
     @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport1")
     Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         @RequestParam("apiId") Integer apiId,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("carrierSsoId")   String carrierSsoId
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("startTime") String startTime,
+                                                   @RequestParam("endTime") String endTime,
+                                                   @RequestParam("carrierSsoId") String carrierSsoId,
+                                                   @RequestParam("userId") String userId,
+                                                   @RequestParam("userIds") String userIds,
+                                                   @RequestParam("con") String con,
+                                                   @RequestParam("orderType") Integer orderType
     );
     @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport2")
     Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("startTime") String startTime,
+                                                   @RequestParam("endTime") String endTime,
+                                                   @RequestParam("carrierSsoId") String carrierSsoId,
+                                                   @RequestParam("userId") String userId,
+                                                   @RequestParam("userIds") String userIds,
+                                                   @RequestParam("con") String con,
+                                                   @RequestParam("orderType") Integer orderType
+    );
+    //内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getAllInwardResult")
+    Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                          @RequestParam("apiId") Integer apiId,
                                          @RequestParam("pageNum") Integer pageNum,
                                          @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
                                          @RequestParam("carrierSsoId")   String carrierSsoId
     );
+
 }
 
 

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

@@ -7,6 +7,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -611,6 +612,23 @@ public interface WMSFeign {
     //下发给行车工
     @PostMapping("/api/v1/wms/reboundResult/IssueToCrane")
     Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map);
-
+    //创建组
+    @PostMapping(value ="/api/v1/wms/wmspinboundgroups/createGrop",produces  = "application/json;charset=UTF-8")
+    public RESTfulResult createGrop(@RequestBody Map mapValue);
+    //
+    @PostMapping("/api/v1/wms/inboundScanResult/insertResult")
+    public RESTfulResult insertScanResult(@RequestBody(required = false) Map<String, Object> map) throws ParseException;
+    //新增入库实绩
+    @PostMapping("/api/v1/wms/inboundResult/insertInboundResult")
+    public  RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList);
+    //加入分组
+    @PostMapping(value ="/api/v1/wms/wmspinboundgroups/joinGroup",produces  = "application/json;charset=UTF-8")
+    public RESTfulResult joinGroup(@RequestBody Map mapValue);
+    //获得抢单信息
+    @PostMapping("/api/v1/wms/wmspinbounddistributes/grabDistribute")
+    public  RESTfulResult grabDistribute( @RequestBody Map<String,Object> mapValue);
+    //抢单
+    @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
+    public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
 }
 

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

@@ -90,4 +90,10 @@ public interface UniversalMapper {
 
     //通过运输订单号查询订单类型和ID
         Map<String, Object> getOrderMesByOrderNumber(String orderNumber);
+
+    //查询所有的门岗（下拉框）
+    List<Map<String, Object>> getAllCalculateMes();
+
+    //查询所有的焦炭子类
+    List<Map<String, Object>> getAllMaterialCoke();
 }

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

@@ -25,11 +25,11 @@ public class ColumnDataUtil {
         return setString;
     }
 
-    public PageListAdd tableColumnData(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data) {
+    public PageListAdd tableColumnData(Integer apiId, 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()));
+            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
         }
         PageListAdd pageList = new PageListAdd(data);
         pageList.setColumnData(columnDataList);

src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
     name: dil-api
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
@@ -28,7 +28,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8012}
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:

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

@@ -60,7 +60,7 @@
     <select id="queryAPOMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (
-                SELECT DISTINCT RM.MATERIAL_ID "materialId",
+                SELECT RM.MATERIAL_ID "materialId",
                     RM.MATERIAL_NAME "materialName",
                     RM.MATERIAL_CODE "materialCode",
                     RM.MATERIAL_SPECIFICATION "materialSpecification",
@@ -72,13 +72,13 @@
                         ON RM.MATERIAL_ID = DB.MATERIAL_ID
                 <where>
                     <if test="index != null">
-                        RM.MATERIAL_NAME LIKE #{index}
+                        instr(RM.MATERIAL_NAME, #{index}) > 0
                     </if>
                 </where>
+                 group by RM.MATERIAL_ID,RM.MATERIAL_NAME,RM.MATERIAL_CODE,RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL
         )
         <where>
             <if test="materialName != null">
-
                 <foreach collection="materialName" item="item" open="(" separator="or" close=")">
                  "materialName" like '%${item}%'
                 </foreach>
@@ -103,9 +103,6 @@
             </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">
@@ -148,34 +145,46 @@
                  SELECT
                         RC.CAPACITY_ID        "capacityId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
-                        RCA.CARRIER_NAME       "carrierName"
+                        RCA.CARRIER_NAME       "carrierName",
+                        RC.INSERT_UPDATE_REMARK "remark"
                  FROM RMS_CAPACITY RC
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RC.CARRIER_ID
-                 WHERE RC.CAPACITY_STATUS = 0 AND RC.CAPACITY_TYPE_ID = 1 AND RC.CAPACITY_SSO_ID is not NULL
+                 WHERE RC.CAPACITY_TYPE_ID = 1 AND RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
                 and RC.CARRIER_ID = #{carrierId}
             </if>
-             ) RCRC
-        <if test="index != null">
-            where RCRC."capacityNumber" LIKE #{index}
-        </if>
-        <if test="index != null">
-            or RCRC."carrierName" LIKE #{index}
+            <if test="index != null">
+                and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
+            </if>
+            <if test="con != null">
+                where "capacityNumber" like #{con} or "carrierName" like #{con} or
+                "remark" like #{con}
+            </if>
+        )
+        <where>
+            <if test="capacityNumber != null">
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="remark != null">
+                and
+                <foreach collection="remark" item="item" open="(" separator="or" close=")">
+                    "remark" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "capacityNumber"
         </if>
-<!--        <where>-->
-<!--            <if test="capacityNumber != null">-->
-<!--                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">-->
-<!--                    "capacityNumber" like '%${item}%'-->
-<!--                </foreach>-->
-<!--            </if>-->
-<!--            <if test="carrierName != null">-->
-<!--                and-->
-<!--                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">-->
-<!--                    "carrierName" like '%${item}%'-->
-<!--                </foreach>-->
-<!--            </if>-->
-<!--        </where>-->
     </select>
 
     <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >
@@ -239,7 +248,7 @@
         from RMS_MATERIAL RM
         <where>
             <if test="index != null">
-                RM.MATERIAL_NAME like #{index}
+               instr(RM.MATERIAL_NAME, #{index}) > 0
             </if>
         </where>
         )
@@ -307,12 +316,12 @@
                      <if test="type != null">
                          RW.WAREHOUSE_TYPE_ID = #{type}
                      </if>
+                     <if test="index != null">
+                         instr(RW.WAREHOUSE_NAME, #{index}) > 0
+                     </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}%'
@@ -336,20 +345,13 @@
         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 '080%'
+            <if test="index != null">
+                instr(RM.MATERIAL_NAM, #{index}) > 0
             </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>
@@ -395,7 +397,7 @@
                                     on RM.MATERIAL_ID = DB.MATERIAL_ID
                  <where>
                      <if test="index != null">
-                         "resultForeignShipName" like #{index}
+                         instr(DB.RESULT_FOREIGN_SHIP_NAME, #{index}) > 0
                      </if>
                  </where>
              )
@@ -491,7 +493,9 @@
     </select>
 
     <select id="queryConsigneeByLike" resultType="java.util.Map" parameterType="java.util.Map" >
-        SELECT * FROM (
+        SELECT
+               *
+        FROM (
         SELECT
         RCO.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
         RCO.CONSIGNEE_CODE AS "consigneeCode",
@@ -499,21 +503,23 @@
         FROM RMS_CONSIGNEE RCO
         <where>
             <if test="index != null">
-                RCO.CONSIGNEE_COMPANY_NAME like #{index}
+                instr(RCO.CONSIGNEE_COMPANY_NAME, #{index}) > 0
             </if>
         </where>
         )
-        <if test="consigneeCompanyName != null">
-            <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
-                "consigneeCompanyName" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="consigneeCode != null">
-            and
-            <foreach collection="consigneeCode" item="item" open="(" separator="or" close=")">
-                "consigneeCode" like '%${item}%'
-            </foreach>
-        </if>
+        <where>
+            <if test="consigneeCompanyName != null">
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCode != null">
+                and
+                <foreach collection="consigneeCode" item="item" open="(" separator="or" close=")">
+                    "consigneeCode" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
     </select>
 
 <!--  通过订单ID查询订单下所有物资  -->
@@ -591,4 +597,20 @@
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
+<!--   查询所有的汽车衡  -->
+    <select id="getAllCalculateMes" resultType="java.util.Map">
+        select
+            RTC.TRUCK_CALCULATE_ID "id",
+            RTC.TRUCK_CALCULATE_ID "value",
+            RTC.TRUCK_CALCULATE_NUMBER "label"
+        from
+            RMS_TRUCK_CALCULATE RTC
+    </select>
+
+    <select id="getAllMaterialCoke" resultType="java.util.Map">
+        SELECT RMC.MATERIAL_COKE_ID   "id",
+               RMC.MATERIAL_COKE_NAME "label"
+        FROM RMS_MATERIAL_COKE RMC
+    </select>
+
 </mapper>