From 0889e6b6045796115b254e34237a932d9241c0f8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 10:54:50 +0800
Subject: [PATCH] 诚发五金：入库/调整/移库/调拨/退料/盘点不再要求手选库区库位，后端自动落到仓库默认库区库位
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
index 45d87ba..1c6fb69 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
@@ -9,17 +9,22 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsAuditReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderItemRespVO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps.MesProMpsDO;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.pro.mps.MesProMpsService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -31,6 +36,10 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.Duration;
+import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -53,6 +62,8 @@
private MesMdUnitMeasureService unitMeasureService;
@Resource
private CrmCustomerApi customerApi;
+ @Resource
+ private AdminUserApi adminUserApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇涓昏鍒�")
@@ -81,7 +92,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢熶骇涓昏鍒�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-mps:query')")
public CommonResult<MesProMpsRespVO> getMps(@RequestParam("id") Long id) {
MesProMpsDO mps = mpsService.getMps(id);
if (mps == null) {
@@ -92,7 +102,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐢熶骇涓昏鍒掑垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:pro-mps:query')")
public CommonResult<PageResult<MesProMpsRespVO>> getMpsPage(@Valid MesProMpsPageReqVO pageReqVO) {
PageResult<MesProMpsDO> pageResult = mpsService.getMpsPage(pageReqVO);
return success(new PageResult<>(buildMpsRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -134,6 +143,38 @@
return success(true);
}
+ @PostMapping("/submit")
+ @Operation(summary = "鎻愪氦鐢熶骇涓昏鍒掑鏍�")
+ @Parameter(name = "id", description = "MPS 缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pro-mps:submit')")
+ public CommonResult<Boolean> submitMps(@RequestParam("id") Long id) {
+ mpsService.submitMps(id);
+ return success(true);
+ }
+
+ @PostMapping("/audit")
+ @Operation(summary = "瀹℃牳鐢熶骇涓昏鍒�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-mps:audit')")
+ public CommonResult<Boolean> auditMps(@Valid @RequestBody MesProMpsAuditReqVO reqVO) {
+ mpsService.auditMps(reqVO);
+ return success(true);
+ }
+
+ @GetMapping("/item-list")
+ @Operation(summary = "鑾峰緱鐢熶骇涓昏鍒掕緟鏂欓渶姹傚垪琛�")
+ @Parameter(name = "id", description = "MPS 缂栧彿", required = true)
+ public CommonResult<List<MesProWorkOrderItemRespVO>> getMpsItemList(@RequestParam("id") Long id) {
+ return success(mpsService.getMpsItemList(id));
+ }
+
+ @PostMapping("/generate-purchase-request")
+ @Operation(summary = "鏍规嵁鐢熶骇涓昏鍒掕緟鏂欑己鍙ｇ敓鎴愰噰璐敵璇峰崟")
+ @Parameter(name = "id", description = "MPS 缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pro-mps:generate-purchase')")
+ public CommonResult<Long> generatePurchaseRequest(@RequestParam("id") Long id) {
+ return success(mpsService.generatePurchaseRequest(id));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesProMpsRespVO> buildMpsRespVOList(List<MesProMpsDO> list) {
@@ -147,6 +188,8 @@
convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
convertSet(list, MesProMpsDO::getClientId));
+ Map<Long, AdminUserRespDTO> auditUserMap = adminUserApi.getUserMap(
+ convertSet(list, MesProMpsDO::getAuditUserId));
// 2. 鎷兼帴 VO
return BeanUtils.toBean(list, MesProMpsRespVO.class, vo -> {
MapUtils.findAndThen(itemMap, vo.getProductId(), item -> {
@@ -158,7 +201,37 @@
});
MapUtils.findAndThen(clientMap, vo.getClientId(),
client -> vo.setClientName(client.getName()));
+ MapUtils.findAndThen(auditUserMap, vo.getAuditUserId(),
+ user -> vo.setAuditUserName(user.getNickname()));
+ vo.setProgressWarning(buildProgressWarning(vo));
});
}
+ /**
+ * 璁＄畻鎵ц杩涘害棰勮锛氬凡涓嬪彂璁″垝鎸夆�滃伐鏈熷凡杩囨瘮渚� - 瀹為檯瀹屾垚姣斾緥鈥濆垽鏂紝鍋忓樊杈惧埌 20% 鎻愮ず
+ */
+ private String buildProgressWarning(MesProMpsRespVO vo) {
+ if (!MesProMpsStatusEnum.ISSUED.getStatus().equals(vo.getStatus())) {
+ return null;
+ }
+ LocalDateTime start = vo.getIssueDate() != null ? vo.getIssueDate() : vo.getPlanStartDate();
+ LocalDateTime end = vo.getRequestDate();
+ if (start == null || end == null || !end.isAfter(start)) {
+ return null;
+ }
+ long totalMinutes = Duration.between(start, end).toMinutes();
+ long elapsedMinutes = Duration.between(start, LocalDateTime.now()).toMinutes();
+ double plannedRatio = Math.min(1D, Math.max(0D, (double) elapsedMinutes / totalMinutes));
+ BigDecimal quantity = vo.getQuantity() != null ? vo.getQuantity() : BigDecimal.ZERO;
+ BigDecimal produced = vo.getQuantityProduced() != null ? vo.getQuantityProduced() : BigDecimal.ZERO;
+ double producedRatio = quantity.compareTo(BigDecimal.ZERO) > 0
+ ? Math.min(1D, produced.divide(quantity, 4, RoundingMode.HALF_UP).doubleValue())
+ : 0D;
+ if (plannedRatio - producedRatio < 0.2D) {
+ return null;
+ }
+ return String.format("宸ユ湡宸茶繃 %d%%锛屽疄闄呭畬鎴� %d%%锛屽瓨鍦ㄨ繘搴﹀亸宸紝璇锋帓鏌ョ摱棰堝伐搴�",
+ Math.round(plannedRatio * 100), Math.round(producedRatio * 100));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3