From 4f38e5827b848298de8e95f59e0ba9b24951e615 Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期二, 16 九月 2025 18:01:18 +0800
Subject: [PATCH] refactor(cms): 优化刀具管理功能和性能 刀具报废功能 - 新增 提交（/subumit）接口 刀具报废功能 - 修改完善其删除功能，同时删除报废单和报废明细 刀具报废功能 - （/add）接口中增加逻辑判断禁制同一个刀具重复申请报废 刀具领用功能 - 完善刀具寿命计算 刀具领用功能 - 完善其删除功能，同时删除领用单和领用明细 刀具入库功能 - 完善其删除功能，同时删除入库单和入库明细 把刀具库存中的库存状态，从“正常”改为“在库”。
---
src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java | 95 ++++++++++++++++++++++++++++-------------------
1 files changed, 57 insertions(+), 38 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java b/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
index 5b702de..5066561 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
+++ b/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) {
+ // 鏉＄爜鐢熸垚瑙勫垯绀轰緥锛氬垁鍏稩D + 搴忓彿(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);
+ }
}
+
+
--
Gitblit v1.9.3