'rms和船运查询'

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")
@@ -1323,8 +1324,10 @@ public class AMScontroller{
                                                Integer sporadicStatus,
                                                String carrierSsoId,
                                                String userId,
-                                               String userIds) {
-        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId,userIds);
+                                               String userIds,
+                                               String startTime,
+                                               String endTime) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId,userIds,startTime,endTime);
     }
 
     @ApiModelProperty(value = "查看物资详情")

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

@@ -595,7 +595,21 @@ public class BMSController extends BaseRESTfulController {
                  endTime);
     }
 
-
+    @PostMapping("/getNoInwardDetails")
+    public Map<String,Object> getNoInwardDetails(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 String carrierSsoId,
+                                                 String userId,
+                                                 String startTime,
+                                                 String endTime){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmstruckFeign.getNoInwardDetails(mapVal, pageNum, pageSize, apiId, carrierSsoId,userId, startTime,
+                endTime);
+    }
 
     @PostMapping("/getInwardWeightTimeDetailsOrder")
     public Map<String, Object> getInwardWeightTimeDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal,
@@ -615,4 +629,7 @@ public class BMSController extends BaseRESTfulController {
                 endTime);
     }
 
+
+
+
 }

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

@@ -40,15 +40,19 @@ public class OMSController {
     })
     @PostMapping("/getAllTruckOrder")
     public Map<String, Object> getAllTruckOrder(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer orderStatus,
-                                          Integer planId,
-                                          Integer orderType,
-                                          Integer fuelOrder,String carrierSSOId,String con) {
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer orderStatus,
+                                                Integer planId,
+                                                Integer orderType,
+                                                Integer fuelOrder,
+                                                String carrierSSOId,
+                                                String con,
+                                                String startTime,
+                                                String endTime) {
         return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con);
+                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con,startTime,endTime);
     }
 
     @ApiOperation(value = "不适用表头返回数据")
@@ -232,9 +236,11 @@ public class OMSController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer orderType,
-                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con){
+                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con,
+                                                    String startTime,
+                                                    String endTime){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                 orderType, orderStatus, fuelOrder,carrierSSOId,con);
+                 orderType, orderStatus, fuelOrder,carrierSSOId,con,startTime,endTime);
     }
 
     /**
@@ -745,8 +751,10 @@ public class OMSController {
                                                  String  con,
                                                  String userId,
                                                  String usersId,
-                                                       Integer type1) {
-        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con,userId,usersId,type1);
+                                                       Integer type1,
+                                                       String startTime,
+                                                       String endTime) {
+        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con,userId,usersId,type1,startTime,endTime);
     }
 
     @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -232,15 +233,25 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
-  //框计算计算货权转移中出现的批次
-  @PostMapping("/getBatchListForAttorney")
-  public Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
+    //为提货委托查询批次
+    @PostMapping("/getBatchListForAttorney")
+    public Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId,
                                           String con){
-      return  tmsshipFeign.getBatchListForAttorney(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
-  }
+        return  tmsshipFeign.getBatchListForAttorney(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    //为装船指令查询批次
+    @PostMapping("/getBatchListForInstruction")
+    public Map<String, Object> getBatchListForInstruction(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con){
+        return  tmsshipFeign.getBatchListForInstruction(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
 
 
     //框计算计算货权转移中出现的批次
@@ -269,11 +280,15 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId);
+                                               Integer apiId,
+                                               String con) {
+        return tmsshipFeign.getCapacityList(mapValue==null?new HashMap<String, Object>():mapValue,pageNum, pageSize, apiId,con);
+    }
+
+
+    @PostMapping(value = "/uploadCargoPic")
+    public String uploadCargoPic(@RequestParam ("file") MultipartFile multipartFile){
+        return tmsshipFeign.uploadCargoPic(multipartFile);
     }
 
     /**
@@ -791,8 +806,10 @@ public class TMSController extends BaseRESTfulController {
                                                     Integer pageNum,
                                                     Integer pageSize,
                                                     Integer resultType,
+                                                    Integer materialId,
+                                                    Integer supplierId,
                                                     String con) {
-        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType, con);
+        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,materialId,supplierId, con);
     }
 
 
@@ -1322,8 +1339,10 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer orderType,
                                                  String con,
                                                  String userId,
-                                                 String userIds){
-        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+                                                 String userIds,
+                                                 String startTime,
+                                                 String endTime){
+        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
     }
 
     @ApiOperation(value = "查询计皮实绩")
@@ -1342,8 +1361,10 @@ public class TMSController extends BaseRESTfulController {
                                                 Integer orderType,
                                                 String con,
                                                 String userId,
-                                                String userIds) {
-        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+                                                String userIds,
+                                                String startTime,
+                                                String endTime) {
+        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
     }
 
 
@@ -1383,9 +1404,11 @@ public class TMSController extends BaseRESTfulController {
                                                Integer orderType,
                                                String con,
                                                String userId,
-                                               String userIds
+                                               String userIds,
+                                               String startTime,
+                                               String endTime
     ){
-        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds,startTime,endTime);
     }
 
     @ApiOperation(value = "添加卸货实绩")
@@ -1421,9 +1444,11 @@ public class TMSController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                                Integer orderType,String con
+                                                Integer orderType,String con,
+                                                String startTime,
+                                                String endTime
     ){
-        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,startTime,endTime);
     }
 
 
@@ -1487,13 +1512,15 @@ public class TMSController extends BaseRESTfulController {
     })
     @PostMapping("/getQualityResult")
     public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer orderType,
-                                          String con
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer orderType,
+                                                String con,
+                                                String startTime,
+                                                String endTime
     ){
-        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,orderType, con);
+        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,orderType, con,startTime,endTime);
     }
 
     @ApiOperation(value = "通过ID获取质检实绩 ")
@@ -1907,8 +1934,8 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "/addDomesticLoadResult")
-    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsTrainFeign.addDomesticLoadResult(map);
+    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) List<Map<String, Object>> list) {
+        return tmsTrainFeign.addDomesticLoadResult(list);
     }
 
     @ApiOperation(value = "国产矿物流补录装车信息")
@@ -2325,4 +2352,35 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.getPersonByName(personName);
 
     }
+
+    @ApiOperation(value="获取内转报表")
+    @PostMapping("/getOutFactoryInwardList")
+    public Map<String, Object> getOutFactoryInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String startTime,
+                                                     String endTime,
+                                                     String orgCode,
+                                                     String isPage,
+                                                     String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getOutFactoryInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+	
+	@ApiOperation(value = "根据物资名和外轮船名查询采购订单号")
+    @PostMapping(value = "/findPurchaseOrderList")
+    public Map<String, Object> findPurchaseOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String materialName,
+                                                          String resultForeignShipName){
+        if(map==null)
+            map=new HashMap<>();
+        System.out.println(map);
+        return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName);
+    }
 }

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

@@ -7,10 +7,7 @@ import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -852,4 +849,11 @@ public class UniversalController extends BaseRESTfulController {
         List<Map<String, Object>> list = universalMapper.getConsigneeMesByLike(index == null ? "" : index);
         return success(list);
     }
+
+    //根据收货客户userId，查询收货客户信息
+    @ApiOperation(value = "根据userId查询收货客户信息")
+    @GetMapping("/getConsigneeByuserid")
+    public Map<String,Object>getConsigneeByuserid(String userId){
+        return universalMapper.getConsigneeByuserid(userId);
+    }
 }

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

@@ -1299,7 +1299,9 @@ public interface AmsFeign {
                                               @RequestParam Integer sporadicStatus,
                                               @RequestParam String carrierSsoId,
                                               @RequestParam String userId,
-                                              @RequestParam String userIds);
+                                              @RequestParam String userIds,
+                                        @RequestParam String startTime,
+                                        @RequestParam String endTime);
 
     @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
     RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -1530,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/BmstruckFeign.java

@@ -259,6 +259,16 @@ public interface BmstruckFeign {
                                                         @RequestParam("userId") String userId,
                                                         @RequestParam("startTime")String startTime,
                                                         @RequestParam("endTime")String endTime);
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getNoInwardDetails")
+    Map<String, Object> getNoInwardDetails(@RequestBody(required = false)Map<String, Object> mapVal,
+                                           @RequestParam("pageNum")Integer pageNum,
+                                           @RequestParam("pageSize")Integer pageSize,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("carrierSsoId") String carrierSsoId,
+                                           @RequestParam("userId") String userId,
+                                           @RequestParam("startTime") String startTime,
+                                           @RequestParam("endTime") String endTime);
 }
 
 

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

@@ -34,7 +34,9 @@ public interface OmsFeign {
                                           @RequestParam("orderType") Integer orderType,
                                           @RequestParam("fuelOrder") Integer fuelOrder,
                                           @RequestParam("carrierSSOId")String carrierSSOId,
-                                          @RequestParam("con")String con);
+                                          @RequestParam("con")String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
     @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
     public Map<String, Object> getAllTruckOrderReturnListMap(
@@ -107,7 +109,9 @@ public interface OmsFeign {
                                               @RequestParam("orderStatus") Integer orderStatus,
                                               @RequestParam("fuelOrder") Integer fuelOrder,
                                               @RequestParam("carrierSSOId") String carrierSSOId,
-                                              @RequestParam("con")      String con);
+                                              @RequestParam("con")      String con,
+                                                    @RequestParam("startTime") String startTime,
+                                                    @RequestParam("endTime")String endTime);
     /**
      * 展示承运商接收销售公司已接受的销售订单
      * @param carrierId
@@ -391,7 +395,9 @@ public interface OmsFeign {
                                                        @RequestParam("con") String con,
                                                        @RequestParam("userId") String userId,
                                                        @RequestParam("usersId") String usersId,
-                                                       @RequestParam("type1")Integer type1
+                                                       @RequestParam("type1")Integer type1,
+                                                @RequestParam("startTime")String  startTime,
+                                                @RequestParam("endTime") String endTime
                                                        );
 
     @ApiOperation(value = "根据运输订单id修改运力id")

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

@@ -31,6 +31,8 @@ public interface TmsTrainFeign {
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
                                               @RequestParam("resultType") Integer resultType,
+                                              @RequestParam("materialId")Integer materialId,
+                                              @RequestParam("supplierId")Integer supplierId,
                                                     @RequestParam("con") String con);
 
 
@@ -230,7 +232,7 @@ public interface TmsTrainFeign {
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addDomesticLoadResult")
-    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) List<Map<String, Object>> list);
 
     @ApiOperation(value = "国产矿物流补录装车信息")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/updateDomesticLoadResult")
@@ -253,4 +255,12 @@ public interface TmsTrainFeign {
     @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
     Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
 
+    @ApiOperation(value = "根据物资名和外轮船名查询采购订单号")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getPurchaseOrderList")
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                   @RequestParam("apiId")Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("materialName")String materialName,
+                                                   @RequestParam("resultForeignShipName")String resultForeignShipName);
 }

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

@@ -147,7 +147,9 @@ public interface TmsTruckFeign {
                                                  @RequestParam("orderType") Integer orderType,
                                                  @RequestParam("con")     String con,
                                                  @RequestParam("userId")  String userId,
-                                                 @RequestParam("userIds") String userIds
+                                                 @RequestParam("userIds") String userIds,
+                                                 @RequestParam("startTime")String startTime,
+                                                 @RequestParam("endTime")String endTime
                                                  );
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
@@ -158,7 +160,9 @@ public interface TmsTruckFeign {
                                                 @RequestParam("orderType") Integer orderType,
                                                 @RequestParam("con") String con,
                                                 @RequestParam("userId")String userId,
-                                                @RequestParam("userIds")String userIds);
+                                                @RequestParam("userIds")String userIds,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
     public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
@@ -179,7 +183,9 @@ public interface TmsTruckFeign {
                                                @RequestParam("orderType") Integer orderType,
                                                @RequestParam("con")      String con,
                                                @RequestParam("userId") String userId,
-                                               @RequestParam("userIds") String userIds
+                                               @RequestParam("userIds") String userIds,
+                                               @RequestParam("startTime")String startTime,
+                                               @RequestParam("endTime")String endTime
     );
 
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
@@ -193,13 +199,15 @@ public interface TmsTruckFeign {
      */
 
 
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiveResult")
+    @PostMapping("api/v1/truckTms/tmstruckreciveresult/getReceiveResult")
     public Map<String, Object> getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")  String con);
+                                          @RequestParam("con")  String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
     /*
     TmstruckLeaveFactoryResultController
@@ -241,7 +249,9 @@ public interface TmsTruckFeign {
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")String con);
+                                          @RequestParam("con")String con,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime);
 
 
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResultById/{resultId}")
@@ -677,6 +687,17 @@ public interface TmsTruckFeign {
                                            @RequestParam("orgCode") String orgCode,
                                            @RequestParam("isPage") String isPage,
                                            @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getOutFactoryInwardList")
+    Map<String, Object> getOutFactoryInwardList(@RequestBody(required = false)Map<String, Object> mapValue,
+                                                @RequestParam("apiId")Integer apiId,
+                                                @RequestParam("pageNum")Integer pageNum,
+                                                @RequestParam("pageSize")Integer pageSize,
+                                                @RequestParam("startTime")String startTime,
+                                                @RequestParam("endTime")String endTime,
+                                                @RequestParam("orgCode")String orgCode,
+                                                @RequestParam("isPage")String isPage,
+                                                @RequestParam("index")String index);
 }
 
 

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

@@ -3,7 +3,9 @@ package com.steerinfo.dil.feign;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.Map;
@@ -251,7 +253,8 @@ public interface TmsshipFeign {
     Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId);
+                                        @RequestParam Integer apiId,
+                                        @RequestParam String con);
 
     /**
      * 展示卸船作业信息列表
@@ -552,6 +555,12 @@ public interface TmsshipFeign {
                                      @RequestParam Integer apiId,
                                      @RequestParam String con);
 
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchListForInstruction")
+    Map<String, Object> getBatchListForInstruction(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam String con);
 
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchIdByForeign")
     Map<String, Object> getBatchIdByForeign(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -786,4 +795,7 @@ public interface TmsshipFeign {
 
     @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
     Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);
+
+    @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/uploadCargoPic" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    String uploadCargoPic(@RequestPart("file") MultipartFile multipartFile);
 }

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

@@ -197,4 +197,7 @@ public interface UniversalMapper {
 
     // 边输边查收货客户
     List<Map<String, Object>> getConsigneeMesByLike(String s);
+
+    Map<String, Object> getConsigneeByuserid(String userId);
+
 }

src/main/resources/application-dev.yml

@@ -42,7 +42,7 @@ openfeign:
   TmsTruckFeign:
     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:

src/main/resources/bootstrap.yml

@@ -12,15 +12,16 @@ spring:
   mvc:
     static-path-pattern:
 
-
 #eureka设置
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
+
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
     register-with-eureka: true #表示向EurekaServer注册自己 默认为true
     fetch-registry: true #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
 
+
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

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

@@ -1002,4 +1002,13 @@
             instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum < 10
         order by "value"
     </select>
+
+    <select id="getConsigneeByuserid" resultType="java.util.Map" parameterType="string">
+        select
+        RC.CONSIGNEE_ID "consigneeId",
+        RC.CONSIGNEE_CODE "consigneeCode",
+        RC.CONSIGNEE_COMPANY_NAME   "consigneeCompanyName"
+        from RMS_CONSIGNEE RC
+        WHERE RC.CONSIGNEE_SSO_ID = #{userId}
+    </select>
 </mapper>