tijiao

pom.xml

@@ -112,9 +112,9 @@
 <!--                <artifactId>generator-maven-plugin</artifactId>-->
 <!--                <version>3.0</version>-->
 <!--                <configuration>-->
-<!--                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>-->
-<!--                    <user>dil</user>-->
-<!--                    <password>Dil123789</password>-->
+<!--            <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>-->
+<!--            <user>dagang</user>-->
+<!--            <password>root123</password>-->
 <!--                    &lt;!&ndash;包名&ndash;&gt;-->
 <!--                    <targetPackage>com.steerinfo.dil</targetPackage>-->
 <!--                    <tables>-->

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

@@ -1004,7 +1004,7 @@ public class AMScontroller{
                                                 Integer pageSize,
                                                 Integer apiId,
                                                 Integer planStatus,
-                                                Integer carrierId,
+                                                String carrierId,
                                                 Integer planId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
@@ -1273,4 +1273,236 @@ public class AMScontroller{
     }
 
 
+    @ApiModelProperty(value = "查询车序号信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "411", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getTruckNoList")
+    public RESTfulResult getTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                         Integer issueStatus,
+                                         String con){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus,con);
+    }
+
+    @PostMapping("getSaleOrderInfoes")
+    @ApiOperation(value = "查询汽运单价信息")
+    public Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @ApiOperation(value="查询已上报销售订单信息")
+    @PostMapping("/getSaleOrderReportedes")
+    Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam Integer apiId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId);
+    }
+
+    @ApiModelProperty(value = "展示销售公司已审核的订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "409", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListBySaleCompanyes")
+    public Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                              Integer pageNum,
+                                                              Integer pageSize,
+                                                              Integer apiId,
+                                                              String con){
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("getAmsSaleOrderApprovedes")
+    @ApiOperation(value = "查询财务已审批销售订单信息")
+    public Map<String, Object> getAmsSaleOrderApprovedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAmsSaleOrderApprovedes(mapValue, pageNum, pageSize, apiId);
+    }
+
+    /*
+     *  根据销售订单主键展示销售基本信息、物资信息
+     * apiId=410
+     * */
+    @PostMapping(value="/getSaleOrderAndMaterialById")
+    public RESTfulResult  getSaleOrderAndMaterialById(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer saleOrderId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderAndMaterialById(mapValue,apiId,pageNum,pageSize,new BigDecimal(saleOrderId));
+    }
+
+    @ApiOperation(value = "新增车序号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "车序号信息", required = false, dataType = ""),
+    })
+    @PostMapping("/addTruckNo")
+    public Map<String, Object> addTruckNo(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.addTruckNo(mapList);
+    }
+
+    @ApiOperation(value = "下发车序号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "车序号信息", required = false, dataType = ""),
+    })
+    @PostMapping("/issueTruckNo")
+    public Map<String, Object> issueTruckNo(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.issueTruckNo(mapList);
+    }
+
+    @ApiOperation(value="销售新增定向派单且直接下发")
+    @PostMapping("/addDispatchSaleOrder")
+    public Map<String,Object> addDispatchSaleOrder(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.addDispatchSaleOrder(mapValue);
+    }
+
+   //发布通知================================================================================================================================
+    //公告展示
+
+
+    @ApiOperation(value = "销售公司获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getMarketingNoticeList")
+    public Map<String, Object> getMarketingNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getMarketingNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+
+
+    @ApiOperation(value = "承运商获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getCarrierNoticeList")
+    public Map<String, Object> getCarrierNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getCarrierNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+
+
+
+    @ApiOperation(value = "收货用户获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getClientNoticeList")
+    public Map<String, Object> getClientNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getClientNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+
+
+
+
+
+
+    @ApiOperation(value="新增公告信息", notes="根据DilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
+    @PostMapping(value = "/insertNotice")
+    public Map<String, Object> insertNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.insertNotice(map);
+    }
+
+    @ApiOperation(value = "更新油价信息", notes = "根据dilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
+    @PostMapping(value = "/updateNotice", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.updateNotice(map);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/deleteNotice/{id}")//BigDecimal
+    public Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id) {
+        return amsFeign.deleteNotice(id);
+    }
+
+
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getNoticeById/{id}")
+    public Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id){
+        return amsFeign.getNoticeById(id);
+    }
+
+    @ApiOperation(value="获取最新公告详细信息", notes="根据url的permissions来获取详细信息")
+    @ApiImplicitParam(paramType = "name", name = "权限permission", value = "permission", required = true, dataType = "String")
+    @PostMapping(value = "/getNewNoticeByPermission/{permissions}")
+    public Map<String, Object> getNewNoticeByPermission(@PathVariable("permissions") String permissions){
+        return amsFeign.getNewNoticeByPermission(permissions);
+    }
+
+
+
+    //*******************************下拉框************************
+
+
+    @GetMapping("getNoticeTypeId")
+    @ApiOperation(value = "得到公告类型Id")
+    public Map<String,Object> getNoticeTypeId(){
+        return amsFeign.getNoticeTypeId();
+    }
 }

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

@@ -14,16 +14,16 @@ import org.springframework.web.bind.annotation.RestController;
  * @ time      :2021/12/14 22:42
  */
 @RestController
-@RequestMapping("/appVersion")
+@RequestMapping("${api.version}/appVersion")
 public class DilVersionController {
 
     @Autowired
     DilVersionServiceImpl dilVersionService;
 
     @ApiOperation(value = "查询版本号")
-    @PostMapping("/checkVersion/{version}")
-    public int deleteTruckRailDayPlan(@PathVariable("version") String version) {
-        return dilVersionService.compareAppVersion(version);
+    @PostMapping("/checkVersion")
+    public String deleteTruckRailDayPlan() {
+        return dilVersionService.compareAppVersion();
     }
 
     @ApiOperation(value = "新增版本号")

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

@@ -413,10 +413,10 @@ public class OMSController {
 
     @ApiOperation(value="承运商分派运输订单给司机")
     @PostMapping("/addAppTruckOrder")
-    public Map<String, Object> addAppTruckOrder(Integer dispatchId,
-                                                Integer orderType,
-                                                String capacityNumber,
-                                                Integer carrierId) {
+    public Map<String, Object> addAppTruckOrder(@RequestParam Integer dispatchId,
+                                                @RequestParam Integer orderType,
+                                                @RequestParam String capacityNumber,
+                                                @RequestParam Integer carrierId) {
         Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType,capacityNumber, carrierId);
         return map;
     }
@@ -515,11 +515,12 @@ public class OMSController {
                                                         Integer apiId,
                                                         Integer pageNum,
                                                         Integer pageSize,
-                                                        String con) {
+                                                        String con,
+                                                        String carrierId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con);
+        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con,carrierId);
         return map;
     }
 
@@ -561,7 +562,7 @@ public class OMSController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer orderStatus,
-                                                  Integer carrierId,
+                                                  String carrierId,
                                                   String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
@@ -654,4 +655,11 @@ public class OMSController {
     public Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map){
         return omsFeign.updateOmstruckOrder(map);
     }
+
+    @ApiOperation(value="承运商销售分派运输订单给司机")
+    @PostMapping("/addSaleTruckOrder")
+    public Map<String, Object> addSaleTruckOrder(@RequestBody Map<String,Object> mapValue) {
+        Map<String, Object> map = omsFeign.addSaleTruckOrder(mapValue);
+        return map;
+    }
 }

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

@@ -6,9 +6,11 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 @RestController
 @RequestMapping("${api.version}/rms")
@@ -800,7 +802,7 @@ public class RMScontroller {
     }
 
     //油价
-    @ApiOperation(value = "获取公告信息", notes = "分页查询")
+    @ApiOperation(value = "获取油价信息", notes = "分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -853,6 +855,8 @@ public class RMScontroller {
 
 
 
+
+
 //*******************************下拉框************************
 
     @GetMapping("getNoticeTypeId")
@@ -861,6 +865,8 @@ public class RMScontroller {
         return rmsFeign.getNoticeTypeId();
     }
 
+
+
     @GetMapping("getPortType")
     @ApiOperation(value = "得到港口类型Id")
     public Map<String,Object> getPortType(){
@@ -874,6 +880,73 @@ public class RMScontroller {
         return rmsFeign.insertWarehouse(map);
     }
 
+
+
+    //展示收货客户信息
+    @ApiOperation(value = "获取收货客户信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getConsigneeList")
+    public Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String con
+    ) {
+
+        return rmsFeign.getConsigneeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="新增收货客户信息", notes="根据rmsConsignee对象创建")
+    @ApiImplicitParam(name = "rmsConsignee", value = "详细实体rmsConsignee", required = true, dataType = "rmsConsignee")
+    @PostMapping(value = "/insertConsignee")
+    public Map<String, Object> insertConsignee(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertConsignee(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsConsignee对象创建")
+    @ApiImplicitParam(name = "收货客户信息id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteConsignee/{id}")
+    public Map<String, Object> deleteConsignee(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteConsignee(id);
+    }
+
+    @ApiOperation(value="获取运力信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getConsigneeById/{id}")
+    public Map<String,Object> getConsigneeById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getConsigneeById(id);
+    }
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCapacity信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),
+            @ApiImplicitParam(name = "rmsConsignee", value = "详细实体rmsConsignee", required = true, dataType = "RmsConsignee")
+    })
+    @PostMapping(value = "/updateConsignee", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateConsignee( @RequestBody Map<String, Object> map){
+
+        return rmsFeign.updateConsignee(map);
+    }
+
+    /*
+     *边写边搜索承运商
+     * */
+    @ApiOperation(value="根据用户输入输出承运商", notes="模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "con",value = "用户输入的承运商名", required = false, dataType = "String")
+    })
+    @PostMapping("/getCarrierName")
+    public Map<String,Object> getCarrierName(@RequestParam(value ="state") String state){
+        return  rmsFeign.getCarrierName(state);
+
+    }
+
+
+
     //港口
     @PostMapping("/insertPort")
     public Map<String, Object> insertPort(@RequestBody(required = false) Map<String, Object> map) {
@@ -906,4 +979,45 @@ public class RMScontroller {
     public Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId) {
         return rmsFeign.deletePortYard(warehouseId);
     }
+
+    //上传图片
+    @PostMapping(value = "/upload")
+    public Map<String,Object> upLoadPhoto(@RequestParam("file") MultipartFile file){
+        return rmsFeign.upLoadPhoto(file);
+    }
+
+    //根据运力id查询承运商
+    @PostMapping(value = "getCarrierNameById/{id}")
+    public Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getCarrierNameById(id);
+    }
+   //根据司机id查询承运商
+   @PostMapping(value = "getCarrierNameByDriverId/{id}")
+   public Map<String,Object> getCarrierNameByDriverId(@PathVariable("id") BigDecimal id){
+       return rmsFeign.getCarrierNameByDriverId(id);
+   }
+
+
+
+    /*
+        txf
+     */
+    @ApiOperation(value="新增组织结构实绩")
+    @PostMapping(value = "/addShipperResult")
+    public Map<String,Object>  addShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.addShipperResult(map);
+    }
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "/updateShipperResult")
+    public Map<String,Object>  updateShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateShipperResult(map);
+    }
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "/deleteShipperResult")
+    public Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.deleteShipperResult(map);
+    }
+
 }

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

@@ -34,7 +34,7 @@ import java.util.Map;
 public class UniversalController extends BaseRESTfulController {
 
     @Autowired
-    UniversalServiceImpl selfServiceMachineService;
+    UniversalServiceImpl universalService;
 
     @Autowired
     UniversalMapper universalMapper;
@@ -49,7 +49,7 @@ public class UniversalController extends BaseRESTfulController {
     })
     @PostMapping("/printTHD")
     public RESTfulResult printTiHuoDan(@RequestBody(required=false) Map<String, Object> mapValue){
-        Map<String, Object> tiHuoDan = selfServiceMachineService.printTiHuoDan((String) mapValue.get("orderNumber"));
+        Map<String, Object> tiHuoDan = universalService.printTiHuoDan((String) mapValue.get("orderNumber"));
         return success(tiHuoDan);
     }
 
@@ -293,12 +293,7 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
-    @ApiModelProperty(value = "模糊查询承运商")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
-    })
+    @ApiModelProperty(value = "边输边查承运商")
     @PostMapping("/getCarrierMesByLike")
     public RESTfulResult getCarrierMesByLike(@RequestParam("index") String index) {
         if(index != null){
@@ -365,4 +360,55 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "返回sha1加密字符串")
+    @PostMapping("/sha1DigestUtils")
+    public String sha1DigestUtils(String text){
+        return universalService.sha1DigestUtils(text);
+    }
+
+    @ApiModelProperty(value = "边输边查装货卸货点")
+    @PostMapping("/selectUnloadingPoint")
+    public RESTfulResult selectUnloadingPoint(@RequestParam("index") String index) {
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index += "%";
+            }
+        }
+        List<Map<String, Object>> list = universalMapper.selectUnloadingPoint(index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "模糊查询承运商")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "412", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getCarrierListByLike")
+    public RESTfulResult getCarrierListByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String index) {
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index = "%" + index + "%";
+            }
+        }
+        if (mapValue == null) {
+            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);
+        return success(data);
+    }
+
 }

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

@@ -1107,7 +1107,7 @@ public interface AmsFeign {
                                          @RequestParam Integer pageSize,
                                          @RequestParam Integer apiId,
                                          @RequestParam Integer planStatus,
-                                         @RequestParam Integer carrierId,
+                                         @RequestParam String carrierId,
                                          @RequestParam Integer planId);
     /**
      *新增用车需求
@@ -1268,4 +1268,142 @@ public interface AmsFeign {
 
     @PostMapping("/api/v1/ams/amstrucksporadicorders/updateSporadicOrder")
     Map<String, Object> updateSporadicOrder(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amssaleordermaterials/getTruckNoList")
+    RESTfulResult getTruckNoList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize,
+                                 @RequestParam Integer issueStatus,
+                                 @RequestParam String con);
+
+
+    @ApiOperation(value="查询未上报的销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(408)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderInfoes")
+    Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId);
+
+    @ApiOperation(value="查询已上报销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(408)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderReportedes")
+    Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam Integer apiId);
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
+    Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("con") String con);
+
+    @ApiOperation(value="查询财务已审批销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(409)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getAmsSaleOrderApprovedes")
+    Map<String, Object> getAmsSaleOrderApprovedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  @RequestParam("pageNum") Integer pageNum,
+                                                  @RequestParam("pageSize") Integer pageSize,
+                                                  @RequestParam("apiId") Integer apiId);
+
+    @ApiOperation(value="查询销售订单物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(410)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderAndMaterialById")
+    RESTfulResult getSaleOrderAndMaterialById(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("saleOrderId") BigDecimal saleOrderId);
+
+    @ApiOperation(value="新增车序号")
+    @PostMapping("/api/v1/ams/amssaleordermaterials/addTruckNo")
+    Map<String, Object> addTruckNo(@RequestBody List<Map<String, Object>> mapList);
+
+    @ApiOperation(value="下发车序号")
+    @PostMapping("/api/v1/ams/amssaleordermaterials/issueTruckNo")
+    Map<String, Object> issueTruckNo(@RequestBody List<Map<String, Object>> mapList);
+
+    @ApiOperation(value="定向派单选择承运商并下发")
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/addDispatchSaleOrder")
+    Map<String, Object> addDispatchSaleOrder(@RequestBody Map<String, Object> mapValue);
+
+
+    //发布通知==============================================================================================
+    /*
+
+    //公告获取列表
+    @PostMapping(value = "/api/v1/rms/dilnotices/getNoticeList")
+    Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("con") String con);
+*/
+
+    //承运商公告获取列表
+    @PostMapping(value = "/api/v1/ams/dilnotices/getCarrierNoticeList")
+    Map<String, Object> getCarrierNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam("con") String con);
+
+
+
+    //销售公司公告获取列表
+    @PostMapping(value = "/api/v1/ams/dilnotices/getMarketingNoticeList")
+    Map<String, Object> getMarketingNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("con") String con);
+
+    //收货用户公告获取列表
+    @PostMapping(value = "/api/v1/ams/dilnotices/getClientNoticeList")
+    Map<String, Object> getClientNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("con") String con);
+
+
+    //新增公告
+    @PostMapping(value = "api/v1/ams/dilnotices/insertNotice")
+    Map<String,Object> insertNotice(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除公告
+    @PostMapping(value = "api/v1/ams/dilnotices/deleteNotice/{id}")
+    Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id);
+
+    //更新公告
+    @PostMapping(value = "api/v1/ams/dilnotices/updateNotice")
+    Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map);
+
+    //根据id获取公告
+    @PostMapping(value = "api/v1/ams/dilnotices/getNoticeById/{id}")
+    Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);
+
+    //根据权限获取最新公告
+    @PostMapping(value = "api/v1/ams/dilnotices/getNewNoticeByPermission/{permissions}")
+    Map<String, Object> getNewNoticeByPermission(@PathVariable("permissions")String permissions);
+
+
+    //******************************************下拉框*******************************
+
+
+    //公告下拉框,须摸清实现原理
+    @GetMapping(value = "api/v1/ams/dilnotices/getNoticeTypeId")
+    Map<String,Object> getNoticeTypeId();
+
 }

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

@@ -284,7 +284,8 @@ public interface OmsFeign {
                                                  @RequestParam Integer apiId,
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
-                                                 @RequestParam String con);
+                                                 @RequestParam String con,
+                                                 @RequestParam String carrierId);
 
     @GetMapping("api/v1/oms/omstruckorders/getReceivingUnit")
     public Map<String, Object> getReceivingUnit();
@@ -307,7 +308,7 @@ public interface OmsFeign {
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer orderStatus,
-                                           @RequestParam Integer carrierId,
+                                           @RequestParam String carrierId,
                                            @RequestParam String con);
 
     // 分派计划
@@ -368,6 +369,10 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/updateOmstruckOrder")
     Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map);
 
+    @ApiOperation(value = "承运商销售分派运输订单给司机")
+    @PostMapping("api/v1/oms/omstruckorderseparates/addSaleTruckOrder")
+    Map<String, Object> addSaleTruckOrder(@RequestBody Map<String, Object> mapValue);
+
     @ApiOperation(value = "根据运输订单号查询物资")
     @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderMaterial")
     Map<String, Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String, Object> map);

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.Map;
@@ -453,6 +454,36 @@ public interface RmsFeign {
     @GetMapping(value = "api/v1/rms/dilnotices/getNoticeTypeId")
     Map<String,Object> getNoticeTypeId();
 
+  //展示收货客户信息
+  @PostMapping(value = "/api/v1/rms/rmsconsignee/getConsigneeList")
+  Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("con") String con);
+
+
+    //新增收货客户信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/insertConsignee")
+    Map<String, Object> insertConsignee(@RequestBody(required = false) Map<String, Object> map);
+    //删除收货客户信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/deleteConsignee/{id}")
+    Map<String, Object> deleteConsignee(@PathVariable("id") BigDecimal id);
+    //修改收货客户信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/updateConsignee")
+    Map<String, Object> updateConsignee(Map<String, Object> map);
+
+    //根据id获取收货客户信息详细信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/getConsigneeById/{id}")
+    Map<String,Object> getConsigneeById(@PathVariable("id") BigDecimal id);
+
+
+
+    //边输入边搜索承运商
+    @PostMapping(value = "/api/v1/rms/rmscardriver/getCarrierName")
+    Map<String, Object> getCarrierName(@RequestParam(value = "state")String state);
+
+
     //港口
     @PostMapping(value = "api/v1/rms/rmsPort/insertPort")
     Map<String,Object> insertPort(@RequestBody(required = false) Map<String,Object> map);
@@ -500,4 +531,28 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmsPortYard/deletePortYard/{warehouseId}")
     Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId);
 
+    //上传图片
+    @PostMapping(value = "api/v1/rms/rmscardriver/upload")
+    Map<String,Object> upLoadPhoto(@RequestParam("file") MultipartFile file);
+
+    //根据运力id查询承运商名称
+    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierNameById/{id}")
+    Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id);
+
+    //根据司机id查询承运商名称
+    @PostMapping(value = "api/v1/rms/rmscardriver/getCarrierNameByDriverId/{id}")
+    Map<String,Object> getCarrierNameByDriverId(@PathVariable("id") BigDecimal id);
+
+    @ApiOperation(value="新增组织结构实绩")
+    @PostMapping(value = "api/v1/rms/rmsshipper/addShipperResult")
+    Map<String,Object>  addShipperResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "api/v1/rms/rmsshipper/updateShipperResult")
+    Map<String,Object>  updateShipperResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "api/v1/rms/rmsshipper/deleteShipperResult")
+    Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map);
+
 }

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

@@ -766,6 +766,4 @@ public interface TmsshipFeign {
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
     Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
 
-
-
 }

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

@@ -55,4 +55,10 @@ public interface UniversalMapper {
 
     // 所有物资
     List<Map<String, Object>> selectAllMaterialName(Map<String, Object> mapValue);
+
+    // 所有承运商
+    List<Map<String, Object>> getCarrierListByLike(Map<String, Object> mapValue);
+
+    //边输边查卸货点
+    List<Map<String, Object>> selectUnloadingPoint(String index);
 }

src/main/java/com/steerinfo/dil/service/IDilVersionService.java

@@ -20,7 +20,7 @@ import java.math.BigDecimal;
  */
 public interface IDilVersionService{
 
-    int compareAppVersion(String version);
+    String compareAppVersion();
 
     String addAppVersion(String version);
 

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

@@ -33,17 +33,11 @@ public class DilVersionServiceImpl implements IDilVersionService {
 
     /**
      * 传入版本号查询是否为最新版本
-     * @param version 版本号
      * @return 0 不需要更新  1 需要更新
      */
-    public int compareAppVersion(String version){
+    public String compareAppVersion(){
         //查找当前最新版本号
-        String theLastVersion = dilVersionMapper.compareVersion();
-        //判断是否为最新版本号
-        if(theLastVersion.equals(version)){
-            return 0;
-        }
-        return 1;
+        return  dilVersionMapper.compareVersion();
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.service.UniversalService;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -46,4 +47,12 @@ public class UniversalServiceImpl implements UniversalService {
     }
 
 
+    /**
+     * sha1加密字符串
+     * @param text
+     * @return
+     */
+    public String sha1DigestUtils(String text){
+        return DigestUtils.sha1Hex(text);
+    }
 }

src/main/resources/bootstrap.yml

@@ -21,14 +21,12 @@ eureka:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
-
-
 openfeign:
-  #正式环境
+#  正式环境
     ColumnDataFeign:
       url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
     AmsFeign:
-      url: ${AMSFEIGN_URL:localhost:8079}
+      url: ${AMSFEIGN_URL:172.16.33.166:8079}
     BmsshipFeign:
       url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
     BmstrainFeign:
@@ -40,7 +38,7 @@ openfeign:
     TmsTrainFeign:
       url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
     TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
     TmsshipFeign:
       url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
     WMSHFeign:
@@ -48,11 +46,9 @@ openfeign:
     WMSFeign:
       url: ${WMSFEIGN_URL:172.16.33.166:8093}
     OMSFeign:
-      url: ${OMSFEIGN_URL:localhost:8095}
+      url: ${OMSFEIGN_URL:172.16.33.166:8095}
     RmsFeign:
-      url: ${RMSFEIGN_URL:localhost:8060}
-
-
+      url: ${RMSFEIGN_URL:172.16.33.166:8060}
   #测试环境
 #  ColumnDataFeign:
 #    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
@@ -81,6 +77,8 @@ openfeign:
 #  RmsFeign:
 #    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
+
+
 genxml:
   pth: com/a
 cache:
@@ -110,4 +108,6 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-  port: 8080
+  port: 8080
+#测试环境
+#  port: 8080

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

@@ -417,6 +417,23 @@
         order by "value"
     </select>
 
+    <select id="getCarrierListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
+        select
+        *
+        from(
+        select
+        RC.CARRIER_ID "carrierId",
+        RC.CARRIER_NAME "carrierName"
+        from RMS_CARRIER RC
+        <where>
+            <if test="index != null">
+                RC.CARRIER_NAME  like #{index}
+            </if>
+        </where>
+        order by RC.CARRIER_NAME
+        )
+    </select>
+
     <select id="queryConsigneeByLike" resultType="java.util.Map" parameterType="java.util.Map" >
         SELECT * FROM (
         SELECT
@@ -457,4 +474,19 @@
             on RM.MATERIAL_ID = OOM.MATERIAL_ID
         where OOM.ORDER_ID = #{orderId}
     </select>
+
+<!--  边输边查卸货点  -->
+    <select id="selectUnloadingPoint" parameterType="string" resultType="java.util.Map">
+        select Rw.WAREHOUSE_NAME "warehouseName",
+               RW.WAREHOUSE_ID "warehouseId"
+        from RMS_WAREHOUSE RW
+        where
+              <if test="index != null">
+                  RW.WAREHOUSE_NAME like #{index}
+              </if>
+              <if test="index == null">
+                  rownum &lt; 10
+              </if>
+        order by "warehouseName"
+    </select>
 </mapper>