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

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

@@ -1940,7 +1940,7 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                             String startTime, String endTime,
+                                               String startTime, String endTime,
                                                Integer orderType
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
@@ -1966,21 +1966,6 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getAllSaleReportTotal(mapValue==null?new HashMap<>():mapValue, startTime, endTime, carrierSsoId);
     }
 
-//    @ApiOperation(value="查询内转统计报表")
-//    @PostMapping("/getAllInwardResult")
-//    public Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                                Integer apiId,
-//                                                Integer pageNum,
-//                                                Integer pageSize,
-//                                                String startTime, String endTime,
-//                                                String carrierSsoId
-//    ){
-//        return tmsTruckFeign.getAllInwardResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
-//    }
-
-
-
-
     @ApiOperation(value="查询零星物资进厂统计报表")
     @PostMapping("/getSporadicSuppliesReport1")
     public Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -2012,4 +1997,15 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
     }
+
+    @ApiOperation(value="查询采购内转运输实绩")
+    @PostMapping("/getPurInwardReport")
+    public Map<String, Object> getPurInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          String endTime){
+        return tmsTruckFeign.getPurInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
 }

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

@@ -158,8 +158,8 @@ public class UniversalController extends BaseRESTfulController {
         if(index != null){
             mapValue.put("index", index);
         }
-        if (con != null&&con.equals("undefined")){
-            mapValue.put("con","%"+con+"%");
+        if (con != null&& !con.equals("undefined")){
+            mapValue.put("con",con);
         }
         if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
             carrierSsoId = null;

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

@@ -68,13 +68,13 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.deleteWmspOutboundResult(resultId);
     }
 
-    @PostMapping("/insertwmspOutboundScanResult")
+    @PostMapping("/wmspoutboundresults/insertwmspOutboundScanResult")
     public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
         Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
         return resTfulResult;
     }
 
-    @PostMapping("/outbountResultToSuccess")
+    @PostMapping("/wmspoutboundresults/outbountResultToSuccess")
     public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
         return wmsFeign.outbountResultToSuccess(resultId);
     }
@@ -782,6 +782,7 @@ public class WMSController extends BaseRESTfulController {
     public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid){
         return wmsFeign.getNewDistribute(personnelWorkshopid);
     }
+
     //    获取物资类型
     @PostMapping(value = "/getMaterialTypeList")
     public Map<String,Object> getMaterialTypeList(@RequestParam("warehouseid") String warehouseid,

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

@@ -425,6 +425,14 @@ public interface TmsTruckFeign {
                                          @RequestParam("carrierSsoId")   String carrierSsoId
     );
 
+    //采购内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getPurInwardReport")
+    Map<String, Object> getPurInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
 }
 
 

src/main/resources/application-prod.yml

@@ -29,7 +29,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -158,8 +158,7 @@
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
             </if>
             <if test="con != null">
-                where "capacityNumber" like #{con} or "carrierName" like #{con} or
-                "remark" like #{con}
+                and instr(RC.INSERT_UPDATE_REMARK,#{con}) > 0
             </if>
         )
         <where>