Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

8 天以前 723cbdddb7d06a1d12564d8d88dfe8d4984315a3

 north-glass-erp/src/main/java/com/example/erp/controller/AppController.java

@@ -1,11 +1,15 @@
package com.example.erp.controller;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.dto.pp.WorkInProgressDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.service.mm.FinishedGoodsInventoryService;
import com.example.erp.service.mm.MaterialInventoryService;
import com.example.erp.service.pp.ReportService;
import com.example.erp.service.pp.ReportingWorkService;
import com.example.erp.service.sd.DeliveryService;
import com.example.erp.service.sd.OrderService;
import io.swagger.annotations.Api;
@@ -15,6 +19,7 @@

import java.time.LocalDate;
import java.util.List;
import java.util.Map;

@RestController
@RequestMapping("/app")
@@ -26,6 +31,7 @@
    private final MaterialInventoryService materialInventoryService;
    private final FinishedGoodsInventoryService finishedGoodsInventoryService;
    private final ReportService reportService;
    private final ReportingWorkService reportingWorkService;

    @ApiOperation("订单报表")
    @PostMapping("/getOrderList")
@@ -54,8 +60,40 @@

    @ApiOperation("半成品库存报表")
    @PostMapping("/getWorkInProgress/{selectProcesses}")
    public Result workInProgress(@PathVariable String selectProcesses,WorkInProgressDTO workInProgressDTO) {
        return Result.success(reportService.workInProgressSv(1, 999999999, "", "", selectProcesses,"", workInProgressDTO));
    public Result getworkInProgress(@PathVariable String selectProcesses,WorkInProgressDTO workInProgressDTO) {
        return Result.success(reportService.workInProgressSv(1, 999999999, "", "", selectProcesses,"","", workInProgressDTO));

    }

    @ApiOperation("可入库的成品查询接口")
    @PostMapping("/getSelectWarehousingList")
    public Result getSelectWarehousingList(@RequestBody Map<String,String> map){
        return Result.success(finishedGoodsInventoryService.getSelectWarehousingApp(map.get("processId")));
    }

    @ApiOperation("成品入库接口")
    @PostMapping("/addSelectWarehousing")
    public Result addSelectWarehousing( @RequestBody Map<String,Object> object){
        return Result.success(finishedGoodsInventoryService.addSelectWarehousing(object));

    }

    @ApiOperation("可发货的成品查询接口")
    @PostMapping("/getSelectDeliveryDetailList")
    public Result getSelectDeliveryDetailList(){
        return Result.success(finishedGoodsInventoryService.getSelectDeliveryDetailApp());
    }

    @ApiOperation("成品出库接口")
    @PostMapping("/addDeliveryDetail")
    public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
        return Result.success(finishedGoodsInventoryService.addDeliveryDetail(object));
    }

    @ApiOperation("app多个流程卡报工")
    @PostMapping("/addWorkInProgress")
    @SaCheckPermission("addReportingWork.add")
    public Result addWorkInProgress(@RequestBody Map<String,Object> object){
        return reportingWorkService.addWorkInProgress(object);
    }
}