Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-26 684399b665ef8c25c43faff0fdc821a0b72b39ba

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

@@ -6,6 +6,8 @@
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.WorkOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -13,12 +15,14 @@
import java.util.Map;

@RestController
@Api(value="工单管理controller",tags={"工单管理操作接口"})
@RequestMapping("/workOrder")
public class WorkOrderController {
    @Autowired
    WorkOrderService workOrderService;

    //查询工单
    @ApiOperation("查询工单接口")
    @PostMapping  ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}")
    public Result dateWork(
            @PathVariable Date selectTime1,
@@ -29,8 +33,8 @@
    }

    //转生产订单查询
    @ApiOperation("转生产订单查询接口")
    @PostMapping  ("/addWork/{orderId}")

    public Result addWork(
            @PathVariable String orderId,
            @RequestBody OrderDetail orderDetail){
@@ -40,6 +44,7 @@


    //添加工单
    @ApiOperation("添加工单接口")
    @PostMapping("/addOrderWork")
    public Result addOrderWork( @RequestBody Map<String,Object>  object){

@@ -52,12 +57,13 @@
    }

    //删除工单
    @PostMapping("/deleteOrderWork/{orderId}/{productName}")
    @ApiOperation("删除工单接口")
    @PostMapping("/deleteOrderWork/{orderId}/{productionId}")
    public Result deleteOrderWork(
            @PathVariable String orderId,
            @PathVariable String productName
            @PathVariable String productionId
    ){
        if(workOrderService.deleteOrderWorkSv(orderId,productName)){
        if(workOrderService.deleteOrderWorkSv(orderId,productionId)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");