From 1458532478eedbd82947e6ee8515f881d4a4912a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 16:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
docs/sql/mes_pro_mps.sql | 92 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 92 insertions(+), 0 deletions(-)
diff --git a/docs/sql/mes_pro_mps.sql b/docs/sql/mes_pro_mps.sql
new file mode 100644
index 0000000..5c6b4d7
--- /dev/null
+++ b/docs/sql/mes_pro_mps.sql
@@ -0,0 +1,92 @@
+-- =============================================
+-- MES 鐢熶骇涓昏鍒掞紙MPS锛夎〃
+-- =============================================
+CREATE TABLE IF NOT EXISTS `mes_pro_mps` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `code` varchar(64) NOT NULL COMMENT 'MPS 缂栫爜',
+ `status` tinyint NOT NULL DEFAULT 0 COMMENT '鐘舵�侊紙0=鑽夌 1=宸蹭笅鍙� 2=宸插畬鎴� 3=宸插彇娑堬級',
+
+ -- 鏉ユ簮淇℃伅锛堟潵鑷攢鍞鍗曪級
+ `sale_order_id` bigint DEFAULT NULL COMMENT '閿�鍞鍗旾D',
+ `sale_order_no` varchar(64) DEFAULT NULL COMMENT '閿�鍞鍗曞彿',
+ `sale_order_item_id` bigint DEFAULT NULL COMMENT '閿�鍞鍗曟槑缁咺D',
+
+ -- 浜у搧淇℃伅
+ `product_id` bigint NOT NULL COMMENT '浜у搧缂栧彿',
+ `quantity` decimal(24,6) NOT NULL COMMENT '璁″垝鐢熶骇鏁伴噺',
+ `quantity_produced` decimal(24,6) DEFAULT 0 COMMENT '宸茬敓浜ф暟閲�',
+ `unit_measure_id` bigint DEFAULT NULL COMMENT '璁￠噺鍗曚綅ID',
+
+ -- 瀹㈡埛淇℃伅
+ `client_id` bigint DEFAULT NULL COMMENT '瀹㈡埛缂栧彿',
+
+ -- 鏃堕棿淇℃伅
+ `request_date` datetime DEFAULT NULL COMMENT '闇�姹傛棩鏈�',
+ `issue_date` datetime DEFAULT NULL COMMENT '涓嬪彂鏃ユ湡',
+ `finish_date` datetime DEFAULT NULL COMMENT '瀹屾垚鏃ユ湡',
+
+ -- 鐢熶骇宸ュ崟鍏宠仈锛堜笅鍙戝悗鐢熸垚锛�
+ `work_order_id` bigint DEFAULT NULL COMMENT '鐢熶骇宸ュ崟ID',
+ `work_order_code` varchar(64) DEFAULT NULL COMMENT '鐢熶骇宸ュ崟缂栫爜',
+
+ -- 鍚堝苟涓嬪彂鏍囪瘑
+ `merge_flag` tinyint DEFAULT 0 COMMENT '鏄惁鍚堝苟涓嬪彂锛�0=鍚� 1=鏄級',
+ `merge_batch_no` varchar(64) DEFAULT NULL COMMENT '鍚堝苟鎵规鍙�',
+
+ -- 鍏朵粬
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) 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`),
+ KEY `idx_sale_order_item_id` (`sale_order_item_id`),
+ KEY `idx_product_id` (`product_id`),
+ KEY `idx_status` (`status`),
+ KEY `idx_merge_batch_no` (`merge_batch_no`)
+) ENGINE=InnoDB COMMENT='MES 鐢熶骇涓昏鍒�';
+
+-- =============================================
+-- MPS 鍚堝苟涓嬪彂鏄庣粏琛�
+-- =============================================
+CREATE TABLE IF NOT EXISTS `mes_pro_mps_merge_item` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `merge_batch_no` varchar(64) NOT NULL COMMENT '鍚堝苟鎵规鍙�',
+ `mps_id` bigint NOT NULL COMMENT 'MPS 缂栧彿',
+ `work_order_id` bigint DEFAULT NULL COMMENT '鐢熸垚鐨勭敓浜у伐鍗旾D',
+ `quantity` decimal(24,6) NOT NULL COMMENT '鍒嗛厤鏁伴噺',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) 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`),
+ KEY `idx_merge_batch_no` (`merge_batch_no`),
+ KEY `idx_mps_id` (`mps_id`)
+) ENGINE=InnoDB COMMENT='MPS 鍚堝苟涓嬪彂鏄庣粏';
+
+-- =============================================
+-- 閿�鍞鍗曟槑缁嗚〃鎵╁睍瀛楁
+-- =============================================
+ALTER TABLE `erp_sale_order_items`
+ADD COLUMN `need_production` tinyint DEFAULT 0 COMMENT '鏄惁闇�瑕佺敓浜э紙0=鍚� 1=鏄級' AFTER `out_count`,
+ADD COLUMN `mps_id` bigint DEFAULT NULL COMMENT '鍏宠仈鐨凪PS缂栧彿' AFTER `need_production`;
+
+-- =============================================
+-- 瀛楀吀绫诲瀷 - MPS 鐘舵��
+-- =============================================
+INSERT INTO `system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES
+('MPS 鐘舵��', 'mes_pro_mps_status', 0, 'MPS 鐘舵��', '1', NOW(), '1', NOW(), b'0');
+
+-- =============================================
+-- 瀛楀吀鏁版嵁 - MPS 鐘舵��
+-- =============================================
+INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES
+(0, '鑽夌', '0', 'mes_pro_mps_status', 0, 'info', '', '', '1', NOW(), '1', NOW(), b'0'),
+(1, '宸蹭笅鍙�', '1', 'mes_pro_mps_status', 0, 'success', '', '', '1', NOW(), '1', NOW(), b'0'),
+(2, '宸插畬鎴�', '2', 'mes_pro_mps_status', 0, 'primary', '', '', '1', NOW(), '1', NOW(), b'0'),
+(3, '宸插彇娑�', '3', 'mes_pro_mps_status', 0, 'danger', '', '', '1', NOW(), '1', NOW(), b'0');
\ No newline at end of file
--
Gitblit v1.9.3