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

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/UniversalController.java

@@ -613,4 +613,16 @@ public class UniversalController extends BaseRESTfulController {
         int i = universalMapper.updateLineSqe(map);
         return success(i);
     }
+
+    @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

@@ -969,6 +969,15 @@ public class WMSController extends BaseRESTfulController {
                                                    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(@RequestBody(required = false) Map<String, Object> mapValue,

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/WMSFeign.java

@@ -841,6 +841,12 @@ public interface WMSFeign {
                                             @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(@RequestBody(required = false) Map<String, Object> mapValue,

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

@@ -133,4 +133,6 @@ public interface UniversalMapper {
 
     //根据订单Id查询物资
     List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId);
+
+    Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
 }

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

@@ -75,14 +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">
                         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>
@@ -168,13 +168,11 @@
             <if test="index != null">
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
             </if>
-        )
-        <where>
             <if test="con != null">
-                and instr(RC.INSERT_UPDATE_REMARK,#{con}) > 0
-                "capacityNumber" like #{con} or "carrierName" like #{con} or
-                "remark" like #{con}
+                and instr(RC.INSERT_UPDATE_REMARK, #{con}) > 0
             </if>
+        )
+        <where>
             <if test="capacityNumber != null">
                 <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
                     "capacityNumber" like '%${item}%'
@@ -732,4 +730,7 @@
                 on RM.MATERIAL_ID = OOM.MATERIAL_ID
         where OOM.ORDER_ID = #{orderId}
     </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>