'销售master'

pom.xml

@@ -106,31 +106,6 @@
     </dependencies>
     <build>
         <plugins>
-<!--            &lt;!&ndash;             自动生成代码文件 &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>com.steerinfo</groupId>-->
-<!--                <artifactId>generator-maven-plugin</artifactId>-->
-<!--                <version>3.0</version>-->
-<!--                <configuration>-->
-<!--            <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>-->
-<!--                        <table></table>-->
-<!--                    </tables>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <phase>compile</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>steerinfo</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

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

@@ -46,9 +46,9 @@ public class OMSController {
                                           Integer orderStatus,
                                           Integer planId,
                                           Integer orderType,
-                                          Integer fuelOrder, String con) {
+                                          Integer fuelOrder,String carrierSSOId,String con) {
         return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderStatus, planId, orderType, fuelOrder, con);
+                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con);
     }
 
     @ApiOperation(value = "不适用表头返回数据")
@@ -217,9 +217,9 @@ public class OMSController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer orderType,
-                                              Integer orderStatus, Integer fuelOrder,String con){
+                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                 orderType, orderStatus, fuelOrder, con);
+                 orderType, orderStatus, fuelOrder,carrierSSOId,con);
     }
 
     /**
@@ -645,7 +645,7 @@ public class OMSController {
                                                  Integer pageSize,
                                                  Integer type,
                                                  Integer orderStatus,
-                                                 Integer carrierId,
+                                                 String carrierId,
                                                  String  con) {
         return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con);
     }
@@ -653,6 +653,9 @@ public class OMSController {
     @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")
     @PostMapping("/updateOmstruckOrder")
     public Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map){
+        Integer orderId = Integer.parseInt(map.get("orderId").toString()) ;
+        map.remove("orderId");
+        map.put("orderId",orderId);
         return omsFeign.updateOmstruckOrder(map);
     }
 

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

@@ -981,11 +981,6 @@ public class RMScontroller {
         return rmsFeign.deletePortYard(warehouseId);
     }
 
-    //上传图片
-    @PostMapping(value = "/upload")
-    public Map<String,Object> upLoadPhoto(@RequestParam("file") MultipartFile file){
-        return rmsFeign.upLoadPhoto(file);
-    }
 
     /**
      * 得到二级部门的下拉
@@ -1055,4 +1050,12 @@ public class RMScontroller {
     public Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.deleteShipperResult(map);
     }
+
+    @PostMapping(value = "/getCarrierNameBySSOId")
+    public Map<String,Object> getCarrierNameBySSOId(@RequestParam("carrierSSOId") String carrierSSOId){
+        return rmsFeign.getCarrierNameBySSOId(carrierSSOId);
+    }
+
+
+
 }

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

@@ -1906,5 +1906,31 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType);
     }
-
+    @ApiOperation(value="查询辅料燃料统计报表")
+    @PostMapping("/getAllSaleReport")
+    public Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize, String carrierSsoId
+    ){
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+    }
+    @ApiOperation(value="查询零星物资进厂统计报表")
+    @PostMapping("/getSporadicSuppliesReport1")
+    public Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize, String carrierSsoId
+    ){
+        return tmsTruckFeign.getSporadicSuppliesReport1(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+    }
+    @ApiOperation(value="查询零星物资出厂统计报表")
+    @PostMapping("/getSporadicSuppliesReport2")
+    public Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize, String carrierSsoId
+    ){
+        return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierSsoId);
+    }
 }

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

@@ -80,6 +80,34 @@ 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 = "247", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryAllSupplierByLike")
+    public RESTfulResult queryAllSupplierByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index","%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryAllSupplierByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryAllSupplierByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+
+
     @ApiModelProperty(value = "通过物资ID查询该物资的发货单位信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -178,6 +206,22 @@ public class UniversalController extends BaseRESTfulController {
         return success(pageList);
     }
 
+
+    @ApiModelProperty(value = "边输边查发货单位")
+    @PostMapping("/getSupplierMesByLike")
+    public RESTfulResult getSupplierMesByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getSupplierMesByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查收货单位")
+    @PostMapping("/getConsigneeByLike")
+    public RESTfulResult getConsigneeByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getConsigneeByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+
     @ApiModelProperty(value = "通过订单ID查询订单下物资信息")
     @PostMapping("/getOrderMaterialMesByOrderId/{orderId}")
     public RESTfulResult getMaterialMesByOrderId(@PathVariable("orderId") Integer orderId){
@@ -305,15 +349,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiModelProperty(value = "边输边查承运商")
     @PostMapping("/getCarrierMesByLike")
     public RESTfulResult getCarrierMesByLike(@RequestParam("index") String index) {
-        if(index != null){
-            if(index.length() == 0){
-                index = null;
-            }else {
-//                index += "%";
-                index = "%"+index+"%";
-            }
-        }
-        List<Map<String, Object>> list = universalMapper.getCarrierMesByLike(index);
+        List<Map<String, Object>> list = universalMapper.getCarrierMesByLike(index == null ? "" : index);
         return success(list);
     }
 
@@ -375,18 +411,10 @@ public class UniversalController extends BaseRESTfulController {
         return universalService.sha1DigestUtils(text);
     }
 
-    @ApiModelProperty(value = "边输边查装货卸货点")
+    @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);
+    public List<Map<String, Object>> selectUnloadingPoint() {
+        return universalMapper.selectUnloadingPoint();
     }
 
     @ApiModelProperty(value = "模糊查询承运商")
@@ -420,6 +448,12 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "所有门岗下拉框")
+    @GetMapping("/getAllGatepost")
+    public List<Map<String,Object>> getAllGatepost(){
+        return universalMapper.getAllGatepost();
+    }
+
     @ApiModelProperty(value = "模糊查询收货单位")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -451,5 +485,4 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
-
 }

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

@@ -31,6 +31,7 @@ public interface OmsFeign {
                                           @RequestParam("planId") Integer planId,
                                           @RequestParam("orderType") Integer orderType,
                                           @RequestParam("fuelOrder") Integer fuelOrder,
+                                          @RequestParam("carrierSSOId")String carrierSSOId,
                                           @RequestParam("con")String con);
 
     @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
@@ -98,6 +99,7 @@ public interface OmsFeign {
                                               @RequestParam("orderType") Integer orderType,
                                               @RequestParam("orderStatus") Integer orderStatus,
                                               @RequestParam("fuelOrder") Integer fuelOrder,
+                                              @RequestParam("carrierSSOId") String carrierSSOId,
                                               @RequestParam("con")      String con);
     /**
      * 展示承运商接收销售公司已接受的销售订单
@@ -359,7 +361,7 @@ public interface OmsFeign {
                                                        @RequestParam("pageNum") Integer pageNum,
                                                        @RequestParam("pageSize") Integer pageSize,
                                                        @RequestParam("orderStatus") Integer orderStatus,
-                                                       @RequestParam("carrierId") Integer carrierId,
+                                                       @RequestParam("carrierId") String carrierId,
                                                        @RequestParam("type") Integer type,
                                                        @RequestParam("con") String con
                                                        );

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

@@ -532,9 +532,6 @@ 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);
 
     // 得到二级部门的下拉
     @GetMapping(value = "api/v1/rms/rmspersonnel/getSecondShipper")
@@ -571,4 +568,7 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmsshipper/deleteShipperResult")
     Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map);
 
+    @ApiOperation(value = "根据carrierSSOId查询承运商")
+    @PostMapping(value = "api/v1/rms/rmscapacity/getCarrierNameBySSOId")
+    Map<String, Object> getCarrierNameBySSOId(@RequestParam("carrierSSOId") String carrierSSOId);
 }

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

@@ -354,6 +354,28 @@ public interface TmsTruckFeign {
                                           @RequestParam Integer pageSize,
                                           @RequestParam Integer orderType,
                                           @RequestParam Integer orderStatus);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReport")
+    Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("carrierSsoId")   String carrierSsoId
+    );
+    @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport1")
+    Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("carrierSsoId")   String carrierSsoId
+    );
+    @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport2")
+    Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("carrierSsoId")   String carrierSsoId
+    );
 }
 
 

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

@@ -50,6 +50,12 @@ public interface UniversalMapper {
     //承运商边输边查
     List<Map<String, Object>> getCarrierMesByLike(String index);
 
+    //边输边查发货单位
+    List<Map<String, Object>> getSupplierMesByLike(String index);
+
+    //边输边查收货单位
+    List<Map<String,Object>> getConsigneeByLike(String index);
+
     // 收货单位
     List<Map<String, Object>> queryConsigneeByLike(Map<String, Object> mapValue);
 
@@ -59,13 +65,19 @@ public interface UniversalMapper {
     // 所有承运商
     List<Map<String, Object>> getCarrierListByLike(Map<String, Object> mapValue);
 
-    //边输边查卸货点
-    List<Map<String, Object>> selectUnloadingPoint(String index);
+    //查卸货点
+    List<Map<String, Object>> selectUnloadingPoint();
+
+    // 查询所有门岗
+    List<Map<String, Object>> getAllGatepost();
 
     // 模糊查询收货单位
     List<Map<String, Object>> getConsigneeListByLike(Map<String, Object> mapValue);
 
+    //模糊查询所有发货单位
+    List<Map<String, Object>> queryAllSupplierByLike(Map<String, Object> mapValue);
+
     // 通过ssoId查询承运商id
     BigDecimal getCarrierIdBySSO(String carrierSsoId);
-    
+
 }

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

@@ -431,17 +431,34 @@
             RC.CARRIER_NAME "value",
             RC.CARRIER_NAME "carrierName"
         from RMS_CARRIER RC
-        <where>
-            <if test="index != null">
-                RC.CARRIER_NAME  like #{index}
-                and rownum &lt; 10
-            </if>
-            <if test="index == null">
-                rownum &lt; 10
-            </if>
-        </where>
+        where
+            instr(RC.CARRIER_NAME, #{index}) > 0 and rownum &lt; 10
+        order by "value"
+    </select>
+
+
+<!--  边输边查发货单位  -->
+    <select id="getSupplierMesByLike" parameterType="string" resultType="java.util.Map">
+        select
+            RS.SUPPLIER_ID "supplierId",
+            RS.SUPPLIER_NAME "value",
+            RS.SUPPLIER_NAME "supplierName"
+        from RMS_SUPPLIER RS
+        where instr(RS.SUPPLIER_NAME, #{index}) > 0 and rownum &lt; 10
         order by "value"
     </select>
+    <!--  边输边查收货单位 -->
+    <select id="getConsigneeByLike" parameterType="string" resultType="java.util.Map">
+        select
+        RC.CONSIGNEE_ID "consigneeId",
+        RC.CONSIGNEE_COMPANY_NAME "value",
+        RC.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        from   RMS_CONSIGNEE   RC
+        where instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum &lt; 10
+        order by "value"
+    </select>
+
+
 
     <select id="getCarrierListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
         select
@@ -506,16 +523,16 @@
         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>
 
+    <select id="getAllGatepost" resultType="java.util.Map" >
+        SELECT
+            RG.GATEPOST_ID AS "gatepostId",
+            RG.GATEPOST_NAME AS "gatepostName"
+        FROM RMS_GATEPOST RG
+    </select>
+
     <!-- 模糊查询收货单位 -->
     <select id="getConsigneeListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
         SELECT
@@ -528,4 +545,19 @@
         order by "consigneeCompanyName"
     </select>
 
+    <select id="queryAllSupplierByLike" resultType="java.util.Map">
+        select *
+        from (
+        select distinct RS.SUPPLIER_ID      "supplierId",
+        RS.SUPPLIER_NAME    "supplierName",
+        RS.SUPPLIER_ADDRESS "supplierAddress"
+        from RMS_SUPPLIER RS
+        )
+        <where>
+            <if test="index != null">
+                "supplierName" like #{index}
+            </if>
+        </where>
+    </select>
+
 </mapper>