zccbbg/wms-ruoyi
1
1
Fork 0
mirror of https://github.com/zccbbg/wms-ruoyi.git synced 2024-09-20 11:05:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

update BaseEntity 优化 Date->LocalDateTime, createBy和updateBy保持String

Browse source
This commit is contained in:
zccbbg 2024-07-08 16:58:01 +08:00
parent 32331c632f
commit b582f9843c
3 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/domain/BaseEntity.java
View file

@ -35,7 +35,7 @@ public class BaseEntity implements Serializable {
* 创建者 * 创建者
*/ */
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private Long createBy; private String createBy;
/** /**
* 创建时间 * 创建时间
@ -48,7 +48,7 @@ public class BaseEntity implements Serializable {
* 更新者 * 更新者
*/ */
@TableField(fill = FieldFill.INSERT_UPDATE) @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateBy; private String updateBy;
/** /**
* 更新时间 * 更新时间

8
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/InjectionMetaObjectHandler.java
View file

@ -11,6 +11,7 @@ import com.ruoyi.common.core.utils.StringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.reflection.MetaObject;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
/** /**
@ -26,8 +27,8 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler {
public void insertFill(MetaObject metaObject) { public void insertFill(MetaObject metaObject) {
try { try {
if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) { if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) {
Date current = ObjectUtil.isNotNull(baseEntity.getCreateTime()) LocalDateTime current = ObjectUtil.isNotNull(baseEntity.getCreateTime())
? baseEntity.getCreateTime() : new Date(); ? baseEntity.getCreateTime() : LocalDateTime.now();;
baseEntity.setCreateTime(current); baseEntity.setCreateTime(current);
baseEntity.setUpdateTime(current); baseEntity.setUpdateTime(current);
if (ObjectUtil.isNull(baseEntity.getCreateBy())) { if (ObjectUtil.isNull(baseEntity.getCreateBy())) {
@ -48,9 +49,8 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler {
public void updateFill(MetaObject metaObject) { public void updateFill(MetaObject metaObject) {
try { try {
if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) { if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) {
Date current = new Date();
// 更新时间填充(不管为不为空) // 更新时间填充(不管为不为空)
baseEntity.setUpdateTime(current); baseEntity.setUpdateTime(LocalDateTime.now());
String username = getLoginUsername(); String username = getLoginUsername();
// 当前已登录 更新人填充(不管为不为空) // 当前已登录 更新人填充(不管为不为空)
if (StringUtils.isNotBlank(username)) { if (StringUtils.isNotBlank(username)) {

86
script/sql/wms/wms.sql
View file

@ -11,9 +11,9 @@ CREATE TABLE `wms_warehouse` (
`warehouse_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', `warehouse_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1213 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 1213 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库' ROW_FORMAT = Dynamic;
@ -23,15 +23,15 @@ CREATE TABLE `wms_warehouse` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_area`; DROP TABLE IF EXISTS `wms_area`;
CREATE TABLE `wms_area` ( CREATE TABLE `wms_area` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`area_no` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', `area_no` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号',
`area_name` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', `area_name` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
`warehouse_id` bigint(20) NOT NULL COMMENT '所属仓库ID', `warehouse_id` bigint(20) NOT NULL COMMENT '所属仓库ID',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1603 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库区' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 1603 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库区' ROW_FORMAT = Dynamic;
@ -41,7 +41,7 @@ CREATE TABLE `wms_area` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_item`; DROP TABLE IF EXISTS `wms_item`;
CREATE TABLE `wms_item` ( CREATE TABLE `wms_item` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`item_no` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', `item_no` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号',
`item_name` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', `item_name` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
`specification` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '规格', `specification` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '规格',
@ -50,9 +50,9 @@ CREATE TABLE `wms_item` (
`unit_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '单价', `unit_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '单价',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1415 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '物料' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 1415 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '物料' ROW_FORMAT = Dynamic;
@ -69,9 +69,9 @@ CREATE TABLE `wms_item_category` (
`order_num` int(11) NULL DEFAULT 0 COMMENT '显示顺序', `order_num` int(11) NULL DEFAULT 0 COMMENT '显示顺序',
`status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '物料类型状态（0正常 1停用）', `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '物料类型状态（0正常 1停用）',
`del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建者', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建者',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '更新者', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '更新者',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1225 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '物料类型表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 1225 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '物料类型表' ROW_FORMAT = Dynamic;
@ -82,7 +82,7 @@ CREATE TABLE `wms_item_category` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_merchant`; DROP TABLE IF EXISTS `wms_merchant`;
CREATE TABLE `wms_merchant` ( CREATE TABLE `wms_merchant` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`merchant_no` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', `merchant_no` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号',
`merchant_name` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', `merchant_name` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
`bank_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开户行', `bank_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开户行',
@ -95,15 +95,15 @@ CREATE TABLE `wms_merchant` (
`email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'Email', `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'Email',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 265 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '往来单位' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 265 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '往来单位' ROW_FORMAT = Dynamic;
CREATE TABLE `wms_inventory_detail` ( CREATE TABLE `wms_inventory_detail` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`receipt_order_id` bigint(20) DEFAULT NULL COMMENT '入库单id', `receipt_order_id` bigint(20) DEFAULT NULL COMMENT '入库单id',
`receipt_order_type` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '入库单类型', `receipt_order_type` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '入库单类型',
`order_no` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '单号', `order_no` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '单号',
@ -117,9 +117,9 @@ CREATE TABLE `wms_inventory_detail` (
`remark` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '备注',
`remain_quantity` decimal(10,2) DEFAULT NULL COMMENT '剩余数量', `remain_quantity` decimal(10,2) DEFAULT NULL COMMENT '剩余数量',
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标识',
`create_by` bigint(20) DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=806 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_polish_ci ROW_FORMAT=DYNAMIC COMMENT='库存详情'; ) ENGINE=InnoDB AUTO_INCREMENT=806 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_polish_ci ROW_FORMAT=DYNAMIC COMMENT='库存详情';
@ -129,7 +129,7 @@ CREATE TABLE `wms_inventory_detail` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_inventory_check`; DROP TABLE IF EXISTS `wms_inventory_check`;
CREATE TABLE `wms_inventory_check` ( CREATE TABLE `wms_inventory_check` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`inventory_check_no` varchar(22) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '库存盘点单号，系统自动生成', `inventory_check_no` varchar(22) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '库存盘点单号，系统自动生成',
`inventory_check_type` int(11) NULL DEFAULT NULL COMMENT '库存盘点类型', `inventory_check_type` int(11) NULL DEFAULT NULL COMMENT '库存盘点类型',
`inventory_check_status` tinyint(4) NULL DEFAULT 11 COMMENT '库存盘点单状态11：盘点中 22：已完成', `inventory_check_status` tinyint(4) NULL DEFAULT 11 COMMENT '库存盘点单状态11：盘点中 22：已完成',
@ -142,9 +142,9 @@ CREATE TABLE `wms_inventory_check` (
`attachment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件文件', `attachment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件文件',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1415 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存盘点单据' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 1415 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存盘点单据' ROW_FORMAT = Dynamic;
@ -154,7 +154,7 @@ CREATE TABLE `wms_inventory_check` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_inventory_check_detail`; DROP TABLE IF EXISTS `wms_inventory_check_detail`;
CREATE TABLE `wms_inventory_check_detail` ( CREATE TABLE `wms_inventory_check_detail` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`inventory_check_id` bigint(20) NULL DEFAULT NULL COMMENT '库存盘点单', `inventory_check_id` bigint(20) NULL DEFAULT NULL COMMENT '库存盘点单',
`item_id` bigint(20) NOT NULL COMMENT '物料', `item_id` bigint(20) NOT NULL COMMENT '物料',
`quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '库存数量', `quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '库存数量',
@ -163,9 +163,9 @@ CREATE TABLE `wms_inventory_check_detail` (
`area_id` bigint(20) NULL DEFAULT NULL COMMENT '所属库区', `area_id` bigint(20) NULL DEFAULT NULL COMMENT '所属库区',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 6399 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存盘点单据详情' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 6399 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存盘点单据详情' ROW_FORMAT = Dynamic;
@ -175,16 +175,16 @@ CREATE TABLE `wms_inventory_check_detail` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_inventory_history`; DROP TABLE IF EXISTS `wms_inventory_history`;
CREATE TABLE `wms_inventory_history` ( CREATE TABLE `wms_inventory_history` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`form_id` bigint(20) NULL DEFAULT NULL COMMENT '操作id（出库、入库、库存移动表单id）', `form_id` bigint(20) NULL DEFAULT NULL COMMENT '操作id（出库、入库、库存移动表单id）',
`form_type` int(11) NULL DEFAULT NULL COMMENT '操作类型', `form_type` int(11) NULL DEFAULT NULL COMMENT '操作类型',
`item_id` bigint(20) NULL DEFAULT NULL COMMENT '物料ID', `item_id` bigint(20) NULL DEFAULT NULL COMMENT '物料ID',
`quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '库存变化', `quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '库存变化',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`warehouse_id` bigint(20) NULL DEFAULT NULL COMMENT '所属仓库', `warehouse_id` bigint(20) NULL DEFAULT NULL COMMENT '所属仓库',
`area_id` bigint(20) NULL DEFAULT NULL COMMENT '所属库区', `area_id` bigint(20) NULL DEFAULT NULL COMMENT '所属库区',
@ -196,7 +196,7 @@ CREATE TABLE `wms_inventory_history` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_inventory_movement_order`; DROP TABLE IF EXISTS `wms_inventory_movement_order`;
CREATE TABLE `wms_inventory_movement_order` ( CREATE TABLE `wms_inventory_movement_order` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`inventory_movement_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号', `inventory_movement_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号',
`source_warehouse_id` bigint(20) NULL DEFAULT NULL COMMENT '源仓库', `source_warehouse_id` bigint(20) NULL DEFAULT NULL COMMENT '源仓库',
`source_area_id` bigint(20) NULL DEFAULT NULL COMMENT '源库区', `source_area_id` bigint(20) NULL DEFAULT NULL COMMENT '源库区',
@ -208,9 +208,9 @@ CREATE TABLE `wms_inventory_movement_order` (
`check_time` datetime(3) NULL DEFAULT NULL COMMENT '审核时间', `check_time` datetime(3) NULL DEFAULT NULL COMMENT '审核时间',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 683 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '移库单' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 683 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '移库单' ROW_FORMAT = Dynamic;
@ -220,16 +220,16 @@ CREATE TABLE `wms_inventory_movement_order` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_inventory_movement_order_detail`; DROP TABLE IF EXISTS `wms_inventory_movement_order_detail`;
CREATE TABLE `wms_inventory_movement_order_detail` ( CREATE TABLE `wms_inventory_movement_order_detail` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`inventory_movement_order_id` bigint(20) NULL DEFAULT NULL COMMENT '移库单Id', `inventory_movement_order_id` bigint(20) NULL DEFAULT NULL COMMENT '移库单Id',
`item_id` bigint(20) NULL DEFAULT NULL COMMENT '物料', `item_id` bigint(20) NULL DEFAULT NULL COMMENT '物料',
`plan_quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '计划数量', `plan_quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '计划数量',
`real_quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '实际数量', `real_quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '实际数量',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`source_area_id` bigint(20) NULL DEFAULT NULL COMMENT '源库区', `source_area_id` bigint(20) NULL DEFAULT NULL COMMENT '源库区',
`target_area_id` bigint(20) NULL DEFAULT NULL COMMENT '目标库区', `target_area_id` bigint(20) NULL DEFAULT NULL COMMENT '目标库区',
@ -241,7 +241,7 @@ CREATE TABLE `wms_inventory_movement_order_detail` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_receipt_order`; DROP TABLE IF EXISTS `wms_receipt_order`;
CREATE TABLE `wms_receipt_order` ( CREATE TABLE `wms_receipt_order` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`receipt_order_no` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '入库单号', `receipt_order_no` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '入库单号',
`receipt_order_type` int(11) NULL DEFAULT NULL COMMENT '入库类型', `receipt_order_type` int(11) NULL DEFAULT NULL COMMENT '入库类型',
`merchant_id` bigint(20) NULL DEFAULT NULL COMMENT '供应商', `merchant_id` bigint(20) NULL DEFAULT NULL COMMENT '供应商',
@ -250,9 +250,9 @@ CREATE TABLE `wms_receipt_order` (
`receipt_order_status` tinyint(4) NULL DEFAULT NULL COMMENT '入库状态', `receipt_order_status` tinyint(4) NULL DEFAULT NULL COMMENT '入库状态',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 4290 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '入库单' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 4290 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '入库单' ROW_FORMAT = Dynamic;
@ -262,7 +262,7 @@ CREATE TABLE `wms_receipt_order` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_receipt_order_detail`; DROP TABLE IF EXISTS `wms_receipt_order_detail`;
CREATE TABLE `wms_receipt_order_detail` ( CREATE TABLE `wms_receipt_order_detail` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`receipt_order_id` bigint(20) NULL DEFAULT NULL COMMENT '入库单号', `receipt_order_id` bigint(20) NULL DEFAULT NULL COMMENT '入库单号',
`item_id` bigint(20) NULL DEFAULT NULL COMMENT '物料', `item_id` bigint(20) NULL DEFAULT NULL COMMENT '物料',
`plan_quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '计划数量', `plan_quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '计划数量',
@ -270,9 +270,9 @@ CREATE TABLE `wms_receipt_order_detail` (
`amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '金额', `amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '金额',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`warehouse_id` bigint(20) NULL DEFAULT NULL COMMENT '所属仓库', `warehouse_id` bigint(20) NULL DEFAULT NULL COMMENT '所属仓库',
`area_id` bigint(20) NULL DEFAULT NULL COMMENT '所属库区', `area_id` bigint(20) NULL DEFAULT NULL COMMENT '所属库区',
@ -285,7 +285,7 @@ CREATE TABLE `wms_receipt_order_detail` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_shipment_order`; DROP TABLE IF EXISTS `wms_shipment_order`;
CREATE TABLE `wms_shipment_order` ( CREATE TABLE `wms_shipment_order` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`shipment_order_no` varchar(22) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库单号，系统自动生成', `shipment_order_no` varchar(22) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库单号，系统自动生成',
`shipment_order_type` int(11) NULL DEFAULT NULL COMMENT '出库类型', `shipment_order_type` int(11) NULL DEFAULT NULL COMMENT '出库类型',
`order_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库订单', `order_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库订单',
@ -297,9 +297,9 @@ CREATE TABLE `wms_shipment_order` (
`check_time` datetime(3) NULL DEFAULT NULL COMMENT '审核时间', `check_time` datetime(3) NULL DEFAULT NULL COMMENT '审核时间',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1790 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库单' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 1790 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库单' ROW_FORMAT = Dynamic;
@ -309,7 +309,7 @@ CREATE TABLE `wms_shipment_order` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `wms_shipment_order_detail`; DROP TABLE IF EXISTS `wms_shipment_order_detail`;
CREATE TABLE `wms_shipment_order_detail` ( CREATE TABLE `wms_shipment_order_detail` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`shipment_order_id` bigint(20) NULL DEFAULT NULL COMMENT '出库单', `shipment_order_id` bigint(20) NULL DEFAULT NULL COMMENT '出库单',
`item_id` bigint(20) NULL DEFAULT NULL COMMENT '物料', `item_id` bigint(20) NULL DEFAULT NULL COMMENT '物料',
`plan_quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '计划数量', `plan_quantity` decimal(20, 2) NULL DEFAULT NULL COMMENT '计划数量',
@ -317,9 +317,9 @@ CREATE TABLE `wms_shipment_order_detail` (
`money` decimal(10, 2) NULL DEFAULT NULL COMMENT '金额', `money` decimal(10, 2) NULL DEFAULT NULL COMMENT '金额',
`del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标识',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(64) NULL DEFAULT NULL COMMENT '修改人',
`update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间', `update_time` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`warehouse_id` bigint(20) NULL DEFAULT NULL COMMENT '所属仓库', `warehouse_id` bigint(20) NULL DEFAULT NULL COMMENT '所属仓库',
`area_id` bigint(20) NULL DEFAULT NULL COMMENT '所属库区', `area_id` bigint(20) NULL DEFAULT NULL COMMENT '所属库区',