From 747d8ed2f6926581f2ead16d13478914728a9ffa Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期日, 31 八月 2025 12:36:23 +0800
Subject: [PATCH] refactor(cms): 优化刀具入库提交流程并添加性能计时
---
src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 200 insertions(+), 36 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..932e249 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,22 @@
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.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;
@@ -19,13 +24,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 +61,10 @@
@Autowired
private CuttingInboundMapper cuttingInboundMapper;
+ @Autowired
+ private ICuttingInventoryService cuttingInventoryService;
+ @Autowired
+ private ICuttingInboundInventoryService cuttingInboundInventoryService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -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,166 @@
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")
+// 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();
+//
+// // 鐢ㄤ簬缁熻鎬绘暟閲�
+// int totalSubmitted = 0;
+//
+// // 鎵归噺淇濆瓨鐨勫垪琛�
+// List<CuttingInventory> inventoryList = new ArrayList<>();
+// List<CuttingInboundInventory> inboundInventoryList = new ArrayList<>();
+//
+// // 4. 鏍规嵁鏄庣粏鏁伴噺鐢熸垚搴撳瓨璁板綍鍜屾潯鐮�
+// for (CuttingInboundDetail detail : detailList) {
+// // 鏍规嵁鏄庣粏涓殑鏁伴噺鐢熸垚瀵瑰簲鏁伴噺鐨勫簱瀛樿褰時eceive_number
+// int quantity = detail.getReceiveNumber() != null ? detail.getReceiveNumber() : 0;
+// for (int i = 0; i < quantity; i++) {
+// totalSubmitted++;
+// // 涓烘瘡涓垁鍏风敓鎴愮嫭绔嬬殑搴撳瓨璁板綍
+// CuttingInventory cuttingInventory = new CuttingInventory();
+// String inventoryId = UUID.randomUUID().toString().replace("-", "");
+// cuttingInventory.setId(inventoryId);
+// cuttingInventory.setCuttingId(detail.getCuttingId());
+// // 涓烘瘡涓垁鍏风敓鎴愬敮涓�鏉＄爜
+// cuttingInventory.setCuttingBarcode(generateUniqueBarcode(detail.getCuttingId(), i));
+// // 璁剧疆搴撳瓨鐘舵�佷负鍦ㄥ簱
+// cuttingInventory.setInventoryStatus("姝ｅ父");
+// // 璁剧疆褰撳墠瀵垮懡涓�100
+// cuttingInventory.setCurrentLife(BigDecimal.valueOf(100));
+// // 娣诲姞鍒版壒閲忎繚瀛樺垪琛�
+// inventoryList.add(cuttingInventory);
+//
+// // 寤虹珛鍏ュ簱鍗曚笌搴撳瓨鐨勫叧鑱斿叧绯�
+// CuttingInboundInventory cuttingInboundInventory = new CuttingInboundInventory();
+// cuttingInboundInventory.setOrderId(orderId);
+// cuttingInboundInventory.setInventoryId(inventoryId);
+// // 娣诲姞鍒版壒閲忎繚瀛樺垪琛�
+// inboundInventoryList.add(cuttingInboundInventory);
+// }
+// }
+//
+// // 鎵归噺淇濆瓨搴撳瓨璁板綍
+// if (!inventoryList.isEmpty()) {
+// boolean saveResult = cuttingInventoryService.saveBatch(inventoryList);
+// if (!saveResult) {
+// throw new RuntimeException("淇濆瓨搴撳瓨璁板綍澶辫触");
+// }
+// }
+//
+// // 鎵归噺淇濆瓨鍏宠仈鍏崇郴
+// if (!inboundInventoryList.isEmpty()) {
+// boolean relationSaveResult = cuttingInboundInventoryService.saveBatch(inboundInventoryList);
+// if (!relationSaveResult) {
+// throw new RuntimeException("淇濆瓨鍏宠仈鍏崇郴澶辫触");
+// }
+// }
+//
+// Map<String, Object> result = new HashMap<>();
+// result.put("message", "鎻愪氦鎴愬姛");
+// result.put("totalSubmitted", totalSubmitted);
+// return Result.ok(result);
+// } catch (Exception e) {
+// log.error("鎻愪氦鍏ュ簱鍗曞け璐ワ紝orderId: " + orderId, e);
+// throw new RuntimeException("鎻愪氦澶辫触: " + e.getMessage(), e);
+// }
+// }
+
+ @GetMapping("/submit")
+ @Timed(value = "cutting.inbound.submit", description = "鍒�鍏峰叆搴撴彁浜よ�楁椂")
+ public Result<?> submit(@RequestParam("orderId") String orderId) {
+ long startTime = System.currentTimeMillis();
+ try {
+ // 1. 鏇存柊鍏ュ簱鍗曠姸鎬�
+ CuttingInbound cuttingInbound = cuttingInboundService.getById(orderId);
+ if (cuttingInbound == null) {
+ return Result.error("鏈壘鍒板搴旂殑鍏ュ簱鍗�");
+ }
+ cuttingInbound.setOrderStatus("2");
+ cuttingInboundService.updateById(cuttingInbound);
+
+ // 2. 鑾峰彇鍏ュ簱鏄庣粏
+ List<CuttingInboundDetail> detailList = cuttingInboundDetailService.lambdaQuery()
+ .eq(CuttingInboundDetail::getOrderId, orderId)
+ .list();
+
+ // 3. 鏀堕泦鎵�鏈夐渶瑕佷繚瀛樼殑鏁版嵁
+ List<CuttingInventory> inventoryList = new ArrayList<>();
+ List<CuttingInboundInventory> inboundInventoryList = new ArrayList<>();
+
+ for (CuttingInboundDetail detail : detailList) {
+ int quantity = detail.getReceiveNumber() != null ? detail.getReceiveNumber().intValue() : 0;
+
+ for (int i = 0; i < quantity; i++) {
+ // 鐢熸垚搴撳瓨璁板綍
+ CuttingInventory cuttingInventory = new CuttingInventory();
+ cuttingInventory.setCuttingId(detail.getCuttingId());
+ cuttingInventory.setCuttingBarcode(generateUniqueBarcode(detail.getCuttingId(), i));
+ cuttingInventory.setInventoryStatus("姝ｅ父");
+ cuttingInventory.setCurrentLife(BigDecimal.valueOf(100));
+ inventoryList.add(cuttingInventory);
+ }
+ }
+
+ // 4. 鎵归噺淇濆瓨搴撳瓨璁板綍锛堜竴娆℃�ф搷浣滐級
+ if (!inventoryList.isEmpty()) {
+ cuttingInventoryService.saveBatch(inventoryList);
+
+ // 5. 涓烘瘡涓繚瀛樼殑搴撳瓨璁板綍鍒涘缓鍏宠仈鍏崇郴
+ for (CuttingInventory inventory : inventoryList) {
+ CuttingInboundInventory cuttingInboundInventory = new CuttingInboundInventory();
+ cuttingInboundInventory.setOrderId(orderId);
+ cuttingInboundInventory.setInventoryId(inventory.getId());
+ inboundInventoryList.add(cuttingInboundInventory);
+ }
+
+ // 6. 鎵归噺淇濆瓨鍏宠仈鍏崇郴锛堜竴娆℃�ф搷浣滐級
+ cuttingInboundInventoryService.saveBatch(inboundInventoryList);
+ }
+
+ long endTime = System.currentTimeMillis();
+ log.info("鍒�鍏峰叆搴撴彁浜ゅ畬鎴愶紝鑰楁椂: {} s", (endTime - startTime)/1000);
+ return Result.ok("鎻愪氦鎴愬姛");
+
+ } catch (Exception e) {
+ long endTime = System.currentTimeMillis();
+ log.error("鎻愪氦鍏ュ簱鍗曞け璐ワ紝orderId: " + orderId + "锛岃�楁椂: " + (endTime - startTime) + " ms", e);
+ return Result.error("鎻愪氦澶辫触: " + e.getMessage());
+ }
+ }
}
+
+
--
Gitblit v1.9.3