From e10c196ff7348a4461e8facee10a208779244ece Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 30 九月 2026 15:33:30 +0800
Subject: [PATCH] 宁夏万通需求：出库单行支持主/辅单位录入；考勤节假日配置改为时间段；物料型号维护；设备批量删除；来料检验默认方案解析
---
docs/sql/gen_config_export_all.py | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/docs/sql/gen_config_export_all.py b/docs/sql/gen_config_export_all.py
index 1069f9e..c384254 100644
--- a/docs/sql/gen_config_export_all.py
+++ b/docs/sql/gen_config_export_all.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
-"""閲嶆柊鐢熸垚 docs/sql/config_export_all_20260928.sql锛堝叏閲忛噸鐢熸垚锛屾浛鎹� 0918 鐗堬級銆�
+"""閲嶆柊鐢熸垚 docs/sql/config_export_all_20260930.sql锛堝叏閲忛噸鐢熸垚锛屾浛鎹� 0929 鐗堬級銆�
-闃舵涓�锛氬綋鍓嶆簮搴� ruoyi-vue-pro 鍏ㄥ簱 416 寮犺〃 CREATE TABLE + 6 绫婚厤缃暟鎹紙mysqldump 瀛楅潰閲忥級銆�
-闃舵浜岋細娌跨敤 0918 鏂囦欢鐨勮法搴撹韩浠�/鑿滃崟/OAuth2 琛ュ娈碉紙閫愬瓧澶嶇敤锛夈��
+闃舵涓�锛氬綋鍓嶆簮搴� ruoyi-vue-pro 鍏ㄥ簱 CREATE TABLE + 6 绫婚厤缃暟鎹紙mysqldump 瀛楅潰閲忥級銆�
+闃舵浜岋細娌跨敤 0929 鏂囦欢鐨勮法搴撹韩浠�/鑿滃崟/OAuth2 琛ュ娈碉紙閫愬瓧澶嶇敤锛夈��
"""
import re
import subprocess
@@ -13,9 +13,9 @@
USER = "root"
PWD = "1234"
-BASE_DIR = r"D:\develop\XingRuan\MOM\mom-pro2-after\docs\sql"
-SRC_0918 = BASE_DIR + r"\config_export_all_20260918.sql"
-OUT = BASE_DIR + r"\config_export_all_20260928.sql"
+BASE_DIR = r"D:\develop\XingRuan\MOM-LXWT\mom-pro2-after\docs\sql"
+SRC_PREV = BASE_DIR + r"\config_export_all_20260929.sql"
+OUT = BASE_DIR + r"\config_export_all_20260930.sql"
MYSQL = MYSQL_BIN + r"\mysql.exe"
MYSQLDUMP = MYSQL_BIN + r"\mysqldump.exe"
@@ -181,36 +181,40 @@
def load_stage2_block():
- with open(SRC_0918, encoding="utf-8") as f:
+ with open(SRC_PREV, encoding="utf-8") as f:
lines = f.read().splitlines()
for i, line in enumerate(lines):
if "闃舵浜岋細琛ュ韬唤" in line:
start = i - 1 # 涓婃柟 =============== 妯嚎
return "\n".join(lines[start:]).rstrip() + "\n"
- raise RuntimeError("0918 鏂囦欢鏈壘鍒伴樁娈典簩娈佃惤")
+ raise RuntimeError("0929 鏂囦欢鏈壘鍒伴樁娈典簩娈佃惤")
HEADER = """-- =======================================================================
--- 鏂囦欢锛歝onfig_export_all_20260928.sql
+-- 鏂囦欢锛歝onfig_export_all_20260930.sql
-- 鐢ㄩ�旓細ruoyi-vue-pro銆屽叏搴撹〃缁撴瀯 + 6 绫婚厤缃暟鎹�嶅鍑猴紝渚涘悓缁撴瀯鍏ㄦ柊搴撳垵濮嬪寲
-- 闃舵涓�锛氬叏搴� {n_tables} 寮犺〃 CREATE TABLE + 6 绫婚厤缃暟鎹紙瀛楅潰閲忥紝鑷寘鍚紝涓嶄緷璧栨簮搴撳湪绾匡級
-- 闃舵浜岋細璺ㄥ簱琛ュ 鑿滃崟/瑙掕壊/鐢ㄦ埛/OAuth2 绛夎韩浠芥暟鎹紙鎵ц鏈熶粠婧愬簱鎷疯礉锛�
-- 鏉ユ簮搴擄細ruoyi-vue-pro
--- 鍩虹嚎锛�2026-09-18 鐗堬紙419 寮犺〃锛夆啋 鏈涓�**鍏ㄩ噺閲嶇敓鎴�**锛堜笉鍐嶅熀浜庢棫鏂囦欢鎵撹ˉ涓侊級锛�
--- 鐩存帴鎸夊綋鍓嶆簮搴撴渶鏂扮姸鎬侀噸瀵硷紝涓�娆℃�ц鐩� 0918 涔嬪悗鍏ㄩ儴缁撴瀯涓庨厤缃紓绉汇��
--- 鏈鍙樻洿锛堢浉瀵� 0918锛�2026-09-28锛夛細
--- 鈶� 琛ㄧ粨鏋勶細419 鈫� {n_tables} 寮�
--- - 鍒犻櫎 6 寮犲巻鍙插浠借〃锛坆pm_bak_20260904_bytearray/category/deployment/model/procdef/procinfo锛屾簮搴撳凡鏃狅級
--- + 鏂板 3 寮犺〃锛坅fter_sale_problem銆乤fter_sale_visit銆乥pm_process_auto_approve_config锛屼粎缁撴瀯锛屾簮搴撴棤鏁版嵁锛�
--- + 10 寮犺〃 DDL 涓� 0918 涓嶅悓锛屼互褰撳墠婧愬簱涓哄噯锛坅fter_sale_ticket銆乵es_qc_indicator銆乵es_qc_indicator_result_detail銆�
--- mes_qc_ipqc銆乵es_qc_iqc銆乵es_qc_oqc銆乵es_qc_rqc銆乵es_qc_template銆乵es_qc_template_indicator銆乵es_wm_return_issue_line锛�
--- 鈶� 閰嶇疆鏁版嵁浠ュ綋鍓嶆簮搴撲负鍑嗛噸瀵硷紙涓嬪垪涓� 0918 澹版槑鍊� 鈫� 鏈瀵煎嚭鍊硷級锛�
--- - system_dict_type 241鈫抺n_dicttype}銆乻ystem_dict_data 1157鈫抺n_dictdata}锛堝惈 hrm_holiday_type 鑺傚亣鏃ョ被鍨嬬瓑鏂板瀛楀吀锛�
--- - system_company_config 0鈫�1銆乥i_chart_config 36鈫�37銆乥i_warehouse_coordinate 1鈫�2銆乤i_api_key 1鈫�3銆乥pm_user_group 3鈫�4
--- - bpm_business_attach 11鈫�4銆乥pm_category 22鈫�15銆乥pm_form 4鈫�3銆乥pm_process_listener 1鈫�0锛堟簮搴撳凡鍒犻櫎鐨勮涓嶅啀瀵煎嚭锛�
+-- 鍩虹嚎锛�2026-09-29 鐗堬紙417 寮犺〃锛夆啋 鏈涓�**鍏ㄩ噺閲嶇敓鎴�**锛堜笉鍐嶅熀浜庢棫鏂囦欢鎵撹ˉ涓侊級锛�
+-- 鐩存帴鎸夊綋鍓嶆簮搴撴渶鏂扮姸鎬侀噸瀵硷紝涓�娆℃�ц鐩� 0929 涔嬪悗鍏ㄩ儴缁撴瀯涓庨厤缃紓绉汇��
+-- 鏈鍙樻洿锛堢浉瀵� 0929锛�2026-09-30锛夛細
+-- 鈶� 琛ㄦ暟閲忎笉鍙橈紙{n_tables} 寮狅級锛屾棤鏂板/鍒犻櫎琛ㄣ��
+-- 鈶� 5 寮犲嚭搴撳崟鏄庣粏琛屽鍔� 3 鍒楋紙鍑哄簱鍗曡鏀寔銆屼富鍗曚綅 + 杈呭崟浣嶏紙缁撳悎鍨嬪彿鎹㈢畻锛夈�嶅綍鍏ワ級锛�
+-- mes_wm_misc_issue_line锛堟潅椤瑰嚭搴擄級銆乵es_wm_outsource_issue_line锛堝鍗忓彂鏂欙級銆�
+-- mes_wm_product_issue_line锛堢敓浜ч鏂欙級銆乵es_wm_product_sales_line锛堥攢鍞嚭搴擄級銆�
+-- mes_wm_return_vendor_line锛堥噰璐��璐э級锛�
+-- item_model_id锛堢墿鏂欏瀷鍙风紪鍙凤級銆乪nter_unit_measure_id锛堝綍鍏ュ崟浣嶇紪鍙凤級銆�
+-- enter_quantity锛堝綍鍏ユ暟閲忥紝鎸夊綍鍏ュ崟浣嶈锛夛紱
+-- quantity 淇濇寔涓恒�岀墿鏂欎富鍗曚綅鍙ｅ緞鐨勫嚭搴撴暟閲忋�嶏紝搴撳瓨涓庡簱瀛樻祦姘村彛寰勪笉鍙樸��
+-- 鈶� hrm_attendance_holiday 澧炲姞 2 鍒楋紙鑰冨嫟鑺傚亣鏃ラ厤缃敱銆屽崟鏃ャ�嶆敼涓恒�屾椂闂存銆嶅綍鍏ワ級锛�
+-- start_date锛堝紑濮嬫棩鏈燂級銆乪nd_date锛堢粨鏉熸棩鏈燂級锛涘師 date 鍒椾繚鐣欎笉鍔紝
+-- 鍚庣淇濆瓨鏃朵粛鍐欏叆寮�濮嬫棩鏈燂紝浠呬綔瀛橀噺鍏煎锛屼笟鍔″垽鏂敼鐢� start_date/end_date銆�
+-- 鈶� 閰嶇疆鏁版嵁浠ュ綋鍓嶆簮搴撲负鍑嗛噸瀵硷細
+-- - system_dict_type {n_dicttype}銆乻ystem_dict_data {n_dictdata}
-- - 鍗忓悓娴佺▼瀹氫箟鎸夋簮搴撳綋鍓�**婵�娲�**闆嗗悎閲嶅锛坽n_procdef} 涓祦绋嬪畾涔� + 瀵瑰簲閮ㄧ讲/瀛楄妭璧勬簮 + 璁捐鎬佹ā鍨嬶級
--- 鈶� 鑿滃崟/鏉冮檺鑺傜偣锛堣妭鍋囨棩閰嶇疆 6014/60141-60145銆佸悇妯″潡瀵煎叆鎸夐挳 1075311/1075417-1075420 绛夛級鐢遍樁娈典簩
--- 璺ㄥ簱鍏ㄩ噺鎷疯礉鑷姩鎼哄甫锛屾棤闇�鏀瑰姩鏈枃浠舵暟鎹锛涘湪姝ょ櫥璁颁互璇存槑鏈増鏂囦欢纭疄瑕嗙洊杩欎簺鍙樻洿銆�
+-- 鈶� 鑿滃崟/鏉冮檺鑺傜偣鐢遍樁娈典簩璺ㄥ簱鍏ㄩ噺鎷疯礉鑷姩鎼哄甫锛屾棤闇�鏀瑰姩鏈枃浠舵暟鎹銆�
+-- 鏈鏈柊澧炶彍鍗�/鏉冮檺鐐癸紙鑺傚亣鏃ラ厤缃彍鍗曞強鍏舵寜閽潈闄愭鍓嶅凡鍏ュ簱锛岄殢闃舵浜岃嚜鍔ㄦ惡甯︼級銆�
-- 楠岃瘉锛歿verify}
-- 鑼冨洿锛氬叏搴� BASE TABLE 鍏� {n_tables} 寮狅紝鍏ㄩ儴杈撳嚭 CREATE TABLE锛�
-- 浠呬互涓嬮厤缃被琛ㄥ甫鏁版嵁(INSERT)锛屽叾浣欎笟鍔�/绯荤粺/杩愯鍘嗗彶琛ㄥ彧淇濈暀绌鸿〃缁撴瀯锛�
--
Gitblit v1.9.3