结构重构

hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/Flow.java

@@ -1,31 +1,9 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package com.fjhx.myapp.application.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
 import com.fjhx.base.BasicEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 业务附件表实体类
@@ -37,37 +15,37 @@ import io.swagger.annotations.ApiModelProperty;
 @TableName("act_flow")
 public class Flow extends BasicEntity {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	* 流程名称
-	*/
-	@ApiModelProperty(value = "流程名称")
-	private String flowName;
-	/**
-	* 流程标识
-	*/
-	@ApiModelProperty(value = "流程标识")
-	private String flowIdentifying;
-	/**
-	* 开始节点
-	*/
-	@ApiModelProperty(value = "开始节点")
-	private String startNodeId;
-	/**
-	* 结束节点
-	*/
-	@ApiModelProperty(value = "结束节点")
-	private String endNodeId;
-	/**
-	* Model表名称
-	*/
-	@ApiModelProperty(value = "Model表名称")
-	private String modelName;
-	/**
-	* 待办类型 （枚举定义：0=物料申购，1=合同管理，2=付款管理，3=出库管理，4=其他出库（退货、报损），5=质检数量修正申请，6=物料修改申请，7=物料价格调整，8=库存盘点，9=归还入库，10=合同删除，11=免检申请，12=供应商出货申请）
-	*/
-	@ApiModelProperty(value = "待办类型 （枚举定义：0=物料申购，1=合同管理，2=付款管理，3=出库管理，4=其他出库（退货、报损），5=质检数量修正申请，6=物料修改申请，7=物料价格调整，8=库存盘点，9=归还入库，10=合同删除，11=免检申请，12=供应商出货申请）")
-	private Integer dealWithType;
+    /**
+     * 流程名称
+     */
+    @ApiModelProperty(value = "流程名称")
+    private String flowName;
+    /**
+     * 流程标识
+     */
+    @ApiModelProperty(value = "流程标识")
+    private String flowIdentifying;
+    /**
+     * 开始节点
+     */
+    @ApiModelProperty(value = "开始节点")
+    private String startNodeId;
+    /**
+     * 结束节点
+     */
+    @ApiModelProperty(value = "结束节点")
+    private String endNodeId;
+    /**
+     * Model表名称
+     */
+    @ApiModelProperty(value = "Model表名称")
+    private String modelName;
+    /**
+     * 待办类型 （枚举定义：0=物料申购，1=合同管理，2=付款管理，3=出库管理，4=其他出库（退货、报损），5=质检数量修正申请，6=物料修改申请，7=物料价格调整，8=库存盘点，9=归还入库，10=合同删除，11=免检申请，12=供应商出货申请）
+     */
+    @ApiModelProperty(value = "待办类型 （枚举定义：0=物料申购，1=合同管理，2=付款管理，3=出库管理，4=其他出库（退货、报损），5=质检数量修正申请，6=物料修改申请，7=物料价格调整，8=库存盘点，9=归还入库，10=合同删除，11=免检申请，12=供应商出货申请）")
+    private Integer dealWithType;
 
 }

hx-service/storage-restructure/src/main/java/com/fjhx/attachment/service/impl/StockAttachmentServiceImpl.java

@@ -33,8 +33,7 @@ public class StockAttachmentServiceImpl extends ServiceImpl<StockAttachmentMappe
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(StockAttachmentVo stockAttachmentVo) {
-        if (StringUtil.isEmpty(stockAttachmentVo.getBusiId()) ||
-                StringUtil.isEmpty(stockAttachmentVo.getPath())) {
+        if (StringUtil.isEmpty(stockAttachmentVo.getBusiId()) || StringUtil.isEmpty(stockAttachmentVo.getPath())) {
             throw new ServiceException("参数异常");
         }
         stockAttachmentVo.setCreatedTime(new Date());

hx-service/storage-restructure/src/main/java/com/fjhx/config/controller/ConfigController.java

@@ -21,7 +21,6 @@ import com.fjhx.config.service.IConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.springblade.common.constant.ApiConstant;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
@@ -38,7 +37,7 @@ import javax.validation.Valid;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX + "/config")
+@RequestMapping("/config")
 @Api(value = "仓库", tags = "仓库接口")
 public class ConfigController extends BladeController {
 

hx-service/storage-restructure/src/main/java/com/fjhx/contract/controller/PurchaseContractController.java

@@ -20,12 +20,10 @@ import com.fjhx.contract.entity.PurchaseContract;
 import com.fjhx.contract.service.IPurchaseContractService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
-
-import org.springblade.common.constant.ApiConstant;
 import org.springblade.common.utils.ListPageMap;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
 import java.util.Map;
@@ -38,53 +36,55 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/purchasecontract")
+@RequestMapping("/purchasecontract")
 @Api(value = "采购合同", tags = "采购合同接口")
 public class PurchaseContractController extends BladeController {
 
-	private final IPurchaseContractService purchaseContractService;
+    private final IPurchaseContractService purchaseContractService;
+
+    /**
+     * 列表
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping("/list")
+    public R list(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        List<PurchaseContract> result = purchaseContractService.getList(condition);
+        return R.success(result);
+    }
 
-	/**
-	 * 列表
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping("/list")
-	public R list(@RequestBody Map<String, Object> condition){
-		ListPageMap.getListPageMap(condition);
-		List<PurchaseContract> result = purchaseContractService.getList(condition);
-		return R.success(result);
-	}
+    /**
+     * 列表条数
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping("/list/count")
+    public R listCount(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        Integer count = purchaseContractService.getListCount(condition);
+        return R.success(count);
+    }
 
-	/**
-	 * 列表条数
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping("/list/count")
-	public R listCount(@RequestBody Map<String, Object> condition){
-		ListPageMap.getListPageMap(condition);
-		Integer count = purchaseContractService.getListCount(condition);
-		return R.success(count);
-	}
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<PurchaseContract> detail(@RequestParam("id") String id) {
+        PurchaseContract detail = purchaseContractService.getDetail(id);
+        return R.data(detail);
+    }
 
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<PurchaseContract> detail(@RequestParam("id")String id) {
-		PurchaseContract detail = purchaseContractService.getDetail(id);
-		return R.data(detail);
-	}
+    /**
+     * 详情
+     */
+    @PostMapping("/statistics/class")
+    public R statisticsClass(@RequestBody Map<String, Object> condition) {
+        List<Map<String, Object>> list = purchaseContractService.statisticsClassify(condition);
+        return R.success(list);
+    }
 
-	/**
-	 * 详情
-	 */
-	@PostMapping("/statistics/class")
-	public R statisticsClass(@RequestBody Map<String, Object> condition) {
-		List<Map<String,Object>> list = purchaseContractService.statisticsClassify(condition);
-		return R.success(list);
-	}
 
-	
 }

hx-service/storage-restructure/src/main/java/com/fjhx/contract/controller/PurchaseContractFlowController.java

@@ -20,7 +20,6 @@ import com.fjhx.contract.entity.PurchaseContract;
 import com.fjhx.contract.service.IPurchaseContractFlowService;
 import com.fjhx.myapp.application.entity.FlowParam;
 import lombok.AllArgsConstructor;
-import org.springblade.common.constant.ApiConstant;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX + "/purchasecontract/flow")
+@RequestMapping("/purchasecontract/flow")
 public class PurchaseContractFlowController extends BladeController {
 
     private final IPurchaseContractFlowService flowService;

hx-service/storage-restructure/src/main/java/com/fjhx/contract/controller/PurchaseContractMaterialController.java

@@ -21,14 +21,13 @@ import com.fjhx.contract.service.IPurchaseContractMaterialService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.validation.Valid;
 
 /**
  * 供应商收款账户 控制器
@@ -38,44 +37,44 @@ import org.springblade.core.boot.ctrl.BladeController;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/purchasecontractmaterial")
+@RequestMapping("/purchasecontractmaterial")
 @Api(value = "供应商收款账户", tags = "供应商收款账户接口")
 public class PurchaseContractMaterialController extends BladeController {
 
-	private final IPurchaseContractMaterialService purchaseContractMaterialService;
+    private final IPurchaseContractMaterialService purchaseContractMaterialService;
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<PurchaseContractMaterial> detail(PurchaseContractMaterial purchaseContractMaterial) {
+        PurchaseContractMaterial detail = purchaseContractMaterialService.getOne(Condition.getQueryWrapper(purchaseContractMaterial));
+        return R.data(detail);
+    }
 
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<PurchaseContractMaterial> detail(PurchaseContractMaterial purchaseContractMaterial) {
-		PurchaseContractMaterial detail = purchaseContractMaterialService.getOne(Condition.getQueryWrapper(purchaseContractMaterial));
-		return R.data(detail);
-	}
+    /**
+     * 新增 供应商收款账户
+     */
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PurchaseContractMaterial purchaseContractMaterial) {
+        return R.status(purchaseContractMaterialService.save(purchaseContractMaterial));
+    }
 
-	/**
-	 * 新增 供应商收款账户
-	 */
-	@PostMapping("/save")
-	public R save(@Valid @RequestBody PurchaseContractMaterial purchaseContractMaterial) {
-		return R.status(purchaseContractMaterialService.save(purchaseContractMaterial));
-	}
+    /**
+     * 修改 供应商收款账户
+     */
+    @PostMapping("/update")
+    public R update(@Valid @RequestBody PurchaseContractMaterial purchaseContractMaterial) {
+        return R.status(purchaseContractMaterialService.updateById(purchaseContractMaterial));
+    }
 
-	/**
-	 * 修改 供应商收款账户
-	 */
-	@PostMapping("/update")
-	public R update(@Valid @RequestBody PurchaseContractMaterial purchaseContractMaterial) {
-		return R.status(purchaseContractMaterialService.updateById(purchaseContractMaterial));
-	}
+    /**
+     * 删除 供应商收款账户
+     */
+    @PostMapping("/remove")
+    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return R.status(purchaseContractMaterialService.removeByIds(Func.toLongList(ids)));
+    }
 
-	/**
-	 * 删除 供应商收款账户
-	 */
-	@PostMapping("/remove")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(purchaseContractMaterialService.removeByIds(Func.toLongList(ids)));
-	}
 
-	
 }

hx-service/storage-restructure/src/main/java/com/fjhx/contract/controller/PurchaseContractbatchController.java

@@ -21,14 +21,13 @@ import com.fjhx.contract.service.IPurchaseContractbatchService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.validation.Valid;
 
 /**
  * 采购批次号 控制器
@@ -38,36 +37,36 @@ import org.springblade.core.boot.ctrl.BladeController;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/purchasecontractbatch")
+@RequestMapping("/purchasecontractbatch")
 @Api(value = "采购批次号", tags = "采购批次号接口")
 public class PurchaseContractbatchController extends BladeController {
 
-	private final IPurchaseContractbatchService purchaseContractbatchService;
+    private final IPurchaseContractbatchService purchaseContractbatchService;
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<PurchaseContractbatch> detail(PurchaseContractbatch purchaseContractbatch) {
+        PurchaseContractbatch detail = purchaseContractbatchService.getOne(Condition.getQueryWrapper(purchaseContractbatch));
+        return R.data(detail);
+    }
+
+    /**
+     * 新增 采购批次号
+     */
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PurchaseContractbatch purchaseContractbatch) {
+        return R.status(purchaseContractbatchService.saveContractBatch(purchaseContractbatch));
+    }
 
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<PurchaseContractbatch> detail(PurchaseContractbatch purchaseContractbatch) {
-		PurchaseContractbatch detail = purchaseContractbatchService.getOne(Condition.getQueryWrapper(purchaseContractbatch));
-		return R.data(detail);
-	}
+    /**
+     * 删除 采购批次号
+     */
+    @PostMapping("/remove")
+    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return R.status(purchaseContractbatchService.removeByIds(Func.toLongList(ids)));
+    }
 
-	/**
-	 * 新增 采购批次号
-	 */
-	@PostMapping("/save")
-	public R save(@Valid @RequestBody PurchaseContractbatch purchaseContractbatch) {
-		return R.status(purchaseContractbatchService.saveContractBatch(purchaseContractbatch));
-	}
-	
-	/**
-	 * 删除 采购批次号
-	 */
-	@PostMapping("/remove")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(purchaseContractbatchService.removeByIds(Func.toLongList(ids)));
-	}
 
-	
 }

hx-service/storage-restructure/src/main/java/com/fjhx/house/controller/HouseController.java

@@ -20,15 +20,14 @@ import com.fjhx.house.entity.House;
 import com.fjhx.house.service.IHouseService;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.common.constant.ApiConstant;
 import org.springblade.common.utils.ListPageMap;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -40,70 +39,71 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/house")
+@RequestMapping("/house")
 public class HouseController extends BladeController {
 
-	private final IHouseService houseService;
+    private final IHouseService houseService;
+
+    /**
+     * 列表
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    @PostMapping("/list")
+    public R getList(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        List<House> list = houseService.getList(condition);
+        return R.list(list);
+    }
+
+    /**
+     * 列表-总条数
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    @PostMapping("/list/count")
+    public R getListCount(@RequestBody Map<String, Object> condition) {
+        Integer count = houseService.getListCount(condition);
+        return R.count(count);
+    }
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<House> detail(House house) {
+        House detail = houseService.getOne(Condition.getQueryWrapper(house));
+        return R.data(detail);
+    }
 
-	/**
-	 * 列表
-	 *
-	 * @param condition 查询条件
-	 * @return
-	 */
-	@PostMapping("/list")
-	public R getList(@RequestBody Map<String, Object> condition) {
-		ListPageMap.getListPageMap(condition);
-		List<House> list = houseService.getList(condition);
-		return R.list(list);
-	}
+    /**
+     * 新增 仓库
+     */
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody House house) {
+        house.setCreate();
+        return R.status(houseService.save(house));
+    }
 
-	/**
-	 * 列表-总条数
-	 *
-	 * @param condition 查询条件
-	 * @return
-	 */
-	@PostMapping("/list/count")
-	public R getListCount(@RequestBody Map<String, Object> condition) {
-		Integer count = houseService.getListCount(condition);
-		return R.count(count);
-	}
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<House> detail(House house) {
-		House detail = houseService.getOne(Condition.getQueryWrapper(house));
-		return R.data(detail);
-	}
+    /**
+     * 修改 仓库
+     */
+    @PostMapping("/update")
+    public R update(@Valid @RequestBody House house) {
+        house.setUpdate();
+        return R.status(houseService.updateById(house));
+    }
 
-	/**
-	 * 新增 仓库
-	 */
-	@PostMapping("/save")
-	public R save(@Valid @RequestBody House house) {
-		house.setCreate();
-		return R.status(houseService.save(house));
-	}
 
-	/**
-	 * 修改 仓库
-	 */
-	@PostMapping("/update")
-	public R update(@Valid @RequestBody House house) {
-		house.setUpdate();
-		return R.status(houseService.updateById(house));
-	}
+    /**
+     * 删除 仓库
+     */
+    @GetMapping("/remove")
+    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return R.status(houseService.removeByIds(Func.toLongList(ids)));
+    }
 
-	
-	/**
-	 * 删除 仓库
-	 */
-	@GetMapping("/remove")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(houseService.removeByIds(Func.toLongList(ids)));
-	}
 
-	
 }

hx-service/storage-restructure/src/main/java/com/fjhx/material/controller/MaterialCategoryController.java

@@ -22,15 +22,13 @@ import com.fjhx.material.service.IMaterialCategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -41,54 +39,55 @@ import java.util.List;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/materialcategory")
+@RequestMapping("/materialcategory")
 @Api(value = "物料分类", tags = "物料分类接口")
 public class MaterialCategoryController extends BladeController {
 
-	private final IMaterialCategoryService materialCategoryService;
+    private final IMaterialCategoryService materialCategoryService;
+
+    /**
+     * 树列表
+     */
+    @GetMapping("/treeList")
+    public R treeList() {
+        List<TreeNode> list = materialCategoryService.getTreeList();
+        return R.list(list);
+    }
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<MaterialCategory> detail(MaterialCategory materialCategory) {
+        MaterialCategory detail = materialCategoryService.getOne(Condition.getQueryWrapper(materialCategory));
+        return R.data(detail);
+    }
 
-	/**
-	 * 树列表
-	 */
-	@GetMapping("/treeList")
-	public R treeList() {
-		List<TreeNode> list = materialCategoryService.getTreeList();
-		return R.list(list);
-	}
+    /**
+     * 新增 物料分类
+     */
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody MaterialCategory materialCategory) {
+        materialCategory.setCreate();
+        return R.status(materialCategoryService.save(materialCategory));
+    }
 
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<MaterialCategory> detail(MaterialCategory materialCategory) {
-		MaterialCategory detail = materialCategoryService.getOne(Condition.getQueryWrapper(materialCategory));
-		return R.data(detail);
-	}
-	/**
-	 * 新增 物料分类
-	 */
-	@PostMapping("/save")
-	public R save(@Valid @RequestBody MaterialCategory materialCategory) {
-		materialCategory.setCreate();
-		return R.status(materialCategoryService.save(materialCategory));
-	}
+    /**
+     * 修改 物料分类
+     */
+    @PostMapping("/update")
+    public R update(@Valid @RequestBody MaterialCategory materialCategory) {
+        materialCategory.setUpdate();
+        return R.status(materialCategoryService.updateById(materialCategory));
+    }
 
-	/**
-	 * 修改 物料分类
-	 */
-	@PostMapping("/update")
-	public R update(@Valid @RequestBody MaterialCategory materialCategory) {
-		materialCategory.setUpdate();
-		return R.status(materialCategoryService.updateById(materialCategory));
-	}
+    /**
+     * 删除 物料分类
+     */
+    @GetMapping("/remove")
+    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return R.status(materialCategoryService.removeByIds(Func.toLongList(ids)));
+    }
 
-	/**
-	 * 删除 物料分类
-	 */
-	@GetMapping("/remove")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(materialCategoryService.removeByIds(Func.toLongList(ids)));
-	}
 
-	
 }

hx-service/storage-restructure/src/main/java/com/fjhx/material/controller/MaterialController.java

@@ -20,15 +20,13 @@ import com.fjhx.material.entity.Material;
 import com.fjhx.material.service.IMaterialService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.common.constant.ApiConstant;
 import org.springblade.common.utils.ListPageMap;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -40,97 +38,98 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/material")
+@RequestMapping("/material")
 @Api(value = "物料", tags = "物料接口")
 public class MaterialController extends BladeController {
 
-	private final IMaterialService materialService;
+    private final IMaterialService materialService;
+
+    /**
+     * 列表
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    @PostMapping("/list")
+    public R getList(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        List<Material> list = materialService.getList(condition);
+        return R.list(list);
+    }
+
+    /**
+     * 列表-总条数
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    @PostMapping("/list/count")
+    public R getListCount(@RequestBody Map<String, Object> condition) {
+        Integer count = materialService.getListCount(condition);
+        return R.count(count);
+    }
+
 
-	/**
-	 * 列表
-	 *
-	 * @param condition 查询条件
-	 * @return
-	 */
-	@PostMapping("/list")
-	public R getList(@RequestBody Map<String, Object> condition) {
-		ListPageMap.getListPageMap(condition);
-		List<Material> list = materialService.getList(condition);
-		return R.list(list);
-	}
+    /**
+     * 主营价格列表
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    @PostMapping("/price/list")
+    public R getPriceList(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        List<Material> list = materialService.getPriceList(condition);
+        return R.list(list);
+    }
 
-	/**
-	 * 列表-总条数
-	 *
-	 * @param condition 查询条件
-	 * @return
-	 */
-	@PostMapping("/list/count")
-	public R getListCount(@RequestBody Map<String, Object> condition) {
-		Integer count = materialService.getListCount(condition);
-		return R.count(count);
-	}
+    /**
+     * 主营价格列表-总条数
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    @PostMapping("/price/list/count")
+    public R getPriceListCount(@RequestBody Map<String, Object> condition) {
+        Integer count = materialService.getPriceListCount(condition);
+        return R.count(count);
+    }
 
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<Material> detail(Material material) {
+        Material detail = materialService.getOne(Condition.getQueryWrapper(material));
+        return R.data(detail);
+    }
 
-	/**
-	 * 主营价格列表
-	 *
-	 * @param condition 查询条件
-	 * @return
-	 */
-	@PostMapping("/price/list")
-	public R getPriceList(@RequestBody Map<String, Object> condition) {
-		ListPageMap.getListPageMap(condition);
-		List<Material> list = materialService.getPriceList(condition);
-		return R.list(list);
-	}
+    /**
+     * 新增 物料
+     */
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody Material material) {
+        materialService.addMaterial(material);
+        return R.success();
+    }
 
-	/**
-	 * 主营价格列表-总条数
-	 *
-	 * @param condition 查询条件
-	 * @return
-	 */
-	@PostMapping("/price/list/count")
-	public R getPriceListCount(@RequestBody Map<String, Object> condition) {
-		Integer count = materialService.getPriceListCount(condition);
-		return R.count(count);
-	}
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<Material> detail(Material material) {
-		Material detail = materialService.getOne(Condition.getQueryWrapper(material));
-		return R.data(detail);
-	}
+    /**
+     * 修改 物料
+     */
+    @PostMapping("/update")
+    public R update(@Valid @RequestBody Material material) {
+        materialService.editMaterial(material);
+        return R.success();
+    }
 
-	/**
-	 * 新增 物料
-	 */
-	@PostMapping("/save")
-	public R save(@Valid @RequestBody Material material) {
-		materialService.addMaterial(material);
-		return R.success();
-	}
+    /**
+     * 删除 物料
+     */
+    @GetMapping("/remove")
+    public R remove(@RequestParam("id") String id) {
+        materialService.delMaterial(id);
+        return R.success();
+    }
 
-	/**
-	 * 修改 物料
-	 */
-	@PostMapping("/update")
-	public R update(@Valid @RequestBody Material material) {
-		materialService.editMaterial(material);
-		return R.success();
-	}
-	
-	/**
-	 * 删除 物料
-	 */
-	@GetMapping("/remove")
-	public R remove(@RequestParam("id") String id) {
-		materialService.delMaterial(id);
-		return R.success();
-	}
 
-	
 }

hx-service/storage-restructure/src/main/java/com/fjhx/material/controller/MaterialExtendController.java

@@ -19,10 +19,9 @@ package com.fjhx.material.controller;
 import com.fjhx.material.service.IMaterialExtendService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
-
-import org.springblade.common.constant.ApiConstant;
-import org.springframework.web.bind.annotation.*;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 物料扩展 控制器
@@ -32,10 +31,10 @@ import org.springblade.core.boot.ctrl.BladeController;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/materialextend")
+@RequestMapping("/materialextend")
 @Api(value = "物料扩展", tags = "物料接口")
 public class MaterialExtendController extends BladeController {
 
-	private final IMaterialExtendService materialExtendService;
-	
+    private final IMaterialExtendService materialExtendService;
+
 }

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/controller/ApplyPurchaseController.java

@@ -21,12 +21,11 @@ import com.fjhx.subscribe.service.IApplyPurchaseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.springblade.common.constant.ApiConstant;
 import org.springblade.common.utils.ListPageMap;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
 import java.util.Map;
@@ -39,50 +38,52 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/applypurchase")
+@RequestMapping("/applypurchase")
 @Api(value = "申购单", tags = "申购单接口")
 public class ApplyPurchaseController extends BladeController {
 
-	private final IApplyPurchaseService applyPurchaseService;
+    private final IApplyPurchaseService applyPurchaseService;
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<ApplyPurchase> detail(@RequestParam("id") String id) {
+        ApplyPurchase detail = applyPurchaseService.detailApplyPurchase(id);
+        return R.data(detail);
+    }
 
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<ApplyPurchase> detail(@RequestParam("id")String id) {
-		ApplyPurchase detail = applyPurchaseService.detailApplyPurchase(id);
-		return R.data(detail);
-	}
-	
-	/**
-	 * 删除 申购单
-	 */
-	@PostMapping("/remove")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(applyPurchaseService.removeByIds(Func.toLongList(ids)));
-	}
+    /**
+     * 删除 申购单
+     */
+    @PostMapping("/remove")
+    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return R.status(applyPurchaseService.removeByIds(Func.toLongList(ids)));
+    }
 
-	/**
-	 * 列表
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping("/list")
-	public R list(@RequestBody Map<String, Object> condition){
-		ListPageMap.getListPageMap(condition);
-		List<ApplyPurchase> result = applyPurchaseService.getList(condition);
-		return R.success(result);
-	}
+    /**
+     * 列表
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping("/list")
+    public R list(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        List<ApplyPurchase> result = applyPurchaseService.getList(condition);
+        return R.success(result);
+    }
 
-	/**
-	 * 列表条数
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping("/list/count")
-	public R listCount(@RequestBody Map<String, Object> condition){
-		ListPageMap.getListPageMap(condition);
-		Integer count = applyPurchaseService.getListCount(condition);
-		return R.success(count);
-	}
+    /**
+     * 列表条数
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping("/list/count")
+    public R listCount(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        Integer count = applyPurchaseService.getListCount(condition);
+        return R.success(count);
+    }
 }

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/controller/ApplyPurchaseFlowController.java

@@ -21,10 +21,12 @@ import com.fjhx.subscribe.entity.ApplyPurchase;
 import com.fjhx.subscribe.service.IApplyPurchaseFlowService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
-import org.springblade.common.constant.ApiConstant;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.*;
+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;
 
 /**
  * 申购单流程 控制器
@@ -34,46 +36,46 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/applypurchase/flow")
+@RequestMapping("/applypurchase/flow")
 @Api(value = "申购单流程", tags = "申购单接口")
 public class ApplyPurchaseFlowController extends BladeController {
 
-	private final IApplyPurchaseFlowService flowService;
+    private final IApplyPurchaseFlowService flowService;
 
 
-	/**
-	 * 开始流程
-	 *
-	 * @param applyPurchase
-	 * @return
-	 */
-	@PostMapping(value = "/start")
-	public R start(@RequestBody ApplyPurchase applyPurchase) {
-		flowService.start(applyPurchase);
-		return R.success();
-	}
+    /**
+     * 开始流程
+     *
+     * @param applyPurchase
+     * @return
+     */
+    @PostMapping(value = "/start")
+    public R start(@RequestBody ApplyPurchase applyPurchase) {
+        flowService.start(applyPurchase);
+        return R.success();
+    }
 
-	/**
-	 * 审核
-	 *
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping(value = "/examine")
-	public R examine(@RequestBody FlowParam condition) {
-		flowService.examine(condition);
-		return R.success();
-	}
+    /**
+     * 审核
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping(value = "/examine")
+    public R examine(@RequestBody FlowParam condition) {
+        flowService.examine(condition);
+        return R.success();
+    }
 
-	/**
-	 * 回退
-	 *
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping(value = "/reject")
-	public R reject(@RequestBody FlowParam condition) {
-		flowService.reject(condition);
-		return R.success();
-	}
+    /**
+     * 回退
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping(value = "/reject")
+    public R reject(@RequestBody FlowParam condition) {
+        flowService.reject(condition);
+        return R.success();
+    }
 }

hx-service/storage-restructure/src/main/java/com/fjhx/subscribe/controller/ApplyPurchasedetailController.java

@@ -21,14 +21,12 @@ import com.fjhx.subscribe.service.IApplyPurchasedetailService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-
-import org.springblade.common.constant.ApiConstant;
 import org.springblade.common.utils.ListPageMap;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
 import java.util.Map;
@@ -41,50 +39,52 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/applypurchasedetail")
+@RequestMapping("/applypurchasedetail")
 @Api(value = "申购单明细", tags = "申购单明细接口")
 public class ApplyPurchasedetailController extends BladeController {
 
-	private final IApplyPurchasedetailService applyPurchasedetailService;
+    private final IApplyPurchasedetailService applyPurchasedetailService;
 
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<ApplyPurchasedetail> detail(ApplyPurchasedetail applyPurchasedetail) {
-		ApplyPurchasedetail detail = applyPurchasedetailService.getOne(Condition.getQueryWrapper(applyPurchasedetail));
-		return R.data(detail);
-	}
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<ApplyPurchasedetail> detail(ApplyPurchasedetail applyPurchasedetail) {
+        ApplyPurchasedetail detail = applyPurchasedetailService.getOne(Condition.getQueryWrapper(applyPurchasedetail));
+        return R.data(detail);
+    }
 
-	/**
-	 * 删除 申购单明细
-	 */
-	@PostMapping("/remove")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(applyPurchasedetailService.removeByIds(Func.toLongList(ids)));
-	}
+    /**
+     * 删除 申购单明细
+     */
+    @PostMapping("/remove")
+    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return R.status(applyPurchasedetailService.removeByIds(Func.toLongList(ids)));
+    }
 
-	/**
-	 * 列表
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping("/list")
-	public R list(@RequestBody Map<String, Object> condition){
-		ListPageMap.getListPageMap(condition);
-		List<ApplyPurchasedetail> result = applyPurchasedetailService.getList(condition);
-		return R.success(result);
-	}
+    /**
+     * 列表
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping("/list")
+    public R list(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        List<ApplyPurchasedetail> result = applyPurchasedetailService.getList(condition);
+        return R.success(result);
+    }
 
-	/**
-	 * 列表条数
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping("/list/count")
-	public R listCount(@RequestBody Map<String, Object> condition){
-		ListPageMap.getListPageMap(condition);
-		Integer count = applyPurchasedetailService.getListCount(condition);
-		return R.success(count);
-	}
+    /**
+     * 列表条数
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping("/list/count")
+    public R listCount(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        Integer count = applyPurchasedetailService.getListCount(condition);
+        return R.success(count);
+    }
 }

hx-service/storage-restructure/src/main/java/com/fjhx/supplier/controller/SupplierBankController.java

@@ -20,12 +20,12 @@ import com.fjhx.supplier.entity.SupplierBank;
 import com.fjhx.supplier.service.ISupplierBankService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
-
-import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -37,19 +37,19 @@ import java.util.List;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/supplierbank")
+@RequestMapping("/supplierbank")
 @Api(value = "供应商收款账户", tags = "供应商收款账户接口")
 public class SupplierBankController extends BladeController {
 
-	private final ISupplierBankService supplierBankService;
+    private final ISupplierBankService supplierBankService;
 
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<SupplierBank> detail(SupplierBank supplierBank) {
-		List<SupplierBank> list = supplierBankService.list(Condition.getQueryWrapper(supplierBank));
-		return R.list(list);
-	}
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<SupplierBank> detail(SupplierBank supplierBank) {
+        List<SupplierBank> list = supplierBankService.list(Condition.getQueryWrapper(supplierBank));
+        return R.list(list);
+    }
 
 }

hx-service/storage-restructure/src/main/java/com/fjhx/supplier/controller/SupplierContactsController.java

@@ -20,12 +20,12 @@ import com.fjhx.supplier.entity.SupplierContacts;
 import com.fjhx.supplier.service.ISupplierContactsService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
-
-import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -37,18 +37,18 @@ import java.util.List;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/suppliercontacts")
+@RequestMapping("/suppliercontacts")
 @Api(value = "供应商联系人", tags = "供应商联系人接口")
 public class SupplierContactsController extends BladeController {
 
-	private final ISupplierContactsService supplierContactsService;
+    private final ISupplierContactsService supplierContactsService;
 
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<SupplierContacts> detail(SupplierContacts supplierContacts) {
-		List<SupplierContacts> list = supplierContactsService.list(Condition.getQueryWrapper(supplierContacts));
-		return R.list(list);
-	}
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<SupplierContacts> detail(SupplierContacts supplierContacts) {
+        List<SupplierContacts> list = supplierContactsService.list(Condition.getQueryWrapper(supplierContacts));
+        return R.list(list);
+    }
 }

hx-service/storage-restructure/src/main/java/com/fjhx/supplier/controller/SupplierController.java

@@ -20,15 +20,13 @@ import com.fjhx.supplier.entity.Supplier;
 import com.fjhx.supplier.service.ISupplierService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.common.constant.ApiConstant;
 import org.springblade.common.utils.ListPageMap;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -40,72 +38,74 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/supplier")
+@RequestMapping("/supplier")
 @Api(value = "供应商", tags = "供应商接口")
 public class SupplierController extends BladeController {
 
-	private final ISupplierService supplierService;
+    private final ISupplierService supplierService;
+
+    /**
+     * 列表
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping("/list")
+    public R list(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        List<Supplier> result = supplierService.getList(condition);
+        return R.success(result);
+    }
 
-	/**
-	 * 列表
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping("/list")
-	public R list(@RequestBody Map<String, Object> condition){
-		ListPageMap.getListPageMap(condition);
-		List<Supplier> result = supplierService.getList(condition);
-		return R.success(result);
-	}
+    /**
+     * 列表条数
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping("/list/count")
+    public R listCount(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        Integer count = supplierService.getListCount(condition);
+        return R.success(count);
+    }
 
-	/**
-	 * 列表条数
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping("/list/count")
-	public R listCount(@RequestBody Map<String, Object> condition){
-		ListPageMap.getListPageMap(condition);
-		Integer count = supplierService.getListCount(condition);
-		return R.success(count);
-	}
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<Supplier> detail(Supplier supplier) {
+        Supplier detail = supplierService.getOne(Condition.getQueryWrapper(supplier));
+        return R.data(detail);
+    }
 
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<Supplier> detail(Supplier supplier) {
-		Supplier detail = supplierService.getOne(Condition.getQueryWrapper(supplier));
-		return R.data(detail);
-	}
 
+    /**
+     * 新增 供应商
+     */
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody Supplier supplier) {
+        supplierService.addSupplier(supplier);
+        return R.success();
+    }
 
-	/**
-	 * 新增 供应商
-	 */
-	@PostMapping("/save")
-	public R save(@Valid @RequestBody Supplier supplier) {
-		supplierService.addSupplier(supplier);
-		return R.success();
-	}
+    /**
+     * 修改 供应商
+     */
+    @PostMapping("/update")
+    public R update(@Valid @RequestBody Supplier supplier) {
+        supplierService.editSupplier(supplier);
+        return R.success();
+    }
 
-	/**
-	 * 修改 供应商
-	 */
-	@PostMapping("/update")
-	public R update(@Valid @RequestBody Supplier supplier) {
-		supplierService.editSupplier(supplier);
-		return R.success();
-	}
+    /**
+     * 删除 供应商
+     */
+    @GetMapping("/remove")
+    public R remove(@RequestParam String id) {
+        supplierService.delSupplier(id);
+        return R.success();
+    }
 
-	/**
-	 * 删除 供应商
-	 */
-	@GetMapping("/remove")
-	public R remove(@RequestParam String id) {
-		supplierService.delSupplier(id);
-		return R.success();
-	}
 
-	
 }

hx-service/storage-restructure/src/main/java/com/fjhx/supplier/controller/SupplierKeepController.java

@@ -20,12 +20,12 @@ import com.fjhx.supplier.entity.SupplierKeep;
 import com.fjhx.supplier.service.ISupplierKeepService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
-
-import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -37,20 +37,20 @@ import java.util.List;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/supplierkeep")
+@RequestMapping("/supplierkeep")
 @Api(value = "供应商维护记录", tags = "供应商维护记录接口")
 public class SupplierKeepController extends BladeController {
 
-	private final ISupplierKeepService supplierKeepService;
+    private final ISupplierKeepService supplierKeepService;
+
 
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<SupplierKeep> detail(SupplierKeep supplierKeep) {
+        List<SupplierKeep> list = supplierKeepService.list(Condition.getQueryWrapper(supplierKeep));
+        return R.list(list);
+    }
 
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	public R<SupplierKeep> detail(SupplierKeep supplierKeep) {
-		List<SupplierKeep> list = supplierKeepService.list(Condition.getQueryWrapper(supplierKeep));
-		return R.list(list);
-	}
-	
 }

hx-service/storage-restructure/src/main/java/com/fjhx/supplier/controller/SupplierPriceController.java

@@ -22,12 +22,13 @@ import com.fjhx.supplier.service.ISupplierPriceService;
 import com.fjhx.supplier.service.ISupplierService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
-
-import org.springblade.common.constant.ApiConstant;
 import org.springblade.common.utils.ListPageMap;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.*;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+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 javax.validation.Valid;
 import java.util.List;
@@ -41,45 +42,47 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/supplierprice")
+@RequestMapping("/supplierprice")
 @Api(value = "供应商价格", tags = "供应商价格接口")
 public class SupplierPriceController extends BladeController {
 
-	private final ISupplierPriceService supplierPriceService;
+    private final ISupplierPriceService supplierPriceService;
+
+    private final ISupplierService iSupplierService;
 
-	private final ISupplierService iSupplierService;
+    /**
+     * 新增 供应商价格
+     */
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody SupplierPrice supplierPrice) {
+        supplierPrice.setCreate();
+        return R.status(supplierPriceService.save(supplierPrice));
+    }
 
-	/**
-	 * 新增 供应商价格
-	 */
-	@PostMapping("/save")
-	public R save(@Valid @RequestBody SupplierPrice supplierPrice) {
-		supplierPrice.setCreate();
-		return R.status(supplierPriceService.save(supplierPrice));
-	}
+    /**
+     * 列表
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping("/list")
+    public R list(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        List<Supplier> result = iSupplierService.getSuPriceList(condition);
+        return R.success(result);
+    }
 
-	/**
-	 * 列表
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping("/list")
-	public R list(@RequestBody Map<String, Object> condition){
-		ListPageMap.getListPageMap(condition);
-		List<Supplier> result = iSupplierService.getSuPriceList(condition);
-		return R.success(result);
-	}
+    /**
+     * 列表条数
+     *
+     * @param condition
+     * @return
+     */
+    @PostMapping("/list/count")
+    public R listCount(@RequestBody Map<String, Object> condition) {
+        ListPageMap.getListPageMap(condition);
+        Integer count = iSupplierService.getSuPriceListCount(condition);
+        return R.success(count);
+    }
 
-	/**
-	 * 列表条数
-	 * @param condition
-	 * @return
-	 */
-	@PostMapping("/list/count")
-	public R listCount(@RequestBody Map<String, Object> condition){
-		ListPageMap.getListPageMap(condition);
-		Integer count = iSupplierService.getSuPriceListCount(condition);
-		return R.success(count);
-	}
-	
 }

hx-service/storage-restructure/src/main/java/com/fjhx/supplier/controller/SupplierProblemController.java

@@ -20,11 +20,9 @@ import com.fjhx.supplier.entity.SupplierProblem;
 import com.fjhx.supplier.service.ISupplierProblemService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
-
-import org.springblade.common.constant.ApiConstant;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.Map;
 
@@ -36,75 +34,82 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/supplierproblem")
+@RequestMapping("/supplierproblem")
 @Api(value = "供应商面料问题反馈表", tags = "供应商面料问题反馈表接口")
 public class SupplierProblemController extends BladeController {
 
-	private final ISupplierProblemService supplierProblemService;
+    private final ISupplierProblemService supplierProblemService;
+
+    /**
+     * 添加
+     *
+     * @param supplierProblem
+     * @return
+     */
+    @PostMapping("/add")
+    public R add(@RequestBody SupplierProblem supplierProblem) {
+        supplierProblemService.add(supplierProblem);
+        return R.success();
+    }
+
+    /**
+     * 修改
+     *
+     * @param supplierProblem
+     * @return
+     */
+    @PostMapping("/edit")
+    public R edit(@RequestBody SupplierProblem supplierProblem) {
+        supplierProblemService.edit(supplierProblem);
+        return R.success();
+    }
 
-	/**
-	 * 添加
-	 * @param supplierProblem
-	 * @return
-	 */
-	@PostMapping("/add")
-	public R add(@RequestBody SupplierProblem supplierProblem){
-		supplierProblemService.add(supplierProblem);
-		return R.success();
-	}
+    /**
+     * 删除
+     *
+     * @param supplierProblem
+     * @return
+     */
+    @PostMapping("/delete")
+    public R delete(@RequestBody SupplierProblem supplierProblem) {
+        supplierProblemService.delete(supplierProblem);
+        return R.success();
+    }
 
-	/**
-	 * 修改
-	 * @param supplierProblem
-	 * @return
-	 */
-	@PostMapping("/edit")
-	public R edit(@RequestBody SupplierProblem supplierProblem){
-		supplierProblemService.edit(supplierProblem);
-		return R.success();
-	}
+    /**
+     * 详情
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam("id") String id) {
+        SupplierProblem data = supplierProblemService.detail(id);
+        return R.success(data);
+    }
 
-	/**
-	 * 删除
-	 * @param supplierProblem
-	 * @return
-	 */
-	@PostMapping("/delete")
-	public R delete(@RequestBody SupplierProblem supplierProblem){
-		supplierProblemService.delete(supplierProblem);
-		return R.success();
-	}
+    /**
+     * 面料问题反馈统计
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/statisticsProblem")
+    public R statisticsProblem(@RequestParam("id") String id) {
+        Map<String, Integer> map = supplierProblemService.statisticsProblem(id);
+        return R.success(map);
+    }
 
-	/**
-	 * 详情
-	 * @param id
-	 * @return
-	 */
-	@GetMapping("/detail")
-	public R detail(@RequestParam("id")String id){
-		SupplierProblem data = supplierProblemService.detail(id);
-		return R.success(data);
-	}
+    /**
+     * 面料问题反馈统计条数
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/statisticsProblemCount")
+    public R statisticsProblemCount(@RequestParam("id") String id) {
+        Integer count = supplierProblemService.statisticsProblemCount(id);
+        return R.success(count);
+    }
 
-	/**
-	 * 面料问题反馈统计
-	 * @param id
-	 * @return
-	 */
-	@GetMapping("/statisticsProblem")
-	public R statisticsProblem(@RequestParam("id")String id){
-		Map<String, Integer> map = supplierProblemService.statisticsProblem(id);
-		return R.success(map);
-	}
-	/**
-	 * 面料问题反馈统计条数
-	 * @param id
-	 * @return
-	 */
-	@GetMapping("/statisticsProblemCount")
-	public R statisticsProblemCount(@RequestParam("id")String id){
-		Integer count = supplierProblemService.statisticsProblemCount(id);
-		return R.success(count);
-	}
-	
 }

hx-service/storage-restructure/src/main/java/com/fjhx/tag/controller/TagController.java

@@ -44,7 +44,7 @@
 // */
 //@RestController
 //@AllArgsConstructor
-//@RequestMapping(ApiConstant.Project.SAAS_STORAGE_REQUEST_PREFIX+"/tag")
+//@RequestMapping("/tag")
 //@Api(value = "物料库存明细", tags = "物料库存明细接口")
 //public class TagController extends BladeController {
 //

hx-service/storage-restructure/src/main/resources/application-dev.yml

@@ -11,6 +11,7 @@ spring:
     url: ${blade.datasource.storage.dev.url}
     username: ${blade.datasource.storage.dev.username}
     password: ${blade.datasource.storage.dev.password}
+
 #rocketmq 配置
 rocketmq:
   name-server: 114.116.8.29:9876

hx-service/storage-restructure/src/main/resources/application-prod.yml

@@ -9,6 +9,7 @@ spring:
     url: ${blade.datasource.storage.prod.url}
     username: ${blade.datasource.storage.prod.username}
     password: ${blade.datasource.storage.prod.password}
+
 #rocketmq 配置
 rocketmq:
   name-server: 114.116.8.29:9876

hx-service/storage-restructure/src/main/resources/application-test.yml

@@ -9,6 +9,7 @@ spring:
     url: ${blade.datasource.storage.test.url}
     username: ${blade.datasource.storage.test.username}
     password: ${blade.datasource.storage.test.password}
+
 #rocketmq 配置
 rocketmq:
   name-server: 114.116.8.29:9876