12.23rms收货客户

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

@@ -1273,4 +1273,113 @@ 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);
+    }
 }

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

@@ -414,10 +414,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;
     }
@@ -655,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/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);
     }
 
@@ -359,6 +359,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "返回MD5加密字符串")
+    @PostMapping("/sha1DigestUtils")
+    public String sha1DigestUtils(String text){
+        return universalService.sha1DigestUtils(text);
+        //获取当前订单还没有净重的计量实绩
+    }
+
     @ApiModelProperty(value = "边输边查装货卸货点")
     @PostMapping("/selectUnloadingPoint")
     public RESTfulResult selectUnloadingPoint(@RequestParam("index") String index) {
@@ -373,4 +380,35 @@ public class UniversalController extends BaseRESTfulController {
         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

@@ -1268,4 +1268,73 @@ 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);
 }

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

@@ -368,6 +368,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/mapper/UniversalMapper.java

@@ -56,6 +56,9 @@ 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/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

@@ -111,6 +111,4 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-#  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