From f785e619ff7cbe99aa80fc7679a244224ab5024f Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 03 十一月 2026 09:19:47 +0800
Subject: [PATCH] feat(erp): 生产车间可从销售订单直接生成生产计划（结合库存判断）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 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 5bf0421..a7dc1b9 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;
@@ -37,10 +39,12 @@
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;
@@ -206,6 +210,28 @@
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) {
if (CollUtil.isEmpty(pageResult.getList())) {
return PageResult.empty(pageResult.getTotal());
@@ -268,7 +294,9 @@
}
// 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()));
@@ -306,4 +334,29 @@
item.setTotalPrice(productAmount.add(tax));
}
+ /**
+ * 鑾峰緱寰呭畨鎺掔敓浜х殑閿�鍞鍗曟槑缁�
+ *
+ * 渚涚敓浜ц溅闂淬�屼粠閿�鍞鍗曠敓鎴愮敓浜ц鍒掋�嶄娇鐢細
+ * 杩斿洖宸插鏍镐笖灏氭湭瀹夋帓鏈夋晥 MPS 鐨勬槑缁嗭紝甯﹀綋鍓嶅彲鐢ㄥ簱瀛樹笌寤鸿鐢熶骇鏁伴噺
+ */
+ @GetMapping("/pending-production-list")
+ @Operation(summary = "鑾峰緱寰呭畨鎺掔敓浜х殑閿�鍞鍗曟槑缁�")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
+ public CommonResult<List<cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPendingProductionRespVO>>
+ getPendingProductionList() {
+ return success(saleOrderService.getPendingProductionList());
+ }
+
+ /**
+ * 浠庨攢鍞鍗曟壒閲忕敓鎴愮敓浜ц鍒掞紙MPS锛�
+ */
+ @PostMapping("/generate-mps")
+ @Operation(summary = "浠庨攢鍞鍗曟壒閲忕敓鎴愮敓浜ц鍒�")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:update')")
+ public CommonResult<Integer> generateMpsFromSaleOrder(
+ @Valid @RequestBody cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderGenerateMpsReqVO reqVO) {
+ return success(saleOrderService.generateMpsFromSaleOrder(reqVO));
+ }
+
}
--
Gitblit v1.9.3