From becedb5388bb4529f5bb2caad807c63fa565cd96 Mon Sep 17 00:00:00 2001 From: chenyuan <1154693969@qq.com> Date: Thu, 16 May 2024 16:15:55 +0800 Subject: [PATCH] fix erp --- sql/mysql/basedata.sql | 298 ++++++++++++++++++ sql/mysql/record.sql | 289 +++++++++++++++++ .../module/erp/enums/ErrorCodeConstants.java | 3 + .../purchase/ErpPurchaseInServiceImpl.java | 1 + .../purchase/ErpPurchaseOrderServiceImpl.java | 4 +- 5 files changed, 594 insertions(+), 1 deletion(-) create mode 100644 sql/mysql/basedata.sql create mode 100644 sql/mysql/record.sql diff --git a/sql/mysql/basedata.sql b/sql/mysql/basedata.sql new file mode 100644 index 0000000000..1432d2df6f --- /dev/null +++ b/sql/mysql/basedata.sql @@ -0,0 +1,298 @@ +CREATE TABLE `erp_autocode_rule` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `rule_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '规则编码', + `rule_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '规则名称', + `rule_desc` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '描述', + `max_length` int DEFAULT NULL COMMENT '最大长度', + `is_padded` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '是否补齐', + `padded_char` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '补齐字符', + `padded_method` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci DEFAULT 'L' COMMENT '补齐方式', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='编码规则表'; + +CREATE TABLE `erp_autocode_part` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `rule_id` bigint NOT NULL COMMENT '规则ID', + `part_index` int NOT NULL COMMENT '分段序号', + `part_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '分段类型，INPUTCHAR：输入字符，NOWDATE：当前日期时间，FIXCHAR：固定字符，SERIALNO：流水号', + `part_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '分段编号', + `part_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '分段名称', + `part_length` int NOT NULL COMMENT '分段长度', + `datetime_format` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '日期时间格式', + `input_character` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '输入字符', + `fix_character` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '固定字符', + `seria_start_no` int DEFAULT NULL COMMENT '流水号起始值', + `seria_step` int DEFAULT NULL COMMENT '流水号步长', + `seria_now_no` int DEFAULT NULL COMMENT '流水号当前值', + `cycle_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '流水号是否循环', + `cycle_method` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '循环方式，YEAR：按年，MONTH：按月，DAY：按天，HOUR：按小时，MINITE：按分钟，OTHER：按传入字符变', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=71 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='编码规则组成表'; + +CREATE TABLE `erp_autocode_record` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `rule_id` bigint NOT NULL COMMENT '规则ID', + `gen_date` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '生成日期时间', + `gen_index` int DEFAULT NULL COMMENT '最后产生的序号', + `last_result` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '最后产生的值', + `last_serial_no` int DEFAULT NULL COMMENT '最后产生的流水号', + `last_input_char` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '最后传入的参数', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='编码生成记录表'; + +CREATE TABLE `erp_mold_brand` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT '型号编码', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT '型号名称', + `mold_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT '规格', + `product_id` bigint NOT NULL COMMENT '产品ID', + `use_time` decimal(24, 6) DEFAULT NULL COMMENT '预期寿命(小时)', + `maintain_type` tinyint DEFAULT '0' COMMENT '维保模式', + `maintain_time` decimal(24, 6) DEFAULT NULL COMMENT '维保周期', + `mold_size` bigint NOT NULL COMMENT '模具系数', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='模具型号表'; + +CREATE TABLE `erp_mold` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT '模具编码', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT '模具名称', + `unit_id` bigint NOT NULL COMMENT '单位ID', + `brand_id` bigint NOT NULL COMMENT '型号ID', + `machine_id` bigint NOT NULL COMMENT '机台ID', + `use_time` decimal(24, 6) DEFAULT NULL COMMENT '使用时间(小时)', + `in_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '入库时间', + `status` tinyint DEFAULT '0' COMMENT '状态', + `images` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT '模具图片', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='模具表'; + + + +CREATE TABLE `mes_bom` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT 'BOM编码', + `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT 'BOM版本', + `product_id` bigint NOT NULL COMMENT '产品ID', + `unit_id` bigint NOT NULL COMMENT '单位ID', + `yield_rate` decimal(24, 6) DEFAULT NULL COMMENT '成品率%', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='产品BOM表'; + +CREATE TABLE `mes_bom_detail` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `product_id` bigint NOT NULL COMMENT '产品ID', + `unit_id` bigint NOT NULL COMMENT '单位ID', + `bom_id` bigint NOT NULL COMMENT 'BOM ID', + `usage` decimal(24, 6) DEFAULT NULL COMMENT '用量', + `yield_rate` decimal(24, 6) DEFAULT NULL COMMENT '损耗率%', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='产品BOM明细表'; + + +CREATE TABLE `mes_task` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + + `code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT '编码', + `order_date` date COMMENT '创建时间', + `delivery_date` date COMMENT '创建时间', + `status` tinyint DEFAULT '0' COMMENT '状态', + `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '流程实例的编号', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='生产任务单'; + +CREATE TABLE `mes_task_detail` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `product_id` bigint NOT NULL COMMENT '产品ID', + `unit_id` bigint NOT NULL COMMENT '单位ID', + `task_id` bigint NOT NULL COMMENT 'task ID', + `number` bigint NOT NULL COMMENT '数量', + `package_size` bigint NOT NULL COMMENT '打包要求(每包/个)', + + `project_name` varchar(56) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '项目名称', + `tech_requirements` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '技术要求', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='生产任务单明细'; + +CREATE TABLE `mes_plan` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `code` varchar(56) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '计划编码', + `product_id` bigint NOT NULL COMMENT '产品ID', + `task_detail_id` bigint NOT NULL COMMENT '任务单明细ID', + `task_id` bigint NOT NULL COMMENT '任务单ID', + `plan_number` bigint NOT NULL COMMENT '数量', + `finish_number` bigint NOT NULL COMMENT '成品数量', + `status` tinyint DEFAULT '0' COMMENT '状态', + `plan_start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '计划开始时间', + `plan_end_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '计划结束时间', + `start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '实际开始时间', + `end_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '实际结束时间', + + `production_manager_id` bigint NOT NULL COMMENT '生产主管ID', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='生产计划'; + + + +CREATE TABLE `mes_item_requisition` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + + `code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT '编码', + `requisition_date` date COMMENT '下料时间', + `delivery_date` date COMMENT '创建时间', + `status` tinyint DEFAULT '0' COMMENT '状态', + `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '流程实例的编号', + `plan_id` bigint NOT NULL COMMENT '计划ID', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='领料单'; + +CREATE TABLE `mes_item_requisition_detail` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `product_id` bigint NOT NULL COMMENT '产品ID', + `unit_id` bigint NOT NULL COMMENT '单位ID', + `item_requisition_id` bigint NOT NULL COMMENT '领料单ID', + `number` decimal(24, 6) DEFAULT NULL COMMENT '数量', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='领料单明细'; + + +CREATE TABLE `mes_organization` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '组织id', + `name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '组织名称', + `parent_id` bigint NOT NULL DEFAULT '0' COMMENT '父组织id', + `sort` int NOT NULL DEFAULT '0' COMMENT '显示顺序', + `worker_user_id` bigint DEFAULT NULL COMMENT '负责人/工人', + `machine_id` bigint DEFAULT NULL COMMENT '对应机台id', + `phone` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '联系电话', + `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '邮箱', + + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + + `status` tinyint NOT NULL COMMENT '组织状态', + `org_class` tinyint NOT NULL COMMENT '组织等级', + `org_type` tinyint NOT NULL COMMENT '组织类型', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='工厂组织表'; diff --git a/sql/mysql/record.sql b/sql/mysql/record.sql new file mode 100644 index 0000000000..296cfde9af --- /dev/null +++ b/sql/mysql/record.sql @@ -0,0 +1,289 @@ + +CREATE TABLE `mes_approve` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + + `title` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT '签名事项', + `status` tinyint DEFAULT '0' COMMENT '状态', + `user_id` bigint DEFAULT NULL COMMENT '用户id', + `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NOT NULL COMMENT '用户名称', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE + +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='签名记录表'; + +CREATE TABLE `mes_record_template` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '组织id', + `name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '名称', + `organization_id` bigint NOT NULL DEFAULT '0' COMMENT '组织id', + `machine_id` bigint DEFAULT NULL COMMENT '对应机台id', + `work_team_id` bigint DEFAULT NULL COMMENT '班组id', + `start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '开始时间', + `end_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '结束时间', + `group_manager_approve_id1` bigint DEFAULT NULL COMMENT '组长上午审批id', + `group_manager_approve_id2` bigint DEFAULT NULL COMMENT '组长下午审批id', + `production_manager_approve_id1` bigint DEFAULT NULL COMMENT '主管上午审批id', + `production_manager_approve_id2` bigint DEFAULT NULL COMMENT '主管下午审批id', + + `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '流程实例的编号', + + `status` tinyint NOT NULL COMMENT '状态', + `record_type` tinyint NOT NULL COMMENT '记录类型（工序类型）', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='生产记录表模板'; + + +CREATE TABLE `mes_record_dajiang` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `record_id` bigint NOT NULL DEFAULT '0' COMMENT '记录id', + `start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '开机时间', + `end_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '停机时间', + + `density` decimal(24, 6) DEFAULT NULL COMMENT '浓度%', + `electric_current` decimal(24, 6) DEFAULT NULL COMMENT '电流A', + `beating_degree_in` decimal(24, 6) DEFAULT NULL COMMENT '进浆叩解度︒SR', + `beating_degree_out` decimal(24, 6) DEFAULT NULL COMMENT '出浆叩解度︒SR', + `wet_weight` decimal(24, 6) DEFAULT NULL COMMENT '湿重', + `density5` decimal(24, 6) DEFAULT NULL COMMENT '5浆罐浓度%', + `jiang_weight` decimal(24, 6) DEFAULT NULL COMMENT '产浆量T', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='打浆记录表'; + + +CREATE TABLE `mes_record_suijiang` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `record_id` bigint NOT NULL DEFAULT '0' COMMENT '组织id', + `start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '开机时间', + `end_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '停机时间', + `suijiang_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '碎浆时间', + `suijiang_cost_time` decimal(24, 6) DEFAULT NULL COMMENT '碎浆时间', + + `ratio_id` bigint DEFAULT NULL COMMENT '原料配比id', + `ratio` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '原料配比', + `water_usage` decimal(24, 6) DEFAULT NULL COMMENT '用水量kg', + `density_out` decimal(24, 6) DEFAULT NULL COMMENT '放浆浓度%', + `add_item_usage` decimal(24, 6) DEFAULT NULL COMMENT '加药量kg', + + `slag_yield` decimal(24, 6) DEFAULT NULL COMMENT '出渣率%', + `density` decimal(24, 6) DEFAULT NULL COMMENT '浓度%', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='碎浆记录表'; + +CREATE TABLE `mes_record_chengxing` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `record_id` bigint NOT NULL DEFAULT '0' COMMENT '记录id', + `start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '开机时间', + `end_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '停机时间', + + `xijiang` int NOT NULL COMMENT '吸浆时间(S)', + `tuoshui` int NOT NULL COMMENT '脱水时间(S)', + `ximu` int NOT NULL COMMENT '洗模时间(S)', + `product_id` bigint NOT NULL COMMENT '产品id', + `appearance` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '产品外观', + `product_weight` decimal(24, 6) DEFAULT NULL COMMENT '湿重(g)', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='成型记录表'; + +CREATE TABLE `mes_record_ganzao` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `record_id` bigint NOT NULL DEFAULT '0' COMMENT '记录id', + `start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '开机时间', + `end_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '停机时间', + + `speed` int NOT NULL COMMENT '速度(赫兹)', + `temperature` int NOT NULL COMMENT '温度℃', + `product_id` bigint NOT NULL COMMENT '产品id', + `appearance` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '产品外观', + `product_weight` decimal(24, 6) DEFAULT NULL COMMENT '产品重量(g)', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='干燥记录表'; + + + +CREATE TABLE `mes_record_wet` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `record_id` bigint NOT NULL DEFAULT '0' COMMENT '记录id', + `start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '开机时间', + `end_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '停机时间', + + `machine_start_time` int NOT NULL COMMENT '开机时间(S)', + `machine_end_time` int NOT NULL COMMENT '停机时间(S)', + `wet_time` int NOT NULL COMMENT '加湿时间(S)', + `product_id` bigint NOT NULL COMMENT '产品id', + `weight_in` decimal(24, 6) DEFAULT NULL COMMENT '产品进入水分', + `weight_out` decimal(24, 6) DEFAULT NULL COMMENT '产品取出水分', + `product_number` bigint NOT NULL COMMENT '产量', + `product_weight` decimal(24, 6) DEFAULT NULL COMMENT '单重(g)', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='加湿记录表'; + +CREATE TABLE `mes_record_reya` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `record_id` bigint NOT NULL DEFAULT '0' COMMENT '记录id', + `start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '开机时间', + `end_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '停机时间', + `machine_id` bigint NOT NULL COMMENT '机台', + `reya_time` int NOT NULL COMMENT '热压时间(S)', + `temperature_mold_up` decimal(24, 6) DEFAULT NULL COMMENT '上模温度℃', + `temperature_mold_down` decimal(24, 6) DEFAULT NULL COMMENT '下模温度℃', + `main_stress` decimal(24, 6) DEFAULT NULL COMMENT '主缸压力KG', + + `product_id` bigint NOT NULL COMMENT '产品id', + `appearance` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '外观', + `wet_degree` decimal(24, 6) DEFAULT NULL COMMENT '湿度', + `product_weight` decimal(24, 6) DEFAULT NULL COMMENT '单重(g)', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='热压记录表'; + +CREATE TABLE `mes_record_cut` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `record_id` bigint NOT NULL DEFAULT '0' COMMENT '记录id', + `start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '开机时间', + `end_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '停机时间', + `machine_id` bigint NOT NULL COMMENT '机台', + + `product_weight_before` decimal(24, 6) DEFAULT NULL COMMENT '切边前单重g', + + `product_id` bigint NOT NULL COMMENT '产品id', + `appearance` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '外观', + `wet_degree` decimal(24, 6) DEFAULT NULL COMMENT '湿度', + `product_weight` decimal(24, 6) DEFAULT NULL COMMENT '单重(g)', + `cut_time` int NOT NULL COMMENT '切边时间(S)', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='切边记录表'; + +CREATE TABLE `mes_record_check` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `record_id` bigint NOT NULL DEFAULT '0' COMMENT '记录id', + + `product_id` bigint NOT NULL COMMENT '产品id', + `appearance` varchar(56) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '外观', + `product_weight` decimal(24, 6) DEFAULT NULL COMMENT '单重(g)', + `waterproof` varchar(56) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '防水', + `qualified_number` bigint NOT NULL COMMENT '合格品量', + `unqualified_number` bigint NOT NULL COMMENT '废品量', + `total_number` bigint NOT NULL COMMENT '总产量', + `qualified_rate` decimal(24, 6) DEFAULT NULL COMMENT '合格率%', + `unqualified_reason` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '废品原因', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='检验记录表'; + +CREATE TABLE `mes_record_package` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `record_id` bigint NOT NULL DEFAULT '0' COMMENT '记录id', + + `product_id` bigint NOT NULL COMMENT '产品id', + `total_number` bigint NOT NULL COMMENT '产量', + `package_item_usage` decimal(24, 6) DEFAULT NULL COMMENT '包装材料用量', + `package_size` bigint NOT NULL COMMENT '每包产品数', + `package_item_specification` varchar(56) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '包装材料规格', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='检验记录表'; \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java b/yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java index 65f64c2f56..90383360d3 100644 --- a/yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java +++ b/yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java @@ -165,4 +165,7 @@ ErrorCode PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED = new ErrorCode(1_030_101_00 ErrorCode FINANCE_RECEIPT_NO_EXISTS = new ErrorCode(1_030_602_004, "生成收款单号失败，请重新提交"); ErrorCode FINANCE_RECEIPT_UPDATE_FAIL_APPROVE = new ErrorCode(1_030_602_005, "收款单({})已审核，无法修改"); + // ========== ERP 模具 1_111_000 ========== + ErrorCode MOLD_BRAND_NOT_EXISTS = new ErrorCode(1_111_001, "模具型号不存在"); + ErrorCode MOLD_NOT_EXISTS = new ErrorCode(1_111_002, "模具不存在"); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java index 58f4952081..1712521d94 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java @@ -89,6 +89,7 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService { .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())) .setOrderNo(purchaseOrder.getNo()).setSupplierId(purchaseOrder.getSupplierId()); calculateTotalPrice(purchaseIn, purchaseInItems); + purchaseIn.setPaymentPrice(new BigDecimal(0)); purchaseInMapper.insert(purchaseIn); // 2.2 插入入库项 purchaseInItems.forEach(o -> o.setInId(purchaseIn.getId())); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java index c585490b97..2c8913d641 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java @@ -77,10 +77,12 @@ public class ErpPurchaseOrderServiceImpl implements ErpPurchaseOrderService { // 2.1 插入订单 ErpPurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, ErpPurchaseOrderDO.class, in -> in .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())); + purchaseOrder.setInCount(new BigDecimal(0)); + purchaseOrder.setReturnCount(new BigDecimal(0)); calculateTotalPrice(purchaseOrder, purchaseOrderItems); purchaseOrderMapper.insert(purchaseOrder); // 2.2 插入订单项 - purchaseOrderItems.forEach(o -> o.setOrderId(purchaseOrder.getId())); + purchaseOrderItems.forEach(o -> o.setOrderId(purchaseOrder.getId()).setInCount(new BigDecimal(0)).setReturnCount(new BigDecimal(0))); purchaseOrderItemMapper.insertBatch(purchaseOrderItems); return purchaseOrder.getId(); }