'销售'

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/controller/OMSController.java

@@ -680,7 +680,13 @@ public class OMSController {
 
     @ApiOperation(value = "根据运单id关闭运输订单")
     @PostMapping("/closeOrder")
-    public Map<String, Object> closeOrder(@RequestParam Integer orderId){
+    public Map<String, Object> closeOrder(@RequestParam Integer orderId) {
         return omsFeign.closeOrder(orderId);
     }
+
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("/getDriverConfirmation")
+    public Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map) {
+        return omsFeign.getDriverConfirmation(map);
+    }
 }

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/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -389,5 +389,9 @@ public interface OmsFeign {
     @ApiOperation(value = "根据运单id关闭运输订单")
     @PostMapping("api/v1/oms/omstruckorderseparates/closeOrder")
     Map<String, Object> closeOrder(@RequestParam Integer orderId);
+
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("api/v1/oms/omstruckorders/getDriverConfirmation")
+    Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map);
 }
 

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

@@ -89,5 +89,5 @@ public interface UniversalMapper {
     Integer getSaleOrderStatus(BigDecimal orderId);
 
     //通过运输订单号查询订单类型和ID
-    Map<String, Object> getOrderMesByOrderNumber(String orderNumber);
+        Map<String, Object> getOrderMesByOrderNumber(String orderNumber);
 }

src/main/resources/application-dev.yml

@@ -1,9 +1,38 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+  BmsshipFeign:
+    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+  BmstrainFeign:
+    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
+  BmstruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+  QmsTruckFeign:
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
+  TmsTrainFeign:
+    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+  TmsshipFeign:
+    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
+  WMSHFeign:
+    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+  OMSFeign:
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+  RmsFeign:
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
+server:
+  port: 8019

src/main/resources/application-prod.yml

@@ -5,4 +5,35 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-api
+    name: dil-api
+
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+  BmsshipFeign:
+    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+  BmstrainFeign:
+    url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
+  BmstruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+  QmsTruckFeign:
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+  TmsTrainFeign:
+    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+  TmsshipFeign:
+    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+  WMSHFeign:
+    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+  OMSFeign:
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+  RmsFeign:
+    url: ${RMSFEIGN_URL:172.16.33.166:8060}
+
+server:
+  port: 8080

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
@@ -16,66 +16,11 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
-openfeign:
-  #  正式环境
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
-  BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
-  BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
-  BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
-  QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
-  TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-  TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
-  WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
-  WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
-  OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
-  RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.33.166:8060}
-  #测试环境
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-#  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.162:8015}
-#  BmsshipFeign:
-#    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
-#  BmstrainFeign:
-#    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
-#  BmstruckFeign:
-#    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
-#  QmsTruckFeign:
-#    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
-#  TmsTrainFeign:
-#    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
-#  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-#  TmsshipFeign:
-#    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
-#  WMSHFeign:
-#    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
-#  WMSFeign:
-#    url: ${WMSFEIGN_URL:172.16.33.162:8012}
-#  OMSFeign:
-#    url: ${OMSFEIGN_URL:172.16.33.162:8016}
-#  RmsFeign:
-#    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
 genxml:
   pth: com/a
@@ -96,8 +41,6 @@ redis:
     time: 864000000
   database: 0
 
-
-
 mybatis:
   type-aliases-package: com.steerinfo.dil.model
   mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml
@@ -105,7 +48,4 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
-server:
-  port: 8080
-#测试环境
-#  port: 8019
+

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>