asdaa

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

@@ -1632,6 +1632,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){

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

@@ -1231,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查询物资信息")
@@ -1426,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);
     }
 
 

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

@@ -621,4 +621,15 @@ public class UniversalController extends BaseRESTfulController {
         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

@@ -227,7 +227,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) {

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

@@ -1501,6 +1501,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);
 

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")

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

@@ -453,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);
+
     /**
      * 库管员下发倒垛单
      *

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

@@ -136,4 +136,7 @@ public interface UniversalMapper {
 
     //边输边查物资
     List<Map<String, Object>> getMaterialByLike(String index);
+
+    Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
+
 }

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

@@ -743,4 +743,11 @@
              )
         where rownum < 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>