From 3488d4b8436dc982079961b4d1af2ded26303f2f Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 14 May 2024 09:53:12 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hd/.idea/sonarlint/issuestore/index.pb | 32 +++++++++++------ .../impl/ActRuExecutionServiceImpl.java | 19 ----------- .../views/wms/pm_manage/form_data/index.vue | 34 ++++++++++++------- .../sync_manage/field_mapping/AddDialog.vue | 5 +++ .../sync_manage/field_mapping/EditDialog.vue | 5 +++ 5 files changed, 54 insertions(+), 41 deletions(-) diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb index b1a744de..5abd183d 100644 --- a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb +++ b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb @@ -99,8 +99,6 @@ cnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/ gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dto/BmClassStandardTree.java,a/e/ae5dc050d1cb8e346c5d74dfdfbe81380844f770 — gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/IBmClassStandardService.java,c/5/c5993a1d750d7041a840a41a573358502883c091 -Ÿ -onladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java,b/1/b140d08f0cb476ebc6fa39caddd1c7f4819af4c3 x Hnladmin-system/src/main/java/org/nl/config/satoken/SaTokenConfigure.java,9/e/9ebc8f924932814262c2d3968e862babba46e751 Ž @@ -137,12 +135,6 @@ m cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854 ’ bnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java,a/4/a44b52a4bc649baab711c5bd57004aa22cc2206b -– -fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818 -– -fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java,6/c/6cccbeca1a92061e0584fff09e8c598223b372a6 -ž -nnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java,9/6/96baf0e9c082471a9e3e86559513272d2680fb09 w Gnladmin-system/src/main/java/org/nl/common/domain/entity/PageQuery.java,4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690 p @@ -153,5 +145,25 @@ Dnladmin-system/src/main/java/org/nl/common/domain/entity/QParam.java,c/8/c81fd `nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/FormStrucQuery.java,2/8/28bd56139ae8c49fb8b946a5db641cec587fe696 w Gnladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java,f/0/f062b578de11e2952654784226f11bae7019cd76 -™ -inladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java,1/7/1734a0b319cf43162c6b2ef4cf7dc9cd2e838740 \ No newline at end of file +š +jnladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java,1/7/17ecbef3e2c19e65dfe2e8c69c7b2fba4fcda5eb +• +enladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/ISyncFormMappingService.java,2/0/20de6d2c7b011146c7b4125faa76cbb7e8a530d1 +‘ +anladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/dao/SyncFormMapping.java,1/1/111d63443dee5cc4cd3f439604732348c245895d + +mnladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/impl/SyncFormMappingServiceImpl.java,f/d/fd8b72fa44840c56a25536d5ae8b06b3a561a0c8 +¥ +unladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/SourceDataTypeHandler.java,0/7/073b8a027d5098b0e28da8f7a8076966a638cb0e +² +nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/impl/MappingSourceDataTypeHandler.java,a/3/a3a5a2860090b68804b8fad26d512236f3eae5b4 +ˆ +Xnladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java,2/0/20d3f5ca66f748f0a2bada36023b0308d4d552c0 +Š +Znladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java,9/0/90cde14dd61225ba9c416f9d10269bab669cd1ad +– +fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818 +– +fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java,6/c/6cccbeca1a92061e0584fff09e8c598223b372a6 +ž +nnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java,9/6/96baf0e9c082471a9e3e86559513272d2680fb09 \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java index adbff257..19755e26 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java @@ -42,25 +42,6 @@ public class ActRuExecutionServiceImpl extends ServiceImpl executionPage = this.page(page.build(), lqw); List records = executionPage.getRecords(); this.findChildren(records); -// for (ActRuExecution record : records) { -// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.eq(ActRuExecution::getParent_id, record.getProc_inst_id()); -// List list = this.list(lambdaQueryWrapper); -// ActReProcdef procdef = procdefService.getById(record.getDeployment_id()); -// if (ObjectUtil.isNotEmpty(procdef)) { -// record.setDeployment_name(procdef.getName()); -// } -// if (CollectionUtil.isNotEmpty(list)) { -// for (ActRuExecution execution : list) { -// ActReProcdef procdefChildren = procdefService.getById(execution.getDeployment_id()); -// if (ObjectUtil.isNotEmpty(procdefChildren)) { -// execution.setDeployment_name(procdefChildren.getName()); -// } -// } -// record.setHasChildren(true); -// record.setChildren(list); -// } -// } return TableDataInfo.build(executionPage); } diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue index 2442acb9..98dcc42c 100644 --- a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue +++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue @@ -81,23 +81,28 @@ @select-all="crud.selectAllChange" @selection-change="crud.selectionChangeHandler" > - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
å–消 diff --git a/wms_pro/qd/src/views/wms/sync_manage/field_mapping/EditDialog.vue b/wms_pro/qd/src/views/wms/sync_manage/field_mapping/EditDialog.vue index 7c3cfab8..a27a29bd 100644 --- a/wms_pro/qd/src/views/wms/sync_manage/field_mapping/EditDialog.vue +++ b/wms_pro/qd/src/views/wms/sync_manage/field_mapping/EditDialog.vue @@ -103,6 +103,11 @@ + + +
å–消