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

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

@@ -11,7 +11,9 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -105,6 +107,21 @@ public class BMSController extends BaseRESTfulController {
         return bmsshipFeign.deletePortHandlingFee(feeId);
     }
 
+
+    @PostMapping("deletePortHandlingFeeSecond/{feeId}")
+    @ApiOperation(value = "逻辑删除二程港口装卸费")
+    Map<String,Object> deletePortHandlingFeeSecond(@PathVariable("feeId") BigDecimal feeId) {
+        return bmsshipFeign.deletePortHandlingFeeSecond(feeId);
+    }
+
+
+    @PostMapping("addwaterStatement")
+    @ApiOperation(value = "修改港口装卸费信息")
+    Map<String,Object> addwaterStatement(@RequestBody Map<String, Object> map) {
+        return bmsshipFeign.addwaterStatement(map);
+    }
+
+
     @PostMapping("getUncomplateDetailsOrderList")
     @ApiOperation(value = "展示未生成账单的详单信息")
     public RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -549,6 +566,19 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.update(statementId);
     }
 
+
+    /**
+     * 审批计费账单
+     */
+    @PostMapping("/getBmsshipFee/{id}")
+    public Map<String,Object> updateConvertedTruckStatement(@PathVariable("id") Integer id) {
+        return bmsshipFeign.getBmsshipFee(id);
+    }
+
+
+
+
+
     @PostMapping("/updateDetailsOrder")
     @ApiOperation(value = "修改详单")
     public RESTfulResult updateDetailsOrder(@RequestBody Map<String, Object> mapValue) {
@@ -561,6 +591,35 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.addLossFeeOfCoke(map);
     }
 
+
+
+
+
+    @PostMapping("/addPortHandlingFeeSecond")
+    @ApiOperation(value = "新增二程船装卸费用")
+    public Map<String,Object> addPortHandlingFeeSecond(@RequestBody(required = false) Map<String, Object> map) {
+        return bmsshipFeign.addPortHandlingFeeSecond(map);
+    }
+
+
+    @PostMapping("/uploadBmsshipOrder")
+    @ApiOperation(value = "上传水运单图片")
+    public Map<String,Object> uploadBmsshipOrder(@RequestParam("file") MultipartFile multipartFile) throws Exception {
+        return bmsshipFeign.uploadBmsshipOrder(multipartFile);
+    }
+
+
+    //获取水运单图片
+    @ApiOperation(value = "获取水运单图片")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/downloadBmsshipOrder")
+    public Map<String, Object> downloadBmsshipOrder(@RequestParam Integer resultId) {
+        return bmsshipFeign.downloadBmsshipOrder(resultId);
+    }
+
+
+
     /**
      * 展示详单信息
      *
@@ -633,7 +692,47 @@ public class BMSController extends BaseRESTfulController {
                 endTime);
     }
 
+    @PostMapping("/selectPortFeeSecondList")
+    public Map<String,Object> selectPortFeeSecondList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 String startTime,
+                                                 String endTime,
+                                                      Integer feeType){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmsshipFeign.selectPortFeeSecondList(mapVal, pageNum, pageSize, apiId, startTime, feeType,endTime);
+    }
 
+    /**
+     * 根据批次查火运湿吨详情
+     * @param batchId
+     * @return
+     */
+    @PostMapping("/getTrainDetailsByBatch/{batchId}")
+    public Map<String,Object> getTrainDetailsByBatch(@PathVariable("batchId")BigDecimal batchId){
+        return bmsshipFeign.getTrainDetailsByBatch(batchId);
+    }
 
+    /**
+     * 根据批次查汽运湿吨详情
+     * @param batchId
+     * @return
+     */
+    @PostMapping("/getTruckDetailsByBatch/{batchId}")
+    public Map<String,Object> getTruckDetailsByBatch(@PathVariable("batchId")BigDecimal batchId){
+        return bmsshipFeign.getTruckDetailsByBatch(batchId);
+    }
 
+    /**
+     * 根据批次查询装船作业
+     * @param
+     * @return
+     */
+    @PostMapping("/findLoadByBatch/{batchId}")
+    public Map<String,Object> findLoadByBatch(@PathVariable("batchId") BigDecimal batchId){
+        return bmsshipFeign.findLoadByBatch(batchId);
+    }
 }

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

@@ -914,4 +914,10 @@ public class OMSController {
         }
         return omsFeign.getWarehouseMes(mapValue,startTime,endTime, con);
     }
+
+    @ApiOperation(value = "通过运单下的物资信息")
+    @PostMapping("/closeInwardOrderByPlan")
+    public  Map<String, Object> closeInwardOrderByPlan(@RequestParam Integer planId) {
+        return omsFeign.closeInwardOrderByPlan(planId);
+    }
 }

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

@@ -1187,4 +1187,54 @@ public class RMScontroller {
         return rmsFeign.getPierName(index);
     }
 
+
+    @ApiOperation(value="获取船运合同管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+    @PostMapping("/selectbmsshipContractPriceList")
+    public Map<String, Object> selectbmsshipContractPriceList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                              Integer apiId,
+                                                              Integer pageNum,
+                                                              Integer pageSize,
+                                                              String con,
+                                                              String startTime,
+                                                              String endTime
+    ){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return   rmsFeign.selectbmsshipContractPriceList(mapValue, apiId, pageNum, pageSize, con, startTime, endTime);
+    }
+
+
+    //新增船运合同管理
+    @PostMapping(value = "/insertBmsshipContractPrice")
+    public Map<String, Object> insertBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.insertBmsshipContractPrice(map);
+    }
+
+    //修改船运合同管理
+    @PostMapping(value = "/updateBmsshipContractPrice")
+    public Map<String, Object> updateBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.updateBmsshipContractPrice(map);
+    }
+
+    //修改船运合同管理
+    @PostMapping(value = "/deleteBmsshipContractPrice")
+    public Map<String, Object> deleteBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteBmsshipContractPrice(map);
+    }
+
+    //修改船运合同管理
+    @PostMapping(value = "/selectBmsshipPriceList/{id}")
+    public Map<String, Object> selectBmsshipPriceList(@PathVariable("id") BigDecimal id){
+        return rmsFeign.selectBmsshipPriceList(id);
+    }
+
 }

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

@@ -120,11 +120,13 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageSize,
                                                Integer apiId,
                                                Integer status,
-                                               @RequestParam(required = false) String con) {
+                                               @RequestParam(required = false) String con,
+                                               String startTime,
+                                               String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
+        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con,startTime,endTime);
     }
 
     @PostMapping("getLoadShip/{resultId}")
@@ -1626,6 +1628,33 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getTmstrainWagonLoadForConverted(apiId, pageNum, pageSize,con);
     }
 
+
+
+
+    @ApiOperation(value = "查询进口矿未绑定装车实绩的车皮")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(203)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getResultType")
+    public Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
+                                                                        Integer apiId,
+
+                                                                String con
+    ) {
+        return tmsTrainFeign.getResultType(map == null ? new HashMap<>() : map,apiId,con);
+    }
+
+    @PostMapping("/addShipLoadResult")
+    @ApiOperation(value = "江港-达州新增装车")
+    public Map<String, Object> addShipLoadResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.addShipLoadResult(map);
+    }
+
+
     @PostMapping("/addWagonPleaseForNZ")
     @ApiOperation(value = "内转物流新增请车")
     public Map<String, Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {
@@ -1962,6 +1991,13 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.getShipNameList(state);
     }
 
+    @ApiOperation(value = "国产矿物流导入")
+    @PostMapping(value = "/importDomesticLoadResult")
+    public Map<String, Object> importDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTrainFeign.importDomesticLoadResult(mapValue);
+    }
+
+
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "/addDomesticLoadResult")
     public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
@@ -2421,11 +2457,12 @@ public class TMSController extends BaseRESTfulController {
                                                           Integer pageNum,
                                                           Integer pageSize,
                                                           String materialName,
-                                                          String resultForeignShipName){
+                                                          String resultForeignShipName,
+                                                          String supplierName){
         if(map==null)
             map=new HashMap<>();
         System.out.println(map);
-        return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName);
+        return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName,supplierName);
     }
 
     @ApiOperation(value = "销售钢材统计报表")

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

@@ -399,6 +399,62 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "模糊查询批次")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "502", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/selectPurchaseOrderForShip")
+    public RESTfulResult selectPurchaseOrderForShip(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId,
+                                          String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.selectPurchaseOrderForShip(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+
+    @ApiModelProperty(value = "查询存在装船作业并且尚未计算水运费的批次")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "502", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/findBatchHavingLoad")
+    public RESTfulResult findBatchHavingLoad(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String index){
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.findBatchHavingLoad(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+
+
+
+
     @ApiModelProperty(value = "边输边查承运商")
     @PostMapping("/getCarrierMesByLike")
     public RESTfulResult getCarrierMesByLike(@RequestParam("index") String index) {
@@ -886,7 +942,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiModelProperty(value = "边输边查片区")
     @PostMapping("/getSaleAreaByLike")
     public RESTfulResult getSaleAreaByLike(@RequestParam("index") String index) {
-        List<Map<String, Object>> list = universalMapper.getSaleAreaByLike(index == null ? "" : index);
+        List<Map<String, Object>> list = universalMapper.getSaleAreaByLike(index == null ? "" : "%" + index + "%");
         return success(list);
     }
 
@@ -937,7 +993,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "关闭过期运输订单")
     @PostMapping("/closePassedOrder")
-//    @Scheduled(cron = "0 0 8 * * ?")
+    @Scheduled(cron = "0 0 8 * * ?")
     public RESTfulResult closePassedOrder() {
         List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
         System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");

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

@@ -1028,5 +1028,18 @@ public class WMSController extends BaseRESTfulController {
     public Map<String, Object> disorderlyOutbound(@RequestBody Map<String,Object> map){
         return wmsFeign.disorderlyOutbound(map);
     }
+
+
+    @ApiOperation(value="船舶动态表展示库存吨位", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "158", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/gePortStockList")
+    public Map<String,Object> gePortStockList(@RequestBody(required = false) Map<String,Object> mapVal
+    ){
+        return wmsFeign.gePortStockList(mapVal);
+    }
 }
 

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

@@ -82,6 +82,16 @@ public class WMSHController extends BaseRESTfulController {
     }
 
 
+    @PostMapping("selectLoadResult")
+    @ApiOperation(value = "展示万州港口港存库库存列表")
+    public Map<String, Object> selectLoadResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.selectLoadResult(mapValue,con);
+    }
+
     /**
      * 展示万州港港存库库存列表
      *

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

@@ -2,7 +2,9 @@ package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 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.List;
@@ -264,4 +266,46 @@ public interface BmsshipFeign {
      */
     @PostMapping(value = "/api/v1/bmsship/bmsshipformulas/getWaterFeesFormula")
     RESTfulResult getWaterFeesFormula();
+
+     //新增二程船装卸费用
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addPortHandlingFeeSecond")
+    Map<String, Object> addPortHandlingFeeSecond(@RequestBody(required = true) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/uploadBmsshipOrder", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    Map<String, Object> uploadBmsshipOrder(@RequestPart("file") MultipartFile multipartFile);
+
+    //下载水运单图片
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/downloadBmsshipOrder")
+    Map<String, Object> downloadBmsshipOrder(@RequestParam("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/selectPortFeeSecondList")
+    Map<String, Object> selectPortFeeSecondList(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                @RequestParam("pageNum")Integer pageNum,
+                                                @RequestParam("pageSize")Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("startTime") String startTime,
+                                                @RequestParam("feeType")Integer feeType,
+                                                @RequestParam("endTime") String endTime);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getBmsshipFee/{id}")
+    Map<String, Object> getBmsshipFee(@PathVariable("id") Integer id);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/deletePortHandlingFeeSecond/{feeId}")
+    Map<String,Object> deletePortHandlingFeeSecond(@PathVariable("feeId")BigDecimal feeId);
+
+
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addwaterStatement")
+    Map<String, Object> addwaterStatement(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getTrainDetailsByBatch/{batchId}")
+    Map<String,Object> getTrainDetailsByBatch(@PathVariable("batchId")BigDecimal batchId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getTruckDetailsByBatch/{batchId}")
+    Map<String,Object> getTruckDetailsByBatch(@PathVariable("batchId")BigDecimal batchId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findBatchHavingLoad")
+    Map<String,Object> findBatchHavingLoad(String con);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findLoadByBatch/{batchId}")
+    Map<String,Object> findLoadByBatch(@PathVariable("batchId")BigDecimal batchId);
 }

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

@@ -273,6 +273,9 @@ public interface BmstruckFeign {
                                            @RequestParam("userId") String userId,
                                            @RequestParam("startTime") String startTime,
                                            @RequestParam("endTime") String endTime);
+
+
+
 }
 
 

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

@@ -528,5 +528,8 @@ public interface OmsFeign {
                                         @RequestParam(required = false) String startTime,
                                         @RequestParam(required = false) String endTime,
                                         @RequestParam(required = false) String con);
+
+    @PostMapping("api/v1/oms/omstruckorders/closeInwardOrderByPlan")
+    Map<String, Object> closeInwardOrderByPlan(@RequestParam Integer planId);
 }
 

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

@@ -648,4 +648,27 @@ public interface RmsFeign {
     // 边输边查码头名称
     @PostMapping(value = "/api/v1/rms/rmsPort/getPierName")
     Map<String, Object> getPierName(@RequestParam("index") String index);
+
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/selectbmsshipContractPriceList")
+    Map<String, Object> selectbmsshipContractPriceList(@RequestBody(required = false) Map<String,Object> map,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("con") String con,
+                                                       @RequestParam("startTime") String startTime,
+                                                       @RequestParam("endTime")String endTime);
+
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/insertBmsshipContractPrice")
+    Map<String, Object> insertBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/updateBmsshipContractPrice")
+    Map<String, Object> updateBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    // 删除船运合同单价
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/deleteBmsshipContractPrice")
+    Map<String, Object> deleteBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    // 渲染船运合同单价
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/selectBmsshipPriceList/{id}")
+    Map<String, Object> selectBmsshipPriceList(@PathVariable("id") BigDecimal id);
 }

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

@@ -235,6 +235,10 @@ public interface TmsTrainFeign {
             @RequestParam("loadingId")Integer loadingId,
             @RequestParam("unloadingId")Integer unloadingId);
 
+    @ApiOperation(value = "国产矿物流导入")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/importDomesticLoadResult")
+    Map<String, Object> importDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
+
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addDomesticLoadResult")
     Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
@@ -281,7 +285,8 @@ public interface TmsTrainFeign {
                                                    @RequestParam("pageNum") Integer pageNum,
                                                    @RequestParam("pageSize") Integer pageSize,
                                                    @RequestParam("materialName")String materialName,
-                                                   @RequestParam("resultForeignShipName")String resultForeignShipName);
+                                                   @RequestParam("resultForeignShipName")String resultForeignShipName,
+                                                   @RequestParam("supplierName")String supplierName);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addWarehouseOutResult")
@@ -293,4 +298,13 @@ public interface TmsTrainFeign {
 
     @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/updateWarehouseResult")
     Map<String, Object> updateWarehouseResult(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/getResultType")
+    Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("con") String con);
+
+    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/addShipLoadResult")
+    Map<String, Object> addShipLoadResult(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -108,11 +108,13 @@ public interface TmsshipFeign {
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/getLoadShipList")
     Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                  @RequestParam Integer pageNum,
-                                  @RequestParam Integer pageSize,
-                                  @RequestParam Integer apiId,
-                                        @RequestParam Integer status,
-                                        @RequestParam(required = false) String con);
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("status") Integer status,
+                                        @RequestParam(required = false) String con,
+                                        @RequestParam("startTime") String startTime,
+                                        @RequestParam("endTime") String endTime);
 
     /**
      * 查询装船作业表单

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

@@ -882,4 +882,7 @@ public interface WMSFeign {
 
     @PostMapping("/api/v1/wms/wmspoutboundresults/disorderlyOutbound")
     Map<String, Object> disorderlyOutbound(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/wms/wmshgridmaterials/gePortStockList")
+    Map<String, Object> gePortStockList(@RequestBody(required = false) Map<String, Object> mapVal);
 }

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

@@ -141,4 +141,8 @@ public interface WMSHFeign {
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("con") String con);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/selectLoadResult")
+    Map<String,Object> selectLoadResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam("con") String con);
 }

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

@@ -181,6 +181,7 @@ public interface UniversalMapper {
     Integer getNotReceiveOrderQuantity(String capacityNumber);
 
     List<Map<String,Object>> getXiNanCarrier();
+
     //边输边查发站到站
     List<Map<String, Object>> getArrivalByLike(String index);
 
@@ -229,4 +230,7 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getInwardWeightMaterial(Map<String, Object> mapValue);
 
+    List<Map<String,Object>> selectPurchaseOrderForShip(Map<String,Object> map);
+
+    List<Map<String,Object>> findBatchHavingLoad(Map<String,Object> map);
 }

src/main/resources/application-prod.yml

@@ -41,7 +41,7 @@ openfeign:
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image
-  #path: C:\Users\24390\Desktop\work\a
-  path: /shared
+  path: C:\Users\24390\Desktop\work\a
+#  path: /shared
 server:
   port: 8080

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

@@ -393,6 +393,7 @@
             order by "materialId" desc
         </if>
     </select>
+
 <!--  查询所有的批次及其关联的采购订单号  -->
     <select id="getBatchAndOrderMes" parameterType="map" resultType="java.util.Map">
         select *
@@ -402,7 +403,8 @@
                         DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
                         RM.MATERIAL_NAME            "materialName",
                         APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
-                        APO.INSERT_TIME             "insetTime"
+                        APO.INSERT_TIME             "insetTime",
+                        APO.PURCHASE_ORDER_ID        "purchaseOrderId"
                  from DIL_BATCH DB
                           left join AMS_PURCHASE_ORDER APO
                                     on APO.BATCH_ID = DB.BATCH_ID
@@ -954,11 +956,14 @@
         WHERE RCA.CARRIER_NAME LIKE '%西南水泥%'
     </select>
 
+    <!-- 边输边查发站-->
     <select id="getArrivalByLike" parameterType="java.lang.String" resultType="java.util.Map">
         SELECT RAS.ARRIVAL_NAME AS "arrivalName",
                RAS.ARRIVAL_ID AS "arrivalId"
         FROM RMSTRAIN_ARRIVAL_SEND RAS
-        WHERE instr(RAS.ARRIVAL_NAME,#{index}) > 0
+        <if test="index!=null and index != ''.toString()">
+            WHERE instr(RAS.ARRIVAL_NAME,#{index}) > 0
+        </if>
     </select>
 
     <select id="getOrderNum" parameterType="string" resultType="java.lang.Integer">
@@ -1050,7 +1055,7 @@
 
     <select id="getSaleAreaByLike" parameterType="java.lang.String" resultType="java.util.Map" >
         SELECT RSA.AREA_ID "id",
-               RSA.AREA_ID "value",
+               RSA.AREA_NAME "value",
                RSA.AREA_ID "areaId",
                RSA.AREA_NAME "label"
         FROM RMS_SALE_AREA RSA
@@ -1164,6 +1169,61 @@
           ORDER BY OO.ORDER_ID DESC
     </select>
 
+
+<!-- 查询进口矿得采购订单-->
+    <select id="selectPurchaseOrderForShip" resultType="java.util.Map" parameterType="java.util.Map">
+        select
+            DB.BATCH_ID                 "batchId",
+            DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+            RM.MATERIAL_NAME            "materialName",
+            APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
+            APO.INSERT_TIME             "insetTime",
+            APO.PURCHASE_ORDER_ID        "purchaseOrderId"
+        from AMS_PURCHASE_ORDER APO
+                 left join DIL_BATCH DB
+                           on APO.BATCH_ID = DB.BATCH_ID
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = DB.MATERIAL_ID
+        WHERE    DB.RESULT_FOREIGN_SHIP_NAME IS NOT NULL
+                 <if test="index!=null">
+                     and (INSTR(DB.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(RM.MATERIAL_NAME,#{index}) > 0)
+                 </if>
+    </select>
+
+    <select id="findBatchHavingLoad" resultType="java.util.Map">
+        SELECT  distinct	db.BATCH_ID "batchId",
+        db.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        rm.MATERIAL_NAME "materialName",
+        apo.PURCHASE_ORDER_NO       "purchaseOrderNo",
+        apo.PURCHASE_ORDER_ID        "purchaseOrderId"
+        FROM TMSSHIP_LOAD_SHIP_RESULT tlsr
+        LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
+        ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
+        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+        ON osi.SHIPMENT_INSTRUCTIONS_ID = oic.INSTRUCTIONS_ID
+        LEFT JOIN DIL_BATCH_INFACOTRY dbi
+        ON dbi.BATCH_INFACOTRY_ID = osi.BATCH_ID
+        LEFT JOIN DIL_BATCH db
+        ON db.BATCH_ID = dbi.BATCH_ID
+        LEFT JOIN TMSSHIP_WATER_QUALITY_RESULT twqr
+        ON ttr.RESULT_ID = twqr.TOTAL_RESULT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER apo
+        ON apo.BATCH_ID=db.BATCH_ID
+        LEFT JOIN RMS_MATERIAL rm
+        ON rm.MATERIAL_ID=db.MATERIAL_ID
+        WHERE     tlsr.DELETED=0
+        and db.BATCH_ID not in (
+        select DISTINCT BATCH_ID
+        from BMSSHIP_FEE bf
+        where FEE_TYPE=3)
+        <if test="index!=null">
+            and (INSTR(db.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(rm.MATERIAL_NAME,#{index}) > 0)
+        </if>
+    </select>
+
+
     <update id="closePassedOrder" >
         UPDATE OMSTRUCK_ORDER OO
         SET OO.ORDER_STATUS = 7
@@ -1182,4 +1242,5 @@
         AND ASOM.SALE_DATE_OF_RECEIPT &lt; sysdate
         )
     </update>
+
 </mapper>