BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 39ddc42240b61f845f8d183049719a81745c8ae2

Authored by YunaiV
1 parent b41bb318

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

将 MES 设备维护记录状态枚举中的状态值更新为常量引用，增强代码可读性和一致性。同时，新增 MES 单据状态常量，简化状态管理。
Inline Side-by-side
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
  View file @39ddc42
1 1 package cn.iocoder.yudao.module.mes.enums.dv;
2 2  
3 3 import cn.iocoder.yudao.framework.common.core.ArrayValuable;
  4 +import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants;
4 5 import lombok.AllArgsConstructor;
5 6 import lombok.Getter;
6 7  
... ... @@ -20,13 +21,13 @@ public enum MesDvMaintenRecordStatusEnum implements ArrayValuable<Integer> {
20 21 *
21 22 * 对应 MesDvMaintenRecordService#createMaintenRecord 方法
22 23 */
23   - PREPARE(1, "草稿"),
  24 + PREPARE(MesOrderStatusConstants.PREPARE, "草稿"),
24 25 /**
25 26 * 已提交
26 27 *
27 28 * 对应 MesDvMaintenRecordService#submitMaintenRecord 方法
28 29 */
29   - SUBMITTED(2, "已提交");
  30 + SUBMITTED(MesOrderStatusConstants.FINISHED, "已提交");
30 31  
31 32 public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesDvMaintenRecordStatusEnum::getStatus)
32 33 .toArray(Integer[]::new);
... ...
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImplTest.java
  View file @39ddc42
... ... @@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordServ
11 11 import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
12 12 import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
13 13 import cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt.MesWmOutsourceReceiptService;
  14 +import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
14 15 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
15 16 import org.junit.jupiter.api.Test;
16 17 import org.springframework.context.annotation.Import;
... ... @@ -55,6 +56,8 @@ public class MesQcIqcServiceImplTest extends BaseDbUnitTest {
55 56 private MesQcTemplateItemService templateItemService;
56 57 @MockitoBean
57 58 private AdminUserApi adminUserApi;
  59 + @MockitoBean
  60 + private MesQcIndicatorResultService indicatorResultService;
58 61  
59 62 @Test
60 63 public void testFinishIqc_writeBack_arrivalNotice() {
... ...
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImplTest.java
  View file @39ddc42
... ... @@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordServ
11 11 import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
12 12 import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
13 13 import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService;
  14 +import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
14 15 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
15 16 import jakarta.annotation.Resource;
16 17 import org.junit.jupiter.api.Test;
... ... @@ -55,6 +56,8 @@ public class MesQcOqcServiceImplTest extends BaseDbUnitTest {
55 56 private MesQcDefectRecordService defectRecordService;
56 57 @MockitoBean
57 58 private AdminUserApi adminUserApi;
  59 + @MockitoBean
  60 + private MesQcIndicatorResultService indicatorResultService;
58 61  
59 62 @Test
60 63 public void testFinishOqc_writeBack_productSales() {
... ...
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java
  View file @39ddc42
... ... @@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordServ
10 10 import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
11 11 import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueLineService;
12 12 import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
  13 +import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
13 14 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
14 15 import jakarta.annotation.Resource;
15 16 import org.junit.jupiter.api.Test;
... ... @@ -56,6 +57,8 @@ public class MesQcRqcServiceImplTest extends BaseDbUnitTest {
56 57 private MesQcDefectRecordService defectRecordService;
57 58 @MockitoBean
58 59 private AdminUserApi adminUserApi;
  60 + @MockitoBean
  61 + private MesQcIndicatorResultService indicatorResultService;
59 62  
60 63 @Test
61 64 public void testFinishRqc_successWithReturnIssue() {
... ...
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImplTest.java
  View file @39ddc42
... ... @@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalN
5 5 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO;
6 6 import cn.iocoder.yudao.module.mes.dal.mysql.wm.arrivalnotice.MesWmArrivalNoticeMapper;
7 7 import cn.iocoder.yudao.module.mes.enums.wm.MesWmArrivalNoticeStatusEnum;
  8 +import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
8 9 import org.junit.jupiter.api.Test;
9 10 import org.springframework.context.annotation.Import;
10 11 import org.springframework.test.context.bean.override.mockito.MockitoBean;
... ... @@ -38,6 +39,8 @@ public class MesWmArrivalNoticeServiceImplTest extends BaseDbUnitTest {
38 39  
39 40 @MockitoBean
40 41 private MesWmArrivalNoticeLineService arrivalNoticeLineService;
  42 + @MockitoBean
  43 + private MesMdVendorService vendorService;
41 44  
42 45 @Test
43 46 public void testUpdateArrivalNoticeWhenIqcFinish_success_allLinesChecked() {
... ...
yudao-module-mes/src/test/resources/sql/create_tables.sql
  View file @39ddc42
... ... @@ -519,6 +519,7 @@ CREATE TABLE IF NOT EXISTS "mes_wm_return_sales_line" (
519 519 "item_id" bigint NOT NULL,
520 520 "quantity" decimal(12,2) NOT NULL DEFAULT 0.00,
521 521 "batch_id" bigint DEFAULT NULL,
  522 + "batch_code" varchar(255) DEFAULT NULL,
522 523 "rqc_id" bigint DEFAULT NULL,
523 524 "rqc_check_flag" bit NOT NULL DEFAULT FALSE,
524 525 "quality_status" int DEFAULT NULL,
... ...