Commit e2261ca6b0bdfb0c0c0719ca5b76a600dac1b8c3
1 parent
8cea2258
✨ feat(mes): 更新条码业务类型和表单逻辑
调整条码业务类型枚举,修改库位和仓库的常量值,优化条码表单组件的选择逻辑,添加库区和设备的选择器,确保用户能够正确选择业务对象。
Showing
2 changed files
with
5 additions
and
15 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesBizTypeConstants.java
| ... | ... | @@ -24,10 +24,11 @@ public final class MesBizTypeConstants { |
| 24 | 24 | public static final int WM_ARRIVAL_NOTICE = 100; // 到货通知单:MesWmArrivalNoticeDO |
| 25 | 25 | // public static final int WM_OUTSOURCE_RECPT = 101; // TODO 外协入库单:未实现,占位 |
| 26 | 26 | public static final int WM_WAREHOUSE = 102; // 仓库:MesWmWarehouseDO |
| 27 | - public static final int WM_AREA = 103; // 库位:MesWmStorageAreaDO | |
| 28 | - public static final int WM_PACKAGE = 104; // 装箱单:MesWmPackageDO | |
| 29 | - public static final int WM_STOCK = 105; // 库存:MesWmMaterialStockDO | |
| 30 | - public static final int WM_BATCH = 106; // 批次:MesWmBatchDO | |
| 27 | + public static final int WM_LOCATION = 103; // 库位:MesWmLocationDO | |
| 28 | + public static final int WM_AREA = 104; // 库位:MesWmStorageAreaDO | |
| 29 | + public static final int WM_PACKAGE = 105; // 装箱单:MesWmPackageDO | |
| 30 | + public static final int WM_STOCK = 106; // 库存:MesWmMaterialStockDO | |
| 31 | + public static final int WM_BATCH = 107; // 批次:MesWmBatchDO | |
| 31 | 32 | |
| 32 | 33 | // ========== CAL 排班模块 [200, 300) ========== |
| 33 | 34 | ... | ... |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/BarcodeBizTypeEnum.java
| ... | ... | @@ -16,25 +16,14 @@ import java.util.Arrays; |
| 16 | 16 | @AllArgsConstructor |
| 17 | 17 | public enum BarcodeBizTypeEnum implements ArrayValuable<Integer> { |
| 18 | 18 | |
| 19 | - // ========== WM 仓库模块 [100, 200) ========== | |
| 20 | - WAREHOUSE(MesBizTypeConstants.WM_WAREHOUSE, "仓库"), | |
| 21 | 19 | AREA(MesBizTypeConstants.WM_AREA, "库位"), |
| 22 | 20 | PACKAGE(MesBizTypeConstants.WM_PACKAGE, "装箱单"), |
| 23 | 21 | STOCK(MesBizTypeConstants.WM_STOCK, "库存"), |
| 24 | 22 | BATCH(MesBizTypeConstants.WM_BATCH, "批次"), |
| 25 | - | |
| 26 | - // ========== PRO 生产模块 [300, 400) ========== | |
| 27 | 23 | PROCARD(MesBizTypeConstants.PRO_CARD, "流转卡"), |
| 28 | 24 | WORKORDER(MesBizTypeConstants.PRO_WORKORDER, "工单"), |
| 29 | 25 | TRANSORDER(MesBizTypeConstants.PRO_TRANS_ORDER, "流转单"), |
| 30 | - | |
| 31 | - // ========== DV 设备模块 [400, 500) ========== | |
| 32 | 26 | MACHINERY(MesBizTypeConstants.DV_MACHINERY, "设备"), |
| 33 | - | |
| 34 | - // ========== TM 工装夹具模块 [500, 600) ========== | |
| 35 | - TOOL(MesBizTypeConstants.TM_TOOL, "工装"), | |
| 36 | - | |
| 37 | - // ========== MD 主数据模块 [600, 700) ========== | |
| 38 | 27 | ITEM(MesBizTypeConstants.MD_ITEM, "物料"), |
| 39 | 28 | VENDOR(MesBizTypeConstants.MD_VENDOR, "供应商"), |
| 40 | 29 | WORKSTATION(MesBizTypeConstants.MD_WORKSTATION, "工作站"), | ... | ... |