refactor(cms): 优化刀具管理功能和性能 刀具报废功能 - 新增 提交（/subumit）接口 刀具报废功能 - 修改完善其删除功能，同时...

lixiangyu

昨天 4f38e5827b848298de8e95f59e0ba9b24951e615

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

@@ -7,12 +7,10 @@

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.CuttingInboundInventory;
import org.jeecg.modules.cms.entity.CuttingInventory;
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;
@@ -141,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("删除成功!");
    }

@@ -278,85 +279,18 @@


    /*
     * 生成唯一条码的方法
     * 生成唯一条码的方法（目前还没有编码规则，确定后在这里改）
     */
    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) {
        //         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());
        }
        return cuttingInboundService.submit(orderId);
    }
}