From a67dab8161c7428aa7cbd6f9051dd5ae77af4ed8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 19:13:41 +0800
Subject: [PATCH] fix: 修复考勤异常并验证原材料销售审批

---
 yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImplTest.java                       |   78 +++++++++++++++++++++++++++++++++++++++
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionSaveReqVO.java |    5 +-
 2 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImplTest.java b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImplTest.java
new file mode 100644
index 0000000..8a8b58c
--- /dev/null
+++ b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImplTest.java
@@ -0,0 +1,78 @@
+package cn.iocoder.yudao.module.erp.service.sale;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+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.dal.mysql.sale.ErpSaleOrderItemMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderMapper;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.enums.MdmItemTypeEnum;
+import cn.iocoder.yudao.module.mes.api.mps.MesProMpsApi;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class ErpSaleOrderServiceImplTest {
+
+    @Mock
+    private ErpSaleOrderMapper saleOrderMapper;
+    @Mock
+    private ErpSaleOrderItemMapper saleOrderItemMapper;
+    @Mock
+    private MdmItemApi mdmItemApi;
+    @Mock
+    private MesProMpsApi mpsApi;
+
+    @InjectMocks
+    private ErpSaleOrderServiceImpl saleOrderService;
+
+    @Test
+    void updateSaleOrderStatus_materialItem_shouldApproveWithoutCreatingMps() {
+        Long orderId = 1L;
+        Long itemId = 10L;
+        Long materialId = 20L;
+        ErpSaleOrderDO order = ErpSaleOrderDO.builder()
+                .id(orderId)
+                .status(ErpAuditStatus.PROCESS.getStatus())
+                .build();
+        ErpSaleOrderItemDO orderItem = ErpSaleOrderItemDO.builder()
+                .id(itemId)
+                .orderId(orderId)
+                .productId(materialId)
+                .needProduction(1)
+                .build();
+        MdmItemRespDTO material = new MdmItemRespDTO();
+        material.setId(materialId);
+        material.setItemType(MdmItemTypeEnum.MATERIAL.getType());
+
+        when(saleOrderMapper.selectById(orderId)).thenReturn(order);
+        when(saleOrderMapper.updateByIdAndStatus(eq(orderId), eq(ErpAuditStatus.PROCESS.getStatus()),
+                any(ErpSaleOrderDO.class))).thenReturn(1);
+        when(saleOrderItemMapper.selectListByOrderId(orderId)).thenReturn(List.of(orderItem));
+        when(mdmItemApi.getItem(materialId)).thenReturn(CommonResult.success(material));
+
+        saleOrderService.updateSaleOrderStatus(orderId, ErpAuditStatus.APPROVE.getStatus());
+
+        ArgumentCaptor<ErpSaleOrderItemDO> itemCaptor = ArgumentCaptor.forClass(ErpSaleOrderItemDO.class);
+        verify(saleOrderItemMapper).updateById(itemCaptor.capture());
+        assertEquals(itemId, itemCaptor.getValue().getId());
+        assertEquals(0, itemCaptor.getValue().getNeedProduction());
+        verify(mpsApi, never()).createMps(any());
+    }
+
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionSaveReqVO.java
index 8cb3df2..202b797 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionSaveReqVO.java
@@ -24,8 +24,7 @@
     @NotNull(message = "寮傚父鏃ユ湡涓嶈兘涓虹┖")
     private LocalDate exceptionDate;
 
-    @Schema(description = "寮傚父鏃堕棿鐐�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024-01-15 09:00:00")
-    @NotNull(message = "寮傚父鏃堕棿鐐逛笉鑳戒负绌�")
+    @Schema(description = "寮傚父鏃堕棿鐐�", example = "2024-01-15 09:00:00")
     private LocalDateTime exceptionTime;
 
     @Schema(description = "鐢宠鍘熷洜", requiredMode = Schema.RequiredMode.REQUIRED, example = "蹇樿鎵撳崱")
@@ -38,4 +37,4 @@
     @Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
     private String remark;
 
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3