From 4b542221036a417ea79c04846a8a979bf69b2e7f Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Mon, 13 May 2024 18:07:55 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hd/.idea/sonarlint/issuestore/index.pb | 38 ++-- .../controller/BmFormStrucController.java | 83 +++---- .../service/IBmFormStrucService.java | 4 + .../form_struc/service/dao/BmFormStruc.java | 12 +- .../service/dto/FormStrucQuery.java | 3 +- .../service/impl/BmFormStrucServiceImpl.java | 41 +++- .../impl/ActRuExecutionServiceImpl.java | 31 ++- .../controller/PmFormDataController.java | 14 +- .../form_data/service/dto/FormDataQuery.java | 2 +- .../resources/config/application-dev3.yml | 2 +- .../wms/config_manage/formStruc/index.vue | 212 ++++++++++-------- .../wms/flow_manage/act/execution/index.vue | 25 ++- .../view_flow/registerNode/registerEnd.js | 2 +- .../registerNode/registerGatewayTask.js | 2 +- .../view_flow/registerNode/registerStart.js | 2 +- .../views/wms/pm_manage/form_data/index.vue | 121 +++++----- .../wms/sync_manage/form_mapping/index.vue | 1 + 17 files changed, 363 insertions(+), 232 deletions(-) diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb index 02d79e82..b1a744de 100644 --- a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb +++ b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb @@ -27,8 +27,6 @@ _nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/ISysCode gnladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java,f/c/fc51b9e09e27f27eee834adb54557bc93da3ccb4  lnladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java,1/1/11978d8ffa97bb119d9c27e2ba034b73db067e4b -p -@nladmin-system/src/main/java/org/nl/common/enums/QueryTEnum.java,f/b/fb1fedd5a3547392fa64608ed6291c9931a5ae3d _ /nladmin-system/src/main/java/org/nl/AppRun.java,1/0/10e40d67bd7d0818c5483704f020703d1bef8378  @@ -113,8 +111,6 @@ cnladmin-system/src/main/java/org/nl/wms/system_manage/controller/login/Authoriz lnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java,1/6/1682613e5ad252f692c7fe9869e05ba6e993ec0b  wnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StartEventActivityBehavior.java,6/2/62bba69557651d0ef8689854cf0192b608958ca8 - -fnladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java,0/4/04a9b66d50a0df59977636c2584c0b33c3c80690  ^nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/IActDeModelService.java,8/e/8e8e6084896058ef5d6e32aeaa325a4d807bd299  @@ -129,14 +125,10 @@ Znladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActD Xnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/enums/TaskTypeEnum.java,9/a/9a80ba3c6d691004cb168b6bef614f1678af32d6  Znladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dto/ModelQuery.java,9/1/91fd50fd8729292d9e298d85ba01a6b5af8593fa -w -Gnladmin-system/src/main/java/org/nl/common/domain/entity/PageQuery.java,4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690 -w -Gnladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java,f/0/f062b578de11e2952654784226f11bae7019cd76 - -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 + +enladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/deployment/IActReProcdefService.java,c/b/cbcdb312056e097d6f706d22c125cde37089b39f +p +@nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java,d/a/da2cfc661b6ccefab91ec1ba98461be21c19e65a  bnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java,1/d/1d97c53dde4069e95a2a9b5e87f1839ef118d3b2 m @@ -145,9 +137,21 @@ 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 -p -@nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java,d/a/da2cfc661b6ccefab91ec1ba98461be21c19e65a - -enladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/deployment/IActReProcdefService.java,c/b/cbcdb312056e097d6f706d22c125cde37089b39f  -fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818 \ No newline at end of file +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 +@nladmin-system/src/main/java/org/nl/common/enums/QueryTEnum.java,f/b/fb1fedd5a3547392fa64608ed6291c9931a5ae3d +t +Dnladmin-system/src/main/java/org/nl/common/domain/entity/QParam.java,c/8/c81fda2ed02b5dc9c21d70a813552d849bd642d8 + +`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 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java index 1a87d946..f4426d51 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java @@ -30,7 +30,7 @@ import java.util.Map; /** *

- * 前端控制器 + * 前端控制器 *

* * @author generator @@ -41,14 +41,14 @@ import java.util.Map; @SaIgnore public class BmFormStrucController { - private static Map BASE_FORM = MapOf.of("biz_id","业务单据单据id" - ,"biz_code","业务单据编号" - ,"biz_date","业务单据日期" - ,"biz_status","业务单据状态" - ,"material_id","物料id" - ,"qty","数量" - ,"unit_id","单位" - ,"vehicle_code","载具"); + private static Map BASE_FORM = MapOf.of("biz_id", "业务单据单据id" + , "biz_code", "业务单据编号" + , "biz_date", "业务单据日期" + , "biz_status", "业务单据状态" + , "material_id", "物料id" + , "qty", "数量" + , "unit_id", "单位" + , "vehicle_code", "载具"); @Autowired IBmFormStrucService iBmFormStrucService; @@ -56,13 +56,15 @@ public class BmFormStrucController { IPmFormDataService iPmFormDataService; @GetMapping - public ResponseEntity queryAll(FormStrucQuery query, PageQuery pageQuery){ + public ResponseEntity queryAll(FormStrucQuery query, PageQuery pageQuery) { + //iBmFormStrucService.queryAll(query, pageQuery); //参数判读，参数解析，调用参数入库 - Page page = iBmFormStrucService.page(pageQuery.build(), query.build()); - return new ResponseEntity<>(TableDataInfo.build(page),HttpStatus.OK); + //Page page = iBmFormStrucService.page(pageQuery.build(), query.build()); + return new ResponseEntity<>(iBmFormStrucService.queryAll(query, pageQuery), HttpStatus.OK); } + @PostMapping - public ResponseEntity save(@RequestBody JSONObject param){ + public ResponseEntity save(@RequestBody JSONObject param) { //参数判读，参数解析，调用参数入库 BmFormStruc formStruc = param.toJavaObject(BmFormStruc.class); formStruc.setCreate_time(DateUtil.now()); @@ -71,76 +73,77 @@ public class BmFormStrucController { iBmFormStrucService.save(formStruc); return new ResponseEntity<>(HttpStatus.OK); } + @GetMapping("/delete") - public ResponseEntity delete(List types){ + public ResponseEntity delete(List types) { //参数判读，参数解析，调用参数入库 int dataCount = iPmFormDataService.count(new QueryWrapper().in("form_type", types)); - if (dataCount>0){ + if (dataCount > 0) { throw new BadRequestException("当前表单存在业务数据,不允许删除"); } iBmFormStrucService.remove(new QueryWrapper().in("form_type", types)); return new ResponseEntity<>(HttpStatus.OK); } + @GetMapping("/getTypes") - public ResponseEntity getTypes(){ + public ResponseEntity getTypes() { //参数判读，参数解析，调用参数入库 List> select = iBmFormStrucService.listMaps(new QueryWrapper().select("form_type", "form_name").groupBy("form_type")); List list = new ArrayList<>(); for (Map map : select) { - list.add(MapOf.of("lable",map.get("form_name"),"value",map.get("form_type"))); + list.add(MapOf.of("lable", map.get("form_name"), "value", map.get("form_type"))); } - return new ResponseEntity<>(list,HttpStatus.OK); + return new ResponseEntity<>(list, HttpStatus.OK); } /** - * @ONLY:动态表单表头信息 - * 数据结构:{"type":xxx,"name":xxx,"desc":xxx,"item":{"desc":"描述"}} + * @ONLY:动态表单表头信息 数据结构:{"type":xxx,"name":xxx,"desc":xxx,"item":{"desc":"描述"}} */ @GetMapping("/formColumns/{form_type}") - public ResponseEntity formColumns(@PathVariable String form_type){ + public ResponseEntity formColumns(@PathVariable String form_type) { //参数判读，参数解析，调用参数入库 List items = new ArrayList<>(); BmFormStruc form_struc = iBmFormStrucService.getOne(new QueryWrapper().eq("form_type", form_type)); - if (form_struc!=null){ + if (form_struc != null) { JSONObject form_param = form_struc.getForm_param(); for (String key : form_param.keySet()) { - items.add(MapOf.of("lable",form_param.get(key),"value",key)); + items.add(MapOf.of("lable", form_param.get(key), "value", key)); } } - return new ResponseEntity<>(items,HttpStatus.OK); + return new ResponseEntity<>(items, HttpStatus.OK); } /** - * @ONLY:只用于获取表单同步配置接口 * @param form_type * @return + * @ONLY:只用于获取表单同步配置接口 */ @GetMapping("/tableColumns/{form_type}") - public ResponseEntity tableColumns(@PathVariable String form_type){ + public ResponseEntity tableColumns(@PathVariable String form_type) { //参数判读，参数解析，调用参数入库 BmFormStruc form_struc = iBmFormStrucService.getOne(new QueryWrapper().eq("form_type", form_type)); - HashMap result = MapOf.of("has_child",form_struc.getHas_child(),"form_type", form_struc.getForm_type(), "form_name", form_struc.getForm_name(), "form_desc", form_struc.getForm_desc()); + HashMap result = MapOf.of("has_child", form_struc.getHas_child(), "form_type", form_struc.getForm_type(), "form_name", form_struc.getForm_name(), "form_desc", form_struc.getForm_desc()); JSONObject form_param = form_struc.getForm_param(); form_param.putAll(BASE_FORM); List items = new ArrayList<>(); for (String key : form_param.keySet()) { - items.add(MapOf.of("lable",form_param.get(key),"value",key)); + items.add(MapOf.of("lable", form_param.get(key), "value", key)); } - if (form_struc.getHas_child()){ + if (form_struc.getHas_child()) { List dtl_items = new ArrayList<>(); - BmFormStruc child_struc = iBmFormStrucService.getOne(new QueryWrapper().eq("parent_id", form_struc.getId())); - if (child_struc == null){ - throw new BadRequestException("当前表单配置异常:无子表配置信息"); + + BmFormStruc child_struc = iBmFormStrucService.getOne(new QueryWrapper().eq("parent_id", form_struc.getForm_type())); + if (child_struc != null) { + JSONObject child_param = child_struc.getForm_param(); + child_param.putAll(BASE_FORM); + for (String key : child_param.keySet()) { + dtl_items.add(MapOf.of("lable", form_param.get(key), "value", key)); + } + result.put("dtl_item", dtl_items); } - JSONObject child_param = child_struc.getForm_param(); - child_param.putAll(BASE_FORM); - for (String key : child_param.keySet()) { - dtl_items.add(MapOf.of("lable",child_param.get(key),"value",key)); - } - result.put("dtl_item",dtl_items); } - result.put("item",items); - return new ResponseEntity<>(result,HttpStatus.OK); + result.put("item", items); + return new ResponseEntity<>(result, HttpStatus.OK); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java index 42d9699f..49437f1d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java @@ -1,7 +1,9 @@ package org.nl.wms.config_manage.form_struc.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.entity.PageQuery; import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; +import org.nl.wms.config_manage.form_struc.service.dto.FormStrucQuery; /** *

@@ -14,4 +16,6 @@ import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; public interface IBmFormStrucService extends IService { BmFormStruc getFormType(String form_type); + + Object queryAll(FormStrucQuery query, PageQuery pageQuery); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java index b376d63c..c0ec2046 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java @@ -6,7 +6,10 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import lombok.Data; @@ -22,7 +25,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName(value = "bm_form_struc",autoResultMap = true) +@TableName(value = "bm_form_struc", autoResultMap = true) public class BmFormStruc implements Serializable { private static final long serialVersionUID = 1L; @@ -108,17 +111,22 @@ public class BmFormStruc implements Serializable { * 自定义表单字段存json:{"dept":"部门","empp":"员工"} */ @TableField(typeHandler = FastjsonTypeHandler.class) - private JSONObject form_param; + private JSONObject form_param = new JSONObject(); /** * 是否含有明细表单 */ private Boolean has_child; + /** * 关联上级表单id */ private String parent_id; + @TableField(exist = false) + private List children = new ArrayList<>(); + @TableField(exist = false) + private Boolean hasChildren = false; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/FormStrucQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/FormStrucQuery.java index ec5a1e3b..dbbab3f6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/FormStrucQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/FormStrucQuery.java @@ -31,7 +31,8 @@ public class FormStrucQuery extends BaseQuery { @Override public void paramMapping() { - this.doP.put("search", QParam.builder().k(new String[]{"form_name"}).type(QueryTEnum.LK).build()); + // this.doP.put("parent_id", QParam.builder().k(new String[]{"parent_id"}).type(QueryTEnum.NULL_OR_EMPTY).build()); + this.doP.put("form_type", QParam.builder().k(new String[]{"form_type"}).type(QueryTEnum.LK).build()); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java index d632c6e8..fccd183d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java @@ -1,16 +1,28 @@ package org.nl.wms.config_manage.form_struc.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; import org.nl.wms.config_manage.form_struc.service.dao.mapper.BmFormStrucMapper; import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService; +import org.nl.wms.config_manage.form_struc.service.dto.FormStrucQuery; +import org.nl.wms.flow_manage.flow.service.deployment.dao.ActReProcdef; +import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution; import org.springframework.stereotype.Service; +import java.util.List; + /** *

- * 服务实现类 + * 服务实现类 *

* * @author generator @@ -21,9 +33,32 @@ public class BmFormStrucServiceImpl extends ServiceImpl().eq("form_type",form_type)); + if (!StringUtils.isEmpty(form_type)) { + return this.getOne(new QueryWrapper().eq("form_type", form_type)); } return null; } + + @Override + public Object queryAll(FormStrucQuery query, PageQuery page) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.isNull(BmFormStruc::getParent_id); + Page executionPage = this.page(page.build(), lqw); + List records = executionPage.getRecords(); + this.findChildren(records); + return TableDataInfo.build(executionPage); + } + + private void findChildren(List records) { + for (BmFormStruc record : records) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(BmFormStruc::getParent_id, record.getForm_type()); + List list = this.list(lambdaQueryWrapper); + if (CollectionUtil.isNotEmpty(list)) { + record.setHasChildren(true); + record.setChildren(list); + this.findChildren(list); + } + } + } } 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 db80d692..adbff257 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.nl.common.TableDataInfo; import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; import org.nl.wms.flow_manage.flow.service.deployment.IActReProcdefService; import org.nl.wms.flow_manage.flow.service.deployment.dao.ActReProcdef; import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution; @@ -40,25 +41,49 @@ 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); + } + + private void findChildren(List 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)){ + 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)){ + if (ObjectUtil.isNotEmpty(procdefChildren)) { execution.setDeployment_name(procdefChildren.getName()); } } record.setHasChildren(true); record.setChildren(list); + this.findChildren(list); } } - return TableDataInfo.build(executionPage); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java index adb9c28b..7510b742 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java @@ -33,20 +33,18 @@ public class PmFormDataController { private IPmFormDataService formDataService; - @GetMapping() - public ResponseEntity queryAll(FormDataQuery query, PageQuery page){ - Page result = formDataService.page(page.build(), query.build()); - return new ResponseEntity<>(TableDataInfo.build(result),HttpStatus.CREATED); + public ResponseEntity queryAll(FormDataQuery query, PageQuery page) { +// Page result = formDataService.page(page.build(), query.build()); +// Object o = formDataService.queryAll(query,page); + return new ResponseEntity<>(formDataService.queryAll(query, page), HttpStatus.CREATED); } - - @GetMapping("/sync/{type}") - public ResponseEntity sync(@RequestParam String type, String formDtl){ + public ResponseEntity sync(@RequestParam String type, String formDtl) { //参数判读，参数解析，调用参数入库 - formDataService.syncFormData("type",formDtl); + formDataService.syncFormData("type", formDtl); return new ResponseEntity<>(HttpStatus.CREATED); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java index 8d107594..817ab372 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java @@ -11,5 +11,5 @@ import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; @Data public class FormDataQuery extends BaseQuery { - private String from_type; + private String form_type; } diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 11ee79f3..6fe761a9 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -9,7 +9,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} - password: ${DB_PWD:123456} + password: ${DB_PWD:password} # 初始连接数 initial-size: 5 diff --git a/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue b/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue index 3f98af7f..a48182e5 100644 --- a/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue +++ b/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue @@ -28,7 +28,7 @@ - + @@ -42,96 +42,105 @@ :title="crud.status.title" width="600px" > - + - - - + + + - - - + + + - - - - - - - - + + + - - + + + + + + + + + + + + + + + + - 是 - 否 + 是 + 否 - - - - - - - - + + + - - - - - - - - + + + - - - + + + - - - - - - - - - - - - - + + + - - + + + + + + + + + + + + + + + + + + + + +
@@ -143,33 +152,33 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - +
@@ -195,8 +202,8 @@