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

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

@@ -1337,11 +1337,12 @@ public class AMScontroller{
     public Map<String, Object> getAmsSaleOrderApprovedes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                          Integer pageNum,
                                                          Integer pageSize,
-                                                         Integer apiId) {
+                                                         Integer apiId,
+                                                         String index) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsSaleOrderApprovedes(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getAmsSaleOrderApprovedes(mapValue, pageNum, pageSize, apiId,index);
     }
 
     /*
@@ -1471,7 +1472,11 @@ public class AMScontroller{
         return amsFeign.getClientNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
     }
 
-
+    @ApiOperation(value="销售公司直接选择车牌号派发运输订单")
+    @PostMapping("/dispatchTruckOrderBySale")
+    public Map<String,Object> dispatchTruckOrderBySale(@RequestBody Map<String,Object> mapValue){
+        return amsFeign.dispatchTruckOrderBySale(mapValue);
+    }
 
 
 

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

@@ -141,7 +141,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiOperation(value="查询所有空闲的运力信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
@@ -157,14 +157,16 @@ public class UniversalController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         if(index != null){
-            mapValue.put("index", "%" + index + "%");
+            mapValue.put("index","%" + index + "%");
         }
-        if(carrierSsoId != null){
-            if(!"null".equals(carrierSsoId)){
-                mapValue.put("carrierSsoId", carrierSsoId);
-            }
+        if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
+            carrierSsoId = null;
         }
-
+        BigDecimal carrierId = null;
+        if (carrierSsoId != null) {
+          carrierId = universalMapper.getCarrierIdBySSO(carrierSsoId);
+        }
+        mapValue.put("carrierId",carrierId);
         //不分页筛选数据
         List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
         PageHelper.startPage(pageNum,pageSize);

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

@@ -1164,7 +1164,7 @@ public interface AmsFeign {
 //                                                      @RequestParam Integer apiId,
 //                                                      @RequestParam String con) ;
 
-    @PostMapping("/api/v1/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
+    @PostMapping("/api/v1销售/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
     Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
                                                       @RequestParam Integer pageNum,
                                                       @RequestParam Integer pageSize,
@@ -1314,7 +1314,8 @@ public interface AmsFeign {
     Map<String, Object> getAmsSaleOrderApprovedes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   @RequestParam("pageNum") Integer pageNum,
                                                   @RequestParam("pageSize") Integer pageSize,
-                                                  @RequestParam("apiId") Integer apiId);
+                                                  @RequestParam("apiId") Integer apiId,
+                                                  @RequestParam("index") String index);
 
     @ApiOperation(value="查询销售订单物资信息")
     @ApiImplicitParams({
@@ -1415,4 +1416,7 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amsdispatchsaleorders/getDispatchMaterialList")
     RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/dispatchTruckOrderBySale")
+    Map<String, Object> dispatchTruckOrderBySale(Map<String, Object> mapValue);
 }

src/main/resources/bootstrap.yml

@@ -22,36 +22,33 @@ eureka:
     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:localhost: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.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}
@@ -113,4 +110,4 @@ mybatis:
 server:
   port: 8080
 #测试环境
-#  port: 8080
+#  port: 8019

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

@@ -149,18 +149,33 @@
                         RC.CAPACITY_ID        "capacityId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName"
-
                  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
-                   <if test="index != null">
-                       and RC.CAPACITY_NUMBER LIKE #{index}
-                   </if>
-                   <if test="carrierSsoId != null">
-                       and RCA.CARRIER_SSO_ID = #{carrierSsoId}
-                   </if>
-             )
+            <if test="carrierId != null" >
+                and RC.CARRIER_ID = #{carrierId}
+            </if>
+             ) RCRC
+        <if test="index != null">
+            where RCRC."capacityNumber" LIKE #{index}
+        </if>
+        <if test="index != null">
+            or RCRC."carrierName" LIKE #{index}
+        </if>
+<!--        <where>-->
+<!--            <if test="capacityNumber != null">-->
+<!--                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">-->
+<!--                    "capacityNumber" like '%${item}%'-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="carrierName != null">-->
+<!--                and-->
+<!--                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">-->
+<!--                    "carrierName" like '%${item}%'-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--        </where>-->
     </select>
 
     <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >