merge

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

@@ -1039,6 +1039,26 @@ public class AMScontroller{
         }
         return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId);
     }
+
+    @ApiModelProperty(value = "展示运输计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "0:257/1,2:258", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getPlanOrder")
+    public Map<String, Object> getPlanOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            Integer planId,
+                                            Integer requirementId,
+                                            Integer orderStatus) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPlanOrder(mapValue, pageNum, pageSize, apiId,planId,requirementId,orderStatus);
+    }
     /**
      *用车单位提出需求
      *新增用车需求
@@ -1632,6 +1652,28 @@ public class AMScontroller{
         return amsFeign.lockDispatchSaleOrderList(mapValue);
     }
 
+    @ApiModelProperty(value = "销售订单批量授权给承运商")
+    @PostMapping("/saleOrderEmpowerCarrier")
+    public RESTfulResult saleOrderEmpowerCarrier(@RequestBody(required = false) Map<String,Object> mapValue){
+        return amsFeign.saleOrderEmpowerCarrier(mapValue);
+    }
+
+    @ApiModelProperty(value = "展示销售公司下发给承运商的销售订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "409", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListByCarrierSsoId")
+    public RESTfulResult getSaleOrderListByCarrierSsoId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                        String carrierSsoId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+
+                                                        Integer apiId,
+                                                        String con) {
+        return amsFeign.getSaleOrderListByCarrierSsoId(mapValue != null ? mapValue : new HashMap<>(), carrierSsoId, pageNum, pageSize, apiId, con);
+    }
     @ApiOperation(value="边输边查具体地址")
     @PostMapping("/getRealAddressByLike")
     public Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index){
@@ -1649,4 +1691,10 @@ public class AMScontroller{
     public Map<String, Object> getBenPrice(@RequestBody Map<String,Object> map){
         return amsFeign.getBenPrice(map);
     }
+
+    @ApiOperation(value="批量拒绝定向派单")
+    @PostMapping(value = "/refuseDispatchSaleOrderList")
+    public Map<String, Object> refuseDispatchSaleOrderList(@RequestBody List<Map<String, Object>> mapList) {
+        return amsFeign.refuseDispatchSaleOrderList(mapList);
+    }
 }

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

@@ -36,5 +36,6 @@ public class DilVersionController {
     @PostMapping("/addAppVersion/{version}")
     public String addAppVersion(@PathVariable("version") String version) {
         return dilVersionService.addAppVersion(version);
+
     }
 }

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

@@ -0,0 +1,30 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.JoinFeign;
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2022/2/24 18:09
+ */
+
+@RestController
+@RequestMapping("${api.version}/join")
+public class JoinController {
+
+    @Autowired
+    JoinFeign joinFeign;
+
+    @PostMapping("/receiveTmsTruckWeightResult")
+    public Map<String, Object> receiveTmsTruckWeightResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        return joinFeign.receiveTmsTruckWeightResult(mapList);
+    }
+}

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

@@ -621,7 +621,11 @@ public class OMSController {
     public Map<String,Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String,Object>map){
         return omsFeign.getUnloadOrderMaterial(map);
     }
-
+    @ApiOperation(value = "根据运输订单号查询卸货点")
+    @PostMapping("/getUnloadOrderWarehouseName")
+    public Map<String,Object> getUnloadOrderWarehouseName(@RequestBody(required = false)Map<String,Object>map){
+        return omsFeign.getUnloadOrderWarehouseName(map);
+    }
 
     @ApiOperation(value = "分解异地库计划")
     @PostMapping("/apportionInwardOffsetOrder")
@@ -759,8 +763,8 @@ public class OMSController {
 
     @ApiOperation(value = "查看所有实绩点")
     @PostMapping("/getAllResultLineMes")
-    public Map<String, Object> getAllResultLineMes(Integer orderId){
-        return omsFeign.getAllResultLineMes(orderId);
+    public Map<String, Object> getAllResultLineMes(Integer orderId, String orderNumber){
+        return omsFeign.getAllResultLineMes(orderId, orderNumber);
     }
 
     @ApiOperation(value = "正常关闭运输订单")

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

@@ -1099,4 +1099,10 @@ public class RMScontroller {
     public Map<String, Object> oilNameSelect(){
         return rmsFeign.oilNameSelect();
     }
+
+    @ApiOperation("解除承运商和车辆的绑定关系")
+    @PostMapping("/deleteCapacityCarrier")
+    public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteCapacityCarrier(map!=null?map:new HashMap<>());
+    }
 }

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

@@ -51,12 +51,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer apiId,
-                                                     String con) {
+                                                     Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getBargeOperationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getBargeOperationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("selectBargeOperation/{bargeOperationId}")
@@ -115,12 +114,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
+                                               Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("getLoadShip/{resultId}")
@@ -212,12 +210,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             Integer apiId,
-                                             String con) {
+                                             Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
 
@@ -225,9 +222,8 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             Integer pageNum,
                                             Integer pageSize,
-                                            Integer apiId,
-                                            String con){
-        return  tmsshipFeign.getBatchList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+                                            Integer apiId){
+        return  tmsshipFeign.getBatchList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
 
@@ -256,12 +252,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
+                                               Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId);
     }
 
     /**
@@ -277,10 +272,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
-                                                 Integer apiId,
-                                                 String con) {
+                                                 Integer apiId) {
 
-        return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("getUnloadShip/{resultId}")
@@ -327,10 +321,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                          Integer pageNum,
                                                          Integer pageSize,
-                                                         Integer apiId,
-                                                         String con) {
+                                                         Integer apiId) {
 
-        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("getWaterQuality/{resultId}")
@@ -425,12 +418,11 @@ public class TMSController extends BaseRESTfulController {
                                                            Integer pageNum,
                                                            Integer pageSize,
                                                            Integer apiId,
-                                                           String con,
                                                            String status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
+        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
     }
 
     @PostMapping("getShipmentInstructions/{instructionsId}")
@@ -477,12 +469,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                                 Integer pageNum,
                                                                 Integer pageSize,
-                                                                Integer apiId,
-                                                                String con) {
+                                                                Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
     @PostMapping("getGroupList")
     @ApiOperation(value = "展示收货人列表")
@@ -566,12 +557,11 @@ public class TMSController extends BaseRESTfulController {
                                                               Integer pageNum,
                                                               Integer pageSize,
                                                               Integer apiId,
-                                                              String con,
                                                               Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
+        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
     }
 
     @PostMapping("insertshipDeliveryAttorney")
@@ -619,12 +609,11 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer pageNum,
                                                          Integer pageSize,
                                                          Integer apiId,
-                                                         String con,
                                                          Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
     }
 
     @PostMapping("insertDeliveryNotice")
@@ -1242,11 +1231,12 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageNum,
                                                Integer pageSize,
                                                Integer orderType,
-                                               String con,
+                                               String startTime,
+                                               String endTime,
                                                String userId,
                                                String userIds
     ){
-        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, startTime,endTime,userId,userIds);
     }
 
     @ApiOperation(value="通过运输订单id查询物资信息")
@@ -1437,9 +1427,11 @@ public class TMSController extends BaseRESTfulController {
                                                      String con,
                                                      String carrierSsoId,
                                                      String userId,
-                                                     String userIds
+                                                     String userIds,
+                                                     String startTime,
+                                                     String endTime
     ){
-        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con, carrierSsoId,userId,userIds);
+        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con, carrierSsoId,userId,userIds,startTime,endTime);
     }
 
 
@@ -2008,8 +2000,48 @@ public class TMSController extends BaseRESTfulController {
                                                           String endTime) {
         return tmsTruckFeign.getPurInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+    @ApiOperation(value="查询内转运输实绩")
+    @PostMapping("/getInwardReport")
+    public Map<String, Object> getInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          String endTime) {
+        return tmsTruckFeign.getInwardReport(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);
     }
+
+    @ApiOperation(value="发送留皮计量委托(neizhuan)")
+    @GetMapping("/sendLiuPiMeasureCommission")
+    public Map<String, Object> sendLiuPiMeasureCommission(String capacityNumber){
+        return tmsTruckFeign.sendLiuPiMeasureCommission(capacityNumber);
+    }
+
+    @ApiOperation(value="对内转车辆装货点进行统计")
+    @PostMapping("/getLoading")
+    public Map<String, Object> getLoading(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String startTime,
+                                             String endTime
+    ){
+        return tmsTruckFeign.getLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+    @ApiOperation(value="对内转车辆装卸货点进行统计")
+    @PostMapping("/getUnLoading")
+    public Map<String, Object> getUnLoading(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String startTime,
+                                          String endTime
+    ){
+        return tmsTruckFeign.getUnLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
 }

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

@@ -244,10 +244,11 @@ public class UniversalController extends BaseRESTfulController {
     })
     @PostMapping("/queryAPOMaterialByLike")
     public RESTfulResult queryAPOMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId,
-                                             String index) {
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String index,
+                                                Integer supplierId) {
 
         if(mapValue == null) {
             mapValue = new HashMap<>();
@@ -255,6 +256,9 @@ public class UniversalController extends BaseRESTfulController {
         if(index != null && !"".equals(index) &&!"null".equals(index)){
             mapValue.put("index", index);
         }
+        if(supplierId != null){
+            mapValue.put("supplierId", supplierId);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.queryAPOMaterialByLike(mapValue);
@@ -523,6 +527,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查批次")
+    @GetMapping("/getBatchByLike")
+    public RESTfulResult getBatchByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getBatchByLike(index == null ? "" : index);
+        return success(list);
+    }
+
     @ApiModelProperty(value = "根据运力id查询所有承运商（下拉框）")
     @GetMapping("/getCarrierByCapacityId")
     public RESTfulResult getCarrierByCapacityId(@RequestParam("capacityId") Integer capacityId) {
@@ -568,4 +579,57 @@ public class UniversalController extends BaseRESTfulController {
         PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
+
+    @ApiModelProperty(value = "获得港口下拉框")
+    @GetMapping("/getPortId")
+    public RESTfulResult getPortId() {
+        return success(universalService.getPortId());
+    }
+
+    @ApiModelProperty(value = "获取车牌号边输边查")
+    @GetMapping("/getCapacityNumber")
+    public RESTfulResult getCapacityNumber(String index) {
+        if(index.length() < 3){
+            return failed();
+        }
+        return success(universalService.getCapacityNumber(index));
+    }
+
+    @ApiModelProperty(value = "获得订单号及订单号下面物资")
+    @GetMapping("/getOrderNumber")
+    public RESTfulResult getOrderNumber(String capacityId) {
+        return success(universalService.getOrderNumber(capacityId));
+    }
+
+    @ApiModelProperty(value = "根据订单查询物资")
+    @GetMapping("/getMaterialIdByOrderId")
+    public RESTfulResult getMaterialIdByOrderId(Integer orderId) {
+        return success(universalService.getMaterialIdByOrderId(orderId));
+    }
+
+    @ApiOperation(value = "修改路段顺序号")
+    @PostMapping("/updateLineSqe")
+    public RESTfulResult updateLineSqe(@RequestBody Map<String,Object> map) {
+        int i = universalMapper.updateLineSqe(map);
+        return success(i);
+    }
+
+    @ApiModelProperty(value = "边输边查物资")
+    @GetMapping("/getMaterialByLike")
+    public RESTfulResult getMaterialByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getMaterialByLike(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiOperation(value="通过一个carrierSsoId获得承运商对象")
+    @GetMapping("/getRmsCarrierByCarrierSsoId")
+    public RESTfulResult getRmsCarrierByCarrierSsoId(String carrierSsoId){
+       Map<String,Object> carrier= universalMapper.getRmsCarrierByCarrierSsoId(carrierSsoId);
+       if (carrier==null){
+           failed();
+       }
+       return success(carrier);
+
+
+    }
 }

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

@@ -30,7 +30,6 @@ public class WMSController extends BaseRESTfulController {
     WMSFeign wmsFeign;
     @Autowired
     QMSFeign qmsFeign;
-
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
@@ -82,8 +81,9 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
+                                                    Integer warehouseId,
                                                     String con) {
-        return wmsFeign.getWmsReservedResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+        return wmsFeign.getWmsReservedResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con);
     }
     @PostMapping("getWmspOutboundResult")
     @ApiOperation(value = "展示出库实绩信息")
@@ -94,8 +94,10 @@ public class WMSController extends BaseRESTfulController {
                                                      Integer pageNum,
                                                      Integer pageSize,
                                                      Integer apiId,
-                                                     String  con) {
-        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
+                                                     Integer warehouseId,
+                                                     String startTime,
+                                                     String endTime) {
+        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
 
     @PostMapping("/wmspoutboundresults/insertWmspOutBoundResult")
@@ -143,9 +145,10 @@ public class WMSController extends BaseRESTfulController {
                                                       Integer pageNum,
                                                       Integer pageSize,
                                                       Integer apiId,
-                                                      Integer warehouseId,
+                                                      String warehouseId,
+                                                      String time,
                                                       String con) {
-        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,con);
+        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,time,con);
 
     }
 //    查询仓库中超过库龄预警的物资
@@ -223,7 +226,12 @@ public class WMSController extends BaseRESTfulController {
         Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
         return resTfulResult;
     }
-
+    //获取已下发的钢材的每个炉号的数量
+    @PostMapping("/getFurnaceNoAmount")
+    public Map<String, Object> getFurnaceNoAmount(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.getFurnaceNoAmount(map);
+        return resTfulResult;
+    }
     //更新状态
     @PostMapping("/updateStatus")
     public Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> map) {
@@ -516,9 +524,8 @@ public class WMSController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer warehouseId,
                                            String  value) {
-        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,value);
+        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,value);
     }
     //库存结转定时器
     @PostMapping("/addInventoryClose")
@@ -537,10 +544,9 @@ public class WMSController extends BaseRESTfulController {
                                         Integer pageNum,
                                         Integer pageSize,
                                         String con,
-                                        Integer warehouseId,
                                         String startTime,
                                         String endTime) {
-        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,warehouseId,startTime,endTime);
+        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
     }
 
     /**
@@ -862,11 +868,6 @@ public class WMSController extends BaseRESTfulController {
 
 
 
-    //收发存
-    @PostMapping("/addSendReceive")
-    public RESTfulResult addSendReceive() {
-        return wmsFeign.addSendReceive();
-    }
 
         //    获取物资类型
         @PostMapping(value = "/getMaterialTypeList")
@@ -963,19 +964,33 @@ public class WMSController extends BaseRESTfulController {
     }
 //    查询所有的钢材物资信息
     @PostMapping(value = "/getSteelMaterialList")
-    public Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
-                                                 @RequestParam(value = "pageSize") Integer pageSize,
-                                                 @RequestParam(value = "apiId") Integer apiId) {
-        return wmsFeign.getSteelMaterialList(pageNum,pageSize,apiId);
+    public Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  Integer warehouseId,
+                                                   String con) {
+        return wmsFeign.getSteelMaterialList(mapVal ==null? new HashMap<>():mapVal,pageNum,pageSize,apiId,warehouseId,con);
+    }
+    //    查询所有的钢材物资信息
+    @PostMapping(value = "/getSteelWarehouseList")
+    public Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                   Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                   String con) {
+        return wmsFeign.getSteelWarehouseList(mapVal ==null? new HashMap<>():mapVal,apiId,pageNum,pageSize,con);
     }
     //    查询所有的钢材物资规格型号信息
     @PostMapping(value = "/getSteelMaterialModelList")
-    public Map<String,Object> getSteelMaterialModelList(@RequestParam(value = "pageNum") Integer pageNum,
-                                                   @RequestParam(value = "pageSize") Integer pageSize,
-                                                   @RequestParam(value = "apiId") Integer apiId,
+    public Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        @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);
+                                                        @RequestParam(value = "status") Integer status,
+                                                        @RequestParam(value = "con") String con) {
+        return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,con);
     }
 //    根据对应的入库实绩id修改入库状态为预留
     @PostMapping("/changeReserved")
@@ -999,5 +1014,12 @@ public class WMSController extends BaseRESTfulController {
                                         String endTime) {
         return wmsFeign.getWmsOutboundResultStatistics(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con,startTime,endTime);
     }
+
+    //删除扫码吊牌
+    @PostMapping("/undoInbound")
+    @ApiOperation(value = "删除扫码吊牌")
+    public Map<String, Object> undoInbound(@RequestParam("inboundId") BigDecimal inboundId){
+        return wmsFeign.undoInbound(inboundId);
+    }
 }
 

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

@@ -1141,6 +1141,22 @@ public interface AmsFeign {
                                          @RequestParam Integer planStatus,
                                          @RequestParam String carrierId,
                                          @RequestParam Integer planId);
+
+    @ApiOperation(value="展示运输计划下的运输订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(还没有设置表头)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/getPlanOrder")
+    Map<String, Object> getPlanOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer planId,
+                                        @RequestParam Integer requirementId,
+                                         @RequestParam Integer orderStatus
+
+                                     );
+
     /**
      *新增用车需求
      */
@@ -1501,6 +1517,16 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRealAddressByLike")
     Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index);
 
+    @PostMapping("/api/v1/ams/amssaleorders/saleOrderEmpowerCarrier")
+    public RESTfulResult saleOrderEmpowerCarrier(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListByCarrierSsoId")
+    public RESTfulResult getSaleOrderListByCarrierSsoId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                        @RequestParam String carrierSsoId,
+                                                        @RequestParam Integer pageNum,
+                                                        @RequestParam Integer pageSize,
+                                                        @RequestParam Integer apiId,
+                                                        @RequestParam String con);
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getPriceMap")
     Map<String, Object> getPriceMap(@RequestBody Map<String, Object> map);
 
@@ -1509,4 +1535,7 @@ public interface AmsFeign {
 
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getBenPrice")
     Map<String, Object> getBenPrice(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/refuseDispatchSaleOrderList")
+    Map<String, Object> refuseDispatchSaleOrderList(List<Map<String, Object>> mapList);
 }

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2022/2/24 18:07
+ */
+
+@FeignClient(value = "dal-dazhou-join-api",url = "${openfeign.JoinFeign.url}")
+public interface JoinFeign {
+
+    @PostMapping("api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult")
+    Map<String, Object> receiveTmsTruckWeightResult(@RequestBody List<Map<String, Object>> mapList);
+
+}

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

@@ -393,6 +393,10 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderMaterial")
     Map<String, Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String, Object> map);
 
+    @ApiOperation(value = "根据运输订单号查询卸货点")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderWarehouseName")
+    Map<String, Object> getUnloadOrderWarehouseName(@RequestBody(required = false)Map<String, Object> map);
+
     @ApiOperation(value = "根据运输订单id查询物资")
     @PostMapping("api/v1/oms/omstruckorders/getOrderMaterialList")
     Map<String, Object> getOrderMaterialList(@RequestParam Integer orderId);
@@ -446,7 +450,7 @@ public interface OmsFeign {
 
 
     @PostMapping("api/v1/oms/omstruckorderseparates/getAllResultLineMes")
-    Map<String, Object> getAllResultLineMes(@RequestParam("orderId") Integer orderId);
+    Map<String, Object> getAllResultLineMes(@RequestParam("orderId") Integer orderId, @RequestParam("orderNumber") String orderNumber);
 
     @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
     Map<String, Object> closeInwardOrder(@RequestParam("orderId") Integer orderId);

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

@@ -601,5 +601,7 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmsoilprice/oilNameSelect")
     Map<String, Object> oilNameSelect();
 
-
+    @ApiOperation("解除承运商和车辆的绑定关系")
+    @PostMapping("api/v1/rms/rmscapacity/deleteCapacityCarrier")
+    public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map);
 }

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

@@ -103,7 +103,8 @@ public interface TmsTruckFeign {
                                                      @RequestParam("pageNum")   Integer pageNum,
                                                      @RequestParam("pageSize")  Integer pageSize,
                                                      @RequestParam("orderType") Integer orderType,
-                                                     @RequestParam("con")       String con,
+                                                     @RequestParam("startTime") String startTime,
+                                                     @RequestParam("endTime") String endTime,
                                                      @RequestParam("userId")    String userId,
                                                      @RequestParam("userIds")   String userIds
     );
@@ -206,7 +207,9 @@ public interface TmsTruckFeign {
                                                @RequestParam("con") String con,
                                                @RequestParam("carrierSsoId")String carrierSsoId,
                                                @RequestParam("userId") String userId,
-                                               @RequestParam("userIds") String userIds
+                                               @RequestParam("userIds") String userIds,
+                                               @RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime
     );
 
     @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")
@@ -433,10 +436,43 @@ public interface TmsTruckFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam String startTime,
                                            @RequestParam String endTime);
+//内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReport")
+    Map<String, Object> getInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @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);
 
+
+    //发送留皮计量委托
+    @GetMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendLiuPiMeasureCommission")
+    Map<String, Object> sendLiuPiMeasureCommission(@RequestParam("capacityNumber")String capacityNumber);
+
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLoading")
+    Map<String, Object> getLoading(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam Integer apiId,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam String startTime,
+                                   @RequestParam String endTime);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getUnLoading")
+    Map<String, Object> getUnLoading(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
     }
 
 
+
+
+
+

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

@@ -28,8 +28,7 @@ public interface TmsshipFeign {
     Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId,
-                                              @RequestParam String con);
+                                        @RequestParam Integer apiId);
 
     /**
      * 查询驳船作业信息
@@ -107,8 +106,7 @@ public interface TmsshipFeign {
     Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                   @RequestParam Integer pageNum,
                                   @RequestParam Integer pageSize,
-                                  @RequestParam Integer apiId,
-                                        @RequestParam String con);
+                                  @RequestParam Integer apiId);
 
     /**
      * 查询装船作业表单
@@ -234,8 +232,7 @@ public interface TmsshipFeign {
     Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                 @RequestParam Integer pageNum,
                                 @RequestParam Integer pageSize,
-                                @RequestParam Integer apiId,
-                                      @RequestParam String con);
+                                @RequestParam Integer apiId);
 
     /**
      * 展示船只信息
@@ -250,8 +247,7 @@ public interface TmsshipFeign {
     Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId,
-                                        @RequestParam String con);
+                                        @RequestParam Integer apiId);
 
     /**
      * 展示卸船作业信息列表
@@ -266,8 +262,7 @@ public interface TmsshipFeign {
     Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam String con);
+                                          @RequestParam Integer apiId);
 
     /**
      * 查询卸船作业信息
@@ -327,8 +322,7 @@ public interface TmsshipFeign {
     Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId,
-                                                  @RequestParam String con);
+                                            @RequestParam Integer apiId);
 
     /**
      * 查询水分质检信息
@@ -441,7 +435,6 @@ public interface TmsshipFeign {
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
                                               @RequestParam Integer apiId,
-                                                    @RequestParam String con,
                                                     @RequestParam String status);
 
     /**
@@ -543,8 +536,7 @@ public interface TmsshipFeign {
     Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam String con);
+                                     @RequestParam Integer apiId);
 
 
 
@@ -572,8 +564,7 @@ public interface TmsshipFeign {
     Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                          @RequestParam Integer pageNum,
                                                          @RequestParam Integer pageSize,
-                                                         @RequestParam Integer apiId,
-                                                         @RequestParam String con);
+                                                         @RequestParam Integer apiId);
     @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/selectShippeByName")
     Map<String, Object>   selectShippeByName(@RequestBody(required = false) Map<String, Object> mapValue,
                                              @RequestParam Integer pageNum,
@@ -643,7 +634,6 @@ public interface TmsshipFeign {
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
                                                  @RequestParam Integer apiId,
-                                                 @RequestParam String con,
                                                  @RequestParam Integer status);
 
     /**
@@ -705,7 +695,6 @@ public interface TmsshipFeign {
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
-                                            @RequestParam String con,
                                             @RequestParam Integer  status);
 
     /**

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

@@ -74,7 +74,8 @@ public interface WMSFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                             @RequestParam String con);
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String con);
     /**
      * 展示出库实绩
      *
@@ -88,7 +89,9 @@ public interface WMSFeign {
                                               @RequestParam Integer apiId,
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
-                                              @RequestParam String con);
+                                              @RequestParam Integer warehouseId,
+                                              @RequestParam String  startTime,
+                                              @RequestParam String  endTime);
 
     /**
      * 新增出库实绩
@@ -151,7 +154,8 @@ public interface WMSFeign {
                                                @RequestParam Integer apiId,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
-                                               @RequestParam Integer warehouseId,
+                                               @RequestParam String warehouseId,
+                                               @RequestParam String time,
                                                @RequestParam String con);
 
     /**
@@ -449,6 +453,9 @@ public interface WMSFeign {
     @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
     Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "/api/v1/wms/inboundResult/getFurnaceNoAmount")
+    Map<String, Object> getFurnaceNoAmount(@RequestBody(required = false) Map<String, Object> map);
+
     /**
      * 库管员下发倒垛单
      *
@@ -551,7 +558,6 @@ public interface WMSFeign {
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
-                                    @RequestParam Integer warehouseId,
                                     @RequestParam String value);
 
     //库存结转定时器
@@ -567,9 +573,9 @@ public interface WMSFeign {
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize,
                                  @RequestParam String con,
-                                 @RequestParam Integer warehouseId,
                                  @RequestParam String startTime,
-                                 @RequestParam String endTime);
+                                 @RequestParam String endTime
+                                 );
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩
@@ -763,9 +769,6 @@ public interface WMSFeign {
     @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
 
     public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
-    //收发存定时器
-    @PostMapping("/api/v1/wms/sendReceive/addSendReceive")
-    public RESTfulResult addSendReceive();
 
 
 //
@@ -835,15 +838,27 @@ public interface WMSFeign {
                                           @RequestParam(value = "pageSize") Integer pageSize,
                                           @RequestParam(value = "apiId") Integer apiId);
     @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialList")
-    Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
-                                          @RequestParam(value = "pageSize") Integer pageSize,
-                                          @RequestParam(value = "apiId") Integer apiId);
+    Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String con);
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelWarehouseList")
+    Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con);
+
     @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,
+    Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @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);
+                                                 @RequestParam(value = "status") Integer status,
+                                                 @RequestParam(value = "con") String con);
 
 
     @PostMapping("/api/v1/wms/inboundResult/changeReserved")
@@ -860,4 +875,6 @@ public interface WMSFeign {
                                  @RequestParam String startTime,
                                  @RequestParam String endTime);
 
+    @PostMapping("/api/v1/wms/inboundResult/undoInbound")
+    Map<String, Object> undoInbound(@RequestParam BigDecimal inboundId);
 }

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

@@ -14,6 +14,8 @@ import java.util.Map;
 
 @Mapper
 public interface UniversalMapper {
+     int updateLineSqe(Map<String, Object> map);
+
     //通过运输订单号查询订单信息
     Map<String, Object> getTiHuoDan(String orderNumber);
 
@@ -101,6 +103,9 @@ public interface UniversalMapper {
     //边输边查发货单位
     List<Map<String, Object>> getCapacityByLike(String index);
 
+    //模糊查询批次品名
+    List<Map<String, Object>> getBatchByLike(String index);
+
     // 根据运力id查询所有承运商
     List<Map<String, Object>> getCarrierByCapacityId(BigDecimal capacityId);
 
@@ -116,4 +121,22 @@ public interface UniversalMapper {
 
     //边输边查用车单位
     List<Map<String, Object>> getRequireUnitName(String index);
+
+    //获得港口下拉框
+    List<Map<String, Object>> getPortId();
+
+    //根据车牌号查询正在运输的订单号
+    Map<String, Object> getOrderNumber(String num);
+
+    //查询车牌号
+    List<Map<String, Object>> getCapacityNumber(String num);
+
+    //根据订单Id查询物资
+    List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId);
+
+    //边输边查物资
+    List<Map<String, Object>> getMaterialByLike(String index);
+
+    Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
+
 }

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

@@ -88,4 +88,22 @@ public class UniversalServiceImpl implements UniversalService {
         map.put("capacityId",capacityId);
         return map;
     }
+
+    public List<Map<String, Object>> getPortId() {
+        return universalMapper.getPortId();
+    }
+
+    //获取订单号以及订单号下的物资
+    public Map<String, Object> getOrderNumber(String num) {
+        return universalMapper.getOrderNumber(num);
+    }
+
+    public List<Map<String, Object>> getCapacityNumber(String num) {
+        return universalMapper.getCapacityNumber(num);
+    }
+
+
+    public List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId) {
+        return universalMapper.getMaterialIdByOrderId(orderId);
+    }
 }

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: DAGANG
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api
@@ -33,6 +33,7 @@ openfeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
-
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
 server:
   port: 8019

src/main/resources/application-prod.yml

@@ -34,6 +34,7 @@ openfeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
-
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
 server:
   port: 8080

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.UniversalMapper">
+    <update id="updateLineSqe" parameterType="java.util.Map">
+        update omstruck_order oo
+        set oo.order_line_sequence = #{orderLineSqe}
+        where oo.order_id = #{orderId}
+    </update>
     <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
         select OO.ORDER_NUMBER             "orderNumber",
                RC.CAPACITY_NUMBER          "capacityNumber",
@@ -70,11 +75,14 @@
                         ON DB.BATCH_ID = APO.BATCH_ID
                     JOIN RMS_MATERIAL RM
                         ON RM.MATERIAL_ID = DB.MATERIAL_ID
-                <where>
+                where APO.DELETED = 0
+                    <if test="supplierId != null">
+                        and APO.SUPPLIER_UNIT_ID = #{supplierId}
+                    </if>
                     <if test="index != null">
-                        (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
+                        and (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
         )
         <where>
@@ -144,12 +152,12 @@
         FROM (
                  SELECT
                         RC.CAPACITY_ID        "capacityId",
-                        RC.CARRIER_ID         "carrierId",
+                        RCC.CARRIER_ID         "carrierId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName",
                         RC.INSERT_UPDATE_REMARK "remark"
-                 FROM RMS_CAPACITY RC
-                            LEFT JOIN RMS_CAPACITY_CARRIER RCC
+                 FROM RMS_CAPACITY_CARRIER RCC
+                            LEFT JOIN RMS_CAPACITY RC
                      ON RCC.CAPACITY_ID = RC.CAPACITY_ID
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RCC.CARRIER_ID
@@ -161,7 +169,7 @@
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
             </if>
             <if test="con != null">
-                and instr(RC.INSERT_UPDATE_REMARK,#{con}) > 0
+                and instr(RC.INSERT_UPDATE_REMARK, #{con}) > 0
             </if>
         )
         <where>
@@ -344,12 +352,10 @@
         RM.MATERIAL_CODE "materialCode",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
         RM.MATERIAL_MODEL "materialModel"
-        FROM RMS_MATERIAL RM
-        <where>
-            <if test="index != null">
-                (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
-            </if>
-        </where>
+        FROM RMS_MATERIAL RM WHERE  RM.DELETED = 0
+        <if test="index != null">
+            AND (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
+        </if>
         )
         <where>
             <if test="materialName != null">
@@ -537,9 +543,10 @@
 
 <!--  边输边查卸货点  -->
     <select id="selectUnloadingPoint" parameterType="string" resultType="java.util.Map">
-        select Rw.WAREHOUSE_NAME "warehouseName",
+        select RW.WAREHOUSE_NAME "warehouseName",
                RW.WAREHOUSE_ID "warehouseId"
         from RMS_WAREHOUSE RW
+        where RW.DELETED = 0
         order by "warehouseName"
     </select>
 
@@ -676,4 +683,70 @@
         FROM BMSTRUCK_FORMULA BF
         WHERE FORMULA_NAME LIKE #{con}
     </select>
+
+    <select id="getBatchByLike" parameterType="string" resultType="java.util.Map">
+        select *
+        from (
+                 select DB.BATCH_ID                                                         "batchId",
+                        DB.RESULT_FOREIGN_SHIP_NAME                                         "foreignShipName",
+                        CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"') "value"
+                 from DIL_BATCH DB
+                          left join RMS_MATERIAL RM on RM.MATERIAL_ID = DB.MATERIAL_ID
+                 where DB.RESULT_FOREIGN_SHIP_NAME is not null
+             )
+        where instr("foreignShipName", #{index}) > 0
+    </select>
+
+    <select id="getPortId" resultType="java.util.Map">
+        SELECT rp.PORT_ID   "id",
+               rp.PORT_ID   "value",
+               rp.PORT_NAME "label"
+        FROM RMS_PORT rp
+    </select>
+
+
+    <select id="getOrderNumber" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_NUMBER  "orderNumber",
+               OO.ORDER_ID      "orderId"
+        from OMSTRUCK_ORDER OO
+        left join RMS_CAPACITY RC
+            ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        where OO.CAPACITY_ID = #{capacityId} and OO.ORDER_STATUS = 5
+    </select>
+
+    <select id="getCapacityNumber" parameterType="string" resultType="java.util.Map">
+        select RC.CAPACITY_NUMBER "capacityNumber",
+               RC.CAPACITY_ID   "capacityId"
+        from RMS_CAPACITY RC
+        where instr(RC.CAPACITY_NUMBER, #{num}) > 0
+    </select>
+
+    <select id="getMaterialIdByOrderId" resultType="java.util.Map">
+        select OOM.MATERIAL_ID "materialId",
+              CONCAT(CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION),RM.MATERIAL_MODEL) "materialName"
+        from OMSTRUCK_ORDER_MATERIAL  OOM
+            left join RMS_MATERIAL RM
+                on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        where OOM.ORDER_ID = #{orderId}
+    </select>
+
+
+    <select id="getMaterialByLike" parameterType="string" resultType="java.util.Map">
+        select *
+        from (
+                 select RM.MATERIAL_ID   "materialId",
+                        CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION) || RM.MATERIAL_MODEL "value",
+                        CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION) || RM.MATERIAL_MODEL "materialName"
+                 from RMS_MATERIAL RM
+                 where instr(RM.MATERIAL_NAME, #{index}) > 0
+             )
+        where rownum &lt; 10
+    </select>
+
+    <select id="getRmsCarrierByCarrierSsoId" resultType="java.util.Map">
+        select r_carrier.CARRIER_NAME "carrierName", r_carrier.CARRIER_ID "carrierId"
+        from RMS_CARRIER r_carrier
+        where r_carrier.CARRIER_SSO_ID = #{carrierSsoId}
+
+    </select>
 </mapper>