'销售master'

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

@@ -1101,8 +1101,8 @@ public class AMScontroller{
                                                            Integer apiId,
                                                            Integer pageNum,
                                                            Integer pageSize,
-                                                           Integer carrierId){
-        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierId);
+                                                           String carrierSSOId){
+        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierSSOId);
     }
 
     //获取到站名称
@@ -1498,11 +1498,36 @@ public class AMScontroller{
 
 
     //*******************************下拉框************************
-
-
     @GetMapping("getNoticeTypeId")
     @ApiOperation(value = "得到公告类型Id")
     public Map<String,Object> getNoticeTypeId(){
         return amsFeign.getNoticeTypeId();
     }
+
+
+    @ApiOperation(value = "展示车序号下的物资详情")
+    @PostMapping(value = "/getTruckNoMaterialList")
+    public RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId) {
+        return amsFeign.getTruckNoMaterialList(saleOrderMaterialId);
+    }
+
+    @ApiOperation(value = "展示销售派单下的物资详情")
+    @PostMapping(value = "/getDispatchMaterialList")
+    public RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId) {
+        return amsFeign.getDispatchMaterialList(dispatchId);
+    }
+
+
+    /**
+     * 展示销售订单下的物资详情
+     * @param saleOrderId
+     * @return
+     */
+    @ApiOperation(value="展示销售订单下的物资详情")
+    @PostMapping(value = "/getSaleMaterialList")
+    public RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId){
+        return amsFeign.getSaleMaterialList(saleOrderId);
+    }
+
+
 }

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

@@ -985,4 +985,40 @@ public class RMScontroller {
     public Map<String,Object> upLoadPhoto(@RequestParam("file") MultipartFile file){
         return rmsFeign.upLoadPhoto(file);
     }
+
+    /**
+     * 得到二级部门的下拉
+     * @return
+     */
+    @GetMapping("/getSecondShipper")
+    public Map<String,Object> getSecondShipper() {
+        return  rmsFeign.getSecondShipper();
+    }
+
+    /**
+     * 得到三级部门的下拉
+     * @return
+     */
+    @GetMapping("/getThirdShipper")
+    public Map<String,Object> getThirdShipper(@RequestParam Integer shipperId) {
+        return  rmsFeign.getThirdShipper(shipperId);
+    }
+
+    /**
+     * 新增人员权限
+     * @return
+     */
+    @PostMapping("/addPersonnel")
+    public Map<String,Object> addPersonnel(@RequestBody Map<String,Object> map) {
+        return  rmsFeign.addPersonnel(map);
+    }
+
+    /**
+     * 查询SSO主键和机构编码
+     * @return
+     */
+    @PostMapping("/getShipperMap")
+    public Map<String,Object> getShipperMap(@RequestParam Integer shipperId) {
+        return  rmsFeign.getShipperMap(shipperId);
+    }
 }

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

@@ -410,4 +410,35 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "模糊查询收货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "418", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getConsigneeListByLike")
+    public RESTfulResult getConsigneeListByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String index) {
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index = "%" + index + "%";
+            }
+        }
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("index",index);
+        List<Map<String, Object>> list = universalMapper.getConsigneeListByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getConsigneeListByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
 }

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

@@ -596,7 +596,7 @@ public interface AmsFeign {
                                                    @RequestParam("apiId") Integer apiId,
                                                    @RequestParam("pageNum") Integer pageNum,
                                                    @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("carrierId") Integer carrierId);
+                                                   @RequestParam("carrierSSOId") String carrierSSOId);
 
     /**
      * 新增销售订单物资信息
@@ -1406,4 +1406,12 @@ public interface AmsFeign {
     @GetMapping(value = "api/v1/ams/dilnotices/getNoticeTypeId")
     Map<String,Object> getNoticeTypeId();
 
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/getTruckNoMaterialList")
+    RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId);
+
+    @PostMapping(value = "api/v1/ams/amssaleordermaterials/getSaleMaterialList")
+    RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "api/v1/ams/amsdispatchsaleorders/getDispatchMaterialList")
+    RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId);
 }

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

@@ -534,4 +534,20 @@ public interface RmsFeign {
     //上传图片
     @PostMapping(value = "api/v1/rms/rmscardriver/upload")
     Map<String,Object> upLoadPhoto(@RequestParam("file") MultipartFile file);
+
+    // 得到二级部门的下拉
+    @GetMapping(value = "api/v1/rms/rmspersonnel/getSecondShipper")
+    Map<String, Object> getSecondShipper();
+
+    // 得到三级部门的下拉
+    @GetMapping(value = "api/v1/rms/rmspersonnel/getThirdShipper")
+    Map<String, Object> getThirdShipper(@RequestParam Integer shipperId);
+
+    // 新增人员权限
+    @PostMapping(value = "api/v1/rms/rmspersonnel/addPersonnel")
+    Map<String, Object> addPersonnel(@RequestBody Map<String, Object> map);
+
+    // 查询SSO主键和机构编码
+    @PostMapping(value = "api/v1/rms/rmspersonnel/getShipperMap")
+    Map<String, Object> getShipperMap(@RequestParam Integer shipperId);
 }

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

@@ -61,4 +61,7 @@ public interface UniversalMapper {
 
     //边输边查卸货点
     List<Map<String, Object>> selectUnloadingPoint(String index);
+
+    // 模糊查询收货单位
+    List<Map<String, Object>> getConsigneeListByLike(Map<String, Object> mapValue);
 }

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

@@ -489,4 +489,16 @@
               </if>
         order by "warehouseName"
     </select>
+
+    <!-- 模糊查询收货单位 -->
+    <select id="getConsigneeListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT
+        RC.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName"
+        FROM RMS_CONSIGNEE RC
+        WHERE
+        <if test="index != null">
+            RC.CONSIGNEE_COMPANY_NAME like #{index}
+        </if>
+        order by "consigneeCompanyName"
+    </select>
 </mapper>