feat(cms): 实现刀具入库单提交功能并优化 Excel导入逻辑

lixiangyu

2 天以前 fdba1595d89d44ced189890c7bc7c918209d4c6d

 src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java

@@ -1,13 +1,7 @@
package org.jeecg.modules.cms.controller;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.math.BigDecimal;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

@@ -15,10 +9,13 @@
import com.alibaba.fastjson.JSONObject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.cms.entity.CuttingInbound;
import org.jeecg.modules.cms.entity.CuttingInboundDetail;
import org.jeecg.modules.cms.entity.CuttingInboundInventory;
import org.jeecg.modules.cms.entity.CuttingInventory;
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;
@@ -26,6 +23,8 @@
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;
@@ -37,175 +36,328 @@
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
/**
 * @Description: 刀具入库单
 * @Author: jeecg-boot
 * @Date:   2025-07-28
 * @Date: 2025-07-28
 * @Version: V1.0
 */
@Api(tags="刀具入库单")
@Api(tags = "刀具入库单")
@RestController
@RequestMapping("/cms/cuttingInbound")
@Slf4j
public class CuttingInboundController extends JeecgController<CuttingInbound, ICuttingInboundService> {
   @Autowired
   private ICuttingInboundService cuttingInboundService;
    @Autowired
    private ICuttingInboundService cuttingInboundService;

    @Autowired
    private ICuttingInboundDetailService cuttingInboundDetailService;
	
   /**
    * 分页列表查询
    *
    * @param cuttingInbound
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   //@AutoLog(value = "刀具入库单-分页列表查询")
   @ApiOperation(value="刀具入库单-分页列表查询", notes="刀具入库单-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<CuttingInbound>> queryPageList(CuttingInbound cuttingInbound,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
      QueryWrapper<CuttingInbound> queryWrapper = QueryGenerator.initQueryWrapper(cuttingInbound, req.getParameterMap());
      Page<CuttingInbound> page = new Page<CuttingInbound>(pageNo, pageSize);
      IPage<CuttingInbound> pageList = cuttingInboundService.page(page, queryWrapper);
      return Result.OK(pageList);
   }
	
   /**
    *   添加
    *
    * @param jSONObject
    * @return
    */
   @AutoLog(value = "刀具入库单-添加")
   @ApiOperation(value="刀具入库单-添加", notes="刀具入库单-添加")
   //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody JSONObject jSONObject) {
      CuttingInbound cuttingInbound = jSONObject.toJavaObject(CuttingInbound.class);
      cuttingInbound.setOrderStatus("1");
      cuttingInboundService.saveOrUpdate(cuttingInbound);
      //删除原关联数据
      List<CuttingInboundDetail> cuttingInboundDetailList = cuttingInboundDetailService.lambdaQuery().eq(CuttingInboundDetail::getOrderId,cuttingInbound.getId()).list();
      cuttingInboundDetailService.removeBatchByIds(cuttingInboundDetailList);
      //添加新关联数据
      JSONArray jsonArray = jSONObject.getJSONArray("detailData");
      List<CuttingInboundDetail> list = jsonArray.toJavaList(CuttingInboundDetail.class);
      for (int i = 0; i < list.size(); i++) {
         CuttingInboundDetail temp = list.get(i);
         temp.setOrderId(cuttingInbound.getId());
         cuttingInboundDetailService.save(temp);
      }
      return Result.OK("入库成功！");
   }
	
   /**
    *  编辑
    *
    * @param cuttingInbound
    * @return
    */
   @AutoLog(value = "刀具入库单-编辑")
   @ApiOperation(value="刀具入库单-编辑", notes="刀具入库单-编辑")
   //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody CuttingInbound cuttingInbound) {
      cuttingInboundService.updateById(cuttingInbound);
      return Result.OK("编辑成功!");
   }
	
   /**
    *   通过id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "刀具入库单-通过id删除")
   @ApiOperation(value="刀具入库单-通过id删除", notes="刀具入库单-通过id删除")
   //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
      cuttingInboundService.removeById(id);
      return Result.OK("删除成功!");
   }
	
   /**
    *  批量删除
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "刀具入库单-批量删除")
   @ApiOperation(value="刀具入库单-批量删除", notes="刀具入库单-批量删除")
   //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
      this.cuttingInboundService.removeByIds(Arrays.asList(ids.split(",")));
      return Result.OK("批量删除成功!");
   }
	
   /**
    * 通过id查询
    *
    * @param id
    * @return
    */
   //@AutoLog(value = "刀具入库单-通过id查询")
   @ApiOperation(value="刀具入库单-通过id查询", notes="刀具入库单-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<CuttingInbound> queryById(@RequestParam(name="id",required=true) String id) {
      CuttingInbound cuttingInbound = cuttingInboundService.getById(id);
      if(cuttingInbound==null) {
         return Result.error("未找到对应数据");
      }
      return Result.OK(cuttingInbound);
   }
    @Autowired
    private ICuttingInboundDetailService cuttingInboundDetailService;

    @Autowired
    private CuttingInboundMapper cuttingInboundMapper;

    @Autowired
    private ICuttingInventoryService cuttingInventoryService;
    @Autowired
    private ICuttingInboundInventoryService cuttingInboundInventoryService;
    /**
    * 导出excel
    *
    * @param request
    * @param cuttingInbound
    */
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, CuttingInbound cuttingInbound) {
        return super.exportXls(request, cuttingInbound, CuttingInbound.class, "刀具入库单");
     * 分页列表查询
     *
     * @param cuttingInbound
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "刀具入库单-分页列表查询")
    @ApiOperation(value = "刀具入库单-分页列表查询", notes = "刀具入库单-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<CuttingInbound>> queryPageList(CuttingInbound cuttingInbound,
                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                       HttpServletRequest req) {
        QueryWrapper<CuttingInbound> queryWrapper = QueryGenerator.initQueryWrapper(cuttingInbound, req.getParameterMap());
        Page<CuttingInbound> page = new Page<CuttingInbound>(pageNo, pageSize);
        IPage<CuttingInbound> pageList = cuttingInboundService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
      * 通过excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
     * 添加
     *
     * @param jSONObject
     * @return
     */
    @AutoLog(value = "刀具入库单-添加")
    @ApiOperation(value = "刀具入库单-添加", notes = "刀具入库单-添加")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody JSONObject jSONObject) {
        CuttingInbound cuttingInbound = jSONObject.toJavaObject(CuttingInbound.class);
        cuttingInbound.setOrderStatus("1");
        cuttingInboundService.saveOrUpdate(cuttingInbound);
        //删除原关联数据
        List<CuttingInboundDetail> cuttingInboundDetailList = cuttingInboundDetailService.lambdaQuery().eq(CuttingInboundDetail::getOrderId, cuttingInbound.getId()).list();
        cuttingInboundDetailService.removeBatchByIds(cuttingInboundDetailList);
        //添加新关联数据
        JSONArray jsonArray = jSONObject.getJSONArray("detailData");
        List<CuttingInboundDetail> list = jsonArray.toJavaList(CuttingInboundDetail.class);
        for (int i = 0; i < list.size(); i++) {
            CuttingInboundDetail temp = list.get(i);
            temp.setOrderId(cuttingInbound.getId());
            cuttingInboundDetailService.save(temp);
        }
        return Result.OK("入库成功！");
    }

    /**
     * 编辑
     *
     * @param cuttingInbound
     * @return
     */
    @AutoLog(value = "刀具入库单-编辑")
    @ApiOperation(value = "刀具入库单-编辑", notes = "刀具入库单-编辑")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody CuttingInbound cuttingInbound) {
        cuttingInboundService.updateById(cuttingInbound);
        return Result.OK("编辑成功!");
    }

    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "刀具入库单-通过id删除")
    @ApiOperation(value = "刀具入库单-通过id删除", notes = "刀具入库单-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        cuttingInboundService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "刀具入库单-批量删除")
    @ApiOperation(value = "刀具入库单-批量删除", notes = "刀具入库单-批量删除")
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.cuttingInboundService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "刀具入库单-通过id查询")
    @ApiOperation(value = "刀具入库单-通过id查询", notes = "刀具入库单-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<CuttingInbound> queryById(@RequestParam(name = "id", required = true) String id) {
        CuttingInbound cuttingInbound = cuttingInboundService.getById(id);
        if (cuttingInbound == null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(cuttingInbound);
    }

    /**
     * 导出excel
     *
     * @param request
     * @param cuttingInbound
     */
    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(CuttingInbound cuttingInbound, HttpServletRequest request) {
//        return super.exportXls(request, cuttingInbound, CuttingInbound.class, "刀具入库单");
        // 获取查询条件
        QueryWrapper<CuttingInbound> queryWrapper = QueryGenerator.initQueryWrapper(cuttingInbound, request.getParameterMap());

        // 查询主表数据
        List<CuttingInbound> pageList = cuttingInboundService.list(queryWrapper);

        // 为每个主表数据设置明细数据
        List<CuttingInboundExportVo> exportList = new ArrayList<>();
        for (CuttingInbound item : pageList) {
            CuttingInboundExportVo exportVo = new CuttingInboundExportVo();
            // 复制主表字段
            exportVo.setId(item.getId());
            exportVo.setReceiver(item.getReceiver());
            exportVo.setReceiveTime(item.getReceiveTime());
            exportVo.setReceiveComment(item.getReceiveComment());
            exportVo.setConfirmer(item.getConfirmer());
            exportVo.setConfirmTime(item.getConfirmTime());
            exportVo.setConfirmComment(item.getConfirmComment());
            exportVo.setOrderStatus(item.getOrderStatus());

            // 查询并设置明细数据
            List<CuttingInboundDetail> details = cuttingInboundDetailService.lambdaQuery()
                    .eq(CuttingInboundDetail::getOrderId, item.getId())
                    .list();
            exportVo.setDetailList(details);

            exportList.add(exportVo);
        }

        // 设置导出参数
        ExportParams params = new ExportParams("刀具入库单", "导出数据");

        // 返回Excel视图
        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        mv.addObject(NormalExcelConstants.PARAMS, params);
        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
        mv.addObject(NormalExcelConstants.CLASS, CuttingInboundExportVo.class);

        return mv;
    }

    /**
     * 通过excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@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);
//        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("导入失败");
    }

    /**
     * 根据入库id查询入库明细
     *
     * @param orderId
     * @return
     */
    @GetMapping("/detailList")
    public Result<?> detailList(@RequestParam("orderId") String orderId) {
       List<Map<String, Object>> list = cuttingInboundDetailService.detailList(orderId);
       return Result.ok(list);
    }

    /**
     * 根据入库id查询入库明细
     *
     * @param orderId
     * @return
     */
    @GetMapping("/detailList")
    public Result<?> detailList(@RequestParam("orderId") String orderId) {
        List<Map<String, Object>> list = cuttingInboundDetailService.detailList(orderId);
        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")
    public Result<?> submit(@RequestParam("orderId") String orderId) {
        //         cuttingInboundService.submit(orderId);
        //         return Result.ok("提交成功");
        try {
            // 1. 更新入库单状态
            CuttingInbound cuttingInbound = cuttingInboundService.getById(orderId);
            if (cuttingInbound == null) {
                return Result.error("未找到对应的入库单");
            }

            // 检查入库单状态，只允许状态为"1"的入库单提交
            if (!"1".equals(cuttingInbound.getOrderStatus())) {
                return Result.error("只有状态为未提交的入库单才能执行提交操作");
            }

            // 2. 更新状态为已提交
            cuttingInbound.setOrderStatus("2");
            boolean updateResult = cuttingInboundService.updateById(cuttingInbound);
            if (!updateResult) {
                return Result.error("更新入库单状态失败");
            }

            // 3. 获取入库明细
            List<CuttingInboundDetail> detailList = cuttingInboundDetailService.lambdaQuery()
                    .eq(CuttingInboundDetail::getOrderId, orderId)
                    .list();

            // 用于统计总数量

            // 4. 根据明细数量生成库存记录和条码
            int totalSubmitted = 0;
            for (CuttingInboundDetail detail : detailList) {
                // 根据明细中的数量生成对应数量的库存记录receive_number
                int quantity = detail.getReceiveNumber() != null ? detail.getReceiveNumber() : 0;
                totalSubmitted = 0;
                for (int i = 0; i < quantity; i++) {
                    totalSubmitted += quantity;
                    // 为每个刀具生成独立的库存记录
                    CuttingInventory cuttingInventory = new CuttingInventory();
                    cuttingInventory.setCuttingId(detail.getCuttingId());
                    // 为每个刀具生成唯一条码
                    cuttingInventory.setCuttingBarcode(generateUniqueBarcode(detail.getCuttingId(), i));
                    // 设置库存状态为在库
                    cuttingInventory.setInventoryStatus("正常");
                    // 设置当前寿命为100
                    cuttingInventory.setCurrentLife(BigDecimal.valueOf(100));
                    // 保存到库存表
                    boolean saveResult = cuttingInventoryService.save(cuttingInventory);
                    if (!saveResult) {
                        return Result.error("保存库存记录失败");
                    }

                    // 建立入库单与库存的关联关系
                    CuttingInboundInventory cuttingInboundInventory = new CuttingInboundInventory();
                    cuttingInboundInventory.setOrderId(orderId);
                    cuttingInboundInventory.setInventoryId(cuttingInventory.getId());

                    // 保存关联关系
                    boolean relationSaveResult = cuttingInboundInventoryService.save(cuttingInboundInventory);
                    if (!relationSaveResult) {
                        return Result.error("保存关联关系失败");
                    }
                }
            }
            Map<String, Object> result = new HashMap<>();
            result.put("message", "提交成功");
            result.put("totalSubmitted", totalSubmitted);
            return Result.ok("提交成功");
        } catch (Exception e) {
            log.error("提交入库单失败，orderId: " + orderId, e);
            return Result.error("提交失败: " + e.getMessage());
        }
    }
}