Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

liding

12 小时以前 3777b6430fe0ed70186cbbcdcf38c464e3adf47f

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

@@ -15,6 +15,7 @@

import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

@RequestMapping("/productOrder")
@RestController
@@ -72,4 +73,33 @@
    public R delete(@PathVariable("ids") Long[] ids) {
        return R.ok(productOrderService.delete(ids));
    }

    @PatchMapping("/{id}")
    public R finishOrder(@PathVariable Long id) {
        return R.ok(productOrderService.finishOrder(id));
    }

    @ApiOperation("更新生产订单的清场记录")
    @PatchMapping("/cleanRecord/{id}")
    public R cleanRecord(@PathVariable Long id, @RequestBody Map<String, Object> cleanRecord) {
        return R.ok(productOrderService.cleanRecord(id, cleanRecord));
    }

    @ApiOperation("查询所有批号")
    @GetMapping("/getProductOrderBatchNo")
    public R getProductOrderBatchNo() {
        return R.ok(productOrderService.getProductOrderBatchNo());
    }

    @ApiOperation("查询生产订单对应的BOM的原材料")
    @GetMapping("/getByBomId")
    public R getByBomId(Long bomId) {
        return R.ok(productOrderService.getByBomId(bomId));
    }

    @ApiOperation("生产订单领料更新")
    @PostMapping("/drawMaterials")
    public R drawMaterials(@RequestBody ProductOrderDto productOrderDto) {
        return R.ok(productOrderService.drawMaterials(productOrderDto));
    }
}