From 5f708178b260cabf081f9049cf51e9ad66ae2911 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 10 九月 2026 14:49:29 +0800
Subject: [PATCH] feat(erp/mes): 新增采购订单/销售订单/计量器具 Excel 导入，含导入菜单权限 SQL
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 70 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 7 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
index 018261f..d08ac09 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
@@ -14,6 +14,8 @@
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderSaveReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportRespVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderItemDO;
import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOrderService;
@@ -24,6 +26,7 @@
import cn.iocoder.yudao.module.mes.api.mps.MesProMpsApi;
import cn.iocoder.yudao.module.mes.api.productsales.MesWmProductSalesLineApi;
import cn.iocoder.yudao.module.mes.api.salesnotice.MesWmSalesNoticeApi;
+import cn.iocoder.yudao.module.mes.api.wms.MesWmStockApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -36,14 +39,17 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.List;
+import java.util.Arrays;
import java.util.Map;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -72,6 +78,8 @@
private StorageAttachmentApi storageAttachmentApi;
@Resource
private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private MesWmStockApi mesWmStockApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞鍗�")
@@ -88,13 +96,21 @@
return success(true);
}
- @PutMapping("/update-status")
- @Operation(summary = "鏇存柊閿�鍞鍗曠殑鐘舵��")
+ @PostMapping("/submit")
+ @Operation(summary = "鎻愪氦閿�鍞鍗曞鎵癸紙鍗忓悓鍔炲叕锛�")
@PreAuthorize("@ss.hasPermission('erp:sale-order:update-status')")
- public CommonResult<Boolean> updateSaleOrderStatus(@RequestParam("id") Long id,
- @RequestParam("status") Integer status) {
- saleOrderService.updateSaleOrderStatus(id, status);
+ public CommonResult<Boolean> submitSaleOrder(@RequestParam("id") Long id,
+ @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ Long userId = getLoginUserId();
+ saleOrderService.submitSaleOrder(id, processDefinitionKey, userId);
return success(true);
+ }
+
+ @GetMapping("/approve-process-list")
+ @Operation(summary = "鑾峰彇閿�鍞鍗曞鎵规祦绋嬪垪琛�")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
+ public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
+ return success(saleOrderService.getSaleOrderApproveProcessDefinitionList());
}
@PutMapping("/cancel")
@@ -158,7 +174,8 @@
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductUnitId));
// 3. 杞崲璁㈠崟椤�
List<ErpSaleOrderRespVO.Item> itemVOList = BeanUtils.toBean(saleOrderItemList, ErpSaleOrderRespVO.Item.class, item -> {
- item.setStockCount(BigDecimal.ZERO); // 搴撳瓨淇℃伅鏆備笉鏌ヨ锛堜粨鍌ㄧ墿娴佹ā鍧楋級
+ fillItemPrice(item);
+ item.setStockCount(mesWmStockApi.getStockQuantity(item.getProductId()));
item.setBatchCode(batchCodeMap.get(item.getId()));
MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
item.setProductName(mdmItem.getName()).setProductBarCode(mdmItem.getBarCode())
@@ -191,6 +208,28 @@
List<ErpSaleOrderRespVO> list = buildSaleOrderVOPageResult(saleOrderService.getSaleOrderPage(pageReqVO)).getList();
// 瀵煎嚭 Excel
ExcelUtils.write(response, "閿�鍞鍗�.xls", "鏁版嵁", ErpSaleOrderRespVO.class, list);
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆閿�鍞鍗曟ā鏉�")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:import')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<ErpSaleOrderImportExcelVO> list = Arrays.asList(
+ ErpSaleOrderImportExcelVO.builder()
+ .no("XSDD20260101000001").customerName("绀轰緥瀹㈡埛").contractNo("HT20260101")
+ .orderTime("2026-01-01 10:00:00").productCode("ITEM001").productName("绀轰緥浜у搧A")
+ .count(new BigDecimal("100")).productPrice(new BigDecimal("20.00"))
+ .taxPercent(new BigDecimal("13")).needProduction("鏄�").remark("绀轰緥").build());
+ ExcelUtils.write(response, "閿�鍞鍗曞鍏ユā鏉�.xls", "閿�鍞鍗�", ErpSaleOrderImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆閿�鍞鍗�")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:import')")
+ public CommonResult<ErpSaleOrderImportRespVO> importSaleOrderExcel(
+ @RequestParam("file") MultipartFile file) throws Exception {
+ List<ErpSaleOrderImportExcelVO> list = ExcelUtils.read(file, ErpSaleOrderImportExcelVO.class);
+ return success(saleOrderService.importSaleOrderList(list));
}
private PageResult<ErpSaleOrderRespVO> buildSaleOrderVOPageResult(PageResult<ErpSaleOrderDO> pageResult) {
@@ -255,8 +294,11 @@
}
// 2. 寮�濮嬫嫾鎺�
return BeanUtils.toBean(pageResult, ErpSaleOrderRespVO.class, saleOrder -> {
- saleOrder.setItems(BeanUtils.toBean(saleOrderItemMap.get(saleOrder.getId()), ErpSaleOrderRespVO.Item.class,
+ saleOrder.setItems(BeanUtils.toBean(
+ saleOrderItemMap.getOrDefault(saleOrder.getId(), java.util.Collections.<ErpSaleOrderItemDO>emptyList()),
+ ErpSaleOrderRespVO.Item.class,
item -> {
+ fillItemPrice(item);
item.setBatchCode(batchCodeMap.get(item.getId()));
MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
item.setProductName(mdmItem.getName()).setProductBarCode(mdmItem.getBarCode())
@@ -278,4 +320,18 @@
});
}
+ /**
+ * 濉厖璁㈠崟椤圭殑閲戦瀛楁
+ *
+ * DO 涓� totalPrice 涓轰骇鍝侀噾棰濓紙涓嶅惈绋庯級锛孯espVO 闇�瑕佽ˉ鍏細
+ * - totalProductPrice锛氫骇鍝侀噾棰�
+ * - totalPrice锛氬惈绋庨噾棰濓紙浜у搧閲戦 + 绋庨锛�
+ */
+ private void fillItemPrice(ErpSaleOrderRespVO.Item item) {
+ BigDecimal productAmount = item.getTotalPrice() != null ? item.getTotalPrice() : BigDecimal.ZERO;
+ BigDecimal tax = item.getTaxPrice() != null ? item.getTaxPrice() : BigDecimal.ZERO;
+ item.setTotalProductPrice(productAmount);
+ item.setTotalPrice(productAmount.add(tax));
+ }
+
}
--
Gitblit v1.9.3