diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpInquiryController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpInquiryController.java index 3994d9d..3cd6a88 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpInquiryController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpInquiryController.java @@ -25,31 +25,30 @@ import java.util.List; @RestController @Api( - value = "ffc_询价接口", - tags = {"ffc_询价接口"} + value = "采购管理_询价" ) -@RequestMapping({"/api/v1/drpinquiry"}) +@RequestMapping({"/supply-chain/purchase/inquiry"}) public class DrpInquiryController extends BaseController { private static final Logger log = LoggerFactory.getLogger(DrpInquiryController.class); @Autowired @Lazy private DrpInquiryService drpInquiryService; - @PostMapping({"/save"}) + @PostMapping({"/draft/add"}) @ApiOperation("新增/编辑保存询价单") public AjaxResult saveInquiry(@RequestBody @Valid DrpInquiryAddDTO request) { DrpInquiryAddVO result = this.drpInquiryService.saveInquiryAndDetails(request); return AjaxResult.success(result); } - @PostMapping({"/commit"}) + @PostMapping({"/add"}) @ApiOperation("新增/编辑提交询价单") public AjaxResult commitInquiry(@RequestBody @Valid DrpInquiryAddDTO request) { DrpInquiryAddVO result = this.drpInquiryService.commitInquiryAndDetails(request); return AjaxResult.success(result); } - @PostMapping({"/page"}) + @PostMapping({"/list"}) @ApiOperation("分页查询询价单") public TableDataInfo queryInquiry(@RequestBody @Valid DrpInquiryPageDTO request) { startPage(); @@ -64,7 +63,6 @@ public class DrpInquiryController extends BaseController { return AjaxResult.success(); } - /** @deprecated */ @PostMapping({"/cancel"}) @ApiOperation("取消询价") public AjaxResult cancelInquiry(@RequestBody DrpInquiryAddVO request) { @@ -72,33 +70,33 @@ public class DrpInquiryController extends BaseController { return AjaxResult.success(); } - @PostMapping({"/list/supplier-quote/{inquiryId}"}) + @PostMapping({"/info/{inquiryId}"}) @ApiOperation("查询询价单报价总详情") public AjaxResult listSupplierQuote(@PathVariable("inquiryId") String inquiryId) { return AjaxResult.success(this.drpInquiryService.listSupplierQuote(inquiryId)); } - @PostMapping({"/finalBidsQuote"}) + @PostMapping({"/supplier/quotation/details"}) @ApiOperation("查询各个供应商报价明细") public AjaxResult finalBidsQuote(@RequestBody DrpFinalBidsDTO request) { List result = this.drpInquiryService.finalBidsQuote(request); return AjaxResult.success(result); } - @PostMapping({"/commitFinalBids"}) + @PostMapping({"/award"}) @ApiOperation("采购决标") public AjaxResult commitFinalBids(@RequestBody @Valid DrpCommitFinalBidsDTO request) { this.drpInquiryService.commitFinalBids(request); return AjaxResult.success(); } - @PostMapping({"/query/supplier-quote/detail/{inquirySupplierId}"}) + @PostMapping({"/supplier/quotation/details/{inquirySupplierId}"}) @ApiOperation("查看供应商报价详情") public AjaxResult querySupplierQuoteDetail(@PathVariable("inquirySupplierId") Long inquirySupplierId) { return AjaxResult.success(this.drpInquiryService.querySupplierQuoteDetail(inquirySupplierId)); } - @PostMapping({"/sendNotice/{inquiryId}"}) + @PostMapping({"/notice/{inquiryId}"}) @ApiOperation("手动通知") public AjaxResult sendNotice(@PathVariable("inquiryId") String inquiryId) { this.drpInquiryService.sendNotice(inquiryId); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpInspectGoodsController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpInspectGoodsController.java index 16b1e50..558bb43 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpInspectGoodsController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpInspectGoodsController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @RestController -@RequestMapping({"/api/v2/drp/drp-inspect-goods"}) +@RequestMapping({"/supply-chain/purchase/check-goods"}) @Api( value = "采购验货", tags = {"采购验货"} @@ -36,27 +36,27 @@ public class DrpInspectGoodsController extends BaseController { @Lazy private DrpInspectGoodsService drpInspectGoodsService; - @PostMapping({"/commit"}) + @PostMapping({"/add"}) @ApiOperation("新增/编辑提交验货单") public AjaxResult addCommitInspectGoods(@RequestBody @Valid DrpInspectGoodsCommitAddDTO content) { return AjaxResult.success(this.drpInspectGoodsService.addCommitInspectGoods(content)); } - @PostMapping({"/save"}) + @PostMapping({"/draft/add"}) @ApiOperation("新增/编辑保存验货单") public AjaxResult addSaveInspectGoods(@RequestBody @Valid DrpInspectGoodsCommitAddDTO content) { this.drpInspectGoodsService.addSaveInspectGoods(content); return AjaxResult.success(); } - @PostMapping({"/page"}) + @PostMapping({"/list"}) @ApiOperation("分页查询验货单列表") public TableDataInfo pageInspectGoods(@RequestBody @Valid DrpInspectGoodsPageDTO content) { startPage(); return getDataTable(this.drpInspectGoodsService.pageInspectGoods(content)); } - @PostMapping({"/page-detail"}) + @PostMapping({"/info"}) @ApiOperation("分页查询验货单明细") public TableDataInfo pageInspectGoodsDetail(@RequestBody @Valid DrpInspectGoodsDetailPageDTO content) { startPage(); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpMarketPriceController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpMarketPriceController.java index 2d32050..ba93e3a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpMarketPriceController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpMarketPriceController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @RestController -@RequestMapping({"/api/v1/DrpMarketPrice"}) +@RequestMapping({"/supply-chain/purchase/market-price"}) @Api( value = "市场价格采集" ) @@ -28,20 +28,20 @@ public class DrpMarketPriceController extends BaseController { @Lazy private DrpMarketPriceService drpMarketPriceService; - @PostMapping({"/commit"}) + @PostMapping({"/add"}) @ApiOperation("新增采集") public AjaxResult commit(@RequestBody @Valid DrpMarketPriceCommitDTO request) { return AjaxResult.success(this.drpMarketPriceService.commit(request)); } - @PostMapping({"/page"}) + @PostMapping({"/list"}) @ApiOperation("分页查询采集价格") public TableDataInfo page(@RequestBody @Valid DrpMarketPricePageDTO request) { startPage(); return getDataTable(this.drpMarketPriceService.page(request)); } - @PostMapping({"/detail/{id}"}) + @PostMapping({"/info/{id}"}) @ApiOperation("采集详情") public AjaxResult detail(@PathVariable("id") String id) { return AjaxResult.success(this.drpMarketPriceService.detail(id)); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpMaterialWinBidRecordsController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpMaterialWinBidRecordsController.java index 20a159f..fdcd82e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpMaterialWinBidRecordsController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpMaterialWinBidRecordsController.java @@ -23,14 +23,14 @@ import java.util.List; @Api( value = "货品价格" ) -@RequestMapping({"/api/v1/drp/material-win-bid-records"}) +@RequestMapping({"/supply-chain/purchase/win-bid"}) public class DrpMaterialWinBidRecordsController extends BaseController { private static final Logger log = LoggerFactory.getLogger(DrpMaterialWinBidRecordsController.class); @Autowired @Lazy private DrpMaterialWinBidRecordsService drpMaterialWinBidRecordsService; - @PostMapping({"/page"}) + @PostMapping({"/material/list"}) @ApiOperation("分页获取原料中标信息") public TableDataInfo pageMaterialBidRecords(@RequestBody @Valid DrpMaterialBidRecordsPageDTO request) { startPage(); @@ -43,7 +43,7 @@ public class DrpMaterialWinBidRecordsController extends BaseController { return AjaxResult.success(this.drpMaterialWinBidRecordsService.listSupplierWinRecords(request)); } - @PostMapping({"/story/bidPrice"}) + @PostMapping({"/history/price"}) @ApiOperation("获取商品历史中标价") public DrpMaterialStoryBidPriceVO storyBidPrice(@PathVariable("bidId") Long bidId) { return this.drpMaterialWinBidRecordsService.storyBidPrice(bidId); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpOrderGoodsController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpOrderGoodsController.java index a26c0a1..660165e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpOrderGoodsController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpOrderGoodsController.java @@ -20,10 +20,9 @@ import javax.validation.Valid; import java.util.List; @RestController -@RequestMapping({"/api/v1/drp-order-goods"}) +@RequestMapping({"/supply-chain/purchase/order"}) @Api( - value = "gyp_采购订单", - tags = {"gyp_采购订单"} + value = "采购订单" ) public class DrpOrderGoodsController extends BaseController { @Autowired @@ -33,19 +32,19 @@ public class DrpOrderGoodsController extends BaseController { @Lazy private DrpOrderGoodsDetailService drpOrderGoodsDetailService; - @PostMapping({"/add/save"}) + @PostMapping({"/draft/add"}) @ApiOperation("新增/编辑采购订单") public AjaxResult addSaveDrpOrderGoods(@RequestBody @Valid DrpOrderGoodsSaveDTO content) { return AjaxResult.success(this.drpPuchaseOrderGoodsService.addSaveDrpOrderGoods(content)); } - @PostMapping({"/add/commit"}) + @PostMapping({"/add"}) @ApiOperation("新增/编辑采购订单提交") public AjaxResult addCommitDrpOrderGoods(@RequestBody @Valid DrpOrderGoodsSaveDTO content) { return AjaxResult.success(this.drpPuchaseOrderGoodsService.addCommitDrpOrderGoods(content)); } - @PostMapping({"/page"}) + @PostMapping({"/list"}) @ApiOperation("分页查询采购订单") public TableDataInfo getDrpOrderGoodsPage(@RequestBody @Valid DrpOrderGoodsPageDTO content) { startPage(); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpOtherController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpOtherController.java index 2421cd3..1b7e4d0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpOtherController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpOtherController.java @@ -18,10 +18,9 @@ import javax.validation.Valid; import java.util.List; @RestController -@RequestMapping({"/api/v1/drp-other"}) +@RequestMapping({"/supply-chain/purchase/dish"}) @Api( - value = "gyp-出入库其他接口", - tags = {"gyp-出入库其他接口"} + value = "gyp-出入库其他接口" ) public class DrpOtherController { private static final Logger log = LoggerFactory.getLogger(DrpOtherController.class); @@ -29,7 +28,7 @@ public class DrpOtherController { @Lazy private DrpOtherService drpOtherService; - @PostMapping({"/dishes/convert"}) + @PostMapping({"/material/cal"}) @ApiOperation("获取菜品原料反算接口") public List dishesConvert(@RequestBody @Valid List content) { return this.drpOtherService.dishesConvert(content); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpProcurementContractController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpProcurementContractController.java index 2df8e59..8252343 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpProcurementContractController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpProcurementContractController.java @@ -18,10 +18,9 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @RestController -@RequestMapping({"/api/v1/drpProcurementContract"}) +@RequestMapping({"/supply-chain/purchase/contract"}) @Api( - value = "ffc-采购合同主表", - tags = {"ffc-采购合同主表"} + value = "采购合同" ) public class DrpProcurementContractController extends BaseController { private static final Logger log = LoggerFactory.getLogger(DrpProcurementContractController.class); @@ -29,21 +28,21 @@ public class DrpProcurementContractController extends BaseController { @Lazy private DrpProcurementContractService drpProcurementContractService; - @PostMapping({"/commit"}) + @PostMapping({"/add"}) @ApiOperation("新增合同") public AjaxResult commit(@RequestBody @Valid DrpContractCommitDTO request) { this.drpProcurementContractService.commit(request); return AjaxResult.success(); } - @PostMapping({"/page"}) + @PostMapping({"/list"}) @ApiOperation("分页查询合同") public TableDataInfo page(@RequestBody @Valid DrpContractPageDTO request) { startPage(); return getDataTable(this.drpProcurementContractService.page(request)); } - @PostMapping({"/detail/{contractId}"}) + @PostMapping({"/info/{contractId}"}) @ApiOperation("合同详情") public AjaxResult detail(@PathVariable("contractId") String contractId) { return AjaxResult.success(this.drpProcurementContractService.detail(contractId)); @@ -56,7 +55,7 @@ public class DrpProcurementContractController extends BaseController { return AjaxResult.success(); } - @PostMapping({"/close/{contractId}"}) + @PostMapping({"/end/{contractId}"}) @ApiOperation("终止合同") public AjaxResult close(@PathVariable("contractId") String contractId) { this.drpProcurementContractService.close(contractId); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpProductionPlanController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpProductionPlanController.java index 9c0ed64..50b7237 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpProductionPlanController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpProductionPlanController.java @@ -21,7 +21,7 @@ import javax.validation.Valid; import java.util.List; @RestController -@RequestMapping({"/api/v1/drp-production-plan"}) +@RequestMapping({"/supply-chain/purchase/production-plan"}) @Api( value = "gyp-生产计划", tags = {"gyp-生产计划"} @@ -35,7 +35,7 @@ public class DrpProductionPlanController extends BaseController { @Lazy private DrpPurchasePlanDisassemblyService drpPurchasePlanDisassemblyService; - @PostMapping({"/page"}) + @PostMapping({"/list"}) @ApiOperation("分页查询生产计划") public TableDataInfo pageProductionPlan(@RequestBody @Valid DrpProductionPlanPageDTO request) { startPage(); @@ -43,11 +43,11 @@ public class DrpProductionPlanController extends BaseController { return getDataTable(resultList); } - @PostMapping({"/materialCount"}) - @ApiOperation("生产计划货品数量") - public AjaxResult materialCount(@RequestBody @Valid DrpProductionPlanPageDTO request) { - return AjaxResult.success(this.drpProductionPlanService.materialCount(request)); - } +// @PostMapping({"/materialCount"}) +// @ApiOperation("生产计划货品数量") +// public AjaxResult materialCount(@RequestBody @Valid DrpProductionPlanPageDTO request) { +// return AjaxResult.success(this.drpProductionPlanService.materialCount(request)); +// } // @PostMapping({"/preOrderInfo"}) // @ApiOperation("根据预订单创建生产计划") @@ -68,16 +68,16 @@ public class DrpProductionPlanController extends BaseController { return AjaxResult.success(); } - @PostMapping({"/generate/pur-plan"}) - @ApiOperation("生产计划生成采购计划") - public AjaxResult generatePurPlan(@RequestBody @Valid List request) { - if (CollUtil.isEmpty(request)) { - throw new ServiceException("采购明细不能为空"); - } else { - String productionId = this.drpProductionPlanService.generatePurPlan(request); - return AjaxResult.success(productionId); - } - } +// @PostMapping({"/generate/pur-plan"}) +// @ApiOperation("生产计划生成采购计划") +// public AjaxResult generatePurPlan(@RequestBody @Valid List request) { +// if (CollUtil.isEmpty(request)) { +// throw new ServiceException("采购明细不能为空"); +// } else { +// String productionId = this.drpProductionPlanService.generatePurPlan(request); +// return AjaxResult.success(productionId); +// } +// } // @PostMapping({"/generate/batch/pur-plan"}) // @ApiOperation("批量生产计划生成采购计划") @@ -90,44 +90,44 @@ public class DrpProductionPlanController extends BaseController { // } // } - @PostMapping({"/generate/batch/pur-plan"}) + @PostMapping({"/purchase-plan/generate"}) @ApiOperation("生产计划生成采购计划") public AjaxResult generateBatchPurPlan(@RequestBody @Valid DrpProductionGeneratePurPlanDTO request) { return AjaxResult.success(this.drpPurchasePlanDisassemblyService.generateBatchPurPlan(request)); } /** @deprecated */ - @PostMapping({"/list/detail-direct/{productionPlanId}"}) - @ApiOperation("查询生产计划详情-菜品") - public AjaxResult listDetailDirect(@PathVariable("productionPlanId") String productionPlanId) { - return AjaxResult.success(this.drpProductionPlanService.listDetailDirect(productionPlanId)); - } +// @PostMapping({"/list/detail-direct/{productionPlanId}"}) +// @ApiOperation("查询生产计划详情-菜品") +// public AjaxResult listDetailDirect(@PathVariable("productionPlanId") String productionPlanId) { +// return AjaxResult.success(this.drpProductionPlanService.listDetailDirect(productionPlanId)); +// } +// +// @PostMapping({"/list/detail-recipe-order"}) +// @ApiOperation("获取生产计划详情-菜谱/预订单") +// public AjaxResult listDetailRecipeOrder(@RequestBody @Valid String productionPlanId) { +// return AjaxResult.success(drpProductionPlanService.listDetailRecipeOrder(productionPlanId)); +// } - @PostMapping({"/list/detail-recipe-order"}) - @ApiOperation("获取生产计划详情-菜谱/预订单") - public AjaxResult listDetailRecipeOrder(@RequestBody @Valid String productionPlanId) { - return AjaxResult.success(drpProductionPlanService.listDetailRecipeOrder(productionPlanId)); - } - - @PostMapping({"/detail/{productionPlanId}"}) + @PostMapping({"/info/{productionPlanId}"}) @ApiOperation("获取生产计划详情") public AjaxResult detail(@PathVariable("productionPlanId") String productionPlanId) { return AjaxResult.success(drpProductionPlanService.detail(productionPlanId)); } - @PostMapping({"/list/production-dishes/sum/{productionPlanId}"}) + @PostMapping({"/dish/{productionPlanId}"}) @ApiOperation("获取生产计划菜品详情汇总") public AjaxResult listProductionDishesSum(@PathVariable("productionPlanId") String productionPlanId) { return AjaxResult.success(drpProductionPlanService.listProductionDishesSum(productionPlanId)); } - @PostMapping({"/list/production-dishes/sumByPlanIds"}) - @ApiOperation("获取生产计划菜品详情汇总") - public AjaxResult listProductionDishesSumByPlanIds(@RequestBody @Valid List productionPlanIdList) { - return AjaxResult.success(drpProductionPlanService.listProductionDishesSumByPlanIds(productionPlanIdList)); - } +// @PostMapping({"/list/production-dishes/sumByPlanIds"}) +// @ApiOperation("获取生产计划菜品详情汇总") +// public AjaxResult listProductionDishesSumByPlanIds(@RequestBody @Valid List productionPlanIdList) { +// return AjaxResult.success(drpProductionPlanService.listProductionDishesSumByPlanIds(productionPlanIdList)); +// } - @PostMapping({"/save/reserve-rate"}) + @PostMapping({"/reserve/add"}) @ApiOperation("存储预留比例值") public AjaxResult saveReserveRate(@RequestBody @Valid List content) { this.drpProductionPlanService.saveReserveRate(content); @@ -145,9 +145,9 @@ public class DrpProductionPlanController extends BaseController { // } // } - @PostMapping({"/getMenuMaterialByPlanIdList"}) - @ApiOperation("获取生产计划菜品原料重量及预留比例") - public AjaxResult getMenuMaterialByPlanIdList(@RequestBody @Valid List planIdList) { - return AjaxResult.success(drpProductionPlanService.getMenuMaterialByPlanIdList(planIdList)); - } +// @PostMapping({"/getMenuMaterialByPlanIdList"}) +// @ApiOperation("获取生产计划菜品原料重量及预留比例") +// public AjaxResult getMenuMaterialByPlanIdList(@RequestBody @Valid List planIdList) { +// return AjaxResult.success(drpProductionPlanService.getMenuMaterialByPlanIdList(planIdList)); +// } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpPurchasePlanController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpPurchasePlanController.java index bcb5a10..bbf6596 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpPurchasePlanController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpPurchasePlanController.java @@ -21,10 +21,9 @@ import javax.validation.Valid; import java.util.List; @RestController -@RequestMapping({"/api/v1/drppurchaseplan"}) +@RequestMapping({"/supply-chain/purchase/purchase-plan"}) @Api( - value = "ffc_采购计划", - tags = {"ffc_采购计划"} + value = "采购计划" ) public class DrpPurchasePlanController extends BaseController { private static final Logger log = LoggerFactory.getLogger(DrpPurchasePlanController.class); @@ -35,28 +34,28 @@ public class DrpPurchasePlanController extends BaseController { @Lazy private DrpPurchasePlanDisassemblyService drpPurchasePlanDisassemblyService; - @PostMapping({"/page/material-info"}) + @PostMapping({"/material/list"}) @ApiOperation("后台通用-获取货品信息") public TableDataInfo pageMaterialInfo(@RequestBody DrpPurMaterialInfoPageDTO content) { startPage(); return getDataTable(this.drpPurchasePlanService.pageMaterialInfo(content)); } - @PostMapping({"/add/save"}) + @PostMapping({"/draft/add"}) @ApiOperation("新增/编辑采购计划保存") public AjaxResult addSaveDrpPurchasePlan(@RequestBody @Valid DrpPurchasePlanSaveDTO content) { DrpPurchasePlanAddVO result = this.drpPurchasePlanService.addSaveDrpPurchasePlan(content); return AjaxResult.success(result); } - @PostMapping({"/add/commit"}) + @PostMapping({"/add"}) @ApiOperation("新增/编辑采购计划提交") public AjaxResult addCommitDrpPurchasePlan(@RequestBody @Valid DrpPurchasePlanSaveDTO content) { DrpPurchasePlanAddVO result = this.drpPurchasePlanService.addCommitDrpPurchasePlan(content); return AjaxResult.success(result); } - @PostMapping({"/page"}) + @PostMapping({"/list"}) @ApiOperation("分页获取采购计划") public TableDataInfo getDrpPurchasePlanPage(@RequestBody DrpPurchasePlanPageDTO content) { startPage(); @@ -64,13 +63,13 @@ public class DrpPurchasePlanController extends BaseController { return getDataTable(resultPage); } - @PostMapping({"/materialCount"}) - @ApiOperation("采购计划货品数量") - public AjaxResult materialCount(@RequestBody @Valid DrpPurchasePlanPageDTO content) { - return AjaxResult.success(this.drpPurchasePlanService.materialCount(content)); - } +// @PostMapping({"/materialCount"}) +// @ApiOperation("采购计划货品数量") +// public AjaxResult materialCount(@RequestBody @Valid DrpPurchasePlanPageDTO content) { +// return AjaxResult.success(this.drpPurchasePlanService.materialCount(content)); +// } - @PostMapping({"/detail/{planId}"}) + @PostMapping({"/info/{planId}"}) @ApiOperation("采购计划详情") public AjaxResult detail(@PathVariable("planId") String planId) { return AjaxResult.success(this.drpPurchasePlanService.detail(planId)); @@ -82,7 +81,7 @@ public class DrpPurchasePlanController extends BaseController { // return this.drpPurchasePlanService.mergeDetail((List)leRequest.getContent()); // } - @PostMapping({"/syncPurchasePrice"}) + @PostMapping({"/price/sync"}) @ApiOperation("同步货品价格") public AjaxResult syncPurchasePrice(@RequestBody @Valid DrpSyncPurchasePriceDTO content) { return AjaxResult.success(this.drpPurchasePlanService.syncPurchasePrice(content.getMaterialIdList(), content.getCanteenId())); @@ -101,27 +100,27 @@ public class DrpPurchasePlanController extends BaseController { // return AjaxResult.success(this.drpPurchasePlanService.sendEmail(content)); // } - @PostMapping({"/page/material"}) - @ApiOperation("采购单分页获取原料") - public TableDataInfo pageMaterial(@RequestBody DrpPurMaterialPageDTO content) { - startPage(); - List resultPage = this.drpPurchasePlanService.pageMaterial(content); - return getDataTable(resultPage); - } - - @PostMapping({"/generate/order-goods"}) - @ApiOperation("采购生成采购订单") - public AjaxResult generateOrderGoods(@RequestBody DrpPurGenerateOrderGoodsDTO content) { - String orderGoodsId = this.drpPurchasePlanService.generateOrderGoods(content); - return AjaxResult.success(orderGoodsId); - } - - @PostMapping({"/generate/inquiry"}) - @ApiOperation("采购生成询价单") - public AjaxResult generateInquiry(@RequestBody DrpPurGenerateInquiryDTO content) { - String inquiryId = this.drpPurchasePlanService.generateInquiry(content); - return AjaxResult.success(inquiryId); - } +// @PostMapping({"/page/material"}) +// @ApiOperation("采购单分页获取原料") +// public TableDataInfo pageMaterial(@RequestBody DrpPurMaterialPageDTO content) { +// startPage(); +// List resultPage = this.drpPurchasePlanService.pageMaterial(content); +// return getDataTable(resultPage); +// } +// +// @PostMapping({"/generate/order-goods"}) +// @ApiOperation("采购生成采购订单") +// public AjaxResult generateOrderGoods(@RequestBody DrpPurGenerateOrderGoodsDTO content) { +// String orderGoodsId = this.drpPurchasePlanService.generateOrderGoods(content); +// return AjaxResult.success(orderGoodsId); +// } +// +// @PostMapping({"/generate/inquiry"}) +// @ApiOperation("采购生成询价单") +// public AjaxResult generateInquiry(@RequestBody DrpPurGenerateInquiryDTO content) { +// String inquiryId = this.drpPurchasePlanService.generateInquiry(content); +// return AjaxResult.success(inquiryId); +// } // @PostMapping({"/apply/approval"}) // @ApiOperation("采购审批申请") @@ -130,38 +129,38 @@ public class DrpPurchasePlanController extends BaseController { // this.drpPurchasePlanService.applyApproval(planId); // } - @PostMapping({"/list/pur-detail/inventory"}) - @ApiOperation("获取采购明细的仓库库存") - public AjaxResult listPurDetailInventory(@RequestBody @Valid MaterialInventoryDTO content) { - return AjaxResult.success(this.drpPurchasePlanService.listPurDetailInventory(content)); - } - - @PostMapping({"/list/detail"}) - @ApiOperation("根据采购单号获取采购明细") - public AjaxResult listPurDetail(@RequestBody @Valid String planId) { - return AjaxResult.success(this.drpPurchasePlanService.listPurDetail(planId)); - } - - @PostMapping({"/generate/order"}) - @ApiOperation("采购计划拆解生成采购订单") - public AjaxResult purGenerateOrder(@RequestBody @Valid List content) { - this.drpPurchasePlanService.purGenerateOrder(content); - return AjaxResult.success(); - } - - @PostMapping({"/generate/dismantle/inquiry"}) - @ApiOperation("采购计划拆解生成采购询价单") - public AjaxResult purGenerateInquiry(@RequestBody @Valid List content) { - this.drpPurchasePlanService.purGenerateInquiry(content); - return AjaxResult.success(); - } - - @PostMapping({"/generate/dismantle/inquiryByGoods"}) - @ApiOperation("采购计划拆解生成采购询价单") - public AjaxResult purGenerateInquiryByGoods(@RequestBody @Valid DrpPurDismantleGenerateInquiryDTO content) { - this.drpPurchasePlanService.purGenerateInquiryByGoods(content); - return AjaxResult.success(); - } +// @PostMapping({"/list/pur-detail/inventory"}) +// @ApiOperation("获取采购明细的仓库库存") +// public AjaxResult listPurDetailInventory(@RequestBody @Valid MaterialInventoryDTO content) { +// return AjaxResult.success(this.drpPurchasePlanService.listPurDetailInventory(content)); +// } +// +// @PostMapping({"/list/detail"}) +// @ApiOperation("根据采购单号获取采购明细") +// public AjaxResult listPurDetail(@RequestBody @Valid String planId) { +// return AjaxResult.success(this.drpPurchasePlanService.listPurDetail(planId)); +// } +// +// @PostMapping({"/generate/order"}) +// @ApiOperation("采购计划拆解生成采购订单") +// public AjaxResult purGenerateOrder(@RequestBody @Valid List content) { +// this.drpPurchasePlanService.purGenerateOrder(content); +// return AjaxResult.success(); +// } +// +// @PostMapping({"/generate/dismantle/inquiry"}) +// @ApiOperation("采购计划拆解生成采购询价单") +// public AjaxResult purGenerateInquiry(@RequestBody @Valid List content) { +// this.drpPurchasePlanService.purGenerateInquiry(content); +// return AjaxResult.success(); +// } +// +// @PostMapping({"/generate/dismantle/inquiryByGoods"}) +// @ApiOperation("采购计划拆解生成采购询价单") +// public AjaxResult purGenerateInquiryByGoods(@RequestBody @Valid DrpPurDismantleGenerateInquiryDTO content) { +// this.drpPurchasePlanService.purGenerateInquiryByGoods(content); +// return AjaxResult.success(); +// } // @PostMapping({"/approve/agree"}) // @ApiOperation("采购计划-审批同意") @@ -208,26 +207,26 @@ public class DrpPurchasePlanController extends BaseController { // } // } - @PostMapping({"/mergeDetailByPlanId"}) - @ApiOperation("采购计划详情") - public AjaxResult planMergeDetail(@RequestBody @Valid List content) { - return AjaxResult.success(this.drpPurchasePlanDisassemblyService.planMergeDetail(content)); - } +// @PostMapping({"/mergeDetailByPlanId"}) +// @ApiOperation("采购计划详情") +// public AjaxResult planMergeDetail(@RequestBody @Valid List content) { +// return AjaxResult.success(this.drpPurchasePlanDisassemblyService.planMergeDetail(content)); +// } - @PostMapping({"/deduction/inventory/{areaId}"}) + @PostMapping({"/config/deduction/inventory/{areaId}"}) @ApiOperation("是否可以扣减库存") public AjaxResult deductionInventory(@PathVariable("areaId") Long areaId) { return AjaxResult.success(this.drpPurchasePlanService.deductionInventory(areaId)); } - @PostMapping({"/direct/generate/inquiry/{planId}"}) + @PostMapping({"/inquiry/generate/{planId}"}) @ApiOperation("直接生成采购询价单") public AjaxResult directGenerateInquiry(@PathVariable("planId") String planId) { String inquiryId = this.drpPurchasePlanDisassemblyService.directGenerateInquiry(planId); return AjaxResult.success(inquiryId); } - @PostMapping({"/direct/generate/order/{planId}"}) + @PostMapping({"/order/generate/{planId}"}) @ApiOperation("直接生成采购订单") public AjaxResult directGenerateOrder(@PathVariable String planId) { String inquiryId = this.drpPurchasePlanDisassemblyService.directGenerateOrder(planId); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpSupplierController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpSupplierController.java index ca139d9..f69259f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpSupplierController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpSupplierController.java @@ -16,10 +16,9 @@ import org.springframework.web.bind.annotation.*; import java.util.List; @RestController -@RequestMapping({"/api/v1/drpsupplier"}) +@RequestMapping({"/supply-chain/purchase/supplier"}) @Api( - value = "gyp_供应商信息管理", - tags = {"gyp_供应商信息管理"} + value = "供应商管理" ) public class DrpSupplierController { private static final Logger log = LoggerFactory.getLogger(DrpSupplierController.class); @@ -88,7 +87,7 @@ public class DrpSupplierController { // return LeResponse.succ(); // } - @PostMapping({"/list/supplier"}) + @PostMapping({"/list"}) @ApiOperation("查询供应商集合") public AjaxResult listSupplier(@RequestBody DrpSupplierQueryDTO content) { List resultList = this.drpPurchaseSupplierService.listSupplier(content); @@ -124,8 +123,8 @@ public class DrpSupplierController { // return PageVO.of(resultList); // } - @PostMapping({"/get/main/info/{supplierId}"}) - @ApiOperation("获取供应商主要信息接口") + @PostMapping({"/info/{supplierId}"}) + @ApiOperation("获取供应商信息接口") public DrpSupplierMainInfoVO getMainInfoById(@PathVariable("supplierId") Long supplierId) { return this.drpPurchaseSupplierService.getMainInfoById(supplierId); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/SupplyUserController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/SupplyUserController.java index c78198c..86ee850 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/SupplyUserController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/SupplyUserController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController -@RequestMapping({"/supply/user"}) +@RequestMapping({"//supply-chain/operate-user"}) public class SupplyUserController extends BaseController { @Autowired private SupplyUserService supplyUserService;