diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..7b016a89 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/cleanup_data.sql b/cleanup_data.sql new file mode 100644 index 00000000..c64310e1 --- /dev/null +++ b/cleanup_data.sql @@ -0,0 +1,176 @@ +SET FOREIGN_KEY_CHECKS = 0; + +-- ============================================== +-- 清理流程管理相关表（Flowable流程引擎） +-- ============================================== + +-- 流程运行时任务表 +TRUNCATE TABLE `ACT_RU_TASK`; +TRUNCATE TABLE `ACT_RU_EXECUTION`; +TRUNCATE TABLE `ACT_RU_VARIABLE`; +TRUNCATE TABLE `ACT_RU_IDENTITYLINK`; +TRUNCATE TABLE `ACT_RU_EVENT_SUBSCR`; +TRUNCATE TABLE `ACT_RU_ENTITYLINK`; +TRUNCATE TABLE `ACT_RU_JOB`; +TRUNCATE TABLE `ACT_RU_TIMER_JOB`; +TRUNCATE TABLE `ACT_RU_SUSPENDED_JOB`; +TRUNCATE TABLE `ACT_RU_DEADLETTER_JOB`; +TRUNCATE TABLE `ACT_RU_EXTERNAL_JOB`; +TRUNCATE TABLE `ACT_RU_HISTORY_JOB`; +TRUNCATE TABLE `ACT_RU_ACTINST`; + +-- 流程历史表 +TRUNCATE TABLE `ACT_HI_TASKINST`; +TRUNCATE TABLE `ACT_HI_PROCINST`; +TRUNCATE TABLE `ACT_HI_ACTINST`; +TRUNCATE TABLE `ACT_HI_VARINST`; +TRUNCATE TABLE `ACT_HI_DETAIL`; +TRUNCATE TABLE `ACT_HI_COMMENT`; +TRUNCATE TABLE `ACT_HI_ATTACHMENT`; +TRUNCATE TABLE `ACT_HI_IDENTITYLINK`; +TRUNCATE TABLE `ACT_HI_ENTITYLINK`; +TRUNCATE TABLE `ACT_HI_TSK_LOG`; + +-- 流程定义表 +TRUNCATE TABLE `ACT_RE_PROCDEF`; +TRUNCATE TABLE `ACT_RE_DEPLOYMENT`; +TRUNCATE TABLE `ACT_RE_MODEL`; +TRUNCATE TABLE `ACT_PROCDEF_INFO`; +TRUNCATE TABLE `ACT_GE_BYTEARRAY`; +TRUNCATE TABLE `ACT_EVT_LOG`; + +-- 事件注册表 +TRUNCATE TABLE `FLW_EVENT_DEFINITION`; +TRUNCATE TABLE `FLW_CHANNEL_DEFINITION`; +TRUNCATE TABLE `FLW_EVENT_DEPLOYMENT`; +TRUNCATE TABLE `FLW_EVENT_RESOURCE`; +TRUNCATE TABLE `FLW_RU_BATCH`; +TRUNCATE TABLE `FLW_RU_BATCH_PART`; + +-- ============================================== +-- 清理工作流相关表（自定义工作流） +-- ============================================== + +TRUNCATE TABLE `wf_form`; +TRUNCATE TABLE `wf_deploy_form`; +TRUNCATE TABLE `wf_category`; +TRUNCATE TABLE `wf_copy`; + +-- ============================================== +-- 清理设备管理相关表 +-- ============================================== + +TRUNCATE TABLE `dv_repair`; +TRUNCATE TABLE `dv_repair_line`; +TRUNCATE TABLE `dv_check_record`; +TRUNCATE TABLE `dv_check_record_line`; +TRUNCATE TABLE `dv_check_machinery`; +TRUNCATE TABLE `dv_check_plan`; +TRUNCATE TABLE `dv_check_subject`; +TRUNCATE TABLE `dv_mainten_record`; +TRUNCATE TABLE `dv_mainten_record_line`; +TRUNCATE TABLE `dv_machinery`; +TRUNCATE TABLE `dv_subject`; + +-- 保留设备类型表（基础数据） +-- TRUNCATE TABLE `dv_machinery_type`; + +-- ============================================== +-- 清理WMS业务表（非库存相关） +-- ============================================== + +-- 订单相关 +TRUNCATE TABLE `wms_order`; +TRUNCATE TABLE `wms_order_detail`; +TRUNCATE TABLE `wms_order_profit`; + +-- 采购相关 +TRUNCATE TABLE `wms_purchase_plan`; +TRUNCATE TABLE `wms_purchase_plan_detail`; + +-- 排产相关 +TRUNCATE TABLE `wms_schedule_plan`; +TRUNCATE TABLE `wms_schedule_plan_detail`; + +-- 生产相关 +TRUNCATE TABLE `wms_production_line`; +TRUNCATE TABLE `wms_process_task`; +TRUNCATE TABLE `wms_processe`; +TRUNCATE TABLE `wms_product_processe`; +TRUNCATE TABLE `wms_product_bom`; +TRUNCATE TABLE `wms_bom`; +TRUNCATE TABLE `wms_bom_item`; +TRUNCATE TABLE `wms_production_task`; + +-- 财务相关 +TRUNCATE TABLE `wms_account`; +TRUNCATE TABLE `wms_financial_document`; +TRUNCATE TABLE `wms_journal_entry`; +TRUNCATE TABLE `wms_journal`; +TRUNCATE TABLE `wms_payable`; +TRUNCATE TABLE `wms_receivable`; + +-- 合同与供应商 +TRUNCATE TABLE `wms_contract`; +TRUNCATE TABLE `wms_supplier`; + +-- 客户管理 +TRUNCATE TABLE `wms_customer`; + +-- 质量检验 +TRUNCATE TABLE `wms_check_item`; +TRUNCATE TABLE `wms_check_task`; +TRUNCATE TABLE `wms_check_task_item`; +TRUNCATE TABLE `wms_common_defect`; + +-- 其他 +TRUNCATE TABLE `wms_camera_management`; +TRUNCATE TABLE `wms_express`; +TRUNCATE TABLE `wms_express_question`; +TRUNCATE TABLE `wms_product_sales_script`; +TRUNCATE TABLE `wms_batch`; +TRUNCATE TABLE `wms_report_detail`; +TRUNCATE TABLE `wms_report_summary`; +TRUNCATE TABLE `wms_product_spec`; +TRUNCATE TABLE `wms_product_spec_group`; + +-- ============================================== +-- 清理质量检验相关表 +-- ============================================== + +TRUNCATE TABLE `is_inspection_commission`; +TRUNCATE TABLE `is_inspection_task`; +TRUNCATE TABLE `is_sample_inventory`; + +-- ============================================== +-- 清理代码生成相关表 +-- ============================================== + +TRUNCATE TABLE `gen_table`; +TRUNCATE TABLE `gen_table_column`; + +-- ============================================== +-- 清理系统日志表 +-- ============================================== + +TRUNCATE TABLE `sys_oper_log`; +TRUNCATE TABLE `sys_logininfor`; +TRUNCATE TABLE `sys_oss`; + +-- ============================================== +-- 重置自增ID（可选） +-- ============================================== + +ALTER TABLE `dv_machinery_type` AUTO_INCREMENT = 1; +ALTER TABLE `wms_category` AUTO_INCREMENT = 1; +ALTER TABLE `wms_raw_material` AUTO_INCREMENT = 1; +ALTER TABLE `wms_product` AUTO_INCREMENT = 1; +ALTER TABLE `wms_warehouse` AUTO_INCREMENT = 1; +ALTER TABLE `wms_stock` AUTO_INCREMENT = 1; +ALTER TABLE `wms_stock_io` AUTO_INCREMENT = 1; +ALTER TABLE `wms_stock_io_detail` AUTO_INCREMENT = 1; +ALTER TABLE `wms_stock_log` AUTO_INCREMENT = 1; + +SET FOREIGN_KEY_CHECKS = 1; + +SELECT '数据清理完成！' AS result; \ No newline at end of file diff --git a/cleanup_zinc_data.sql b/cleanup_zinc_data.sql new file mode 100644 index 00000000..a601f89e --- /dev/null +++ b/cleanup_zinc_data.sql @@ -0,0 +1,153 @@ +SET FOREIGN_KEY_CHECKS = 0; + +-- ============================================== +-- 镀锌板块数据清理脚本 +-- 涉及仓库ID： +-- 1988150263284953089 - 镀锌原料库 +-- 1988150323162836993 - 镀锌成品库 +-- 1988150487185289217 - 镀锌纵剪分条原料库 +-- 1988150380649967617 - 镀锌分条成品库 +-- ============================================== + +-- 定义镀锌仓库ID集合 +SET @zinc_warehouse_ids = '1988150263284953089,1988150323162836993,1988150487185289217,1988150380649967617'; + +-- ============================================== +-- 0. 先获取所有镀锌相关的实际库区ID（包括子级） +-- ============================================== + +CREATE TEMPORARY TABLE temp_zinc_actual_warehouse_ids AS +WITH RECURSIVE zinc_warehouses AS ( + SELECT actual_warehouse_id + FROM `wms_actual_warehouse` + WHERE warehouse_id IN (1988150263284953089, 1988150323162836993, 1988150487185289217, 1988150380649967617) + UNION ALL + SELECT w.actual_warehouse_id + FROM `wms_actual_warehouse` w + INNER JOIN zinc_warehouses zw ON w.parent_id = zw.actual_warehouse_id +) +SELECT actual_warehouse_id FROM zinc_warehouses; + +-- ============================================== +-- 1. 删除钢卷相关数据 +-- ============================================== + +-- 钢卷仓库操作记录 +DELETE FROM `wms_coil_warehouse_operation_` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- 钢卷异常记录 +DELETE FROM `wms_coil_abnormal` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- 钢卷缓存记录 +DELETE FROM `wms_coil_cache` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- 钢卷待处理动作 +DELETE FROM `wms_coil_pending_action` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- 钢卷包装明细 +DELETE FROM `wms_coil_packing_detail` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- 钢卷包装记录 +DELETE FROM `wms_coil_packing_record` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- 钢卷质量复判 +DELETE FROM `wms_coil_quality_rejudge` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- 钢卷统计汇总 +DELETE FROM `wms_coil_statistics_summary` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- ============================================== +-- 2. 删除出入库相关数据 +-- ============================================== + +-- 先获取涉及镀锌仓库的出入库单ID +CREATE TEMPORARY TABLE temp_zinc_io_ids AS +SELECT DISTINCT stock_io_id +FROM `wms_stock_io_detail` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids) + OR from_warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- 删除出入库明细 +DELETE FROM `wms_stock_io_detail` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids) + OR from_warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- 删除出入库单 +DELETE FROM `wms_stock_io` +WHERE stock_io_id IN (SELECT stock_io_id FROM temp_zinc_io_ids); + +-- ============================================== +-- 3. 删除库存相关数据 +-- ============================================== + +-- 删除库存记录 +DELETE FROM `wms_stock` +WHERE warehouse_id IN (1988150263284953089, 1988150323162836993, 1988150487185289217, 1988150380649967617); + +-- 删除钢卷物料记录 +DELETE FROM `wms_material_coil` +WHERE actual_warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- 删除库存流水记录 +DELETE FROM `wms_stock_log` +WHERE warehouse_id IN (1988150263284953089, 1988150323162836993, 1988150487185289217, 1988150380649967617); + +-- ============================================== +-- 4. 删除仓库/库区/库位记录 +-- ============================================== + +DELETE FROM `wms_warehouse` +WHERE warehouse_id IN (1988150263284953089, 1988150323162836993, 1988150487185289217, 1988150380649967617); + +-- 删除实际库区/库位记录（包括所有子级） +DELETE FROM `wms_actual_warehouse` +WHERE actual_warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- ============================================== +-- 5. 删除发货计划相关数据 +-- ============================================== + +DELETE FROM `wms_delivery_plan_coil_operate` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- ============================================== +-- 6. 删除质量检查任务相关数据 +-- ============================================== + +DELETE FROM `wms_check_task_item` +WHERE check_task_id IN ( + SELECT check_task_id FROM `wms_check_task` + WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids) +); + +DELETE FROM `wms_check_task` +WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids); + +-- ============================================== +-- 7. 删除检查任务与钢卷关联数据 +-- ============================================== + +DELETE FROM `wms_check_task_coil_relation` +WHERE check_task_id IN ( + SELECT check_task_id FROM `wms_check_task` + WHERE warehouse_id IN (SELECT actual_warehouse_id FROM temp_zinc_actual_warehouse_ids) +); + +-- ============================================== +-- 清理临时表 +-- ============================================== + +DROP TEMPORARY TABLE IF EXISTS temp_zinc_io_ids; +DROP TEMPORARY TABLE IF EXISTS temp_zinc_actual_warehouse_ids; + +SET FOREIGN_KEY_CHECKS = 1; + +SELECT '镀锌板块数据清理完成！' AS result; \ No newline at end of file diff --git a/create_xgy_system.bat b/create_xgy_system.bat new file mode 100644 index 00000000..3c9064f6 --- /dev/null +++ b/create_xgy_system.bat @@ -0,0 +1,59 @@ +@echo off +chcp 65001 >nul +echo ======================================== +echo 創建鑫廣宇系統 - 完整腳本 +echo ======================================== +echo. + +echo 步驟1: 複製項目到 xgy-oa 目錄... +xcopy /E /I /Y "d:\klp-oa\klp-oa" "d:\klp-oa\xgy-oa" +if %errorlevel% neq 0 ( + echo 複製失敗，請手動複製項目 + pause + exit /b 1 +) + +echo. +echo 步驟2: 替換 vue.config.js 中的內容... +powershell -Command "(Get-Content 'd:\klp-oa\xgy-oa\klp-ui\vue.config.js') -replace '琛德', '鑫廣宇' | Set-Content 'd:\klp-oa\xgy-oa\klp-ui\vue.config.js' -Encoding UTF8" + +echo. +echo 步驟3: 替換 views 目錄中的文件... +powershell -Command "(Get-ChildItem -Path 'd:\klp-oa\xgy-oa\klp-ui\src\views' -Recurse -Include *.vue -Exclude *.md | ForEach-Object { (Get-Content $_.FullName -Raw) -replace '琛德', '鑫廣宇' | Set-Content $_.FullName -Encoding UTF8 })" + +echo. +echo 步驟4: 替換 api 目錄中的文件... +powershell -Command "(Get-ChildItem -Path 'd:\klp-oa\xgy-oa\klp-ui\src\api' -Recurse -Include *.js | ForEach-Object { (Get-Content $_.FullName -Raw) -replace '琛德', '鑫廣宇' | Set-Content $_.FullName -Encoding UTF8 })" + +echo. +echo 步驟5: 替換 layout 目錄中的文件... +powershell -Command "(Get-ChildItem -Path 'd:\klp-oa\xgy-oa\klp-ui\src\layout' -Recurse -Include *.vue | ForEach-Object { (Get-Content $_.FullName -Raw) -replace '琛德', '鑫廣宇' | Set-Content $_.FullName -Encoding UTF8 })" + +echo. +echo 步驟6: 替換 components 目錄中的文件... +powershell -Command "(Get-ChildItem -Path 'd:\klp-oa\xgy-oa\klp-ui\src\components' -Recurse -Include *.vue | ForEach-Object { (Get-Content $_.FullName -Raw) -replace '琛德', '鑫廣宇' | Set-Content $_.FullName -Encoding UTF8 })" + +echo. +echo 步驟7: 替換 utils 目錄中的文件... +powershell -Command "(Get-ChildItem -Path 'd:\klp-oa\xgy-oa\klp-ui\src\utils' -Recurse -Include *.js | ForEach-Object { (Get-Content $_.FullName -Raw) -replace '琛德', '鑫廣宇' | Set-Content $_.FullName -Encoding UTF8 })" + +echo. +echo ======================================== +echo 鑫廣宇系統創建完成！ +echo ======================================== +echo. +echo 以下目錄中的文件需要手動檢查並替換： +echo - d:\klp-oa\xgy-oa\klp-ui\src\plugins\ +echo - d:\klp-oa\xgy-oa\klp-ui\src\directive\ +echo - d:\klp-oa\xgy-oa\klp-ui\src\store\ +echo - d:\klp-oa\xgy-oa\klp-ui\src\router\ +echo - d:\klp-oa\xgy-oa\klp-ui\src\assets\ +echo. +echo 建議使用 VS Code 的查找替換功能： +echo 1. 打開 d:\klp-oa\xgy-oa 文件夾 +echo 2. 按 Ctrl+Shift+H 打開全局替換 +echo 3. 搜索 "琛德" +echo 4. 替換為 "鑫廣宇" +echo 5. 點擊 "全部替換" +echo. +pause diff --git a/klp-admin/src/main/resources/application-dev.yml b/klp-admin/src/main/resources/application-dev.yml index c5e8a7f4..14a95a10 100644 --- a/klp-admin/src/main/resources/application-dev.yml +++ b/klp-admin/src/main/resources/application-dev.yml @@ -75,7 +75,7 @@ spring: url: jdbc:mysql://140.143.206.120:13306/klp-oa-test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true username: klp password: KeLunPu@123 - # 从库数据源 + # 从库数据源 acid: lazy: true type: ${spring.datasource.type} diff --git a/klp-admin/src/main/resources/application-prod.yml b/klp-admin/src/main/resources/application-prod.yml index a96a335b..e3eafb52 100644 --- a/klp-admin/src/main/resources/application-prod.yml +++ b/klp-admin/src/main/resources/application-prod.yml @@ -62,13 +62,13 @@ spring: datasource: # 主库数据源 master: - type: ${spring.datasource.type} - driverClassName: com.mysql.cj.jdbc.Driver - # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 - # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://140.143.206.120:13306/klp-oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true - username: klp - password: KeLunPu@123 + type: ${spring.datasource.type} + driverClassName: com.mysql.cj.jdbc.Driver + # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 + # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) + url: jdbc:mysql://140.143.206.120:13306/klp-oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true + username: klp + password: KeLunPu@123 # 从库数据源（酸轧库） acid: lazy: true diff --git a/klp-ui/package.json b/klp-ui/package.json index f6a6a48c..fa80f569 100644 --- a/klp-ui/package.json +++ b/klp-ui/package.json @@ -1,5 +1,5 @@ { - "name": "klp-flowable-plus", + "name": "xgy-flowable-plus", "version": "0.8.3", "description": "RuoYi-Flowable-Plus后台管理系统", "author": "KonBAI", @@ -34,7 +34,7 @@ ], "repository": { "type": "git", - "url": "https://gitee.com/KonBAI-Q/klp-flowable-plus.git" + "url": "https://gitee.com/KonBAI-Q/xgy-flowable-plus.git" }, "dependencies": { "@babel/parser": "7.7.4", diff --git a/klp-ui/src/api/finance/account.js b/klp-ui/src/api/finance/account.js index 7c36349b..0a1264ab 100644 --- a/klp-ui/src/api/finance/account.js +++ b/klp-ui/src/api/finance/account.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询会计科目列表 export function listAccount(query) { return request({ - url: '/klp/account/list', + url: '/xgy/account/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listAccount(query) { // 查询会计科目详细 export function getAccount(accountId) { return request({ - url: '/klp/account/' + accountId, + url: '/xgy/account/' + accountId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getAccount(accountId) { // 新增会计科目 export function addAccount(data) { return request({ - url: '/klp/account', + url: '/xgy/account', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addAccount(data) { // 修改会计科目 export function updateAccount(data) { return request({ - url: '/klp/account', + url: '/xgy/account', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateAccount(data) { // 删除会计科目 export function delAccount(accountId) { return request({ - url: '/klp/account/' + accountId, + url: '/xgy/account/' + accountId, method: 'delete' }) } diff --git a/klp-ui/src/api/finance/financialDocument.js b/klp-ui/src/api/finance/financialDocument.js index 62932a2a..c7e8ac8f 100644 --- a/klp-ui/src/api/finance/financialDocument.js +++ b/klp-ui/src/api/finance/financialDocument.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询财务单据列表 export function listFinancialDocument(query) { return request({ - url: '/klp/financialDocument/list', + url: '/xgy/financialDocument/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listFinancialDocument(query) { // 查询财务单据详细 export function getFinancialDocument(documentId) { return request({ - url: '/klp/financialDocument/' + documentId, + url: '/xgy/financialDocument/' + documentId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getFinancialDocument(documentId) { // 新增财务单据 export function addFinancialDocument(data) { return request({ - url: '/klp/financialDocument', + url: '/xgy/financialDocument', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addFinancialDocument(data) { // 修改财务单据 export function updateFinancialDocument(data) { return request({ - url: '/klp/financialDocument', + url: '/xgy/financialDocument', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateFinancialDocument(data) { // 删除财务单据 export function delFinancialDocument(documentId) { return request({ - url: '/klp/financialDocument/' + documentId, + url: '/xgy/financialDocument/' + documentId, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delFinancialDocument(documentId) { // 创建财务单据，带明细，使用借贷记账法 export function addFinancialDocumentWithDetail(data) { return request({ - url: '/klp/financialDocument/addDetail', + url: '/xgy/financialDocument/addDetail', method: 'post', data: data }) @@ -55,7 +55,7 @@ export function addFinancialDocumentWithDetail(data) { // 查询带明细的财务单据 export function listFinancialDocumentWithDetail(query) { return request({ - url: '/klp/financialDocument/ListDetail', + url: '/xgy/financialDocument/ListDetail', method: 'get', params: query }) diff --git a/klp-ui/src/api/finance/jouneryEntry.js b/klp-ui/src/api/finance/jouneryEntry.js index 835b9089..d0fe0b8f 100644 --- a/klp-ui/src/api/finance/jouneryEntry.js +++ b/klp-ui/src/api/finance/jouneryEntry.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询日记账凭证（宽松版）列表 export function listJournalEntry(query) { return request({ - url: '/klp/journalEntry/list', + url: '/xgy/journalEntry/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listJournalEntry(query) { // 查询日记账凭证（宽松版）详细 export function getJournalEntry(entryId) { return request({ - url: '/klp/journalEntry/' + entryId, + url: '/xgy/journalEntry/' + entryId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getJournalEntry(entryId) { // 新增日记账凭证（宽松版） export function addJournalEntry(data) { return request({ - url: '/klp/journalEntry', + url: '/xgy/journalEntry', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addJournalEntry(data) { // 修改日记账凭证（宽松版） export function updateJournalEntry(data) { return request({ - url: '/klp/journalEntry', + url: '/xgy/journalEntry', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateJournalEntry(data) { // 删除日记账凭证（宽松版） export function delJournalEntry(entryId) { return request({ - url: '/klp/journalEntry/' + entryId, + url: '/xgy/journalEntry/' + entryId, method: 'delete' }) } diff --git a/klp-ui/src/api/finance/journal.js b/klp-ui/src/api/finance/journal.js index db7137a4..684361ad 100644 --- a/klp-ui/src/api/finance/journal.js +++ b/klp-ui/src/api/finance/journal.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询资金日记账列表 export function listJournal(query) { return request({ - url: '/klp/journal/list', + url: '/xgy/journal/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listJournal(query) { // 查询资金日记账详细 export function getJournal(journalId) { return request({ - url: '/klp/journal/' + journalId, + url: '/xgy/journal/' + journalId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getJournal(journalId) { // 新增资金日记账 export function addJournal(data) { return request({ - url: '/klp/journal', + url: '/xgy/journal', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addJournal(data) { // 修改资金日记账 export function updateJournal(data) { return request({ - url: '/klp/journal', + url: '/xgy/journal', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateJournal(data) { // 删除资金日记账 export function delJournal(journalId) { return request({ - url: '/klp/journal/' + journalId, + url: '/xgy/journal/' + journalId, method: 'delete' }) } diff --git a/klp-ui/src/api/finance/otherIncome.js b/klp-ui/src/api/finance/otherIncome.js index e23003a3..b74e3959 100644 --- a/klp-ui/src/api/finance/otherIncome.js +++ b/klp-ui/src/api/finance/otherIncome.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询其他收入列表 export function listOtherIncome(query) { return request({ - url: '/klp/otherIncome/list', + url: '/xgy/otherIncome/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listOtherIncome(query) { // 查询其他收入详细 export function getOtherIncome(otherIncomeId) { return request({ - url: '/klp/otherIncome/' + otherIncomeId, + url: '/xgy/otherIncome/' + otherIncomeId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getOtherIncome(otherIncomeId) { // 新增其他收入 export function addOtherIncome(data) { return request({ - url: '/klp/otherIncome', + url: '/xgy/otherIncome', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addOtherIncome(data) { // 修改其他收入 export function updateOtherIncome(data) { return request({ - url: '/klp/otherIncome', + url: '/xgy/otherIncome', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateOtherIncome(data) { // 删除其他收入 export function delOtherIncome(otherIncomeId) { return request({ - url: '/klp/otherIncome/' + otherIncomeId, + url: '/xgy/otherIncome/' + otherIncomeId, method: 'delete' }) } diff --git a/klp-ui/src/api/finance/payable.js b/klp-ui/src/api/finance/payable.js index c3d5f9ee..26ea926f 100644 --- a/klp-ui/src/api/finance/payable.js +++ b/klp-ui/src/api/finance/payable.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询应付款管理（宽松版）列表 export function listPayable(query) { return request({ - url: '/klp/payable/list', + url: '/xgy/payable/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listPayable(query) { // 查询应付款管理（宽松版）详细 export function getPayable(payableId) { return request({ - url: '/klp/payable/' + payableId, + url: '/xgy/payable/' + payableId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getPayable(payableId) { // 新增应付款管理（宽松版） export function addPayable(data) { return request({ - url: '/klp/payable', + url: '/xgy/payable', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addPayable(data) { // 修改应付款管理（宽松版） export function updatePayable(data) { return request({ - url: '/klp/payable', + url: '/xgy/payable', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updatePayable(data) { // 删除应付款管理（宽松版） export function delPayable(payableId) { return request({ - url: '/klp/payable/' + payableId, + url: '/xgy/payable/' + payableId, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delPayable(payableId) { // 付款 export function updatePaidAmount(data) { return request({ - url: '/klp/payable/updatePaidAmount', + url: '/xgy/payable/updatePaidAmount', method: 'post', data: data }) diff --git a/klp-ui/src/api/finance/receivable.js b/klp-ui/src/api/finance/receivable.js index 7ee43c15..df539be6 100644 --- a/klp-ui/src/api/finance/receivable.js +++ b/klp-ui/src/api/finance/receivable.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询应收款管理（宽松版）列表 export function listReceivable(query) { return request({ - url: '/klp/receivable/list', + url: '/xgy/receivable/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listReceivable(query) { // 查询应收款管理（宽松版）详细 export function getReceivable(receivableId) { return request({ - url: '/klp/receivable/' + receivableId, + url: '/xgy/receivable/' + receivableId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getReceivable(receivableId) { // 新增应收款管理（宽松版） export function addReceivable(data) { return request({ - url: '/klp/receivable', + url: '/xgy/receivable', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addReceivable(data) { // 修改应收款管理（宽松版） export function updateReceivable(data) { return request({ - url: '/klp/receivable', + url: '/xgy/receivable', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateReceivable(data) { // 删除应收款管理（宽松版） export function delReceivable(receivableId) { return request({ - url: '/klp/receivable/' + receivableId, + url: '/xgy/receivable/' + receivableId, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delReceivable(receivableId) { // 收款 export function updatePaidAmount(data) { return request({ - url: '/klp/receivable/updatePaidAmount', + url: '/xgy/receivable/updatePaidAmount', method: 'post', data: data }) diff --git a/klp-ui/src/api/wms/batch.js b/klp-ui/src/api/wms/batch.js index b5a5419a..0bd37907 100644 --- a/klp-ui/src/api/wms/batch.js +++ b/klp-ui/src/api/wms/batch.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询批次（合并相同工艺的任务）列表 export function listBatch(query) { return request({ - url: '/klp/batch/list', + url: '/xgy/batch/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listBatch(query) { // 查询批次（合并相同工艺的任务）详细 export function getBatch(batchId) { return request({ - url: '/klp/batch/' + batchId, + url: '/xgy/batch/' + batchId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getBatch(batchId) { // 新增批次（合并相同工艺的任务） export function addBatch(data) { return request({ - url: '/klp/batch', + url: '/xgy/batch', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addBatch(data) { // 修改批次（合并相同工艺的任务） export function updateBatch(data) { return request({ - url: '/klp/batch', + url: '/xgy/batch', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateBatch(data) { // 删除批次（合并相同工艺的任务） export function delBatch(batchId) { return request({ - url: '/klp/batch/' + batchId, + url: '/xgy/batch/' + batchId, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delBatch(batchId) { // 检测批次生成方案是否会出现死锁 export function checkBatchLock(data) { return request({ - url: '/klp/batch/check', + url: '/xgy/batch/check', method: 'post', data: data }) @@ -56,7 +56,7 @@ export function checkBatchLock(data) { // 给出一个可行的批次生成方案 export function generateBatch(data) { return request({ - url: '/klp/batch/generate', + url: '/xgy/batch/generate', method: 'post', data: data }) diff --git a/klp-ui/src/api/wms/bom.js b/klp-ui/src/api/wms/bom.js index f179312b..9552b72f 100644 --- a/klp-ui/src/api/wms/bom.js +++ b/klp-ui/src/api/wms/bom.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询BOM 头，关联产品或原材料列表 export function listBom(query) { return request({ - url: '/klp/bom/list', + url: '/xgy/bom/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listBom(query) { // 查询BOM 头，关联产品或原材料详细 export function getBom(bomId) { return request({ - url: '/klp/bom/' + bomId, + url: '/xgy/bom/' + bomId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getBom(bomId) { // 新增BOM 头，关联产品或原材料 export function addBom(data) { return request({ - url: '/klp/bom', + url: '/xgy/bom', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addBom(data) { // 修改BOM 头，关联产品或原材料 export function updateBom(data) { return request({ - url: '/klp/bom', + url: '/xgy/bom', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateBom(data) { // 删除BOM 头，关联产品或原材料 export function delBom(bomId) { return request({ - url: '/klp/bom/' + bomId, + url: '/xgy/bom/' + bomId, method: 'delete' }) } diff --git a/klp-ui/src/api/wms/craft.js b/klp-ui/src/api/wms/craft.js index 9fe12f8b..e0e7d4c1 100644 --- a/klp-ui/src/api/wms/craft.js +++ b/klp-ui/src/api/wms/craft.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询工艺列表 export function listProcesse(query) { return request({ - url: '/klp/processe/list', + url: '/xgy/processe/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listProcesse(query) { // 查询工艺详细 export function getProcesse(processId) { return request({ - url: '/klp/processe/' + processId, + url: '/xgy/processe/' + processId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getProcesse(processId) { // 新增工艺 export function addProcesse(data) { return request({ - url: '/klp/processe', + url: '/xgy/processe', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addProcesse(data) { // 修改工艺 export function updateProcesse(data) { return request({ - url: '/klp/processe', + url: '/xgy/processe', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateProcesse(data) { // 删除工艺 export function delProcesse(processId) { return request({ - url: '/klp/processe/' + processId, + url: '/xgy/processe/' + processId, method: 'delete' }) } diff --git a/klp-ui/src/api/wms/generateRecord.js b/klp-ui/src/api/wms/generateRecord.js index 8faa544c..72bde50c 100644 --- a/klp-ui/src/api/wms/generateRecord.js +++ b/klp-ui/src/api/wms/generateRecord.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询二维码生成记录列表 export function listGenerateRecord(query) { return request({ - url: '/klp/generateRecord/list', + url: '/xgy/generateRecord/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listGenerateRecord(query) { // 查询二维码生成记录详细 export function getGenerateRecord(recordId) { return request({ - url: '/klp/generateRecord/' + recordId, + url: '/xgy/generateRecord/' + recordId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getGenerateRecord(recordId) { // 新增二维码生成记录 export function addGenerateRecord(data) { return request({ - url: '/klp/generateRecord', + url: '/xgy/generateRecord', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addGenerateRecord(data) { // 修改二维码生成记录 export function updateGenerateRecord(data) { return request({ - url: '/klp/generateRecord', + url: '/xgy/generateRecord', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateGenerateRecord(data) { // 删除二维码生成记录 export function delGenerateRecord(recordId) { return request({ - url: '/klp/generateRecord/' + recordId, + url: '/xgy/generateRecord/' + recordId, method: 'delete' }) } diff --git a/klp-ui/src/api/wms/processTask.js b/klp-ui/src/api/wms/processTask.js index e0ec3456..0decd5de 100644 --- a/klp-ui/src/api/wms/processTask.js +++ b/klp-ui/src/api/wms/processTask.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询工艺任务（生产计划所需工艺任务）列表 export function listProcessTask(query) { return request({ - url: '/klp/processTask/list', + url: '/xgy/processTask/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listProcessTask(query) { // 查询工艺任务（生产计划所需工艺任务）详细 export function getProcessTask(taskId) { return request({ - url: '/klp/processTask/' + taskId, + url: '/xgy/processTask/' + taskId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getProcessTask(taskId) { // 新增工艺任务（生产计划所需工艺任务） export function addProcessTask(data) { return request({ - url: '/klp/processTask', + url: '/xgy/processTask', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addProcessTask(data) { // 修改工艺任务（生产计划所需工艺任务） export function updateProcessTask(data) { return request({ - url: '/klp/processTask', + url: '/xgy/processTask', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateProcessTask(data) { // 删除工艺任务（生产计划所需工艺任务） export function delProcessTask(taskId) { return request({ - url: '/klp/processTask/' + taskId, + url: '/xgy/processTask/' + taskId, method: 'delete' }) } diff --git a/klp-ui/src/api/wms/stockLog.js b/klp-ui/src/api/wms/stockLog.js index cc9e6a57..26b341ac 100644 --- a/klp-ui/src/api/wms/stockLog.js +++ b/klp-ui/src/api/wms/stockLog.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询库存流水列表 export function listStockLog(query) { return request({ - url: '/klp/stockLog/list', + url: '/xgy/stockLog/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listStockLog(query) { // 查询库存流水详细 export function getStockLog(id) { return request({ - url: '/klp/stockLog/' + id, + url: '/xgy/stockLog/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getStockLog(id) { // 新增库存流水 export function addStockLog(data) { return request({ - url: '/klp/stockLog', + url: '/xgy/stockLog', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addStockLog(data) { // 修改库存流水 export function updateStockLog(data) { return request({ - url: '/klp/stockLog', + url: '/xgy/stockLog', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateStockLog(data) { // 删除库存流水 export function delStockLog(id) { return request({ - url: '/klp/stockLog/' + id, + url: '/xgy/stockLog/' + id, method: 'delete' }) } diff --git a/klp-ui/src/api/work/manufacturingSpec.js b/klp-ui/src/api/work/manufacturingSpec.js index 170dd374..0796f9f4 100644 --- a/klp-ui/src/api/work/manufacturingSpec.js +++ b/klp-ui/src/api/work/manufacturingSpec.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询制造规范列表 export function listManufacturingSpec(query) { return request({ - url: '/klp/manufacturingSpec/list', + url: '/xgy/manufacturingSpec/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listManufacturingSpec(query) { // 查询制造规范详细 export function getManufacturingSpec(specId) { return request({ - url: '/klp/manufacturingSpec/' + specId, + url: '/xgy/manufacturingSpec/' + specId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getManufacturingSpec(specId) { // 新增制造规范 export function addManufacturingSpec(data) { return request({ - url: '/klp/manufacturingSpec', + url: '/xgy/manufacturingSpec', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addManufacturingSpec(data) { // 修改制造规范 export function updateManufacturingSpec(data) { return request({ - url: '/klp/manufacturingSpec', + url: '/xgy/manufacturingSpec', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateManufacturingSpec(data) { // 删除制造规范 export function delManufacturingSpec(specId) { return request({ - url: '/klp/manufacturingSpec/' + specId, + url: '/xgy/manufacturingSpec/' + specId, method: 'delete' }) } diff --git a/klp-ui/src/api/work/productSpec.js b/klp-ui/src/api/work/productSpec.js index 6521a372..89a8fc15 100644 --- a/klp-ui/src/api/work/productSpec.js +++ b/klp-ui/src/api/work/productSpec.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询产品规范（键值对模式）列表 export function listProductSpec(query) { return request({ - url: '/klp/productSpec/list', + url: '/xgy/productSpec/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listProductSpec(query) { // 查询产品规范（键值对模式）详细 export function getProductSpec(specId) { return request({ - url: '/klp/productSpec/' + specId, + url: '/xgy/productSpec/' + specId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getProductSpec(specId) { // 新增产品规范（键值对模式） export function addProductSpec(data) { return request({ - url: '/klp/productSpec', + url: '/xgy/productSpec', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addProductSpec(data) { // 修改产品规范（键值对模式） export function updateProductSpec(data) { return request({ - url: '/klp/productSpec', + url: '/xgy/productSpec', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateProductSpec(data) { // 删除产品规范（键值对模式） export function delProductSpec(specId) { return request({ - url: '/klp/productSpec/' + specId, + url: '/xgy/productSpec/' + specId, method: 'delete' }) } diff --git a/klp-ui/src/api/work/productSpecGroup.js b/klp-ui/src/api/work/productSpecGroup.js index 7b218835..005b58c2 100644 --- a/klp-ui/src/api/work/productSpecGroup.js +++ b/klp-ui/src/api/work/productSpecGroup.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询产品规范组列表 export function listProductSpecGroup(query) { return request({ - url: '/klp/productSpecGroup/list', + url: '/xgy/productSpecGroup/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listProductSpecGroup(query) { // 查询产品规范组详细 export function getProductSpecGroup(groupId) { return request({ - url: '/klp/productSpecGroup/' + groupId, + url: '/xgy/productSpecGroup/' + groupId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getProductSpecGroup(groupId) { // 新增产品规范组 export function addProductSpecGroup(data) { return request({ - url: '/klp/productSpecGroup', + url: '/xgy/productSpecGroup', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addProductSpecGroup(data) { // 修改产品规范组 export function updateProductSpecGroup(data) { return request({ - url: '/klp/productSpecGroup', + url: '/xgy/productSpecGroup', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateProductSpecGroup(data) { // 删除产品规范组 export function delProductSpecGroup(groupId) { return request({ - url: '/klp/productSpecGroup/' + groupId, + url: '/xgy/productSpecGroup/' + groupId, method: 'delete' }) } diff --git a/klp-ui/src/api/work/productionTask.js b/klp-ui/src/api/work/productionTask.js index 39fdd36c..223310b1 100644 --- a/klp-ui/src/api/work/productionTask.js +++ b/klp-ui/src/api/work/productionTask.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询生产任务列表 export function listProductionTask(query) { return request({ - url: '/klp/productionTask/list', + url: '/xgy/productionTask/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listProductionTask(query) { // 查询生产任务详细 export function getProductionTask(taskId) { return request({ - url: '/klp/productionTask/' + taskId, + url: '/xgy/productionTask/' + taskId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getProductionTask(taskId) { // 新增生产任务 export function addProductionTask(data) { return request({ - url: '/klp/productionTask', + url: '/xgy/productionTask', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addProductionTask(data) { // 修改生产任务 export function updateProductionTask(data) { return request({ - url: '/klp/productionTask', + url: '/xgy/productionTask', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateProductionTask(data) { // 删除生产任务 export function delProductionTask(taskId) { return request({ - url: '/klp/productionTask/' + taskId, + url: '/xgy/productionTask/' + taskId, method: 'delete' }) } diff --git a/klp-ui/src/assets/logo/logo.png b/klp-ui/src/assets/logo/logo.png index b440cf92..330495fb 100644 Binary files a/klp-ui/src/assets/logo/logo.png and b/klp-ui/src/assets/logo/logo.png differ diff --git a/klp-ui/src/assets/styles/klp.scss b/klp-ui/src/assets/styles/klp.scss index 8c706236..c314b3a4 100644 --- a/klp-ui/src/assets/styles/klp.scss +++ b/klp-ui/src/assets/styles/klp.scss @@ -1,6 +1,6 @@ /** * 通用css样式布局处理 -* Copyright (c) 2019 klp +* Copyright (c) 2019 鑫广宇 */ /** 基础通用 **/ diff --git a/klp-ui/src/components/KLPService/WarehouseTree/index.vue b/klp-ui/src/components/KLPService/WarehouseTree/index.vue index a15e8610..7431bde0 100644 --- a/klp-ui/src/components/KLPService/WarehouseTree/index.vue +++ b/klp-ui/src/components/KLPService/WarehouseTree/index.vue @@ -45,7 +45,8 @@ export default { this.loading = true; if (this.warehouseType === 'real') { treeActualWarehouseTwoLevel().then(response => { - const data = response.data; + let data = response.data; + data = this.filterZincWarehouse(data); if (this.showEmpty) { data.unshift({ actualWarehouseId: '-1', @@ -67,6 +68,22 @@ export default { }); } }, + filterZincWarehouse(data) { + const zincKeywords = ['镀锌']; + const filterNode = (node) => { + if (!node) return false; + const name = node.actualWarehouseName || node.warehouseName || ''; + const containsZinc = zincKeywords.some(keyword => name.includes(keyword)); + if (containsZinc) { + return false; + } + if (node.children && node.children.length > 0) { + node.children = node.children.filter(filterNode); + } + return true; + }; + return data.filter(filterNode); + }, handleTree(data, id, parentId) { const cloneData = JSON.parse(JSON.stringify(data)); return cloneData.filter(father => { diff --git a/klp-ui/src/directive/dialog/drag.js b/klp-ui/src/directive/dialog/drag.js index 44622327..fd710108 100644 --- a/klp-ui/src/directive/dialog/drag.js +++ b/klp-ui/src/directive/dialog/drag.js @@ -1,6 +1,6 @@ /** * v-dialogDrag 弹窗拖拽 -* Copyright (c) 2019 klp +* Copyright (c) 2019 鑫广宇 */ export default { diff --git a/klp-ui/src/directive/dialog/dragHeight.js b/klp-ui/src/directive/dialog/dragHeight.js index 9baa9803..0f4a23f3 100644 --- a/klp-ui/src/directive/dialog/dragHeight.js +++ b/klp-ui/src/directive/dialog/dragHeight.js @@ -1,6 +1,6 @@ /** * v-dialogDragWidth 可拖动弹窗高度（右下角） -* Copyright (c) 2019 klp +* Copyright (c) 2019 鑫广宇 */ export default { diff --git a/klp-ui/src/directive/dialog/dragWidth.js b/klp-ui/src/directive/dialog/dragWidth.js index 40c57b11..c004c5c2 100644 --- a/klp-ui/src/directive/dialog/dragWidth.js +++ b/klp-ui/src/directive/dialog/dragWidth.js @@ -1,6 +1,6 @@ /** * v-dialogDragWidth 可拖动弹窗宽度（右侧边） -* Copyright (c) 2019 klp +* Copyright (c) 2019 鑫广宇 */ export default { diff --git a/klp-ui/src/directive/module/clipboard.js b/klp-ui/src/directive/module/clipboard.js index b9763c2b..ae1fc2b5 100644 --- a/klp-ui/src/directive/module/clipboard.js +++ b/klp-ui/src/directive/module/clipboard.js @@ -1,6 +1,6 @@ /** * v-clipboard 文字复制剪贴 -* Copyright (c) 2021 klp +* Copyright (c) 2021 鑫广宇 */ import Clipboard from 'clipboard' diff --git a/klp-ui/src/directive/permission/hasPermi.js b/klp-ui/src/directive/permission/hasPermi.js index d51acd35..9cbda719 100644 --- a/klp-ui/src/directive/permission/hasPermi.js +++ b/klp-ui/src/directive/permission/hasPermi.js @@ -1,6 +1,6 @@ /** * v-hasPermi 操作权限处理 - * Copyright (c) 2019 klp + * Copyright (c) 2019 鑫广宇 */ import store from '@/store' diff --git a/klp-ui/src/directive/permission/hasRole.js b/klp-ui/src/directive/permission/hasRole.js index 8ceaf0d8..def2af7d 100644 --- a/klp-ui/src/directive/permission/hasRole.js +++ b/klp-ui/src/directive/permission/hasRole.js @@ -1,6 +1,6 @@ /** * v-hasRole 角色权限处理 - * Copyright (c) 2019 klp + * Copyright (c) 2019 鑫广宇 */ import store from '@/store' diff --git a/klp-ui/src/layout/components/Sidebar/Logo.vue b/klp-ui/src/layout/components/Sidebar/Logo.vue index b9b4aa78..95e51871 100644 --- a/klp-ui/src/layout/components/Sidebar/Logo.vue +++ b/klp-ui/src/layout/components/Sidebar/Logo.vue @@ -35,7 +35,7 @@ export default { }, data() { return { - title: '科伦普一体化平台', + title: '鑫广宇一体化平台', logo: logoImg } } diff --git a/klp-ui/src/permission.js b/klp-ui/src/permission.js index fbd242ce..80f639c6 100644 --- a/klp-ui/src/permission.js +++ b/klp-ui/src/permission.js @@ -58,4 +58,4 @@ router.beforeEach((to, from, next) => { router.afterEach(() => { NProgress.done() -}) +}) \ No newline at end of file diff --git a/klp-ui/src/utils/klp.js b/klp-ui/src/utils/klp.js index aa37e5fe..0647a51e 100644 --- a/klp-ui/src/utils/klp.js +++ b/klp-ui/src/utils/klp.js @@ -2,7 +2,7 @@ import QRCode from 'qrcode'; /** * 通用js方法封装处理 - * Copyright (c) 2019 klp + * Copyright (c) 2019 鑫广宇 */ // 日期格式化 diff --git a/klp-ui/src/views/components/Greeting.vue b/klp-ui/src/views/components/Greeting.vue index 530690a6..88bcf199 100644 --- a/klp-ui/src/views/components/Greeting.vue +++ b/klp-ui/src/views/components/Greeting.vue @@ -3,7 +3,7 @@ 头像
{{ greeting }}，{{ name }}
-
欢迎使用科伦普冷轧涂渡数智一体化平台
+
欢迎使用鑫广宇冷轧涂渡数智一体化平台
diff --git a/klp-ui/src/views/crm/components/ReceiveTable.vue b/klp-ui/src/views/crm/components/ReceiveTable.vue index f95c738f..bc8e6dba 100644 --- a/klp-ui/src/views/crm/components/ReceiveTable.vue +++ b/klp-ui/src/views/crm/components/ReceiveTable.vue @@ -335,7 +335,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('klp/receivable/export', { + this.download('xgy/receivable/export', { ...this.queryParams }, `receivable_${new Date().getTime()}.xlsx`) }, diff --git a/klp-ui/src/views/crm/contract/components/ContractList.vue b/klp-ui/src/views/crm/contract/components/ContractList.vue index 2a690c31..259c544e 100644 --- a/klp-ui/src/views/crm/contract/components/ContractList.vue +++ b/klp-ui/src/views/crm/contract/components/ContractList.vue @@ -281,7 +281,7 @@ export default { // 3. 合并单元格并设置内容 // 公司信息 worksheet.mergeCells('A1:H1'); - worksheet.getCell('A1').value = '嘉祥科伦普重工有限公司'; + worksheet.getCell('A1').value = '嘉祥鑫广宇重工有限公司'; worksheet.getCell('A1').font = { size: 16, bold: true }; worksheet.getCell('A1').alignment = { horizontal: 'center', vertical: 'middle' }; @@ -297,7 +297,7 @@ export default { worksheet.getCell('G2').alignment = { horizontal: 'right', vertical: 'middle' }; // 供方信息 - worksheet.getCell('A3').value = `供方（甲方）：${row.supplier || '嘉祥科伦普重工有限公司'}`; + worksheet.getCell('A3').value = `供方（甲方）：${row.supplier || '嘉祥鑫广宇重工有限公司'}`; worksheet.getCell('A3').alignment = { horizontal: 'left', vertical: 'middle' }; // 签订时间 @@ -329,7 +329,7 @@ export default { worksheet.mergeCells('D6:H6'); - worksheet.getCell('D6').value = `生产厂家：${row.manufacturer || '嘉祥科伦普重工有限公司'}`; + worksheet.getCell('D6').value = `生产厂家：${row.manufacturer || '嘉祥鑫广宇重工有限公司'}`; worksheet.getCell('D6').alignment = { horizontal: 'left', vertical: 'middle' }; worksheet.getCell('D6').border = { top: { style: 'thin' }, @@ -709,7 +709,7 @@ export default { // 供方（甲方）信息 worksheet.mergeCells(`A${currentRow}:D${currentRow}`); - worksheet.getCell(`A${currentRow}`).value = `供方（甲方）：${row.supplier || '嘉祥科伦普重工有限公司'}`; + worksheet.getCell(`A${currentRow}`).value = `供方（甲方）：${row.supplier || '嘉祥鑫广宇重工有限公司'}`; worksheet.getCell(`A${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' }; worksheet.mergeCells(`E${currentRow}:H${currentRow}`); diff --git a/klp-ui/src/views/crm/contract/components/OrderDetail.vue b/klp-ui/src/views/crm/contract/components/OrderDetail.vue index 910192c0..8e55f41d 100644 --- a/klp-ui/src/views/crm/contract/components/OrderDetail.vue +++ b/klp-ui/src/views/crm/contract/components/OrderDetail.vue @@ -2,13 +2,13 @@
- +
产品名称：{{ productName }}
-
生产厂家：嘉祥科伦普重工有限公司
+
生产厂家：嘉祥鑫广宇重工有限公司
diff --git a/klp-ui/src/views/crm/contract/components/ProductContent.vue b/klp-ui/src/views/crm/contract/components/ProductContent.vue index b95c7e94..e96b423d 100644 --- a/klp-ui/src/views/crm/contract/components/ProductContent.vue +++ b/klp-ui/src/views/crm/contract/components/ProductContent.vue @@ -2,13 +2,13 @@
- +
产品名称：
-
生产厂家：嘉祥科伦普重工有限公司
+
生产厂家：嘉祥鑫广宇重工有限公司
diff --git a/klp-ui/src/views/crm/contract/index.vue b/klp-ui/src/views/crm/contract/index.vue index 1892a9ee..d5da8fbb 100644 --- a/klp-ui/src/views/crm/contract/index.vue +++ b/klp-ui/src/views/crm/contract/index.vue @@ -372,7 +372,7 @@ export default { contractId: undefined, contractName: '产品销售合同', contractCode: undefined, - supplier: '嘉祥科伦普重工有限公司', + supplier: '嘉祥鑫广宇重工有限公司', customer: undefined, signTime: undefined, deliveryDate: undefined, diff --git a/klp-ui/src/views/finance/components/PayTable.vue b/klp-ui/src/views/finance/components/PayTable.vue index 6c1f7c98..afcf85fb 100644 --- a/klp-ui/src/views/finance/components/PayTable.vue +++ b/klp-ui/src/views/finance/components/PayTable.vue @@ -357,7 +357,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('klp/payable/export', { + this.download('xgy/payable/export', { ...this.queryParams }, `payable_${new Date().getTime()}.xlsx`) }, diff --git a/klp-ui/src/views/finance/components/ReceiveTable.vue b/klp-ui/src/views/finance/components/ReceiveTable.vue index f41cdbb3..b9c4d34c 100644 --- a/klp-ui/src/views/finance/components/ReceiveTable.vue +++ b/klp-ui/src/views/finance/components/ReceiveTable.vue @@ -357,7 +357,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('klp/receivable/export', { + this.download('xgy/receivable/export', { ...this.queryParams }, `receivable_${new Date().getTime()}.xlsx`) }, diff --git a/klp-ui/src/views/finance/document/components/detail.vue b/klp-ui/src/views/finance/document/components/detail.vue index 3ca2105c..0082861e 100644 --- a/klp-ui/src/views/finance/document/components/detail.vue +++ b/klp-ui/src/views/finance/document/components/detail.vue @@ -364,7 +364,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('klp/journalEntry/export', { + this.download('xgy/journalEntry/export', { ...this.queryParams }, `journalEntry_${new Date().getTime()}.xlsx`) } diff --git a/klp-ui/src/views/finance/document/index.vue b/klp-ui/src/views/finance/document/index.vue index a440be25..f5ec79eb 100644 --- a/klp-ui/src/views/finance/document/index.vue +++ b/klp-ui/src/views/finance/document/index.vue @@ -248,7 +248,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('klp/financialDocument/export', { + this.download('xgy/financialDocument/export', { ...this.queryParams }, `financialDocument_${new Date().getTime()}.xlsx`) }, diff --git a/klp-ui/src/views/finance/jounery/index.vue b/klp-ui/src/views/finance/jounery/index.vue index 1bfe29b9..c9377d9d 100644 --- a/klp-ui/src/views/finance/jounery/index.vue +++ b/klp-ui/src/views/finance/jounery/index.vue @@ -285,7 +285,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('klp/journal/export', { + this.download('xgy/journal/export', { ...this.queryParams }, `journal_${new Date().getTime()}.xlsx`) } diff --git a/klp-ui/src/views/index.vue b/klp-ui/src/views/index.vue index 293f0367..08d950f0 100644 --- a/klp-ui/src/views/index.vue +++ b/klp-ui/src/views/index.vue @@ -1,6 +1,6 @@