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

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

@@ -1167,11 +1167,12 @@ public class AMScontroller{
                                                        String enableStatus,
                                                        String planStatus,
                                                      String startTime,
-                                                     String endTime) {
+                                                     String endTime,
+                                                     BigDecimal planId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus,startTime,endTime);
+        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus,startTime,endTime,planId);
     }
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping("/getDispatchSaleOrderList")

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

@@ -896,4 +896,10 @@ public class OMSController {
         }
         return omsFeign.getDriverInfoForSale2(mapValue,apiId,pageNum,pageSize,new BigDecimal(saleOrderId),con);
     }
+
+    @ApiOperation(value = "通过运单id或者运单号查询车辆是否放行")
+    @PostMapping("canCapacityEnfactory")
+    public Map<String, Object> canCapacityEnfactory(@RequestBody Map<String, Object> mapValue) {
+        return omsFeign.canCapacityEnfactory(mapValue);
+    }
 }

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

@@ -1164,4 +1164,9 @@ public class RMScontroller {
     }
 
 
+    //收货客户注册
+    @PostMapping(value = "/signConsignee")
+    public Map<String, Object> signConsignee(@RequestBody Map<String,Object> mapVal){
+        return rmsFeign.signConsignee(mapVal);
+    }
 }

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

@@ -118,11 +118,13 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               Integer status,
+                                               @RequestParam(required = false) String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
     }
 
     @PostMapping("getLoadShip/{resultId}")
@@ -351,9 +353,10 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                          Integer pageNum,
                                                          Integer pageSize,
-                                                         Integer apiId) {
+                                                         Integer apiId,
+                                                         @RequestParam(required = false) String con) {
 
-        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getWaterQuality/{resultId}")
@@ -640,11 +643,12 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer pageNum,
                                                          Integer pageSize,
                                                          Integer apiId,
-                                                         Integer status) {
+                                                         Integer status,
+                                                         @RequestParam(required = false) String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
     }
 
     @PostMapping("insertDeliveryNotice")
@@ -875,8 +879,11 @@ public class TMSController extends BaseRESTfulController {
                                           @RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize){
-        return tmsTrainFeign.getWagonNo(resultType, mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+                                          Integer pageSize,
+                                          String wagon,
+                                          String purchaseOrderNum,
+                                          String materialName){
+        return tmsTrainFeign.getWagonNo(resultType, mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,wagon,purchaseOrderNum,materialName);
     }
 
     @ApiOperation(value = "查询所有发运计划")
@@ -1954,8 +1961,20 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLoadResultToSendMC( @RequestBody(required = false) Map<String, Object> mapValue,
             Integer apiId,
             Integer pageNum,
-            Integer pageSize,Integer resultType) {
-        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType);
+            Integer pageSize, String startTime, String endTime,Integer resultType,String con) {
+        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
+    }
+
+    @ApiOperation(value = "查询计量数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(209)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/getWeightResult")
+    public Map<String, Object> getWeightResult( @RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,String startTime, String endTime,Integer resultType,String con) {
+        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
     }
 
     @ApiOperation(value = "批量新增计量委托")
@@ -2260,9 +2279,10 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer pageNum,
                                                  Integer pageSize,
                                                  String startTime,
-                                                 String endTime
+                                                 String endTime,BigDecimal orderType, String index, String isPage,String orgCode
+
     ){
-        return tmsTruckFeign.getInwardReportForAssemble(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+        return tmsTruckFeign.getInwardReportForAssemble(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,orderType,index,isPage,orgCode);
     }
 
 

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

@@ -843,6 +843,13 @@ public class UniversalController extends BaseRESTfulController {
         return universalMapper.getCapacityTel(capacityId);
     }
 
+    @ApiModelProperty(value = "边输边查收货客户")
+    @PostMapping("/getConsigneeMesByLike")
+    public RESTfulResult getConsigneeMesByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getConsigneeMesByLike(index == null ? "" : index);
+        return success(list);
+    }
+
     //根据收货客户userId，查询收货客户信息
     @ApiOperation(value = "根据userId查询收货客户信息")
     @GetMapping("/getConsigneeByuserid")

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

@@ -1532,7 +1532,8 @@ public interface AmsFeign {
                                               @RequestParam String enableStatus,
                                               @RequestParam String planStatus,
                                               @RequestParam String startTime,
-                                              @RequestParam String endTime);
+                                              @RequestParam String endTime,
+                                              @RequestParam BigDecimal planId);
 
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRealAddressByLike")
     Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index);

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

@@ -519,5 +519,8 @@ public interface OmsFeign {
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("orderId") Integer orderId,
                                           @RequestParam("orderStatus") Integer orderStatus);
+
+    @PostMapping("api/v1/oms/omstruckorders/canCapacityEnfactory")
+    Map<String, Object> canCapacityEnfactory(@RequestBody Map<String, Object> mapValue);
 }
 

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

@@ -637,4 +637,7 @@ public interface RmsFeign {
 
     @PostMapping("api/v1/rms/rmscargodeps/getCargoDepById/{id}")
     Map<String, Object> getCargoDepById(@PathVariable("id") BigDecimal id);
+
+    @PostMapping("api/v1/rms/rmsconsignee/signConsignee")
+    Map<String, Object> signConsignee(@RequestBody Map<String, Object> mapVal);
 }

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

@@ -70,7 +70,10 @@ public interface TmsTrainFeign {
                                     @RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam("apiId") Integer apiId,
                                     @RequestParam("pageNum") Integer pageNum,
-                                    @RequestParam("pageSize") Integer pageSize);
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("wagon") String wagon,
+                                    @RequestParam("purchaseOrderNum") String purchaseOrderNum,
+                                    @RequestParam("materialName")String materialName);
 
     /*
         TmstrainWagonUnloadResultController
@@ -248,9 +251,23 @@ public interface TmsTrainFeign {
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("resultType") Integer resultType
+                                               @RequestParam("resultType") Integer resultType,
+                                               @RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime,
+                                               @RequestParam("con") String con
                                                );
 
+    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/getWeightResult")
+    Map<String, Object> getWeightResult( @RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("resultType") Integer resultType,
+                                               @RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime,
+                                               @RequestParam("con") String con
+    );
+
     @ApiOperation(value = "批量新增计量委托")
     @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
     Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);

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

@@ -547,7 +547,11 @@ public interface TmsTruckFeign {
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
                                           @RequestParam String startTime,
-                                          @RequestParam String endTime);
+                                          @RequestParam String endTime,
+                                                   @RequestParam BigDecimal orderType,
+                                                   @RequestParam String index,
+                                                   @RequestParam String isPage,
+                                                   @RequestParam String orgCode);
 
 
     @PostMapping("api/v1/truckTms/statisticalReport/getCapacityByDefend")

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

@@ -110,7 +110,9 @@ public interface TmsshipFeign {
     Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                   @RequestParam Integer pageNum,
                                   @RequestParam Integer pageSize,
-                                  @RequestParam Integer apiId);
+                                  @RequestParam Integer apiId,
+                                        @RequestParam Integer status,
+                                        @RequestParam(required = false) String con);
 
     /**
      * 查询装船作业表单
@@ -327,7 +329,8 @@ public interface TmsshipFeign {
     Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId);
+                                            @RequestParam Integer apiId,
+                                                  @RequestParam(required = false) String con);
 
     /**
      * 查询水分质检信息
@@ -720,7 +723,8 @@ public interface TmsshipFeign {
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
-                                            @RequestParam Integer  status);
+                                            @RequestParam Integer  status,
+                                                  @RequestParam(required = false) String con);
 
     /**
      * 新增放货通知

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

@@ -195,6 +195,9 @@ public interface UniversalMapper {
     //查询运力联系方式
     Map<String, Object> getCapacityTel(BigDecimal capacityId);
 
+    // 边输边查收货客户
+    List<Map<String, Object>> getConsigneeMesByLike(String s);
+
     Map<String, Object> getConsigneeByuserid(String userId);
 
 }

src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -40,17 +40,17 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:localhost:8003}
+    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:192.168.1.104:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:localhost:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   OTMSFeign:

src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign:

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

@@ -991,6 +991,18 @@
         SELECT RC.CAPACITY_TEL "capacityTel" FROM RMS_CAPACITY RC
         WHERE RC.CAPACITY_ID = #{capacityId}
     </select>
+
+    <select id="getConsigneeMesByLike" resultType="java.util.Map" parameterType="java.lang.String" >
+        select
+            RC.CONSIGNEE_ID "consigneeId",
+            RC.CONSIGNEE_COMPANY_NAME "value",
+            RC.CONSIGNEE_COMPANY_NAME "consigneeName"
+        from RMS_CONSIGNEE RC
+        where
+            instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum &lt; 10
+        order by "value"
+    </select>
+
     <select id="getConsigneeByuserid" resultType="java.util.Map" parameterType="string">
         select
         RC.CONSIGNEE_ID "consigneeId",