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

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/TMSController.java

@@ -230,15 +230,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);
+    }
 
 
     //框计算计算货权转移中出现的批次
@@ -267,11 +277,9 @@ 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);
     }
 
     /**
@@ -787,8 +795,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);
     }
 
 
@@ -1913,8 +1923,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 = "国产矿物流补录装车信息")
@@ -2331,4 +2341,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;
@@ -845,4 +842,11 @@ public class UniversalController extends BaseRESTfulController {
     public Map<String,Object>getCapacityTel(BigDecimal capacityId){
         return universalMapper.getCapacityTel(capacityId);
     }
+
+    //根据收货客户userId，查询收货客户信息
+    @ApiOperation(value = "根据userId查询收货客户信息")
+    @GetMapping("/getConsigneeByuserid")
+    public Map<String,Object>getConsigneeByuserid(String userId){
+        return universalMapper.getConsigneeByuserid(userId);
+    }
 }

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/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

@@ -687,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

@@ -249,7 +249,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);
 
     /**
      * 展示卸船作业信息列表
@@ -549,6 +550,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,

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

@@ -194,4 +194,7 @@ public interface UniversalMapper {
 
     //查询运力联系方式
     Map<String, Object> getCapacityTel(BigDecimal capacityId);
+
+    Map<String, Object> getConsigneeByuserid(String userId);
+
 }

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

@@ -991,4 +991,12 @@
         SELECT RC.CAPACITY_TEL "capacityTel" FROM RMS_CAPACITY RC
         WHERE RC.CAPACITY_ID = #{capacityId}
     </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>