bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

供应链-采购管理api修改

This commit is contained in:
gaowdong 2025-05-19 17:00:37 +08:00
parent d4a6118e1f
commit 532eb15e38
11 changed files with 158 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpInquiryController.java
View File

@ -25,31 +25,30 @@ import java.util.List;
@RestController @RestController
@Api( @Api(
value = "ffc_询价接口", value = "采购管理_询价"
tags = {"ffc_询价接口"}
) )
@RequestMapping({"/api/v1/drpinquiry"}) @RequestMapping({"/supply-chain/purchase/inquiry"})
public class DrpInquiryController extends BaseController { public class DrpInquiryController extends BaseController {
private static final Logger log = LoggerFactory.getLogger(DrpInquiryController.class); private static final Logger log = LoggerFactory.getLogger(DrpInquiryController.class);
@Autowired @Autowired
@Lazy @Lazy
private DrpInquiryService drpInquiryService; private DrpInquiryService drpInquiryService;
@PostMapping({"/save"}) @PostMapping({"/draft/add"})
@ApiOperation("新增/编辑保存询价单") @ApiOperation("新增/编辑保存询价单")
public AjaxResult saveInquiry(@RequestBody @Valid DrpInquiryAddDTO request) { public AjaxResult saveInquiry(@RequestBody @Valid DrpInquiryAddDTO request) {
DrpInquiryAddVO result = this.drpInquiryService.saveInquiryAndDetails(request); DrpInquiryAddVO result = this.drpInquiryService.saveInquiryAndDetails(request);
return AjaxResult.success(result); return AjaxResult.success(result);
} }
@PostMapping({"/commit"}) @PostMapping({"/add"})
@ApiOperation("新增/编辑提交询价单") @ApiOperation("新增/编辑提交询价单")
public AjaxResult commitInquiry(@RequestBody @Valid DrpInquiryAddDTO request) { public AjaxResult commitInquiry(@RequestBody @Valid DrpInquiryAddDTO request) {
DrpInquiryAddVO result = this.drpInquiryService.commitInquiryAndDetails(request); DrpInquiryAddVO result = this.drpInquiryService.commitInquiryAndDetails(request);
return AjaxResult.success(result); return AjaxResult.success(result);
} }
@PostMapping({"/page"}) @PostMapping({"/list"})
@ApiOperation("分页查询询价单") @ApiOperation("分页查询询价单")
public TableDataInfo queryInquiry(@RequestBody @Valid DrpInquiryPageDTO request) { public TableDataInfo queryInquiry(@RequestBody @Valid DrpInquiryPageDTO request) {
startPage(); startPage();
@ -64,7 +63,6 @@ public class DrpInquiryController extends BaseController {
return AjaxResult.success(); return AjaxResult.success();
} }
/** @deprecated */
@PostMapping({"/cancel"}) @PostMapping({"/cancel"})
@ApiOperation("取消询价") @ApiOperation("取消询价")
public AjaxResult cancelInquiry(@RequestBody DrpInquiryAddVO request) { public AjaxResult cancelInquiry(@RequestBody DrpInquiryAddVO request) {
@ -72,33 +70,33 @@ public class DrpInquiryController extends BaseController {
return AjaxResult.success(); return AjaxResult.success();
} }
@PostMapping({"/list/supplier-quote/{inquiryId}"}) @PostMapping({"/info/{inquiryId}"})
@ApiOperation("查询询价单报价总详情") @ApiOperation("查询询价单报价总详情")
public AjaxResult listSupplierQuote(@PathVariable("inquiryId") String inquiryId) { public AjaxResult listSupplierQuote(@PathVariable("inquiryId") String inquiryId) {
return AjaxResult.success(this.drpInquiryService.listSupplierQuote(inquiryId)); return AjaxResult.success(this.drpInquiryService.listSupplierQuote(inquiryId));
} }
@PostMapping({"/finalBidsQuote"}) @PostMapping({"/supplier/quotation/details"})
@ApiOperation("查询各个供应商报价明细") @ApiOperation("查询各个供应商报价明细")
public AjaxResult finalBidsQuote(@RequestBody DrpFinalBidsDTO request) { public AjaxResult finalBidsQuote(@RequestBody DrpFinalBidsDTO request) {
List<DrpFinalBidsQuotePageVO> result = this.drpInquiryService.finalBidsQuote(request); List<DrpFinalBidsQuotePageVO> result = this.drpInquiryService.finalBidsQuote(request);
return AjaxResult.success(result); return AjaxResult.success(result);
} }
@PostMapping({"/commitFinalBids"}) @PostMapping({"/award"})
@ApiOperation("采购决标") @ApiOperation("采购决标")
public AjaxResult commitFinalBids(@RequestBody @Valid DrpCommitFinalBidsDTO request) { public AjaxResult commitFinalBids(@RequestBody @Valid DrpCommitFinalBidsDTO request) {
this.drpInquiryService.commitFinalBids(request); this.drpInquiryService.commitFinalBids(request);
return AjaxResult.success(); return AjaxResult.success();
} }
@PostMapping({"/query/supplier-quote/detail/{inquirySupplierId}"}) @PostMapping({"/supplier/quotation/details/{inquirySupplierId}"})
@ApiOperation("查看供应商报价详情") @ApiOperation("查看供应商报价详情")
public AjaxResult querySupplierQuoteDetail(@PathVariable("inquirySupplierId") Long inquirySupplierId) { public AjaxResult querySupplierQuoteDetail(@PathVariable("inquirySupplierId") Long inquirySupplierId) {
return AjaxResult.success(this.drpInquiryService.querySupplierQuoteDetail(inquirySupplierId)); return AjaxResult.success(this.drpInquiryService.querySupplierQuoteDetail(inquirySupplierId));
} }
@PostMapping({"/sendNotice/{inquiryId}"}) @PostMapping({"/notice/{inquiryId}"})
@ApiOperation("手动通知") @ApiOperation("手动通知")
public AjaxResult sendNotice(@PathVariable("inquiryId") String inquiryId) { public AjaxResult sendNotice(@PathVariable("inquiryId") String inquiryId) {
this.drpInquiryService.sendNotice(inquiryId); this.drpInquiryService.sendNotice(inquiryId);

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpInspectGoodsController.java
View File

@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid; import javax.validation.Valid;
@RestController @RestController
@RequestMapping({"/api/v2/drp/drp-inspect-goods"}) @RequestMapping({"/supply-chain/purchase/check-goods"})
@Api( @Api(
value = "采购验货", value = "采购验货",
tags = {"采购验货"} tags = {"采购验货"}
@ -36,27 +36,27 @@ public class DrpInspectGoodsController extends BaseController {
@Lazy @Lazy
private DrpInspectGoodsService drpInspectGoodsService; private DrpInspectGoodsService drpInspectGoodsService;
@PostMapping({"/commit"}) @PostMapping({"/add"})
@ApiOperation("新增/编辑提交验货单") @ApiOperation("新增/编辑提交验货单")
public AjaxResult addCommitInspectGoods(@RequestBody @Valid DrpInspectGoodsCommitAddDTO content) { public AjaxResult addCommitInspectGoods(@RequestBody @Valid DrpInspectGoodsCommitAddDTO content) {
return AjaxResult.success(this.drpInspectGoodsService.addCommitInspectGoods(content)); return AjaxResult.success(this.drpInspectGoodsService.addCommitInspectGoods(content));
} }
@PostMapping({"/save"}) @PostMapping({"/draft/add"})
@ApiOperation("新增/编辑保存验货单") @ApiOperation("新增/编辑保存验货单")
public AjaxResult addSaveInspectGoods(@RequestBody @Valid DrpInspectGoodsCommitAddDTO content) { public AjaxResult addSaveInspectGoods(@RequestBody @Valid DrpInspectGoodsCommitAddDTO content) {
this.drpInspectGoodsService.addSaveInspectGoods(content); this.drpInspectGoodsService.addSaveInspectGoods(content);
return AjaxResult.success(); return AjaxResult.success();
} }
@PostMapping({"/page"}) @PostMapping({"/list"})
@ApiOperation("分页查询验货单列表") @ApiOperation("分页查询验货单列表")
public TableDataInfo pageInspectGoods(@RequestBody @Valid DrpInspectGoodsPageDTO content) { public TableDataInfo pageInspectGoods(@RequestBody @Valid DrpInspectGoodsPageDTO content) {
startPage(); startPage();
return getDataTable(this.drpInspectGoodsService.pageInspectGoods(content)); return getDataTable(this.drpInspectGoodsService.pageInspectGoods(content));
} }
@PostMapping({"/page-detail"}) @PostMapping({"/info"})
@ApiOperation("分页查询验货单明细") @ApiOperation("分页查询验货单明细")
public TableDataInfo pageInspectGoodsDetail(@RequestBody @Valid DrpInspectGoodsDetailPageDTO content) { public TableDataInfo pageInspectGoodsDetail(@RequestBody @Valid DrpInspectGoodsDetailPageDTO content) {
startPage(); startPage();

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpMarketPriceController.java
View File

@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
@RestController @RestController
@RequestMapping({"/api/v1/DrpMarketPrice"}) @RequestMapping({"/supply-chain/purchase/market-price"})
@Api( @Api(
value = "市场价格采集" value = "市场价格采集"
) )
@ -28,20 +28,20 @@ public class DrpMarketPriceController extends BaseController {
@Lazy @Lazy
private DrpMarketPriceService drpMarketPriceService; private DrpMarketPriceService drpMarketPriceService;
@PostMapping({"/commit"}) @PostMapping({"/add"})
@ApiOperation("新增采集") @ApiOperation("新增采集")
public AjaxResult commit(@RequestBody @Valid DrpMarketPriceCommitDTO request) { public AjaxResult commit(@RequestBody @Valid DrpMarketPriceCommitDTO request) {
return AjaxResult.success(this.drpMarketPriceService.commit(request)); return AjaxResult.success(this.drpMarketPriceService.commit(request));
} }
@PostMapping({"/page"}) @PostMapping({"/list"})
@ApiOperation("分页查询采集价格") @ApiOperation("分页查询采集价格")
public TableDataInfo page(@RequestBody @Valid DrpMarketPricePageDTO request) { public TableDataInfo page(@RequestBody @Valid DrpMarketPricePageDTO request) {
startPage(); startPage();
return getDataTable(this.drpMarketPriceService.page(request)); return getDataTable(this.drpMarketPriceService.page(request));
} }
@PostMapping({"/detail/{id}"}) @PostMapping({"/info/{id}"})
@ApiOperation("采集详情") @ApiOperation("采集详情")
public AjaxResult detail(@PathVariable("id") String id) { public AjaxResult detail(@PathVariable("id") String id) {
return AjaxResult.success(this.drpMarketPriceService.detail(id)); return AjaxResult.success(this.drpMarketPriceService.detail(id));

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpMaterialWinBidRecordsController.java
View File

@ -23,14 +23,14 @@ import java.util.List;
@Api( @Api(
value = "货品价格" value = "货品价格"
) )
@RequestMapping({"/api/v1/drp/material-win-bid-records"}) @RequestMapping({"/supply-chain/purchase/win-bid"})
public class DrpMaterialWinBidRecordsController extends BaseController { public class DrpMaterialWinBidRecordsController extends BaseController {
private static final Logger log = LoggerFactory.getLogger(DrpMaterialWinBidRecordsController.class); private static final Logger log = LoggerFactory.getLogger(DrpMaterialWinBidRecordsController.class);
@Autowired @Autowired
@Lazy @Lazy
private DrpMaterialWinBidRecordsService drpMaterialWinBidRecordsService; private DrpMaterialWinBidRecordsService drpMaterialWinBidRecordsService;
@PostMapping({"/page"}) @PostMapping({"/material/list"})
@ApiOperation("分页获取原料中标信息") @ApiOperation("分页获取原料中标信息")
public TableDataInfo pageMaterialBidRecords(@RequestBody @Valid DrpMaterialBidRecordsPageDTO request) { public TableDataInfo pageMaterialBidRecords(@RequestBody @Valid DrpMaterialBidRecordsPageDTO request) {
startPage(); startPage();
@ -43,7 +43,7 @@ public class DrpMaterialWinBidRecordsController extends BaseController {
return AjaxResult.success(this.drpMaterialWinBidRecordsService.listSupplierWinRecords(request)); return AjaxResult.success(this.drpMaterialWinBidRecordsService.listSupplierWinRecords(request));
} }
@PostMapping({"/story/bidPrice"}) @PostMapping({"/history/price"})
@ApiOperation("获取商品历史中标价") @ApiOperation("获取商品历史中标价")
public DrpMaterialStoryBidPriceVO storyBidPrice(@PathVariable("bidId") Long bidId) { public DrpMaterialStoryBidPriceVO storyBidPrice(@PathVariable("bidId") Long bidId) {
return this.drpMaterialWinBidRecordsService.storyBidPrice(bidId); return this.drpMaterialWinBidRecordsService.storyBidPrice(bidId);

11
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpOrderGoodsController.java
View File

@ -20,10 +20,9 @@ import javax.validation.Valid;
import java.util.List; import java.util.List;
@RestController @RestController
@RequestMapping({"/api/v1/drp-order-goods"}) @RequestMapping({"/supply-chain/purchase/order"})
@Api( @Api(
value = "gyp_采购订单", value = "采购订单"
tags = {"gyp_采购订单"}
) )
public class DrpOrderGoodsController extends BaseController { public class DrpOrderGoodsController extends BaseController {
@Autowired @Autowired
@ -33,19 +32,19 @@ public class DrpOrderGoodsController extends BaseController {
@Lazy @Lazy
private DrpOrderGoodsDetailService drpOrderGoodsDetailService; private DrpOrderGoodsDetailService drpOrderGoodsDetailService;
@PostMapping({"/add/save"}) @PostMapping({"/draft/add"})
@ApiOperation("新增/编辑采购订单") @ApiOperation("新增/编辑采购订单")
public AjaxResult addSaveDrpOrderGoods(@RequestBody @Valid DrpOrderGoodsSaveDTO content) { public AjaxResult addSaveDrpOrderGoods(@RequestBody @Valid DrpOrderGoodsSaveDTO content) {
return AjaxResult.success(this.drpPuchaseOrderGoodsService.addSaveDrpOrderGoods(content)); return AjaxResult.success(this.drpPuchaseOrderGoodsService.addSaveDrpOrderGoods(content));
} }
@PostMapping({"/add/commit"}) @PostMapping({"/add"})
@ApiOperation("新增/编辑采购订单提交") @ApiOperation("新增/编辑采购订单提交")
public AjaxResult addCommitDrpOrderGoods(@RequestBody @Valid DrpOrderGoodsSaveDTO content) { public AjaxResult addCommitDrpOrderGoods(@RequestBody @Valid DrpOrderGoodsSaveDTO content) {
return AjaxResult.success(this.drpPuchaseOrderGoodsService.addCommitDrpOrderGoods(content)); return AjaxResult.success(this.drpPuchaseOrderGoodsService.addCommitDrpOrderGoods(content));
} }
@PostMapping({"/page"}) @PostMapping({"/list"})
@ApiOperation("分页查询采购订单") @ApiOperation("分页查询采购订单")
public TableDataInfo getDrpOrderGoodsPage(@RequestBody @Valid DrpOrderGoodsPageDTO content) { public TableDataInfo getDrpOrderGoodsPage(@RequestBody @Valid DrpOrderGoodsPageDTO content) {
startPage(); startPage();

7
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpOtherController.java
View File

@ -18,10 +18,9 @@ import javax.validation.Valid;
import java.util.List; import java.util.List;
@RestController @RestController
@RequestMapping({"/api/v1/drp-other"}) @RequestMapping({"/supply-chain/purchase/dish"})
@Api( @Api(
value = "gyp-出入库其他接口", value = "gyp-出入库其他接口"
tags = {"gyp-出入库其他接口"}
) )
public class DrpOtherController { public class DrpOtherController {
private static final Logger log = LoggerFactory.getLogger(DrpOtherController.class); private static final Logger log = LoggerFactory.getLogger(DrpOtherController.class);
@ -29,7 +28,7 @@ public class DrpOtherController {
@Lazy @Lazy
private DrpOtherService drpOtherService; private DrpOtherService drpOtherService;
@PostMapping({"/dishes/convert"}) @PostMapping({"/material/cal"})
@ApiOperation("获取菜品原料反算接口") @ApiOperation("获取菜品原料反算接口")
public List<DrpDishesConvertVO> dishesConvert(@RequestBody @Valid List<DrpDishesConvertDTO> content) { public List<DrpDishesConvertVO> dishesConvert(@RequestBody @Valid List<DrpDishesConvertDTO> content) {
return this.drpOtherService.dishesConvert(content); return this.drpOtherService.dishesConvert(content);

13
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpProcurementContractController.java
View File

@ -18,10 +18,9 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
@RestController @RestController
@RequestMapping({"/api/v1/drpProcurementContract"}) @RequestMapping({"/supply-chain/purchase/contract"})
@Api( @Api(
value = "ffc-采购合同主表", value = "采购合同"
tags = {"ffc-采购合同主表"}
) )
public class DrpProcurementContractController extends BaseController { public class DrpProcurementContractController extends BaseController {
private static final Logger log = LoggerFactory.getLogger(DrpProcurementContractController.class); private static final Logger log = LoggerFactory.getLogger(DrpProcurementContractController.class);
@ -29,21 +28,21 @@ public class DrpProcurementContractController extends BaseController {
@Lazy @Lazy
private DrpProcurementContractService drpProcurementContractService; private DrpProcurementContractService drpProcurementContractService;
@PostMapping({"/commit"}) @PostMapping({"/add"})
@ApiOperation("新增合同") @ApiOperation("新增合同")
public AjaxResult commit(@RequestBody @Valid DrpContractCommitDTO request) { public AjaxResult commit(@RequestBody @Valid DrpContractCommitDTO request) {
this.drpProcurementContractService.commit(request); this.drpProcurementContractService.commit(request);
return AjaxResult.success(); return AjaxResult.success();
} }
@PostMapping({"/page"}) @PostMapping({"/list"})
@ApiOperation("分页查询合同") @ApiOperation("分页查询合同")
public TableDataInfo page(@RequestBody @Valid DrpContractPageDTO request) { public TableDataInfo page(@RequestBody @Valid DrpContractPageDTO request) {
startPage(); startPage();
return getDataTable(this.drpProcurementContractService.page(request)); return getDataTable(this.drpProcurementContractService.page(request));
} }
@PostMapping({"/detail/{contractId}"}) @PostMapping({"/info/{contractId}"})
@ApiOperation("合同详情") @ApiOperation("合同详情")
public AjaxResult detail(@PathVariable("contractId") String contractId) { public AjaxResult detail(@PathVariable("contractId") String contractId) {
return AjaxResult.success(this.drpProcurementContractService.detail(contractId)); return AjaxResult.success(this.drpProcurementContractService.detail(contractId));
@ -56,7 +55,7 @@ public class DrpProcurementContractController extends BaseController {
return AjaxResult.success(); return AjaxResult.success();
} }
@PostMapping({"/close/{contractId}"}) @PostMapping({"/end/{contractId}"})
@ApiOperation("终止合同") @ApiOperation("终止合同")
public AjaxResult close(@PathVariable("contractId") String contractId) { public AjaxResult close(@PathVariable("contractId") String contractId) {
this.drpProcurementContractService.close(contractId); this.drpProcurementContractService.close(contractId);

84
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpProductionPlanController.java
View File

@ -21,7 +21,7 @@ import javax.validation.Valid;
import java.util.List; import java.util.List;
@RestController @RestController
@RequestMapping({"/api/v1/drp-production-plan"}) @RequestMapping({"/supply-chain/purchase/production-plan"})
@Api( @Api(
value = "gyp-生产计划", value = "gyp-生产计划",
tags = {"gyp-生产计划"} tags = {"gyp-生产计划"}
@ -35,7 +35,7 @@ public class DrpProductionPlanController extends BaseController {
@Lazy @Lazy
private DrpPurchasePlanDisassemblyService drpPurchasePlanDisassemblyService; private DrpPurchasePlanDisassemblyService drpPurchasePlanDisassemblyService;
@PostMapping({"/page"}) @PostMapping({"/list"})
@ApiOperation("分页查询生产计划") @ApiOperation("分页查询生产计划")
public TableDataInfo pageProductionPlan(@RequestBody @Valid DrpProductionPlanPageDTO request) { public TableDataInfo pageProductionPlan(@RequestBody @Valid DrpProductionPlanPageDTO request) {
startPage(); startPage();
@ -43,11 +43,11 @@ public class DrpProductionPlanController extends BaseController {
return getDataTable(resultList); return getDataTable(resultList);
} }
@PostMapping({"/materialCount"}) // @PostMapping({"/materialCount"})
@ApiOperation("生产计划货品数量") // @ApiOperation("生产计划货品数量")
public AjaxResult materialCount(@RequestBody @Valid DrpProductionPlanPageDTO request) { // public AjaxResult materialCount(@RequestBody @Valid DrpProductionPlanPageDTO request) {
return AjaxResult.success(this.drpProductionPlanService.materialCount(request)); // return AjaxResult.success(this.drpProductionPlanService.materialCount(request));
} // }
// @PostMapping({"/preOrderInfo"}) // @PostMapping({"/preOrderInfo"})
// @ApiOperation("根据预订单创建生产计划") // @ApiOperation("根据预订单创建生产计划")
@ -68,16 +68,16 @@ public class DrpProductionPlanController extends BaseController {
return AjaxResult.success(); return AjaxResult.success();
} }
@PostMapping({"/generate/pur-plan"}) // @PostMapping({"/generate/pur-plan"})
@ApiOperation("生产计划生成采购计划") // @ApiOperation("生产计划生成采购计划")
public AjaxResult generatePurPlan(@RequestBody @Valid List<DrpGeneratePurPlanDetailDTO> request) { // public AjaxResult generatePurPlan(@RequestBody @Valid List<DrpGeneratePurPlanDetailDTO> request) {
if (CollUtil.isEmpty(request)) { // if (CollUtil.isEmpty(request)) {
throw new ServiceException("采购明细不能为空"); // throw new ServiceException("采购明细不能为空");
} else { // } else {
String productionId = this.drpProductionPlanService.generatePurPlan(request); // String productionId = this.drpProductionPlanService.generatePurPlan(request);
return AjaxResult.success(productionId); // return AjaxResult.success(productionId);
} // }
} // }
// @PostMapping({"/generate/batch/pur-plan"}) // @PostMapping({"/generate/batch/pur-plan"})
// @ApiOperation("批量生产计划生成采购计划") // @ApiOperation("批量生产计划生成采购计划")
@ -90,44 +90,44 @@ public class DrpProductionPlanController extends BaseController {
// } // }
// } // }
@PostMapping({"/generate/batch/pur-plan"}) @PostMapping({"/purchase-plan/generate"})
@ApiOperation("生产计划生成采购计划") @ApiOperation("生产计划生成采购计划")
public AjaxResult generateBatchPurPlan(@RequestBody @Valid DrpProductionGeneratePurPlanDTO request) { public AjaxResult generateBatchPurPlan(@RequestBody @Valid DrpProductionGeneratePurPlanDTO request) {
return AjaxResult.success(this.drpPurchasePlanDisassemblyService.generateBatchPurPlan(request)); return AjaxResult.success(this.drpPurchasePlanDisassemblyService.generateBatchPurPlan(request));
} }
/** @deprecated */ /** @deprecated */
@PostMapping({"/list/detail-direct/{productionPlanId}"}) // @PostMapping({"/list/detail-direct/{productionPlanId}"})
@ApiOperation("查询生产计划详情-菜品") // @ApiOperation("查询生产计划详情-菜品")
public AjaxResult listDetailDirect(@PathVariable("productionPlanId") String productionPlanId) { // public AjaxResult listDetailDirect(@PathVariable("productionPlanId") String productionPlanId) {
return AjaxResult.success(this.drpProductionPlanService.listDetailDirect(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"}) @PostMapping({"/info/{productionPlanId}"})
@ApiOperation("获取生产计划详情-菜谱/预订单")
public AjaxResult listDetailRecipeOrder(@RequestBody @Valid String productionPlanId) {
return AjaxResult.success(drpProductionPlanService.listDetailRecipeOrder(productionPlanId));
}
@PostMapping({"/detail/{productionPlanId}"})
@ApiOperation("获取生产计划详情") @ApiOperation("获取生产计划详情")
public AjaxResult detail(@PathVariable("productionPlanId") String productionPlanId) { public AjaxResult detail(@PathVariable("productionPlanId") String productionPlanId) {
return AjaxResult.success(drpProductionPlanService.detail(productionPlanId)); return AjaxResult.success(drpProductionPlanService.detail(productionPlanId));
} }
@PostMapping({"/list/production-dishes/sum/{productionPlanId}"}) @PostMapping({"/dish/{productionPlanId}"})
@ApiOperation("获取生产计划菜品详情汇总") @ApiOperation("获取生产计划菜品详情汇总")
public AjaxResult listProductionDishesSum(@PathVariable("productionPlanId") String productionPlanId) { public AjaxResult listProductionDishesSum(@PathVariable("productionPlanId") String productionPlanId) {
return AjaxResult.success(drpProductionPlanService.listProductionDishesSum(productionPlanId)); return AjaxResult.success(drpProductionPlanService.listProductionDishesSum(productionPlanId));
} }
@PostMapping({"/list/production-dishes/sumByPlanIds"}) // @PostMapping({"/list/production-dishes/sumByPlanIds"})
@ApiOperation("获取生产计划菜品详情汇总") // @ApiOperation("获取生产计划菜品详情汇总")
public AjaxResult listProductionDishesSumByPlanIds(@RequestBody @Valid List<String> productionPlanIdList) { // public AjaxResult listProductionDishesSumByPlanIds(@RequestBody @Valid List<String> productionPlanIdList) {
return AjaxResult.success(drpProductionPlanService.listProductionDishesSumByPlanIds(productionPlanIdList)); // return AjaxResult.success(drpProductionPlanService.listProductionDishesSumByPlanIds(productionPlanIdList));
} // }
@PostMapping({"/save/reserve-rate"}) @PostMapping({"/reserve/add"})
@ApiOperation("存储预留比例值") @ApiOperation("存储预留比例值")
public AjaxResult saveReserveRate(@RequestBody @Valid List<DrpReserveRateSaveDTO> content) { public AjaxResult saveReserveRate(@RequestBody @Valid List<DrpReserveRateSaveDTO> content) {
this.drpProductionPlanService.saveReserveRate(content); this.drpProductionPlanService.saveReserveRate(content);
@ -145,9 +145,9 @@ public class DrpProductionPlanController extends BaseController {
// } // }
// } // }
@PostMapping({"/getMenuMaterialByPlanIdList"}) // @PostMapping({"/getMenuMaterialByPlanIdList"})
@ApiOperation("获取生产计划菜品原料重量及预留比例") // @ApiOperation("获取生产计划菜品原料重量及预留比例")
public AjaxResult getMenuMaterialByPlanIdList(@RequestBody @Valid List<String> planIdList) { // public AjaxResult getMenuMaterialByPlanIdList(@RequestBody @Valid List<String> planIdList) {
return AjaxResult.success(drpProductionPlanService.getMenuMaterialByPlanIdList(planIdList)); // return AjaxResult.success(drpProductionPlanService.getMenuMaterialByPlanIdList(planIdList));
} // }
} }

149
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpPurchasePlanController.java
View File

@ -21,10 +21,9 @@ import javax.validation.Valid;
import java.util.List; import java.util.List;
@RestController @RestController
@RequestMapping({"/api/v1/drppurchaseplan"}) @RequestMapping({"/supply-chain/purchase/purchase-plan"})
@Api( @Api(
value = "ffc_采购计划", value = "采购计划"
tags = {"ffc_采购计划"}
) )
public class DrpPurchasePlanController extends BaseController { public class DrpPurchasePlanController extends BaseController {
private static final Logger log = LoggerFactory.getLogger(DrpPurchasePlanController.class); private static final Logger log = LoggerFactory.getLogger(DrpPurchasePlanController.class);
@ -35,28 +34,28 @@ public class DrpPurchasePlanController extends BaseController {
@Lazy @Lazy
private DrpPurchasePlanDisassemblyService drpPurchasePlanDisassemblyService; private DrpPurchasePlanDisassemblyService drpPurchasePlanDisassemblyService;
@PostMapping({"/page/material-info"}) @PostMapping({"/material/list"})
@ApiOperation("后台通用-获取货品信息") @ApiOperation("后台通用-获取货品信息")
public TableDataInfo pageMaterialInfo(@RequestBody DrpPurMaterialInfoPageDTO content) { public TableDataInfo pageMaterialInfo(@RequestBody DrpPurMaterialInfoPageDTO content) {
startPage(); startPage();
return getDataTable(this.drpPurchasePlanService.pageMaterialInfo(content)); return getDataTable(this.drpPurchasePlanService.pageMaterialInfo(content));
} }
@PostMapping({"/add/save"}) @PostMapping({"/draft/add"})
@ApiOperation("新增/编辑采购计划保存") @ApiOperation("新增/编辑采购计划保存")
public AjaxResult addSaveDrpPurchasePlan(@RequestBody @Valid DrpPurchasePlanSaveDTO content) { public AjaxResult addSaveDrpPurchasePlan(@RequestBody @Valid DrpPurchasePlanSaveDTO content) {
DrpPurchasePlanAddVO result = this.drpPurchasePlanService.addSaveDrpPurchasePlan(content); DrpPurchasePlanAddVO result = this.drpPurchasePlanService.addSaveDrpPurchasePlan(content);
return AjaxResult.success(result); return AjaxResult.success(result);
} }
@PostMapping({"/add/commit"}) @PostMapping({"/add"})
@ApiOperation("新增/编辑采购计划提交") @ApiOperation("新增/编辑采购计划提交")
public AjaxResult addCommitDrpPurchasePlan(@RequestBody @Valid DrpPurchasePlanSaveDTO content) { public AjaxResult addCommitDrpPurchasePlan(@RequestBody @Valid DrpPurchasePlanSaveDTO content) {
DrpPurchasePlanAddVO result = this.drpPurchasePlanService.addCommitDrpPurchasePlan(content); DrpPurchasePlanAddVO result = this.drpPurchasePlanService.addCommitDrpPurchasePlan(content);
return AjaxResult.success(result); return AjaxResult.success(result);
} }
@PostMapping({"/page"}) @PostMapping({"/list"})
@ApiOperation("分页获取采购计划") @ApiOperation("分页获取采购计划")
public TableDataInfo getDrpPurchasePlanPage(@RequestBody DrpPurchasePlanPageDTO content) { public TableDataInfo getDrpPurchasePlanPage(@RequestBody DrpPurchasePlanPageDTO content) {
startPage(); startPage();
@ -64,13 +63,13 @@ public class DrpPurchasePlanController extends BaseController {
return getDataTable(resultPage); return getDataTable(resultPage);
} }
@PostMapping({"/materialCount"}) // @PostMapping({"/materialCount"})
@ApiOperation("采购计划货品数量") // @ApiOperation("采购计划货品数量")
public AjaxResult materialCount(@RequestBody @Valid DrpPurchasePlanPageDTO content) { // public AjaxResult materialCount(@RequestBody @Valid DrpPurchasePlanPageDTO content) {
return AjaxResult.success(this.drpPurchasePlanService.materialCount(content)); // return AjaxResult.success(this.drpPurchasePlanService.materialCount(content));
} // }
@PostMapping({"/detail/{planId}"}) @PostMapping({"/info/{planId}"})
@ApiOperation("采购计划详情") @ApiOperation("采购计划详情")
public AjaxResult detail(@PathVariable("planId") String planId) { public AjaxResult detail(@PathVariable("planId") String planId) {
return AjaxResult.success(this.drpPurchasePlanService.detail(planId)); return AjaxResult.success(this.drpPurchasePlanService.detail(planId));
@ -82,7 +81,7 @@ public class DrpPurchasePlanController extends BaseController {
// return this.drpPurchasePlanService.mergeDetail((List)leRequest.getContent()); // return this.drpPurchasePlanService.mergeDetail((List)leRequest.getContent());
// } // }
@PostMapping({"/syncPurchasePrice"}) @PostMapping({"/price/sync"})
@ApiOperation("同步货品价格") @ApiOperation("同步货品价格")
public AjaxResult syncPurchasePrice(@RequestBody @Valid DrpSyncPurchasePriceDTO content) { public AjaxResult syncPurchasePrice(@RequestBody @Valid DrpSyncPurchasePriceDTO content) {
return AjaxResult.success(this.drpPurchasePlanService.syncPurchasePrice(content.getMaterialIdList(), content.getCanteenId())); 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)); // return AjaxResult.success(this.drpPurchasePlanService.sendEmail(content));
// } // }
@PostMapping({"/page/material"}) // @PostMapping({"/page/material"})
@ApiOperation("采购单分页获取原料") // @ApiOperation("采购单分页获取原料")
public TableDataInfo pageMaterial(@RequestBody DrpPurMaterialPageDTO content) { // public TableDataInfo pageMaterial(@RequestBody DrpPurMaterialPageDTO content) {
startPage(); // startPage();
List<DrpPurMaterialPageVO> resultPage = this.drpPurchasePlanService.pageMaterial(content); // List<DrpPurMaterialPageVO> resultPage = this.drpPurchasePlanService.pageMaterial(content);
return getDataTable(resultPage); // return getDataTable(resultPage);
} // }
//
@PostMapping({"/generate/order-goods"}) // @PostMapping({"/generate/order-goods"})
@ApiOperation("采购生成采购订单") // @ApiOperation("采购生成采购订单")
public AjaxResult generateOrderGoods(@RequestBody DrpPurGenerateOrderGoodsDTO content) { // public AjaxResult generateOrderGoods(@RequestBody DrpPurGenerateOrderGoodsDTO content) {
String orderGoodsId = this.drpPurchasePlanService.generateOrderGoods(content); // String orderGoodsId = this.drpPurchasePlanService.generateOrderGoods(content);
return AjaxResult.success(orderGoodsId); // return AjaxResult.success(orderGoodsId);
} // }
//
@PostMapping({"/generate/inquiry"}) // @PostMapping({"/generate/inquiry"})
@ApiOperation("采购生成询价单") // @ApiOperation("采购生成询价单")
public AjaxResult generateInquiry(@RequestBody DrpPurGenerateInquiryDTO content) { // public AjaxResult generateInquiry(@RequestBody DrpPurGenerateInquiryDTO content) {
String inquiryId = this.drpPurchasePlanService.generateInquiry(content); // String inquiryId = this.drpPurchasePlanService.generateInquiry(content);
return AjaxResult.success(inquiryId); // return AjaxResult.success(inquiryId);
} // }
// @PostMapping({"/apply/approval"}) // @PostMapping({"/apply/approval"})
// @ApiOperation("采购审批申请") // @ApiOperation("采购审批申请")
@ -130,38 +129,38 @@ public class DrpPurchasePlanController extends BaseController {
// this.drpPurchasePlanService.applyApproval(planId); // this.drpPurchasePlanService.applyApproval(planId);
// } // }
@PostMapping({"/list/pur-detail/inventory"}) // @PostMapping({"/list/pur-detail/inventory"})
@ApiOperation("获取采购明细的仓库库存") // @ApiOperation("获取采购明细的仓库库存")
public AjaxResult listPurDetailInventory(@RequestBody @Valid MaterialInventoryDTO content) { // public AjaxResult listPurDetailInventory(@RequestBody @Valid MaterialInventoryDTO content) {
return AjaxResult.success(this.drpPurchasePlanService.listPurDetailInventory(content)); // return AjaxResult.success(this.drpPurchasePlanService.listPurDetailInventory(content));
} // }
//
@PostMapping({"/list/detail"}) // @PostMapping({"/list/detail"})
@ApiOperation("根据采购单号获取采购明细") // @ApiOperation("根据采购单号获取采购明细")
public AjaxResult listPurDetail(@RequestBody @Valid String planId) { // public AjaxResult listPurDetail(@RequestBody @Valid String planId) {
return AjaxResult.success(this.drpPurchasePlanService.listPurDetail(planId)); // return AjaxResult.success(this.drpPurchasePlanService.listPurDetail(planId));
} // }
//
@PostMapping({"/generate/order"}) // @PostMapping({"/generate/order"})
@ApiOperation("采购计划拆解生成采购订单") // @ApiOperation("采购计划拆解生成采购订单")
public AjaxResult purGenerateOrder(@RequestBody @Valid List<DrpPurGenerateOrderDTO> content) { // public AjaxResult purGenerateOrder(@RequestBody @Valid List<DrpPurGenerateOrderDTO> content) {
this.drpPurchasePlanService.purGenerateOrder(content); // this.drpPurchasePlanService.purGenerateOrder(content);
return AjaxResult.success(); // return AjaxResult.success();
} // }
//
@PostMapping({"/generate/dismantle/inquiry"}) // @PostMapping({"/generate/dismantle/inquiry"})
@ApiOperation("采购计划拆解生成采购询价单") // @ApiOperation("采购计划拆解生成采购询价单")
public AjaxResult purGenerateInquiry(@RequestBody @Valid List<DrpPurDismantleGenerateInquiryDTO> content) { // public AjaxResult purGenerateInquiry(@RequestBody @Valid List<DrpPurDismantleGenerateInquiryDTO> content) {
this.drpPurchasePlanService.purGenerateInquiry(content); // this.drpPurchasePlanService.purGenerateInquiry(content);
return AjaxResult.success(); // return AjaxResult.success();
} // }
//
@PostMapping({"/generate/dismantle/inquiryByGoods"}) // @PostMapping({"/generate/dismantle/inquiryByGoods"})
@ApiOperation("采购计划拆解生成采购询价单") // @ApiOperation("采购计划拆解生成采购询价单")
public AjaxResult purGenerateInquiryByGoods(@RequestBody @Valid DrpPurDismantleGenerateInquiryDTO content) { // public AjaxResult purGenerateInquiryByGoods(@RequestBody @Valid DrpPurDismantleGenerateInquiryDTO content) {
this.drpPurchasePlanService.purGenerateInquiryByGoods(content); // this.drpPurchasePlanService.purGenerateInquiryByGoods(content);
return AjaxResult.success(); // return AjaxResult.success();
} // }
// @PostMapping({"/approve/agree"}) // @PostMapping({"/approve/agree"})
// @ApiOperation("采购计划-审批同意") // @ApiOperation("采购计划-审批同意")
@ -208,26 +207,26 @@ public class DrpPurchasePlanController extends BaseController {
// } // }
// } // }
@PostMapping({"/mergeDetailByPlanId"}) // @PostMapping({"/mergeDetailByPlanId"})
@ApiOperation("采购计划详情") // @ApiOperation("采购计划详情")
public AjaxResult planMergeDetail(@RequestBody @Valid List<String> content) { // public AjaxResult planMergeDetail(@RequestBody @Valid List<String> content) {
return AjaxResult.success(this.drpPurchasePlanDisassemblyService.planMergeDetail(content)); // return AjaxResult.success(this.drpPurchasePlanDisassemblyService.planMergeDetail(content));
} // }
@PostMapping({"/deduction/inventory/{areaId}"}) @PostMapping({"/config/deduction/inventory/{areaId}"})
@ApiOperation("是否可以扣减库存") @ApiOperation("是否可以扣减库存")
public AjaxResult deductionInventory(@PathVariable("areaId") Long areaId) { public AjaxResult deductionInventory(@PathVariable("areaId") Long areaId) {
return AjaxResult.success(this.drpPurchasePlanService.deductionInventory(areaId)); return AjaxResult.success(this.drpPurchasePlanService.deductionInventory(areaId));
} }
@PostMapping({"/direct/generate/inquiry/{planId}"}) @PostMapping({"/inquiry/generate/{planId}"})
@ApiOperation("直接生成采购询价单") @ApiOperation("直接生成采购询价单")
public AjaxResult directGenerateInquiry(@PathVariable("planId") String planId) { public AjaxResult directGenerateInquiry(@PathVariable("planId") String planId) {
String inquiryId = this.drpPurchasePlanDisassemblyService.directGenerateInquiry(planId); String inquiryId = this.drpPurchasePlanDisassemblyService.directGenerateInquiry(planId);
return AjaxResult.success(inquiryId); return AjaxResult.success(inquiryId);
} }
@PostMapping({"/direct/generate/order/{planId}"}) @PostMapping({"/order/generate/{planId}"})
@ApiOperation("直接生成采购订单") @ApiOperation("直接生成采购订单")
public AjaxResult directGenerateOrder(@PathVariable String planId) { public AjaxResult directGenerateOrder(@PathVariable String planId) {
String inquiryId = this.drpPurchasePlanDisassemblyService.directGenerateOrder(planId); String inquiryId = this.drpPurchasePlanDisassemblyService.directGenerateOrder(planId);

11
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/DrpSupplierController.java
View File

@ -16,10 +16,9 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@RestController @RestController
@RequestMapping({"/api/v1/drpsupplier"}) @RequestMapping({"/supply-chain/purchase/supplier"})
@Api( @Api(
value = "gyp_供应商信息管理", value = "供应商管理"
tags = {"gyp_供应商信息管理"}
) )
public class DrpSupplierController { public class DrpSupplierController {
private static final Logger log = LoggerFactory.getLogger(DrpSupplierController.class); private static final Logger log = LoggerFactory.getLogger(DrpSupplierController.class);
@ -88,7 +87,7 @@ public class DrpSupplierController {
// return LeResponse.succ(); // return LeResponse.succ();
// } // }
@PostMapping({"/list/supplier"}) @PostMapping({"/list"})
@ApiOperation("查询供应商集合") @ApiOperation("查询供应商集合")
public AjaxResult listSupplier(@RequestBody DrpSupplierQueryDTO content) { public AjaxResult listSupplier(@RequestBody DrpSupplierQueryDTO content) {
List<DrpSupplierVO> resultList = this.drpPurchaseSupplierService.listSupplier(content); List<DrpSupplierVO> resultList = this.drpPurchaseSupplierService.listSupplier(content);
@ -124,8 +123,8 @@ public class DrpSupplierController {
// return PageVO.of(resultList); // return PageVO.of(resultList);
// } // }
@PostMapping({"/get/main/info/{supplierId}"}) @PostMapping({"/info/{supplierId}"})
@ApiOperation("获取供应商主要信息接口") @ApiOperation("获取供应商信息接口")
public DrpSupplierMainInfoVO getMainInfoById(@PathVariable("supplierId") Long supplierId) { public DrpSupplierMainInfoVO getMainInfoById(@PathVariable("supplierId") Long supplierId) {
return this.drpPurchaseSupplierService.getMainInfoById(supplierId); return this.drpPurchaseSupplierService.getMainInfoById(supplierId);
} }

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/purchase/controller/SupplyUserController.java
View File

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
@RestController @RestController
@RequestMapping({"/supply/user"}) @RequestMapping({"//supply-chain/operate-user"})
public class SupplyUserController extends BaseController { public class SupplyUserController extends BaseController {
@Autowired @Autowired
private SupplyUserService supplyUserService; private SupplyUserService supplyUserService;