Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -837,4 +837,8 @@ public class AMScontroller  extends BaseRESTfulController {
     Map<String,Object> addSerialNumber(@RequestBody Map<String,Object> map) {
         return amsFeign.getSerialNumber(map);
     }
+
+    @ApiOperation("批量审批运输单价")
+    @PostMapping("approvePriceData")
+    Map<String,Object> approvePriceData(@RequestBody Map<String,Object> map) {return amsFeign.approvePriceData(map);}
 }

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

@@ -58,4 +58,34 @@ public class ReportController {
                                       Integer pageSize){
         return reportFeign.getDestination(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
     }
+
+    @ApiOperation(value="查询转库单报表")
+    @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"),
+    })
+    @PostMapping(value = "/getTransferOrder")
+    Map<String, Object> getTransferOrder(@RequestBody(required=false) HashMap<String,Object> mapValue,
+                                      Integer apiId,
+                                      Integer pageNum,
+                                      Integer pageSize){
+        return reportFeign.getTransferOrder(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="查询转库单明细")
+    @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"),
+    })
+    @PostMapping(value = "/getTransferOrderDetails")
+    Map<String, Object> getTransferOrderDetails(@RequestBody(required=false) HashMap<String,Object> mapValue,
+                                      Integer apiId,
+                                      Integer pageNum,
+                                      Integer pageSize){
+        return reportFeign.getTransferOrderDetails(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
 }

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

@@ -305,4 +305,7 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/getSerialNumber")
     Map<String, Object> getSerialNumber(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransprices/approvePriceData")
+    Map<String, Object> approvePriceData(@RequestBody Map<String, Object> map);
+
 }

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

@@ -28,4 +28,14 @@ public interface ReportFeign {
                                       @RequestParam Integer apiId,
                                       @RequestParam  Integer pageNum,
                                       @RequestParam  Integer pageSize);
+    @PostMapping(value = "api/v1/report/transferOrder/getTransferOrder")
+    Map<String, Object> getTransferOrder(@RequestBody(required = false) HashMap<String, Object> map,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam  Integer pageNum,
+                                      @RequestParam  Integer pageSize);
+    @PostMapping(value = "api/v1/report/transferOrder/getTransferOrderDetails")
+    Map<String, Object> getTransferOrderDetails(@RequestBody(required = false) HashMap<String, Object> map,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam  Integer pageNum,
+                                      @RequestParam  Integer pageSize);
 }

src/main/resources/application-dev.yml

@@ -24,23 +24,23 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.90.214:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.214:8079}
+    url: ${AMSFEIGN_URL:172.16.90.214:80}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8086}
+    url: ${TMSFEIGN_URL:172.16.90.214:80}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.214:8093}
+    url: ${WMSFEIGN_URL:172.16.90.214:80}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.214:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:80}
   EmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8096}
+    url: ${TMSFEIGN_URL:172.16.90.214:80}
   SSOFeign:
-    url: ${SSOFEIGN_URL:172.16.90.214:9001}
+    url: ${SSOFEIGN_URL:172.16.90.214:80}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:80}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.214:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.214:80}
 
 
 #远程调用

src/main/resources/application-prod.yml

@@ -24,23 +24,23 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.90.202:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:8079}
+    url: ${AMSFEIGN_URL:172.16.90.202:80}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8086}
+    url: ${TMSFEIGN_URL:172.16.90.202:80}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.202:8093}
+    url: ${WMSFEIGN_URL:172.16.90.202:80}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:8060}
+    url: ${RMSFEIGN_URL:172.16.90.202:80}
   EmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8096}
+    url: ${TMSFEIGN_URL:172.16.90.202:80}
   SSOFeign:
-    url: ${SSOFEIGN_URL:172.16.90.202:9001}
+    url: ${SSOFEIGN_URL:172.16.90.202:80}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:80}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.202:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.202:80}
 
 
 #远程调用

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

@@ -233,7 +233,11 @@
             <if test="remark!=null and remark!=''">
                 AND REGEXP_LIKE("remark", #{remark})
             </if>
+            <if test="lastIndex!=null">
+                and "operationsNameId" &lt; #{lastIndex}
+            </if>
         </where>
+        order by "operationsNameId" desc
         FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
@@ -373,10 +377,16 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
+            <if test="lastIndex!=null">
+                and "personnelId" &lt; #{lastIndex}
+            </if>
         </where>
         <if test="capacityId!=null and capacityId!=''">
             ORDER BY "countNumber" DESC
         </if>
+        <if test="!(capacityId!=null and capacityId!='')">
+            order by "personnelId" desc
+        </if>
         FETCH NEXT 10 ROWS ONLY
     )
     <if test="id!=null and id.size>0">
@@ -494,9 +504,17 @@
             <if test="capacityId!=null and capacityId!=''">
                 AND RCA .CAPACITY_ID = #{capacityId}
             </if>
+
+            <if test="lastIndex!=null">
+                and RCA.CAPACITY_ID &lt; #{lastIndex}
+            </if>
             <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
                 ORDER BY "countNumber" DESC
             </if>
+            <if test="!((driverId!=null and driverId!='') or (driverId2!=null and driverId2!=''))">
+                order by RCA.CAPACITY_ID desc
+            </if>
+
             FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
@@ -739,7 +757,11 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="lastIndex!=null">
+                and "transrangeId" &lt; #{lastIndex}
+            </if>
         </where>
+        order by "transrangeId" desc
         FETCH NEXT 10 ROWS ONLY
     </select>
     <select id="getCategoryCodeByLike" resultType="java.util.Map">
@@ -799,8 +821,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="lastIndex!=null">
+                and RCT.CAPACITY_TYPE_ID &lt; #{lastIndex}
+            </if>
         </where>
-        GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
+        GROUP BY RCT.CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
+        ORDER BY RCT.CAPACITY_TYPE_ID desc
         FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">