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;-->
+<!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>&lt;!&ndash;运力&ndash;&gt;-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -456,6 +456,7 @@ public class AMScontroller{
     public Map<String, Object> getDeliveryAddress(){
         return amsFeign.getDeliveryAddress();
     }
+
     @PostMapping("/addAmsDispatchSaleOrder")
     Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.addAmsDispatchSaleOrder(mapVal);
@@ -722,11 +723,12 @@ public class AMScontroller{
     public Map<String,Object> amsSaleOrderList(@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.amsSaleOrderList(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.amsSaleOrderList(mapValue, pageNum, pageSize, apiId,status);
     }
 
     //固定派单：通过车序号查询收货地址，截取收货地址的区域，去资源管理中查询对应的承运商,将车序号与承运商绑定
@@ -740,19 +742,20 @@ public class AMScontroller{
     @PostMapping("/getAmsSaleOrderMaterial")
     @ApiOperation(value = "展示车序号列表")
     public Map<String,Object> getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer apiId) {
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsSaleOrderMaterial(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getAmsSaleOrderMaterial(mapValue, pageNum, pageSize, apiId,status);
     }
 
     //新增公开派单
-    @PostMapping("/addOpenAmsDispatchSaleOrder/{saleOrderMaterialId}")
-    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderId) {
-        return amsFeign.addOpenAmsDispatchSaleOrder(saleOrderId);
+    @PostMapping("/addOpenAmsDispatchSaleOrder/{orderMaterialId}")
+    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("orderMaterialId") BigDecimal orderMaterialId) {
+        return amsFeign.addOpenAmsDispatchSaleOrder(orderMaterialId);
     }
 
     //删除公开派单
@@ -796,17 +799,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")
@@ -814,11 +842,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);
     }
 
     //新增钢材发往异地库计划
@@ -958,6 +987,20 @@ public class AMScontroller{
         return amsFeign.getLockDispatchSaleOrderList(carrierId);
     }
 
+    @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);
+    }
+
+    //获取到站名称
+    @GetMapping("/getArriveName")
+    public Map<String,Object> getArriveName() {
+        return amsFeign.getArriveName();
+    }
+
     @ApiModelProperty(value = "查询所有的钢材物资")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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

@@ -5,11 +5,13 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 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.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -122,9 +124,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);
     }
 
 
@@ -271,19 +273,19 @@ public class OMSController {
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
-    @PostMapping("/getDriverInfoForSale/{orderReceiveStatus}")
+    @PostMapping("/getDriverInfoForSale")
    public Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
                                             Integer apiId,
                                             Integer pageNum,
                                             Integer pageSize,
-                                            @PathVariable Integer orderReceiveStatus,
+
                                             Integer orderType,
                                             Integer orderStatus,
                                             String con,
-                                           Integer carrierId
+                                            Integer carrierId
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderReceiveStatus, orderType, orderStatus, con,carrierId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierId);
     }
 
 
@@ -364,7 +366,7 @@ public class OMSController {
                                                            Integer orderType,
                                                            String con
     ){
-        return  omsFeign.getCokeRailDayPlanForGenOrder(map==null?new HashMap<>():map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
+        return  omsFeign.getCokeRailDayPlanForGenOrder(map==null?new HashMap<>():map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus, orderType, con);
     }
 
 
@@ -382,9 +384,130 @@ public class OMSController {
 
 
    ){
-        return omsFeign.getWaterslagDayPlanForGenOrder(map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
+        return omsFeign.getWaterslagDayPlanForGenOrder(map==null?new HashMap<>():map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
+
    }
 
+    @ApiOperation(value="车牌号下拉")
+    @GetMapping("/getDriverCapacity")
+    public Map<String, Object> getDriverCapacity() {
+        Map<String,Object> map = omsFeign.getDriverCapacity();
+        return map;
+    }
+
+    @ApiOperation(value="派单信息")
+    @PostMapping("/getTruckNoDispatchMap")
+    public Map<String, Object> getTruckNoDispatchMap(Integer dispatchId) {
+        Map<String,Object> map = omsFeign.getTruckNoDispatchMap(dispatchId);
+        return map;
+    }
+
+    @ApiOperation(value="承运商分派运输订单给司机")
+    @PostMapping("/addAppTruckOrder")
+    public Map<String, Object> addAppTruckOrder(Integer dispatchId,
+                                                Integer orderType,
+                                                Integer driverCapacityId) {
+        Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType, driverCapacityId);
+        return 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"),
+    })
+    @PostMapping("/selectSteelSaleForCarrier/{carrierId}")
+    public Map<String, Object> selectSteelSaleForCarrier(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                         Integer apiId,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         @PathVariable Integer carrierId
+
+    )
+
+    {
+        return omsFeign.selectSteelSaleForCarrier(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierId);
+    }
+
+
+
+    @ApiOperation(value=" 通过销售订单id查找信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(235)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectInfoBySaleOrderId/{saleOrderId}")
+    public Map<String, Object> selectInfoBySaleOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       @PathVariable Integer saleOrderId
+
+
+    ){
+        return  omsFeign.selectInfoBySaleOrderId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,saleOrderId);
+    }
+
+    //展示发运计划信息
+    @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("/selectCokeRailPlan/{carrierId}")
+    public Map<String, Object> selectCokeRailPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  @PathVariable Integer carrierId,
+                                                  Integer orderType
+
+    ){
+        return  omsFeign.selectCokeRailPlan(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierId, orderType);
+    }
+
+    @ApiOperation(value=" 通过发运id查找信息")
+    @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("/selectInfoByDayPlanId/{dayPlanId}")
+    public Map<String, Object> selectInfoByDayPlanId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     @PathVariable  Integer dayPlanId,
+                                                     Integer orderType
+
+
+    ){
+        return omsFeign.selectInfoByDayPlanId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, dayPlanId, orderType);
+    }
+
+    //查询所有的收货单位
+    @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);
+    }
 }

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/UniversalController.java

@@ -0,0 +1,72 @@
+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.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 = "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) {
+        index = index + "%";
+        List<Map<String, Object>> list = universalMapper.queryMaterialByLike(index);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryMaterialByLike(index);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+}

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

@@ -572,6 +572,15 @@ public interface AmsFeign {
     })
     @GetMapping(value = "/api/v1/ams/amssaleorders/getConsigneeCompanyName")
     Map<String, Object> getConsigneeCompanyName();
+    //获取到站名称
+    @GetMapping("/api/v1/ams/amstruckraildayplans/getArriveName")
+    Map<String,Object> getArriveName();
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/selectDispatchSaleOrderList")
+    Map<String,Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize);
+
     /**
      * 新增销售订单物资信息
      * @param map
@@ -928,9 +937,10 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderList")
     Map<String,Object> amsSaleOrderList(@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 status);
 
     //固定派单：通过车序号查询收货地址，截取收货地址的区域，去资源管理中查询对应的承运商,将车序号与承运商绑定
     @PostMapping(value = "/api/v1/ams/amssaleorders/addAmsDispatchSaleOrder")
@@ -944,12 +954,13 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/getAmsSaleOrderMaterial")
     Map<String,Object> getAmsSaleOrderMaterial(@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("status") Integer status);
     //新增公开派单
-    @PostMapping(value = "/api/v1/ams/amssaleorders/addOpenAmsDispatchSaleOrder/{saleOrderMaterialId}")
-    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderId);
+    @PostMapping(value = "/api/v1/ams/amssaleorders/addOpenAmsDispatchSaleOrder/{orderMaterialId}")
+    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("orderMaterialId") BigDecimal orderMaterialId);
     //删除公开派单
     @PostMapping(value = "/api/v1/ams/amssaleorders//deleteAmsDispatchSaleOrder/{dispatchId}")
     Map<String,Object> deleteAmsDispatchSaleOrder(@PathVariable("dispatchId")BigDecimal saleOrderId);
@@ -974,6 +985,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);
@@ -984,9 +1007,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({
@@ -994,9 +1019,10 @@ 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")

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -57,9 +58,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,
@@ -120,12 +120,12 @@ public interface OmsFeign {
     /**
      * 销售物流司机接收新的订单
      */
-    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale/{orderReceiveStatus}")
+    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale")
     Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
                                             @RequestParam("apiId")      Integer apiId,
                                             @RequestParam("pageNum")    Integer pageNum,
                                             @RequestParam("pageSize")   Integer pageSize,
-                                            @PathVariable               Integer orderReceiveStatus,
+
                                             @RequestParam("orderType")  Integer orderType,
                                             @RequestParam("orderStatus")Integer orderStatus,
                                             @RequestParam("con")        String con,
@@ -206,8 +206,8 @@ public interface OmsFeign {
                                                      @RequestParam ("pageSize")  Integer pageSize,
                                                      @RequestParam("apiId")      Integer apiId,
                                                      @RequestParam("dayPlanId")  Integer dayPlanId,
-                                                     @RequestParam("orderType") Integer orderType,
                                                      @RequestParam("orderStatus")Integer orderStatus,
+                                                     @RequestParam("orderType") Integer orderType,
                                                      @RequestParam("con")  String con
     );
     @PostMapping(value = "api/v1/oms/omstruckorders/getWaterslagDayPlanForGenOrder/{carrierId}")
@@ -221,8 +221,68 @@ public interface OmsFeign {
                                                       @RequestParam("orderStatus") Integer orderStatus,
                                                       @RequestParam("con") String con
     );
-    
-    
 
+    @PostMapping("api/v1/oms/omstruckorders/selectSteelSaleForCarrier/{carrierId}")
+    public Map<String,Object> selectSteelSaleForCarrier(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @PathVariable Integer carrierId
+    );
+
+    @PostMapping("api/v1/oms/omstruckorders/selectInfoBySaleOrderId/{saleOrderId}")
+    public Map<String,Object> selectInfoBySaleOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @PathVariable Integer saleOrderId
+
+
+    )  ;
+    @PostMapping("api/v1/oms/omstruckorders/selectCokeRailPlan/{carrierId}")
+     Map<String,Object> selectCokeRailPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                       @PathVariable Integer carrierId,
+                                      @RequestParam  Integer orderType
+
+    );
+    @PostMapping("api/v1/oms/omstruckorders/selectInfoByDayPlanId/{dayPlanId}")
+     Map<String,Object> selectInfoByDayPlanId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                               @PathVariable  Integer dayPlanId,
+                                               @RequestParam Integer orderType
+
+
+    );
+
+
+
+    @ApiOperation(value="车牌号下拉")
+    @GetMapping(value = "api/v1/oms/omstruckorders/getDriverCapacity")
+    Map<String, Object> getDriverCapacity();
+
+    @ApiOperation(value="派单信息")
+    @PostMapping(value = "api/v1/oms/omstruckorders/getTruckNoDispatchMap")
+    Map<String, Object> getTruckNoDispatchMap(@RequestParam Integer dispatchId);
+
+    @ApiOperation(value="承运商分派运输订单给司机")
+    @PostMapping(value = "api/v1/oms/omstruckorders/addAppTruckOrder")
+    Map<String, Object> addAppTruckOrder(@RequestParam Integer dispatchId,
+                                         @RequestParam Integer orderType,
+                                         @RequestParam Integer driverCapacityId);
+
+    @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);
 }
 

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

@@ -6,16 +6,21 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 自助一体机
+ * 通用接口
  * @ author    :TXF
  * @ time      :2021/10/19 18:03
  */
 
 @Mapper
-public interface SelfServiceMachineMapper {
+public interface UniversalMapper {
     //通过运输订单号查询订单信息
     Map<String, Object> getTiHuoDan(String orderNumber);
 
     //通过运输订单号查找订单子表物资信息
     List<Map<String, Object>> getOOMMes(String orderNumber);
+
+    //模糊查询所有物资
+    List<Map<String, Object>> queryMaterialByLike(String index);
+
+
 }

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,7 +8,7 @@ import java.util.Map;
  * @ time      :2021/10/19 18:04
  */
 
-public interface SelfServiceMachineService {
+public interface UniversalService {
 
     //打印提货单
     Map<String, Object> printTiHuoDan(String orderNumber);

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

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

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

@@ -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:

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

@@ -1,6 +1,6 @@
 <?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">
+<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",
@@ -18,6 +18,9 @@
                            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">
@@ -44,4 +47,14 @@
                            on RP.PERSONNEL_ID = TLR.LOADER_ID
         where ORDER_NUMBER = #{orderNumber}
     </select>
+<!--  模糊查询所有物资  -->
+    <select id="queryMaterialByLike" parameterType="string" resultType="java.util.Map">
+        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 RM.MATERIAL_NAME LIKE #{index}
+    </select>
 </mapper>