✨ feat(mes): 更新 MES 状态常量和相关枚举

将 MES 设备维护记录状态枚举中的状态值更新为常量引用，增强代码可读性和一致性。同时，新增 MES 单据状态常量，简化状态管理。

✨ feat(mes): 更新 MES 状态常量和相关枚举
将 MES 设备维护记录状态枚举中的状态值更新为常量引用，增强代码可读性和一致性。同时，新增 MES 单据状态常量，简化状态管理。
YunaiV
1 parent b41bb318
Showing 6 changed files with 16 additions and 2 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvMaintenRecordStatusEnum.java
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImplTest.java
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImplTest.java
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImplTest.java
yudao-module-mes/src/test/resources/sql/create_tables.sql
 package cn.iocoder.yudao.module.mes.enums.dv;
 import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -20,13 +21,13 @@ public enum MesDvMaintenRecordStatusEnum implements ArrayValuable&lt;Integer&gt; {
      *
      * 对应 MesDvMaintenRecordService#createMaintenRecord 方法
      */
-    PREPARE(1, "草稿"),
+    PREPARE(MesOrderStatusConstants.PREPARE, "草稿"),
     /**
      * 已提交
      *
      * 对应 MesDvMaintenRecordService#submitMaintenRecord 方法
      */
-    SUBMITTED(2, "已提交");
+    SUBMITTED(MesOrderStatusConstants.FINISHED, "已提交");
     public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesDvMaintenRecordStatusEnum::getStatus)
             .toArray(Integer[]::new);
@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordServ
 import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
 import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
 import cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt.MesWmOutsourceReceiptService;
+import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
@@ -55,6 +56,8 @@ public class MesQcIqcServiceImplTest extends BaseDbUnitTest {
     private MesQcTemplateItemService templateItemService;
     @MockitoBean
     private AdminUserApi adminUserApi;
+    @MockitoBean
+    private MesQcIndicatorResultService indicatorResultService;
     @Test
     public void testFinishIqc_writeBack_arrivalNotice() {
@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordServ
 import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
 import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
 import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService;
+import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
@@ -55,6 +56,8 @@ public class MesQcOqcServiceImplTest extends BaseDbUnitTest {
     private MesQcDefectRecordService defectRecordService;
     @MockitoBean
     private AdminUserApi adminUserApi;
+    @MockitoBean
+    private MesQcIndicatorResultService indicatorResultService;
     @Test
     public void testFinishOqc_writeBack_productSales() {
@@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordServ
 import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
 import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueLineService;
 import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
+import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
@@ -56,6 +57,8 @@ public class MesQcRqcServiceImplTest extends BaseDbUnitTest {
     private MesQcDefectRecordService defectRecordService;
     @MockitoBean
     private AdminUserApi adminUserApi;
+    @MockitoBean
+    private MesQcIndicatorResultService indicatorResultService;
     @Test
     public void testFinishRqc_successWithReturnIssue() {
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalN
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.arrivalnotice.MesWmArrivalNoticeMapper;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmArrivalNoticeStatusEnum;
+import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
@@ -38,6 +39,8 @@ public class MesWmArrivalNoticeServiceImplTest extends BaseDbUnitTest {
     @MockitoBean
     private MesWmArrivalNoticeLineService arrivalNoticeLineService;
+    @MockitoBean
+    private MesMdVendorService vendorService;
     @Test
     public void testUpdateArrivalNoticeWhenIqcFinish_success_allLinesChecked() {
@@ -519,6 +519,7 @@ CREATE TABLE IF NOT EXISTS &quot;mes_wm_return_sales_line&quot; (
     "item_id" bigint NOT NULL,
     "quantity" decimal(12,2) NOT NULL DEFAULT 0.00,
     "batch_id" bigint DEFAULT NULL,
+    "batch_code" varchar(255) DEFAULT NULL,
     "rqc_id" bigint DEFAULT NULL,
     "rqc_check_flag" bit NOT NULL DEFAULT FALSE,
     "quality_status" int DEFAULT NULL,