Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
# Conflicts: # nl-module-wms/nl-module-wms-api/src/main/java/cn/code/nl/module/wms/enums/ErrorCodeConstants.java # nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/packages/constants/src/dict-enum.ts
This commit is contained in:
@@ -5,6 +5,12 @@ export const CommonStatusEnum = {
|
||||
DISABLE: 1, // 禁用
|
||||
};
|
||||
|
||||
// true or false
|
||||
export const CommonTrueOrFalseEnum = {
|
||||
TRUE: true,
|
||||
FALSE: false,
|
||||
};
|
||||
|
||||
// 全局用户类型枚举
|
||||
export const UserTypeEnum = {
|
||||
MEMBER: 1, // 会员
|
||||
|
||||
@@ -4,7 +4,8 @@ const COMMON_DICT = {
|
||||
COMMON_STATUS: 'common_status',
|
||||
TERMINAL: 'terminal', // 终端
|
||||
DATE_INTERVAL: 'date_interval', // 数据间隔
|
||||
PRODUCT_AREA: 'product_area'
|
||||
PRODUCT_AREA: 'product_area',
|
||||
COMMON_TRUE_FALSE: 'common_true_false',
|
||||
} as const;
|
||||
|
||||
/** ========== SYSTEM - 系统模块 ========== */
|
||||
@@ -279,6 +280,8 @@ const WMS_DICT = {
|
||||
WMS_ORDER_STATUS: 'wms_order_status', // WMS 单据状态
|
||||
WMS_RECEIPT_ORDER_TYPE: 'wms_receipt_order_type', // WMS 入库单类型
|
||||
WMS_SHIPMENT_ORDER_TYPE: 'wms_shipment_order_type', // WMS 出库单类型
|
||||
WMS_STRATEGY_TYPE: 'wms_strategy_type', // WMS策略类型
|
||||
WMS_OUT_IN_STRATEGY_TYPE: 'wms_out_in_strategy_type', // WMS出入库策略类型
|
||||
WMS_LOCK_TYPE: 'wms_lock_type', // WMS 锁定类型
|
||||
} as const;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user