From 74b0d9c5ab1dc316b29f8525dcffe45225d4c43c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 16 十月 2026 10:29:23 +0800
Subject: [PATCH] Merge branch 'dev_海西州_惠牧' into dev_business
---
yudao-module-mes/src/test/resources/sql/create_tables.sql | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/test/resources/sql/create_tables.sql b/yudao-module-mes/src/test/resources/sql/create_tables.sql
index fd73613..50fe66d 100644
--- a/yudao-module-mes/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-mes/src/test/resources/sql/create_tables.sql
@@ -202,6 +202,7 @@
"source_line_id" bigint DEFAULT NULL,
"source_doc_code" varchar(64) DEFAULT NULL,
"vendor_id" bigint DEFAULT NULL,
+ "vendor_name" varchar(255) DEFAULT NULL,
"vendor_batch" varchar(64) DEFAULT NULL,
"item_id" bigint DEFAULT NULL,
"received_quantity" decimal(24,6) DEFAULT NULL,
@@ -277,6 +278,9 @@
-- MES 鐢熶骇鎶ュ伐
-- ----------------------------
CREATE TABLE IF NOT EXISTS "mes_pro_feedback" (
+ "machinery_ids" varchar(2048) DEFAULT NULL,
+ "process_instance_id" varchar(64) DEFAULT NULL,
+ "process_definition_key" varchar(255) DEFAULT NULL,
"id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
"code" varchar(64) DEFAULT NULL,
"type" tinyint DEFAULT NULL,
@@ -393,7 +397,7 @@
"source_doc_id" bigint DEFAULT NULL,
"source_line_id" bigint DEFAULT NULL,
"source_doc_code" varchar(64) DEFAULT NULL,
- "client_id" bigint NOT NULL,
+ "client_id" bigint DEFAULT NULL,
"batch_code" varchar(64) DEFAULT NULL,
"item_id" bigint NOT NULL,
"min_check_quantity" int DEFAULT 1,
@@ -830,3 +834,29 @@
"tenant_id" bigint NOT NULL DEFAULT 0,
PRIMARY KEY ("id")
);
+
+-- ----------------------------
+-- MES 璐ㄦ鎸囨爣
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "mes_qc_indicator" (
+ "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+ "code" varchar(100) DEFAULT NULL,
+ "name" varchar(100) DEFAULT NULL,
+ "parent_id" bigint NOT NULL DEFAULT 0,
+ "item_type" tinyint NOT NULL DEFAULT 1,
+ "formula_text" varchar(500) DEFAULT NULL,
+ "unit_text" varchar(50) DEFAULT NULL,
+ "sort_order" int NOT NULL DEFAULT 0,
+ "type" int DEFAULT NULL,
+ "tool" varchar(255) DEFAULT NULL,
+ "result_type" int DEFAULT NULL,
+ "result_specification" varchar(255) DEFAULT NULL,
+ "remark" varchar(255) DEFAULT NULL,
+ "creator" varchar(64) DEFAULT '',
+ "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ "updater" varchar(64) DEFAULT '',
+ "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ "deleted" bit NOT NULL DEFAULT FALSE,
+ "tenant_id" bigint NOT NULL DEFAULT 0,
+ PRIMARY KEY ("id")
+);
--
Gitblit v1.9.3