jiesuan

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

@@ -421,6 +421,20 @@ public class AMScontroller{
         return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, deleted);
     }
 
+    @PostMapping("/getInwardContractPrice")
+    @ApiOperation(value = "查询内转汽运单价信息")
+    public Map<String, Object> getInwardContractPrice(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                             Integer pageNum,
+                                                             Integer pageSize,
+                                                             Integer apiId,
+                                                             Integer deleted) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getInwardContractPrice(mapValue, pageNum, pageSize, apiId, deleted);
+    }
+
+
     /**
      * 新增汽运单价
      * @param mapVal
@@ -431,6 +445,14 @@ public class AMScontroller{
     Map<String, Object> addAmsContractTransportUnitPrice1(@RequestBody Map<String, Object> mapVal) {
         return amsFeign.addAmsContractTransportUnitPrice1(mapVal);
     }
+
+
+    @PostMapping("insertInwardPrice")
+    @ApiOperation(value = "新增内转运输单价")
+    Map<String, Object> insertInwardPrice(@RequestBody Map<String, Object> mapVal) {
+        return amsFeign.insertInwardPrice(mapVal);
+    }
+
     @PostMapping("deleteAmsContractTransportPrice1")
     @ApiOperation(value = "通过主键id删除汽运单价")
     Map<String, Object> deleteAmsContractTransportPrice1(@RequestParam BigDecimal priceId) {

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

@@ -561,4 +561,35 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.addLossFeeOfCoke(map);
     }
 
+    /**
+     * 展示详单信息
+     *
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示内转汽运未生成账单的作业详单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "还没定", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "orderType", value = "1:计时,2:计数，3：计重，4：包月", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getInwardWeightDetailsOrder")
+    public Map<String, Object> getInwardWeightDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           String carrierSsoId,
+                                                           Integer detailStatus,
+                                                           Integer orderType,
+                                                           String userId) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmstruckFeign.getInwardWeightDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId);
+    }
+
 }

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

@@ -636,4 +636,10 @@ public class UniversalController extends BaseRESTfulController {
     public Integer getPlanCount(){
         return universalMapper.getPlanCount();
     }
+
+    @ApiOperation(value = "查询承运起止地点下拉框")
+    @GetMapping("/getTransRange")
+    public RESTfulResult getTransRange(){
+        return success(universalMapper.getTransRange());
+    }
 }

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

@@ -1550,4 +1550,21 @@ public interface AmsFeign {
                                                         @RequestParam Integer pageSize,
                                                         @RequestParam Integer sporadicId);
 
+    /*
+    新增内转运输单价
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/insertInwardPrice")
+    Map<String, Object> insertInwardPrice(Map<String, Object> mapVal);
+
+
+    @ApiOperation(value="查询汽运单价信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(109)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardContractPrice")
+    Map<String, Object> getInwardContractPrice(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      @RequestParam("pageNum") Integer pageNum,
+                                                      @RequestParam("pageSize") Integer pageSize,
+                                                      @RequestParam("apiId") Integer apiId,
+                                                      @RequestParam("deleted") Integer deleted);
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.sun.corba.se.spi.ior.ObjectKey;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -222,4 +223,25 @@ public interface BmstruckFeign {
 
     @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addLossFeeOfCoke")
     RESTfulResult addLossFeeOfCoke(@RequestBody Map<String, Object> map);
+
+    /**
+     * 内转结算详单
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @param carrierSsoId
+     * @param detailStatus
+     * @param orderType
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getInwardWeightDetailsOrder")
+    Map<String, Object> getInwardWeightDetailsOrder(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                    @RequestParam("pageNum") Integer pageNum,
+                                                    @RequestParam("pageSize") Integer pageSize,
+                                                    @RequestParam("apiId") Integer apiId,
+                                                    @RequestParam("carrierSsoId") String carrierSsoId,
+                                                    @RequestParam("detailStatus") Integer detailStatus,
+                                                    @RequestParam("orderType") Integer orderType,
+                                                    @RequestParam("userId") String userId);
 }

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

@@ -141,4 +141,6 @@ public interface UniversalMapper {
 
     Integer getPlanCount();
 
+    List<Map<String, Object>> getTransRange();
+
 }

src/main/resources/application-prod.yml

@@ -11,19 +11,19 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
     url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
   BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   QmsTruckFeign:
     url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:
@@ -31,7 +31,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:

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

@@ -759,4 +759,12 @@
             AIR.REQUIREMENT_STATUS = 2
           AND AIR.DELETED = 0
     </select>
+    <select id="getTransRange" resultType="java.util.Map">
+        SELECT
+        RTR.TRANS_RANGE_ID "value",
+        RTR.TRANS_RANGE_VALUE "label",
+        RTR.TRANS_RANGE_ID  "id"
+        FROM
+        RMS_TRANS_RANGE RTR
+    </select>
 </mapper>