Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

13 小时以前 1765150bd38a53f6466a6e355f231e21f25fc9f2

 src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java

@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductWorkOrderDto;
import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.service.ProductWorkOrderService;
import com.ruoyi.quality.pojo.QualityInspect;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;

@RestController
@AllArgsConstructor
@@ -27,4 +29,32 @@
        return R.ok(productWorkOrderservice.listPage(page, productWorkOrder));
    }

    /**
     * 产品工单更新
     */
    @ApiOperation("产品工单更新")
    @PostMapping ("/updateProductWorkOrder")
    public R updateProductWorkOrder(@RequestBody ProductWorkOrderDto productWorkOrderDto) {
        return R.ok(productWorkOrderservice.updateProductWorkOrder(productWorkOrderDto));
    }

    /**
     * pda根据二维码的工单id查询数据
     */
    @ApiOperation("pda根据二维码的工单id查询数据")
    @GetMapping("/getProductWorkOrderById")
    public R getProductWorkOrderById(Long id) {
        return R.ok(productWorkOrderservice.getById(id));
    }

    /**
     * 工单流转卡下载
     * @param response
     * @param productWorkOrder
     */
    @PostMapping("/down")
    public void down(HttpServletResponse response, @RequestBody ProductWorkOrder productWorkOrder) {
        productWorkOrderservice.down(response, productWorkOrder);
    }

}