Merge branch 'master' into dev

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

@@ -1223,8 +1223,9 @@ public class AMScontroller{
                                             Integer pageSize,
                                             Integer orderType,
                                             Integer issueStatus,
-                                            String con) {
-        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con);
+                                            String con,
+                                            Integer dispatchStatus) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus);
     }
 
     @ApiModelProperty(value = "查看物资详情")
@@ -1261,6 +1262,12 @@ public class AMScontroller{
         return amsFeign.addSporadicOrders(mapValue);
     }
 
+    @ApiOperation(value="零星一车多趟新增订单")
+    @PostMapping("/addSporadicOrderTimes")
+    public Map<String, Object> addSporadicOrderTimes(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.addSporadicOrderTimes(mapValue);
+    }
+
     @ApiOperation(value="查询修改渲染")
     @PostMapping("/selectSporadicOrder")
     public RESTfulResult selectSporadicOrder(@RequestParam Integer sporadicOrderId) {

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

@@ -1245,7 +1245,8 @@ public interface AmsFeign {
                                               @RequestParam Integer pageSize,
                                               @RequestParam Integer orderType,
                                               @RequestParam Integer issueStatus,
-                                              @RequestParam String con);
+                                              @RequestParam String con,
+                                              @RequestParam Integer dispatchStatus);
 
     @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
     RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -1264,6 +1265,9 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amstrucksporadicorders/addSporadicOrders")
     Map<String, Object> addSporadicOrders(@RequestBody Map<String, Object> mapValue);
 
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/addSporadicOrderTimes")
+    Map<String, Object> addSporadicOrderTimes(@RequestBody Map<String, Object> mapValue);
+
     @PostMapping("/api/v1/ams/amstrucksporadicorders/selectSporadicOrder")
     RESTfulResult selectSporadicOrder(@RequestParam Integer sporadicOrderId);
 

src/main/resources/application-dev.yml

@@ -1,4 +1,3 @@
-#测试环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
@@ -7,7 +6,6 @@ spring:
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api
-
 openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}

src/main/resources/application-prod.yml

@@ -1,4 +1,3 @@
-# 正式环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri

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

@@ -152,7 +152,7 @@
                  FROM RMS_CAPACITY RC
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RC.CARRIER_ID
-                 WHERE RC.CAPACITY_STATUS = 0 AND RC.CAPACITY_TYPE_ID = 1
+                 WHERE RC.CAPACITY_STATUS = 0 AND RC.CAPACITY_TYPE_ID = 1 AND RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
                 and RC.CARRIER_ID = #{carrierId}
             </if>