From fdba1595d89d44ced189890c7bc7c918209d4c6d Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期四, 21 八月 2025 18:00:32 +0800
Subject: [PATCH] feat(cms): 实现刀具入库单提交功能并优化 Excel导入逻辑
---
src/main/java/org/jeecg/modules/cms/service/ICuttingInboundDetailService.java | 1
src/main/java/org/jeecg/modules/cms/service/impl/CuttingInboundServiceImpl.java | 80 ++++++++++++++++
src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java | 1
src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java | 157 ++++++++++++++++++++++++-------
src/main/java/org/jeecg/modules/cms/service/ICuttingInboundService.java | 6 +
5 files changed, 208 insertions(+), 37 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..173d574 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.cms.controller;
+import java.math.BigDecimal;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -10,8 +11,11 @@
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 +23,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 +60,10 @@
@Autowired
private CuttingInboundMapper cuttingInboundMapper;
+ @Autowired
+ private ICuttingInventoryService cuttingInventoryService;
+ @Autowired
+ private ICuttingInboundInventoryService cuttingInboundInventoryService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -224,42 +237,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 +276,88 @@
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();
+
+ // 鐢ㄤ簬缁熻鎬绘暟閲�
+
+ // 4. 鏍规嵁鏄庣粏鏁伴噺鐢熸垚搴撳瓨璁板綍鍜屾潯鐮�
+ int totalSubmitted = 0;
+ for (CuttingInboundDetail detail : detailList) {
+ // 鏍规嵁鏄庣粏涓殑鏁伴噺鐢熸垚瀵瑰簲鏁伴噺鐨勫簱瀛樿褰時eceive_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());
+ }
+ }
}
+
+
diff --git a/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java b/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
index 4b6649c..f9c7d7b 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
@@ -55,6 +55,7 @@
/**鍒�鍏稩D*/
@Excel(name = "鍒�鍏稩D", width = 15)
@ApiModelProperty(value = "鍒�鍏稩D")
+ @Dict(dictTable = "cms_cutting_tool",dicCode="id",dicText = "cutting_code")
private String cuttingId;
/**鍒�鍏锋潯鐮�*/
@Excel(name = "鍒�鍏锋潯鐮�", width = 15)
diff --git a/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundDetailService.java b/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundDetailService.java
index c34fa1d..836a042 100644
--- a/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundDetailService.java
+++ b/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundDetailService.java
@@ -15,4 +15,5 @@
public interface ICuttingInboundDetailService extends IService<CuttingInboundDetail> {
public List<Map<String, Object>> detailList(String orderId);
+
}
diff --git a/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundService.java b/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundService.java
index 3cdc08a..c01d8f1 100644
--- a/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundService.java
+++ b/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundService.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.cms.service;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.cms.entity.CuttingInbound;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cms.vo.CuttingInboundExportVo;
+
+import java.util.List;
/**
* @Description: 鍒�鍏峰叆搴撳崟
@@ -10,5 +14,5 @@
* @Version: V1.0
*/
public interface ICuttingInboundService extends IService<CuttingInbound> {
-
+ Result<?> importExcelData(List<CuttingInboundExportVo> list);
}
diff --git a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInboundServiceImpl.java b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInboundServiceImpl.java
index 4ca9708..991f67f 100644
--- a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInboundServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInboundServiceImpl.java
@@ -1,11 +1,20 @@
package org.jeecg.modules.cms.service.impl;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.cms.entity.CuttingInbound;
+import org.jeecg.modules.cms.entity.CuttingInboundDetail;
import org.jeecg.modules.cms.mapper.CuttingInboundMapper;
import org.jeecg.modules.cms.service.ICuttingInboundService;
+import org.jeecg.modules.cms.service.ICuttingInboundDetailService;
+import org.jeecg.modules.cms.vo.CuttingInboundExportVo;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: 鍒�鍏峰叆搴撳崟
@@ -15,5 +24,76 @@
*/
@Service
public class CuttingInboundServiceImpl extends ServiceImpl<CuttingInboundMapper, CuttingInbound> implements ICuttingInboundService {
+ @Autowired
+ private ICuttingInboundDetailService cuttingInboundDetailService; // 娉ㄥ叆浠庤〃鏈嶅姟
+ /**
+ * 閫氳繃Excel瀵煎叆鍒�鍏峰叆搴撳崟鏁版嵁
+ *
+ * @param list 寰呭鍏ョ殑鏁版嵁鍒楄〃
+ * @return 瀵煎叆缁撴灉
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result<?> importExcelData(List<CuttingInboundExportVo> list) {
+// try {
+// for (CuttingInboundExportVo exportVo : list) {
+// // 淇濆瓨涓昏〃鏁版嵁
+// CuttingInbound cuttingInbound = new CuttingInbound();
+// cuttingInbound.setReceiver(exportVo.getReceiver());
+// cuttingInbound.setReceiveTime(exportVo.getReceiveTime());
+// cuttingInbound.setReceiveComment(exportVo.getReceiveComment());
+// cuttingInbound.setConfirmer(exportVo.getConfirmer());
+// cuttingInbound.setConfirmTime(exportVo.getConfirmTime());
+// cuttingInbound.setConfirmComment(exportVo.getConfirmComment());
+// cuttingInbound.setOrderStatus(exportVo.getOrderStatus());
+//
+// // 淇濆瓨涓昏〃鏁版嵁浠ヨ幏鍙朓D
+// this.save(cuttingInbound);
+//
+// // 鑾峰彇涓昏〃ID
+// String orderId = cuttingInbound.getId();
+//
+// // 澶勭悊浠庤〃鏁版嵁
+// List<CuttingInboundDetail> detailList = exportVo.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("瀵煎叆澶辫触: " + e.getMessage());
+// }
+// }
+ for (CuttingInboundExportVo exportVo : list) {
+ // 淇濆瓨涓昏〃鏁版嵁
+ CuttingInbound cuttingInbound = new CuttingInbound();
+ cuttingInbound.setReceiver(exportVo.getReceiver());
+ cuttingInbound.setReceiveTime(exportVo.getReceiveTime());
+ cuttingInbound.setReceiveComment(exportVo.getReceiveComment());
+ cuttingInbound.setConfirmer(exportVo.getConfirmer());
+ cuttingInbound.setConfirmTime(exportVo.getConfirmTime());
+ cuttingInbound.setConfirmComment(exportVo.getConfirmComment());
+ cuttingInbound.setOrderStatus(exportVo.getOrderStatus());
+ // 淇濆瓨涓昏〃鏁版嵁浠ヨ幏鍙朓D
+ this.save(cuttingInbound);
+
+ // 鑾峰彇涓昏〃ID
+ String orderId = cuttingInbound.getId();
+
+ // 澶勭悊浠庤〃鏁版嵁
+ List<CuttingInboundDetail> detailList = exportVo.getDetailList();
+ if (detailList != null && !detailList.isEmpty()) {
+ for (CuttingInboundDetail detail : detailList) {
+ detail.setOrderId(orderId); // 璁剧疆澶栭敭鍏宠仈
+ cuttingInboundDetailService.save(detail);
+ }
+ }
+ }
+ return Result.ok("瀵煎叆鎴愬姛");
+ }
}
--
Gitblit v1.9.3