BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 9ac2bb261a7aa6ba095f92f5eefe7fa60f7cae2f

Authored by YunaiV
1 parent ba64b2f6

reviewed

Inline Side-by-side
Showing 4 changed files with 51 additions and 25 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
  View file @9ac2bb2
... ... @@ -57,15 +57,6 @@ public class MesWmItemReceiptController {
57 57 private MesMdVendorService vendorService;
58 58  
59 59 @Resource
60   - private MesWmWarehouseService warehouseService;
61   -
62   - @Resource
63   - private MesWmWarehouseLocationService locationService;
64   -
65   - @Resource
66   - private MesWmWarehouseAreaService areaService;
67   -
68   - @Resource
69 60 private MesQcIqcService iqcService;
70 61  
71 62 @Resource
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesOrderStatusConstants.java
  View file @9ac2bb2
... ... @@ -10,22 +10,31 @@ package cn.iocoder.yudao.module.mes.enums;
10 10 */
11 11 public final class MesOrderStatusConstants {
12 12  
13   - /** 草稿 */
14   - public static final int DRAFT = 0;
15   -
16   - /** 已确认 */
  13 + /**
  14 + * 草稿
  15 + */
  16 + public static final int PREPARE = 0;
  17 +
  18 + /**
  19 + * 已确认
  20 + */
17 21 public static final int CONFIRMED = 1;
18   -
19   - /** 审批中 */
  22 + /**
  23 + * 审批中
  24 + */
20 25 public static final int APPROVING = 2;
21   -
22   - /** 已审批 */
  26 + /**
  27 + * 已审批
  28 + */
23 29 public static final int APPROVED = 3;
24 30  
25   - /** 已完成 */
  31 + /**
  32 + * 已完成
  33 + */
26 34 public static final int FINISHED = 4;
27   -
28   - /** 已取消 */
  35 + /**
  36 + * 已取消
  37 + */
29 38 public static final int CANCELLED = 5;
30 39  
31 40 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcStatusEnum.java
  View file @9ac2bb2
... ... @@ -18,7 +18,7 @@ import java.util.Arrays;
18 18 @AllArgsConstructor
19 19 public enum MesQcStatusEnum implements ArrayValuable<Integer> {
20 20  
21   - DRAFT(MesOrderStatusConstants.DRAFT, "草稿"),
  21 + DRAFT(MesOrderStatusConstants.PREPARE, "草稿"),
22 22 FINISHED(MesOrderStatusConstants.FINISHED, "已完成");
23 23  
24 24 public static final Integer[] ARRAYS = Arrays.stream(values())
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmArrivalNoticeStatusEnum.java
  View file @9ac2bb2
1 1 package cn.iocoder.yudao.module.mes.enums.wm;
2 2  
3 3 import cn.iocoder.yudao.framework.common.core.ArrayValuable;
  4 +import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeSaveReqVO;
  5 +import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants;
  6 +import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
4 7 import lombok.AllArgsConstructor;
5 8 import lombok.Getter;
6 9  
  10 +import java.math.BigDecimal;
7 11 import java.util.Arrays;
8 12  
9 13 /**
... ... @@ -15,10 +19,32 @@ import java.util.Arrays;
15 19 @AllArgsConstructor
16 20 public enum MesWmArrivalNoticeStatusEnum implements ArrayValuable<Integer> {
17 21  
18   - PREPARE(0, "草稿"),
19   - PENDING_QC(1, "待质检"), // 对接 qc 模块的 MesQcIqcDO 前置流程
20   - PENDING_RECEIPT(2, "待入库"), // 对接 wm 模块的 MesWmItemReceiptDO 后续流程
21   - FINISHED(3, "已完成");
  22 + /**
  23 + * 草稿
  24 + *
  25 + * 对应方法：{@link MesWmArrivalNoticeService#createArrivalNotice(MesWmArrivalNoticeSaveReqVO)}
  26 + */
  27 + PREPARE(MesOrderStatusConstants.PREPARE, "草稿"),
  28 + /**
  29 + * 待质检（需要检验时），对接 qc 模块的 MesQcIqcDO 后续流程
  30 + *
  31 + * 对应方法：{@link MesWmArrivalNoticeService#submitArrivalNotice(Long)}
  32 + */
  33 + PENDING_QC(MesOrderStatusConstants.APPROVING, "待质检"),
  34 + /**
  35 + * 待入库（不需要检验时，或检验完成时），对接 wm 模块的 MesWmItemReceiptDO 后续流程
  36 + *
  37 + * 对应方法：
  38 + * 1. 不需要检验时：{@link MesWmArrivalNoticeService#submitArrivalNotice(Long)}
  39 + * 2. 或检验完成时：{@link MesWmArrivalNoticeService#approveArrivalNoticeWhenIqcComplete(Long, Long, Long, BigDecimal)}
  40 + */
  41 + PENDING_RECEIPT(MesOrderStatusConstants.APPROVED, "待入库"),
  42 + /**
  43 + * 已完成
  44 + *
  45 + * 对应方法：{@link MesWmArrivalNoticeService#finishArrivalNotice(Long)}
  46 + */
  47 + FINISHED(MesOrderStatusConstants.FINISHED, "已完成");
22 48  
23 49 public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmArrivalNoticeStatusEnum::getStatus).toArray(Integer[]::new);
24 50  
... ...