工具管理-DNC刀具写入刀具准备单接口

cuilei

2025-06-13 7894ec4aafc42f90932aca9215405ed03a54edd9

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java

@@ -1,5 +1,6 @@
package org.jeecg.modules.tms.controller;

import com.alibaba.fastjson.JSONObject;
import org.jeecg.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -72,9 +73,10 @@
                                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                         HttpServletRequest req) {
        QueryWrapper<PreparationOrder> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrder, req.getParameterMap());
        Map<String, String[]> parameterMap = req.getParameterMap();
        QueryWrapper<PreparationOrder> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrder, parameterMap);
        Page<PreparationOrder> page = new Page<PreparationOrder>(pageNo, pageSize);
        IPage<PreparationOrder> pageList = preparationOrderService.page(page, queryWrapper);
        IPage<PreparationOrder> pageList = preparationOrderService.queryPageList(page, parameterMap);
        return Result.OK(pageList);
    }

@@ -89,6 +91,15 @@
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody PreparationOrder preparationOrder) {
        preparationOrderService.save(preparationOrder);
        return Result.OK("添加成功！");
    }

    @AutoLog(value = "刀具准备单-从DNC系统写入刀具准备单及明细")
    @ApiOperation(value="刀具准备单-从DNC系统写入刀具准备单及明细", notes="刀具准备单-从DNC系统写入刀具准备单及明细")
    //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:add")
    @PostMapping(value = "/addPreparationOrderFromDnc")
    public Result<String> addPreparationOrderFromDnc(@RequestBody PreparationOrderAndDetailDto preparationOrderAndDetailDto) {
        preparationOrderService.addPreparationOrderFromDnc(preparationOrderAndDetailDto);
        return Result.OK("添加成功！");
    }

@@ -139,8 +150,17 @@
    //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.preparationOrderService.delBatchMain(Arrays.asList(ids.split(",")));
        preparationOrderService.delBatchMain(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    @AutoLog(value = "刀具准备单-转出库申请单")
    @ApiOperation(value = "刀具准备单-转出库申请单", notes = "刀具准备单-转出库申请单")
    //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:convert")
    @PostMapping(value = "/convertToOutboundOrder")
    public Result<String> convertToOutboundOrder(@RequestBody List<String> preparationOrderIds) {
        List<String> result = preparationOrderService.convertToOutboundOrder(preparationOrderIds);
        return Result.OK(JSONObject.toJSONString(result));
    }

    /**
@@ -177,9 +197,10 @@
                                                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                                    HttpServletRequest req) {
        QueryWrapper<PreparationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrderDetail, req.getParameterMap());
        Map<String, String[]> parameterMap = req.getParameterMap();
        QueryWrapper<PreparationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrderDetail, parameterMap);
        Page<PreparationOrderDetail> page = new Page<PreparationOrderDetail>(pageNo, pageSize);
        IPage<PreparationOrderDetail> pageList = preparationOrderDetailService.page(page, queryWrapper);
        IPage<PreparationOrderDetail> pageList = preparationOrderDetailService.queryPageList(page, parameterMap);
        return Result.OK(pageList);
    }