新火炬后端单体项目初始化代码
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
lixiangyu
昨天 4f38e5827b848298de8e95f59e0ba9b24951e615 
 src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java


@@ -1,17 +1,19 @@


package org.jeecg.modules.cms.controller;




import java.math.BigDecimal;


import java.util.*;


import javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpServletResponse;




import com.alibaba.fastjson.JSONArray;


import com.alibaba.fastjson.JSONObject;


import io.micrometer.core.annotation.Timed;


import org.jeecg.common.api.vo.Result;


import org.jeecg.common.system.query.QueryGenerator;


import org.jeecg.modules.cms.entity.CuttingInbound;


import org.jeecg.modules.cms.entity.CuttingInboundDetail;


import org.jeecg.modules.cms.entity.*;


import org.jeecg.modules.cms.mapper.CuttingInboundMapper;


import org.jeecg.modules.cms.service.ICuttingInboundDetailService;


import org.jeecg.modules.cms.service.ICuttingInboundInventoryService;


import org.jeecg.modules.cms.service.ICuttingInboundService;




import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


@@ -19,13 +21,18 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import lombok.extern.slf4j.Slf4j;




import org.jeecg.modules.cms.service.ICuttingInventoryService;


import org.jeecg.modules.cms.vo.CuttingInboundExportVo;


import org.jeecgframework.poi.excel.ExcelImportUtil;


import org.jeecgframework.poi.excel.def.NormalExcelConstants;


import org.jeecgframework.poi.excel.entity.ExportParams;


import org.jeecgframework.poi.excel.entity.ImportParams;


import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;


import org.jeecg.common.system.base.controller.JeecgController;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;


import org.springframework.web.multipart.MultipartHttpServletRequest;


import org.springframework.web.servlet.ModelAndView;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


@@ -51,6 +58,10 @@


    @Autowired


    private CuttingInboundMapper cuttingInboundMapper;




    @Autowired


    private ICuttingInventoryService cuttingInventoryService;


    @Autowired


    private ICuttingInboundInventoryService cuttingInboundInventoryService;


    /**


     * 分页列表查询


     *


@@ -128,6 +139,9 @@


    @DeleteMapping(value = "/delete")


    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {


        cuttingInboundService.removeById(id);


        //删除刀具领用明细表的数据


        cuttingInboundDetailService.remove


                (new QueryWrapper<CuttingInboundDetail>().eq("order_id", id));


        return Result.OK("删除成功!");


    }




@@ -224,42 +238,30 @@


    //@RequiresPermissions("cms_cutting_inbound:importExcel")


    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)


    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {


        return super.importExcel(request, response, CuttingInbound.class);


//        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;


//        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();


//


//        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {


//            MultipartFile file = entity.getValue();


//            ImportParams params = new ImportParams();


//            params.setTitleRows(1);


//            params.setHeadRows(1);


//            try {


//                // 解析Excel文件


//                List<CuttingInbound> list = ExcelImportUtil.importExcel(file.getInputStream(), CuttingInbound.class, params);


//


//                for (CuttingInbound cuttingInbound : list) {


//                    // 保存主表数据


//                    cuttingInboundService.save(cuttingInbound);


//


//                    // 获取主表ID


//                    String orderId = cuttingInbound.getId();


//


//                    // 处理从表数据


//                    List<CuttingInboundDetail> detailList = cuttingInbound.getDetailList(); // 假设主表实体中有从表数据列表


//                    if (detailList != null && !detailList.isEmpty()) {


//                        for (CuttingInboundDetail detail : detailList) {


//                            detail.setOrderId(orderId); // 设置外键关联


//                            cuttingInboundDetailService.save(detail);


//                        }


//                    }


//                }


//                return Result.ok("导入成功");


//            } catch (Exception e) {


//                log.error("导入失败", e);


//                return Result.error("导入失败");


//            }


//        }


//        return Result.error("导入失败");


//        return super.importExcel(request, response, CuttingInbound.class);


        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;


        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();




        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {


            MultipartFile file = entity.getValue();


            ImportParams params = new ImportParams();


            params.setTitleRows(1);


            params.setHeadRows(1);


            try {


                // 解析Excel文件


                List<CuttingInboundExportVo> list = ExcelImportUtil.importExcel(file.getInputStream(), CuttingInboundExportVo.class, params);




                // 调用Service层处理导入逻辑


                return cuttingInboundService.importExcelData(list);


            } catch (org.jeecgframework.poi.exception.excel.ExcelImportException e) {


                log.error("Excel导入异常", e);


                return Result.error("Excel数据格式错误，请检查数据是否符合模板要求");


            } catch (Exception e) {


                log.error("导入失败", e);


                return Result.error("导入失败: " + e.getMessage());


            }


        }


        return Result.error("导入失败");


    }






@@ -275,4 +277,21 @@


        return Result.ok(list);


    }






    /*


     * 生成唯一条码的方法（目前还没有编码规则，确定后在这里改）


     */


    private String generateUniqueBarcode(String cuttingId, int index) {


        // 条码生成规则示例：刀具ID + 序号(4位) + 随机数


        return cuttingId + String.format("%04d", index + 1) + (int) (Math.random() * 10000);


    }




    @GetMapping("/submit")


    @Timed(value = "cutting.inbound.submit", description = "刀具入库提交耗时")


    public Result<?> submit(@RequestParam("orderId") String orderId) {




        return cuttingInboundService.submit(orderId);


    }


}