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

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

@@ -114,6 +114,14 @@ public class BMSController extends BaseRESTfulController {
         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,
@@ -698,7 +706,33 @@ public class BMSController extends BaseRESTfulController {
         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/TMSController.java

@@ -1642,11 +1642,10 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping("/getResultType")
     public Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
                                                                         Integer apiId,
-                                                                Integer pageNum,
-                                                                Integer pageSize,
+
                                                                 String con
     ) {
-        return tmsTrainFeign.getResultType(map == null ? new HashMap<>() : map,apiId, pageNum, pageSize,con);
+        return tmsTrainFeign.getResultType(map == null ? new HashMap<>() : map,apiId,con);
     }
 
     @PostMapping("/addShipLoadResult")
@@ -1992,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) {
@@ -2451,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

@@ -426,6 +426,31 @@ public class UniversalController extends BaseRESTfulController {
     }
 
 
+    @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);
+    }
+
 
 
 

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

@@ -292,4 +292,20 @@ public interface BmsshipFeign {
 
     @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/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")
@@ -298,8 +303,6 @@ public interface TmsTrainFeign {
     @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/getResultType")
     Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
                                       @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
                                       @RequestParam("con") String con);
 
     @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/addShipLoadResult")

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

@@ -232,4 +232,5 @@ public interface UniversalMapper {
 
     List<Map<String,Object>> selectPurchaseOrderForShip(Map<String,Object> map);
 
+    List<Map<String,Object>> findBatchHavingLoad(Map<String,Object> map);
 }

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

@@ -1189,6 +1189,39 @@
                  </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