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

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

@@ -1078,6 +1078,13 @@ public class AMScontroller{
         return amsFeign.selectRequirement(requirementId);
     }
 
+    /*
+    查询需求物资详情
+     */
+    @PostMapping("/getRequirementMaterial/{requirementId}")
+    public Map<String,Object> getRequirementMaterial(@PathVariable("requirementId") Integer requirementId) {
+        return amsFeign.getRequirementMaterial(requirementId);
+    }
     /**
      * 展示用车需求
      * @param mapValue
@@ -1098,11 +1105,11 @@ public class AMScontroller{
                                           Integer pageSize,
                                           Integer apiId,
                                           Integer requirementStatus,
-                                          String con) {
+                                          String orgCode) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con);
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode);
     }
 
     @PostMapping("/getPurRequirementList")
@@ -1626,4 +1633,22 @@ public class AMScontroller{
     public Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String,Object> mapValue) {
         return amsFeign.lockDispatchSaleOrderList(mapValue);
     }
+
+    @ApiOperation(value="边输边查具体地址")
+    @PostMapping("/getRealAddressByLike")
+    public Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index){
+        return amsFeign.getRealAddressByLike(addressId,index);
+    }
+
+    @ApiOperation(value="得到单价和单价id")
+    @PostMapping("/getPriceMap")
+    public Map<String, Object> getPriceMap(@RequestBody Map<String,Object> map){
+        return amsFeign.getPriceMap(map);
+    }
+
+    @ApiOperation(value="得到单价和单价id")
+    @PostMapping("/getBenPrice")
+    public Map<String, Object> getBenPrice(@RequestBody Map<String,Object> map){
+        return amsFeign.getBenPrice(map);
+    }
 }

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

@@ -378,11 +378,11 @@ public class BMSController extends BaseRESTfulController {
                                                   Integer pageSize,
                                                   Integer apiId,
                                                   Integer orderType,
-                                                  String con) {
+                                                  String carrierSsoId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType, con);
+        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType,carrierSsoId);
     }
 
     @PostMapping("getTruckResultList")
@@ -403,12 +403,11 @@ public class BMSController extends BaseRESTfulController {
     public RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
+                                               Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId, con);
+        return bmstruckFeign.getTruckStatementList(mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("getInvoiceList")
@@ -430,12 +429,11 @@ public class BMSController extends BaseRESTfulController {
                                                                Integer pageNum,
                                                                Integer pageSize,
                                                                Integer apiId,
-                                                               Integer statementId,
-                                                               String con) {
+                                                               Integer statementId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getSaleTruckStatementDetailsOrderList(mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId), con);
+        return bmstruckFeign.getSaleTruckStatementDetailsOrderList(mapValue, pageNum, pageSize, apiId, new BigDecimal(statementId));
     }
 
     @PostMapping("getUnFinishedTruckDetailsOrderList")
@@ -445,11 +443,11 @@ public class BMSController extends BaseRESTfulController {
                                                             Integer pageSize,
                                                             Integer apiId,
                                                             Integer orderType,
-                                                            String con) {
+                                                            String carrierSsoId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType, con);
+        return bmstruckFeign.getUnFinishedTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId, orderType,carrierSsoId);
     }
 
     @PostMapping("addBmstruckInvoice")
@@ -551,4 +549,16 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.update(statementId);
     }
 
+    @PostMapping("/updateDetailsOrder")
+    @ApiOperation(value = "修改详单")
+    public RESTfulResult updateDetailsOrder(@RequestBody Map<String, Object> mapValue) {
+        return bmstruckFeign.updateDetailsOrder(mapValue);
+    }
+
+    @PostMapping("/addLossFeeOfCoke")
+    @ApiOperation(value = "增加焦炭途损费")
+    public RESTfulResult addLossFeeOfCoke(@RequestBody Map<String, Object> map) {
+        return bmstruckFeign.addLossFeeOfCoke(map);
+    }
+
 }

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

@@ -743,4 +743,30 @@ public class OMSController {
     public Map<String, Object> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> mapValue){
         return omsFeign.getAllLoadUnloadResult(mapValue);
     }
+
+    @ApiOperation(value="批量关闭运输订单")
+    @PostMapping("/batchCloseOrder")
+    public Map<String, Object> batchCloseOrder(@RequestBody List<Map<String,Object>> mapList) {
+        return omsFeign.batchCloseOrder(mapList);
+    }
+
+    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
+    @PostMapping("/getOrderMaterial/{orderId}")
+    public Map<String,Object> getOrderMaterial(@PathVariable("orderId")Integer orderId){
+        return omsFeign.getOrderMaterial(orderId);
+    }
+
+
+    @ApiOperation(value = "查看所有实绩点")
+    @PostMapping("/getAllResultLineMes")
+    public Map<String, Object> getAllResultLineMes(Integer orderId){
+        return omsFeign.getAllResultLineMes(orderId);
+    }
+
+    @ApiOperation(value = "正常关闭运输订单")
+    @PostMapping("/closeInwardOrder")
+    public Map<String, Object> closeInwardOrder(Integer orderId){
+        return omsFeign.closeInwardOrder(orderId);
+    }
+
 }

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

@@ -60,7 +60,7 @@ public class RMScontroller {
 
     @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
     @PostMapping("/getGateCalculateMes")
-    public Map<String, Object> getGateCalculateMes(Integer lineId){
+    public Map<String, Object> getGateCalculateMes(@RequestParam Integer lineId){
         return rmsFeign.getGateCalculateMes(lineId);
     }
 

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

@@ -2005,7 +2005,11 @@ public class TMSController extends BaseRESTfulController {
                                                           Integer pageNum,
                                                           Integer pageSize,
                                                           String startTime,
-                                                          String endTime){
-        return tmsTruckFeign.getPurInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+                                                          String endTime) {
+        return tmsTruckFeign.getPurInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+    @PostMapping("/sendMeasureCommission")
+    public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.sendMeasureCommission(map);
     }
 }

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -213,6 +214,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查用车单位")
+    @PostMapping("/getRequireUnitName")
+    public RESTfulResult getRequireUnitName(@RequestParam("index") String index) {
+        List<Map<String,Object>>list = universalMapper.getRequireUnitName(index == null ? "" : "%" + index + "%");
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查收货单位")
     @PostMapping("/getConsigneeByLike")
     public RESTfulResult getConsigneeByLike(@RequestParam("index") String index) {
@@ -507,4 +515,57 @@ public class UniversalController extends BaseRESTfulController {
     public List<Map<String, Object>> getAllMaterialCoke() {
         return universalMapper.getAllMaterialCoke();
     }
+
+    @ApiModelProperty(value = "边输边查车牌号")
+    @PostMapping("/getCapacityByLike")
+    public RESTfulResult getCapacityByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getCapacityByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "根据运力id查询所有承运商（下拉框）")
+    @GetMapping("/getCarrierByCapacityId")
+    public RESTfulResult getCarrierByCapacityId(@RequestParam("capacityId") Integer capacityId) {
+        List<Map<String, Object>> list = universalMapper.getCarrierByCapacityId(new BigDecimal(capacityId));
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "根据收货客户查询承运商")
+    @PostMapping("/getCarrierByConsignee")
+    public RESTfulResult getCarrierByConsignee(@RequestBody Map<String,Object> mapValue) {
+        Map<String, Object> map = universalService.getCarrierByConsignee(mapValue);
+        return success(map);
+    }
+
+    @ApiModelProperty(value = "确认车牌号与承运商关系是否存在")
+    @PostMapping("/isInCapacityCarrier")
+    public RESTfulResult isInCapacityCarrier(@RequestBody Map<String,Object> mapValue) {
+        Map<String,Object> map = universalService.isInCapacityCarrier(mapValue);
+        BigDecimal capacityId = (BigDecimal) map.get("capacityId");
+        BigDecimal capacityCarrierId = (BigDecimal) map.get("capacityCarrierId");
+        if (capacityId == null) {
+            return failed();
+        }
+        if (capacityCarrierId == null) {
+            return failed(capacityId);
+        }
+        return success(map);
+    }
+
+    @ApiModelProperty(value = "得到所有油价联动计费公式（apiId：444）")
+    @PostMapping("/getOilFormula")
+    public RESTfulResult getOilFormula(@RequestBody(required = false) Map<String,Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("con", "%执行运价公式");
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getOilFormula(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
 }

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

@@ -40,10 +40,39 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
-                                                   String  con) {
-        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+                                                   Integer warehouseId,
+                                                   String startTime,
+                                                   String endTime) {
+        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
+    }
+    @PostMapping("getWmsInboundResultStatistics")
+    @ApiOperation(value = "展示入库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "445", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer warehouseId,
+                                                   String startTime,
+                                                   String endTime) {
+        return wmsFeign.getWmsInboundResultStatistics(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
+    }
+    @PostMapping("getWmsInboundResults")
+    @ApiOperation(value = "展示入库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsInboundResults(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer warehouseId,
+                                                   String startTime,
+                                                   String endTime) {
+        return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
-
     @PostMapping("getWmsReservedResult")
     @ApiOperation(value = "展示预留入库实绩信息")
     @ApiImplicitParams({
@@ -53,7 +82,7 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
-                                                   String  con) {
+                                                    String con) {
         return wmsFeign.getWmsReservedResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
     @PostMapping("getWmspOutboundResult")
@@ -382,7 +411,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsReboundResult(Map<String, Object> mapValue,
+    public RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize,
@@ -425,7 +454,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundResult(Map<String, Object> mapValue,
+    public RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize) {
@@ -447,7 +476,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundMaterial(Map<String, Object> mapValue,
+    public RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize) {
@@ -459,7 +488,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryCheck(Map<String, Object> mapValue,
+    public RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
@@ -472,7 +501,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryClose(Map<String, Object> mapValue,
+    public RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
@@ -485,7 +514,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getSendReceive(Map<String, Object> mapValue,
+    public RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
@@ -581,7 +610,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增入库实绩")
     @PostMapping("/insertInboundResult")
     @Transactional
-    public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
+    public Map<String,Object> addInvoice(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         return wmsFeign.insertInboundResult(mapList);
     }
 
@@ -594,7 +623,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增退库实绩")
     @PostMapping("/insertReboundResult")
     @Transactional
-    public String addReboundResult(@RequestBody List<Map<String, Object>> mapList) {
+    public String addReboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -622,7 +651,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增倒库入库实绩")
     @PostMapping("/insertIvboundResult")
     @Transactional
-    public String addIvboundResult(@RequestBody List<Map<String, Object>> mapList) {
+    public String addIvboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -726,7 +755,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
+    public RESTfulResult getIvboundMakeResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                           Integer pageNum,
                                                           Integer pageSize,
                                                           Integer apiId,
@@ -895,6 +924,24 @@ public class WMSController extends BaseRESTfulController {
                                                 @RequestParam(value = "quantity") Integer quantity) {
         return wmsFeign.insertStockTaking(warehouseId,materialCode,quantity);
     }
+    //修改入库转预留作业,针对预留
+    @PostMapping(value = "/insertReserved")
+    public Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
+                                             @RequestParam(value = "materialCode") String materialCode,
+                                             @RequestParam(value = "materialSpecification") String materialSpecification,
+                                             @RequestParam(value = "materialModel") String materialModel,
+                                             @RequestParam(value = "quantity") Integer quantity) {
+        return wmsFeign.insertReserved(warehouseId,materialCode,materialSpecification,materialModel,quantity);
+    }
+    //修改预留转入库作业,针对预留
+    @PostMapping(value = "/insertInbounds")
+    public Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
+                                             @RequestParam(value = "materialCode") String materialCode,
+                                             @RequestParam(value = "materialSpecification") String materialSpecification,
+                                             @RequestParam(value = "materialModel") String materialModel,
+                                             @RequestParam(value = "quantity") Integer quantity) {
+        return wmsFeign.insertInbounds(warehouseId,materialCode,materialSpecification,materialModel,quantity);
+    }
 //    查询所有的钢材物资信息
     @PostMapping(value = "/getSteelMaterialList")
     public Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
@@ -902,11 +949,36 @@ public class WMSController extends BaseRESTfulController {
                                                  @RequestParam(value = "apiId") Integer apiId) {
         return wmsFeign.getSteelMaterialList(pageNum,pageSize,apiId);
     }
+    //    查询所有的钢材物资规格型号信息
+    @PostMapping(value = "/getSteelMaterialModelList")
+    public Map<String,Object> getSteelMaterialModelList(@RequestParam(value = "pageNum") Integer pageNum,
+                                                   @RequestParam(value = "pageSize") Integer pageSize,
+                                                   @RequestParam(value = "apiId") Integer apiId,
+                                                        @RequestParam(value = "warehouseId") Integer warehouseId,
+                                                        @RequestParam(value = "status") Integer status) {
+        return wmsFeign.getSteelMaterialModelList(pageNum,pageSize,apiId,warehouseId,status);
+    }
 //    根据对应的入库实绩id修改入库状态为预留
     @PostMapping("/changeReserved")
     @ApiOperation(value = "根据对应的入库实绩id修改入库状态为预留")
     public int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         return wmsFeign.changeReserved(mapList);
     }
+
+    @PostMapping("/getWmsOutboundResultStatistics")
+    @ApiOperation(value = "展示炉号对应的出厂数量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "446", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult getWmsOutboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer warehouseId,
+                                        String con,
+                                        String startTime,
+                                        String endTime) {
+        return wmsFeign.getWmsOutboundResultStatistics(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con,startTime,endTime);
+    }
 }
 

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

@@ -1173,8 +1173,8 @@ public interface AmsFeign {
                                    @RequestParam Integer pageNum,
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId,
-                                                @RequestParam Integer requirementStatus,
-                                                @RequestParam String con);
+                                   @RequestParam Integer requirementStatus,
+                                   @RequestParam String orgCode);
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
@@ -1500,6 +1500,15 @@ public interface AmsFeign {
                                               @RequestParam String enableStatus,
                                               @RequestParam String planStatus);
 
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRealAddressByLike")
+    Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index);
 
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getPriceMap")
+    Map<String, Object> getPriceMap(@RequestBody Map<String, Object> map);
 
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getRequirementMaterial/{requirementId}")
+    Map<String,Object> getRequirementMaterial(@PathVariable("requirementId") Integer requirementId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getBenPrice")
+    Map<String, Object> getBenPrice(@RequestBody Map<String, Object> map);
 }

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

@@ -32,7 +32,7 @@ public interface BmstruckFeign {
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("orderType") Integer orderType,
-                                           @RequestParam("con") String con);
+                                           @RequestParam("carrierSsoId") String carrierSsoId);
 
     /**
      * 展示汽运实绩信息
@@ -117,8 +117,7 @@ public interface BmstruckFeign {
     RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("con") String con);
+                                        @RequestParam("apiId") Integer apiId);
 
     /**
      * 生成销售汽运计费账单
@@ -144,8 +143,7 @@ public interface BmstruckFeign {
                                                         @RequestParam("pageNum") Integer pageNum,
                                                         @RequestParam("pageSize") Integer pageSize,
                                                         @RequestParam("apiId") Integer apiId,
-                                                        @RequestParam("statementId") BigDecimal statementId,
-                                                        @RequestParam("con") String con);
+                                                        @RequestParam("statementId") BigDecimal statementId);
 
     /**
      * 审核
@@ -217,5 +215,11 @@ public interface BmstruckFeign {
                                                      @RequestParam("pageSize") Integer pageSize,
                                                      @RequestParam("apiId") Integer apiId,
                                                      @RequestParam("orderType") Integer orderType,
-                                                     @RequestParam("con") String con);
+                                                     @RequestParam("carrierSsoId") String carrierSsoId);
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/updateDetailsOrder")
+    RESTfulResult updateDetailsOrder(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addLossFeeOfCoke")
+    RESTfulResult addLossFeeOfCoke(@RequestBody Map<String, Object> map);
 }

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

@@ -436,5 +436,20 @@ public interface OmsFeign {
     @ApiOperation(value = "撤销已拒绝")
     @PostMapping("api/v1/oms/omstruckorders/refuseCtrlZ")
     Map<String, Object> refuseCtrlZ(Map<String, Object> map);
+
+    @ApiOperation(value = "批量关闭运输订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/batchCloseOrder")
+    Map<String, Object> batchCloseOrder(@RequestBody List<Map<String, Object>> mapList);
+    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOrderMaterial/{orderId}")
+    Map<String, Object> getOrderMaterial(@PathVariable Integer orderId);
+
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getAllResultLineMes")
+    Map<String, Object> getAllResultLineMes(@RequestParam("orderId") Integer orderId);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
+    Map<String, Object> closeInwardOrder(@RequestParam("orderId") Integer orderId);
+
 }
 

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

@@ -49,7 +49,7 @@ public interface RmsFeign {
                                         @RequestParam("con")String con);
 
     @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
-    @PostMapping("/getGateCalculateMes")
+    @PostMapping("/api/v1/rms/rmslines/getGateCalculateMes")
     Map<String, Object> getGateCalculateMes(@RequestParam("lineId")Integer lineId);
 
     @ApiOperation(value = "根据主键查询出数据以供修改")

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

@@ -433,6 +433,10 @@ public interface TmsTruckFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam String startTime,
                                            @RequestParam String endTime);
-}
+
+    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
+    Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+
+    }
 
 

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

@@ -28,12 +28,36 @@ public interface WMSFeign {
      * @param pageSize
      * @return
      */
+
     @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResult", method = RequestMethod.POST)
     Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam String con);
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResultStatistics", method = RequestMethod.POST)
+    Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+    /**
+     * 展示真实入库实绩
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResults", method = RequestMethod.POST)
+    Map<String, Object> getWmsInboundResults(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+
 
     /**
      * 展示预留入库实绩信息
@@ -49,7 +73,7 @@ public interface WMSFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam String con);
+                                             @RequestParam String con);
     /**
      * 展示出库实绩
      *
@@ -772,6 +796,20 @@ public interface WMSFeign {
                                          @RequestParam(value = "materialCode") String materialCode,
                                          @RequestParam(value = "quantity") Integer quantity);
 
+    @PostMapping("/api/v1/wms/wmspgridmaterials/insertReserved")
+    Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
+                                         @RequestParam(value = "materialCode") String materialCode,
+                                         @RequestParam(value = "materialSpecification") String materialSpecification,
+                                         @RequestParam(value = "materialModel") String materialModel,
+                                         @RequestParam(value = "quantity") Integer quantity);
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/insertInbounds")
+    Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
+                                      @RequestParam(value = "materialCode") String materialCode,
+                                      @RequestParam(value = "materialSpecification") String materialSpecification,
+                                      @RequestParam(value = "materialModel") String materialModel,
+                                      @RequestParam(value = "quantity") Integer quantity);
+
     @PostMapping("/api/v1/wms/wmspgridmaterials/getStockTakingList")
     Map<String,Object> getStockTakingList(@RequestParam(value = "pageNum") Integer pageNum,
                                           @RequestParam(value = "pageSize") Integer pageSize,
@@ -780,7 +818,26 @@ public interface WMSFeign {
     Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
                                           @RequestParam(value = "pageSize") Integer pageSize,
                                           @RequestParam(value = "apiId") Integer apiId);
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialModelList")
+    Map<String,Object> getSteelMaterialModelList(@RequestParam(value = "pageNum") Integer pageNum,
+                                            @RequestParam(value = "pageSize") Integer pageSize,
+                                            @RequestParam(value = "apiId") Integer apiId,
+                                                 @RequestParam(value = "warehouseId") Integer warehouseId,
+                                                 @RequestParam(value = "status") Integer status);
+
 
     @PostMapping("/api/v1/wms/inboundResult/changeReserved")
     int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList);
+
+    //出库炉号对应的数量
+    @PostMapping("/api/v1/wms/wmspoutboundresults/getWmsOutboundResultStatistics")
+    RESTfulResult getWmsOutboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize,
+                                 @RequestParam Integer warehouseId,
+                                 @RequestParam String con,
+                                 @RequestParam String startTime,
+                                 @RequestParam String endTime);
+
 }

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

@@ -96,4 +96,24 @@ public interface UniversalMapper {
 
     //查询所有的焦炭子类
     List<Map<String, Object>> getAllMaterialCoke();
+
+
+    //边输边查发货单位
+    List<Map<String, Object>> getCapacityByLike(String index);
+
+    // 根据运力id查询所有承运商
+    List<Map<String, Object>> getCarrierByCapacityId(BigDecimal capacityId);
+
+    // 根据收货客户查询承运商
+    Map<String, Object> getCarrierByConsignee(String consigneeName);
+
+    // 确认车牌号与承运商关系是否存在
+    BigDecimal isInCapacityCarrier(Map<String, Object> mapValue);
+
+    BigDecimal isInCapacity(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getOilFormula(Map<String, Object> mapValue);
+
+    //边输边查用车单位
+    List<Map<String, Object>> getRequireUnitName(String index);
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -5,6 +5,8 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -55,4 +57,35 @@ public class UniversalServiceImpl implements UniversalService {
     public String sha1DigestUtils(String text){
         return DigestUtils.sha1Hex(text);
     }
+
+    /**
+     * 根据收货客户查询承运商
+      */
+    public Map<String, Object> getCarrierByConsignee(Map<String, Object> mapValue){
+        String isSelfMention = (String) mapValue.get("isSelfMention");
+        String consigneeName = (String) mapValue.get("consigneeName");
+        Map<String, Object> map = new HashMap<>();
+        if (isSelfMention.equals("是")) {
+            map = universalMapper.getCarrierByConsignee(consigneeName);
+        }
+        else {
+            map.put("carrierId",null);
+            map.put("carrierName",null);
+        }
+        return map;
+    }
+
+    /**
+     *
+     * @param mapValue
+     * @return
+     */
+    public Map<String, Object> isInCapacityCarrier(Map<String, Object> mapValue) {
+        BigDecimal capacityCarrierId = universalMapper.isInCapacityCarrier(mapValue);
+        BigDecimal capacityId = universalMapper.isInCapacity(mapValue);
+        Map<String,Object> map = new HashMap<>();
+        map.put("capacityCarrierId",capacityCarrierId);
+        map.put("capacityId",capacityId);
+        return map;
+    }
 }

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -22,17 +22,17 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8012}
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.166:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
 server:
   port: 8019

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

@@ -72,7 +72,7 @@
                         ON RM.MATERIAL_ID = DB.MATERIAL_ID
                 <where>
                     <if test="index != null">
-                        instr(RM.MATERIAL_NAME, #{index}) > 0
+                        (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
                     </if>
                 </where>
                  group by RM.MATERIAL_ID,RM.MATERIAL_NAME,RM.MATERIAL_CODE,RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL
@@ -149,11 +149,13 @@
                         RCA.CARRIER_NAME       "carrierName",
                         RC.INSERT_UPDATE_REMARK "remark"
                  FROM RMS_CAPACITY RC
+                            LEFT JOIN RMS_CAPACITY_CARRIER RCC
+                     ON RCC.CAPACITY_ID = RC.CAPACITY_ID
                           JOIN RMS_CARRIER RCA
-                                ON RCA.CARRIER_ID = RC.CARRIER_ID
+                                ON RCA.CARRIER_ID = RCC.CARRIER_ID
                  WHERE RC.CAPACITY_TYPE_ID = 1 AND RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
-                and RC.CARRIER_ID = #{carrierId}
+                and RCC.CARRIER_ID = #{carrierId}
             </if>
             <if test="index != null">
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
@@ -345,7 +347,7 @@
         FROM RMS_MATERIAL RM
         <where>
             <if test="index != null">
-                instr(RM.MATERIAL_NAM, #{index}) > 0
+                (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
             </if>
         </where>
         )
@@ -471,9 +473,6 @@
         where instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum &lt; 10
         order by "value"
     </select>
-
-
-
     <select id="getCarrierListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
         select
         *
@@ -611,5 +610,70 @@
                RMC.MATERIAL_COKE_NAME "label"
         FROM RMS_MATERIAL_COKE RMC
     </select>
+    <select id="getRequireUnitName" resultType="java.util.Map">
+        SELECT
+	    RS.SHIPPER_ID "shipperId",
+	    RS.SHIPPER_NAME "shipperName"
+        FROM
+	    RMS_SHIPPER RS
+        <where>
+            <if test="index != null">
+                RS.SHIPPER_NAME like #{index}
+            </if>
+        </where>
+    </select>
 
+    <!--  边输边查车牌号  -->
+    <select id="getCapacityByLike" parameterType="string" resultType="java.util.Map">
+        select
+            RC.CAPACITY_ID "capacityId",
+            RC.CAPACITY_NUMBER "value",
+            RC.CAPACITY_NUMBER "capacityNumber"
+        from RMS_CAPACITY RC
+        where instr(RC.CAPACITY_NUMBER, #{index}) > 0
+        order by "value"
+    </select>
+
+    <select id="getCarrierByCapacityId" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RC.CARRIER_ID   AS "id",
+               RC.CARRIER_ID   AS "value",
+               RC.CARRIER_NAME AS "label"
+        FROM RMS_CAPACITY_CARRIER RCC
+                 LEFT JOIN RMS_CARRIER RC
+                           ON RC.CARRIER_ID = RCC.CARRIER_ID
+        WHERE RCC.CAPACITY_ID = #{capacityId}
+    </select>
+
+    <select id="getCarrierByConsignee" parameterType="String" resultType="java.util.Map">
+        SELECT RC.CARRIER_ID   AS "carrierId",
+               RC.CARRIER_NAME AS "carrierName"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_NAME = #{consigneeName}
+    </select>
+
+    <select id="isInCapacityCarrier" parameterType="java.util.Map" resultType="DECIMAL">
+        SELECT RCC.CAPACITY_CARRIER_ID AS "capacityCarrierId"
+        FROM RMS_CAPACITY RCA
+                 LEFT JOIN RMS_CAPACITY_CARRIER RCC
+                           ON RCC.CAPACITY_ID = RCA.CAPACITY_ID
+        WHERE RCA.CAPACITY_NUMBER = #{capacityNumber}
+          <if test="carrierId != null" >
+              AND RCC.CARRIER_ID = #{carrierId}
+          </if>
+        AND rownum = 1
+    </select>
+
+    <select id="isInCapacity" parameterType="java.util.Map" resultType="DECIMAL">
+        SELECT RC.CAPACITY_ID AS "capacityId"
+        FROM RMS_CAPACITY RC
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+    </select>
+
+    <select id="getOilFormula" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT BF.FORMULA_ID     AS "formulaId",
+               BF.FORMULA_NAME   AS "formulaName",
+               BF.FORMULA_STRING AS "formulaString"
+        FROM BMSTRUCK_FORMULA BF
+        WHERE FORMULA_NAME LIKE #{con}
+    </select>
 </mapper>