Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1915,4 +1915,22 @@ public class TMSController extends BaseRESTfulController {
     ){
         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

@@ -204,6 +204,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){
@@ -331,15 +347,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);
     }
 

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

@@ -362,6 +362,20 @@ public interface TmsTruckFeign {
                                       @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);
 

src/main/resources/bootstrap.yml

@@ -38,7 +38,7 @@ openfeign:
     TmsTrainFeign:
       url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
     TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
     TmsshipFeign:
       url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
     WMSHFeign:

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

@@ -416,18 +416,35 @@
             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
         *