From c5c93d73eed1fed27040efff5b4de4f6bf6e6838 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 17 May 2024 16:22:23 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E7=BB=84=E7=9B=98->=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/publish/BussEventMulticaster.java | 5 +- .../nl/config/mybatis/MybatisPlusConfig.java | 8 +- .../controller/BmMeasureunitController.java | 2 +- .../measure/service/dao/BmMeasureUnit.java | 2 +- .../impl/BmMeasureUnitServiceImpl.java | 2 +- .../MdPbVehicleMaterController.java | 11 + .../service/dao/MdPbVehicleMater.java | 26 +- .../controller/BmFormStrucController.java | 19 +- .../form_struc/service/dao/BmFormStruc.java | 4 +- .../flow_manage/event/FlowEventListener.java | 27 +++ .../wms/flow_manage/event/FlowStartEvent.java | 56 +++++ .../impl/ServerTaskActivityBehavior.java | 4 +- .../impl/StartEventActivityBehavior.java | 6 + .../flow/framework/entity/ExecutionDto.java | 57 ++++- .../framework/entity/ExecutionEntity.java | 9 + .../execution/IFlowOperationService.java | 5 +- .../impl/FlowOperationServiceImpl.java | 14 +- .../controller/MdGruopDickController.java | 12 +- .../service/IMdGruopDickService.java | 8 + .../service/IMdGruopDtlService.java | 24 ++ .../group_dick/service/dao/MdGruopDick.java | 7 +- .../group_dick/service/dao/MdGruopDtl.java | 65 +++++ .../service/dao/mapper/MdGruopDickMapper.java | 4 + .../service/dao/mapper/MdGruopDtlMapper.java | 21 ++ .../dao/mapper/xml/MdGruopDickMapper.xml | 34 ++- .../service/dto/GroupDickQuery.java | 1 + .../group_dick/service/dto/MdGruopDtlDto.java | 60 +++++ .../group_dick/service/dto/MdGruopDtlVo.java | 21 ++ .../service/impl/MdGruopDickServiceImpl.java | 90 +++++-- .../service/impl/MdGruopDtlServiceImpl.java | 21 ++ .../controller/PmFormDataController.java | 2 +- .../form_data/service/IPmFormDataService.java | 7 + .../form_data/service/dao/PmFormData.java | 4 +- .../service/dao/mapper/PmFormDataMapper.java | 3 +- .../dao/mapper/xml/PmFormDataMapper.xml | 54 +++++ .../form_data/service/dto/PmFormDataDto.java | 61 ++++- .../service/impl/PmFormDataServiceImpl.java | 66 +++--- .../src/main/resources/config/application.yml | 6 + .../views/wms/base_manage/measure/index.vue | 8 +- .../wms/config_manage/formStruc/index.vue | 24 +- .../wms/flow_manage/act/execution/index.vue | 30 ++- .../views/wms/flow_manage/act/model/index.vue | 3 + .../wms/md_manage/group_dick/AddDialog.vue | 173 ++++++++------ .../wms/md_manage/group_dick/ViewDialog.vue | 177 ++++++++++++++ .../group_dick/group_config/index.vue | 194 ++++----------- .../views/wms/md_manage/group_dick/index.vue | 78 ++++-- .../wms/md_manage/group_dick/viewDialog.vue | 224 ------------------ .../md_manage/vehicleMater/vehicleMater.js | 71 +----- .../wms/pm_manage/form_data/FormDialog.vue | 91 ++++--- 49 files changed, 1174 insertions(+), 727 deletions(-) create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/event/FlowEventListener.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/event/FlowStartEvent.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDtlService.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDtl.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDtlMapper.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDtlServiceImpl.java create mode 100644 wms_pro/qd/src/views/wms/md_manage/group_dick/ViewDialog.vue delete mode 100644 wms_pro/qd/src/views/wms/md_manage/group_dick/viewDialog.vue diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java index 92b3aa3d..14a5029f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java @@ -22,7 +22,7 @@ public class BussEventMulticaster implements BeanPostProcessor { public static Set> LISTENER_SRT = new LinkedHashSet<>(); - public final static void publish(PublishEvent event, Boolean sync){ + public final static void Publish(PublishEvent event, Boolean sync){ if (event == null){ return; } @@ -40,7 +40,8 @@ public class BussEventMulticaster implements BeanPostProcessor { } } } - public final static void Publish(PublishEvent event){ publish(event,true); } + public final static void Publish(PublishEvent event){ + Publish(event,true); } private static List> getListenerByEvent(PublishEvent event){ List> list = new ArrayList<>(); try { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java index ed5a9007..516803a9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java @@ -2,9 +2,12 @@ package org.nl.config.mybatis; import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; +import com.baomidou.mybatisplus.core.MybatisConfiguration; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import com.github.pagehelper.PageInterceptor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -36,7 +39,10 @@ public class MybatisPlusConfig { return interceptor; } - + @Bean + ConfigurationCustomizer mybatisConfigurationCustomizer() { + return configuration -> configuration.addInterceptor(new PageInterceptor()); + } @PostConstruct public void datainnit(){ String url = ((DruidDataSource) dataSource).getUrl(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/controller/BmMeasureunitController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/controller/BmMeasureunitController.java index a97608ad..3d77358e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/controller/BmMeasureunitController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/controller/BmMeasureunitController.java @@ -46,7 +46,7 @@ public class BmMeasureunitController { List list = measureUnitService.list(); List result = new ArrayList<>(); for (BmMeasureUnit item : list) { - result.add(MapOf.of("label", item.getUnit_name(), "value", item.getMeasure_unit_id())); + result.add(MapOf.of("label", item.getUnit_name(), "value", item.getUnit_id())); } return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dao/BmMeasureUnit.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dao/BmMeasureUnit.java index c1727366..29325713 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dao/BmMeasureUnit.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dao/BmMeasureUnit.java @@ -27,7 +27,7 @@ public class BmMeasureUnit implements Serializable { * 计量单位标识 */ @TableId - private String measure_unit_id; + private String unit_id; /** * 编码 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/impl/BmMeasureUnitServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/impl/BmMeasureUnitServiceImpl.java index e25b6946..877d9491 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/impl/BmMeasureUnitServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/impl/BmMeasureUnitServiceImpl.java @@ -42,7 +42,7 @@ public class BmMeasureUnitServiceImpl extends ServiceImpl * 载具信息表 前端控制器 @@ -37,6 +41,13 @@ public class MdPbVehicleMaterController { return new ResponseEntity<>(TableDataInfo.build(iMdPbVehicleMaterService.page(page.build(), query.build())), HttpStatus.OK); } + @GetMapping("getVehicleMater/{code}") + public ResponseEntity vehicleInfo(@PathVariable String code) { + List dick_code = iMdPbVehicleMaterService.list(new QueryWrapper() + .eq("dick_code", code)); + return new ResponseEntity<>(TableDataInfo.build(dick_code), HttpStatus.OK); + } + } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java index 0a73ebbd..f50956dc 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java @@ -1,6 +1,9 @@ package org.nl.wms.base_manage.vehicle.vehicleMater.service.dao; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,7 +20,7 @@ import java.math.BigDecimal; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName("md_pb_vehicleMater") +@TableName(value = "md_pb_vehicleMater", autoResultMap = true) public class MdPbVehicleMater implements Serializable { private static final long serialVersionUID = 1L; @@ -57,8 +60,7 @@ public class MdPbVehicleMater implements Serializable { /** * 数量计量单位标识 */ - private String qty_unit_id; - + private String unit_id; /** * 父容器 @@ -73,16 +75,8 @@ public class MdPbVehicleMater implements Serializable { /** * 扩展信息 */ - private String form_data; - - /** - * 物料关联单据id - */ - private String source_form_id; - /** - * 物料关联单据 - */ - private String source_form_type; + @TableField(typeHandler = FastjsonTypeHandler.class) + private JSONObject form_data; /** * 修改时间 @@ -94,10 +88,4 @@ public class MdPbVehicleMater implements Serializable { */ private String remark; - /** - * 组盘表code - */ - private String dick_code; - - } 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 d6f8bdf5..5169e34d 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 @@ -19,6 +19,7 @@ import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.util.*; @@ -63,12 +64,26 @@ public class BmFormStrucController { public ResponseEntity save(@RequestBody JSONObject param){ //参数判读，参数解析，调用参数入库 BmFormStruc formStruc = param.toJavaObject(BmFormStruc.class); - formStruc.setCreate_time(DateUtil.now()); + formStruc.setUpdate_time(DateUtil.now()); formStruc.setId(IdUtil.getStringId()); - formStruc.setCreate_id(SecurityUtils.getCurrentUserId()); + formStruc.setUpdate_name(SecurityUtils.getCurrentNickName()); iBmFormStrucService.save(formStruc); return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/update") + public ResponseEntity update(@RequestBody JSONObject param){ + //逻辑判断：如果有数据了则不允许修改 + BmFormStruc formStruc = param.toJavaObject(BmFormStruc.class); + List formDatas = iPmFormDataService.getByType(param.getString("form_type")); + if (!CollectionUtils.isEmpty(formDatas)){ + throw new BadRequestException("当前表单存在数据,不允许直接修改"); + } + formStruc.setUpdate_time(DateUtil.now()); + formStruc.setUpdate_name(SecurityUtils.getCurrentUserId()); + iBmFormStrucService.updateById(formStruc); + return new ResponseEntity<>(HttpStatus.OK); + } + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids){ //参数判读，参数解析，调用参数入库 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 0b914f51..e4b4a731 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 @@ -56,12 +56,12 @@ public class BmFormStruc implements Serializable { /** * 创建id */ - private String create_time; + private String update_time; /** * 创建id */ - private String create_id; + private String update_name; /** * 业务单据单据id diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/event/FlowEventListener.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/event/FlowEventListener.java new file mode 100644 index 00000000..9f916dcd --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/event/FlowEventListener.java @@ -0,0 +1,27 @@ +package org.nl.wms.flow_manage.event; + +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.publish.AbstraceListener; +import org.nl.wms.flow_manage.flow.service.execution.IFlowOperationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/* + * @author ZZQ + * @Date 2024/5/17 15:27 + */ +@Component +@Slf4j +public class FlowEventListener extends AbstraceListener { + + @Autowired + private IFlowOperationService flowOperationService; + + @Override + protected String doEvent(FlowStartEvent event) { + String s = JSON.toJSONString(event.getDto()); + log.info("触发流程"+ s); + return flowOperationService.startUp(event.getModel_key(), event.getCallback(), event.getDto()); + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/event/FlowStartEvent.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/event/FlowStartEvent.java new file mode 100644 index 00000000..fbc8fcc4 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/event/FlowStartEvent.java @@ -0,0 +1,56 @@ +package org.nl.wms.flow_manage.event; + +import com.alibaba.fastjson.JSONObject; +import org.nl.common.domain.exception.BadRequestException; +import org.nl.common.publish.event.PublishEvent; +import org.nl.wms.flow_manage.flow.framework.entity.ExecutionDto; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + +/* + * @author ZZQ + * @Date 2024/5/17 15:02 + */ + +public class FlowStartEvent extends PublishEvent { + //数据传输 + private ExecutionDto dto; + + private String model_key; + + public FlowStartEvent(String model_key, Consumer callback) { + this.model_key = model_key; + this.setCallback(callback); + } + + public String getModel_key() { + return model_key; + } + + public FlowStartEvent build(String form_type, String form_id, JSONObject data){ + if (dto == null){ + dto = ExecutionDto.builder().form_id(form_id).form_type(form_type).t(data).build(); + } + return this; + } + public FlowStartEvent build(String form_type,List ids, List datas){ + if (dto == null){ + throw new BadRequestException("主数据参数未构建"); + } + List item =new ArrayList(); + for (int i = 0; i < ids.size(); i++) { + String id = ids.get(i); + JSONObject data = datas.get(i); + ExecutionDto build = ExecutionDto.builder().form_id(id).form_type(form_type).t(data).build(); + item.add(build); + } + dto.setItem(item); + return this; + } + + public ExecutionDto getDto() { + return dto; + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java index f8c83c2b..8ac62ebd 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java @@ -25,11 +25,11 @@ public class ServerTaskActivityBehavior extends FlowNodeActivityBehavior, ExecutionEntity> typeHandler = TypeHandler.HANDLER_MAP.get(currentNode.getCategory()); + TypeHandler> typeHandler = TypeHandler.HANDLER_MAP.get(currentNode.getCategory()); if (typeHandler == null) { throw new BadRequestException("【flow】当前节点处理类型未定义"); } - ExecutionDto result = typeHandler.handler(currentNode.getSkipExpression(), entity, null); + ExecutionDto result = typeHandler.handler(currentNode.getSkipExpression(), entity, null); entity.setT(result.getT()); entity.setForm_id(result.getForm_id()); entity.setForm_type(currentNode.getForm_type()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StartEventActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StartEventActivityBehavior.java index 24de7ef6..155971a1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StartEventActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StartEventActivityBehavior.java @@ -17,6 +17,8 @@ import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.function.Consumer; + /* * @author ZZQ * @Date 2024/3/18 13:17 @@ -52,6 +54,10 @@ public class StartEventActivityBehavior extends FlowNodeActivityBehavior { execution.setCreate_time(DateUtil.now()); execution.setStatus(StatusEnum.FLOW_STATUS.code("启动")); iActRuExecutionService.save(execution); + Consumer callback = entity.getCallback(); + if (callback!=null){ + callback.accept(execution.getProc_inst_id()); + } entity.setProc_inst_id(execution.getProc_inst_id()); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionDto.java index db1b8797..bd32873d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionDto.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionDto.java @@ -1,5 +1,6 @@ package org.nl.wms.flow_manage.flow.framework.entity; +import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -8,17 +9,63 @@ import org.nl.common.domain.exception.BadRequestException; import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; import org.nl.wms.flow_manage.flow.framework.entity.node.base.impl.FlowElement; +import java.util.List; + /* * @author ZZQ * @Date 2024/3/18 13:15 - * 流程执行相关参数 + * 流程传输数据 */ -@Data @AllArgsConstructor @Builder -public class ExecutionDto { - +public class ExecutionDto { + /** + * 表单id + */ private String form_id; - private T t; + /** + * 单据类型 + */ + private String form_type; + /** + * 主数据 + */ + private JSONObject t; + /** + * 明细数据 + */ + private List item; + /** + * 获取数据时：合并主表明细表 + * @return + */ + public JSONObject getT() { + t.put("item",item); + return t; + } + + public void setT(JSONObject t) { + this.t = t; + } + + public void setItem(List item) { + this.item = item; + } + + public String getForm_id() { + return form_id; + } + + public void setForm_id(String form_id) { + this.form_id = form_id; + } + + public String getForm_type() { + return form_type; + } + + public void setForm_type(String form_type) { + this.form_type = form_type; + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionEntity.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionEntity.java index d205efcd..6caaecca 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionEntity.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionEntity.java @@ -6,6 +6,8 @@ import org.nl.common.domain.exception.BadRequestException; import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; import org.nl.wms.flow_manage.flow.framework.entity.node.base.impl.FlowElement; +import java.util.function.Consumer; + /* * @author ZZQ * @Date 2024/3/18 13:15 @@ -36,6 +38,9 @@ public class ExecutionEntity implements Cloneable{ protected String form_type; protected BmFormStruc form_struc; protected String form_id; + //回调执行 + protected Consumer callback = null; + protected T t; public void setCurrentFlowElement(FlowElement currentFlowElement) { @@ -75,4 +80,8 @@ public class ExecutionEntity implements Cloneable{ public void setParent_id(String parent_id) { this.parent_id = parent_id; } + + public void setCallback(Consumer callback) { + this.callback = callback; + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IFlowOperationService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IFlowOperationService.java index 76de8deb..b365b32c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IFlowOperationService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IFlowOperationService.java @@ -2,9 +2,10 @@ package org.nl.wms.flow_manage.flow.service.execution; import com.alibaba.fastjson.JSONObject; +import org.nl.wms.flow_manage.flow.framework.entity.ExecutionDto; import org.nl.wms.flow_manage.flow.service.execution.dto.StartProcessInstanceVo; -import java.util.List; +import java.util.function.Consumer; /** * @program: flow @@ -14,7 +15,7 @@ import java.util.List; **/ public interface IFlowOperationService { - Boolean startUp(String model_key, JSONObject mst, List items); + String startUp(String model_key, Consumer callback,ExecutionDto dto); Boolean startFormFlow(StartProcessInstanceVo params); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java index a46b1256..6a34b1b1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java @@ -11,6 +11,7 @@ import org.nl.wms.flow_manage.flow.framework.converter.BpmnJSONConverter; import org.nl.wms.flow_manage.flow.framework.engine.cmd.CommandExecutor; import org.nl.wms.flow_manage.flow.framework.engine.cmd.unify.impl.ExeInstanceCmd; import org.nl.wms.flow_manage.flow.framework.engine.cmd.unify.impl.StartInstanceCmd; +import org.nl.wms.flow_manage.flow.framework.entity.ExecutionDto; import org.nl.wms.flow_manage.flow.framework.entity.ExecutionEntity; import org.nl.wms.flow_manage.flow.framework.entity.node.base.impl.FlowNode; import org.nl.wms.flow_manage.flow.service.deployment.IActReProcdefService; @@ -23,7 +24,7 @@ import org.nl.wms.flow_manage.flow.service.model.IActDeModelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; +import java.util.function.Consumer; /* * @author ZZQ @@ -44,7 +45,7 @@ public class FlowOperationServiceImpl implements IFlowOperationService { private CommandExecutor commandExecutor; @Override - public Boolean startUp(String model_key, JSONObject mst, List items) { + public String startUp(String model_key, Consumer callback, ExecutionDto dto) { ActReProcdef deployment = actReProcdefService.getCurrentVersion(model_key); if (deployment==null){ throw new BadRequestException("当前单据类型未配置业务流程"); @@ -54,14 +55,13 @@ public class FlowOperationServiceImpl implements IFlowOperationService { JSONObject model_json = JSONObject.parseObject(model_json_string); BpmnModel bpmnModel = bpmnJSONConverter.convertToBpmnModel(deployment.getModel_key(), deployment.getVersion(), model_json); System.out.println(bpmnModel.getNodeFlow().size()); - //创建流程参数ExecutionEntity：执行流程 - mst.put("item",items); ExecutionEntity entity = new ExecutionEntity(); entity.setCurrentFlowElement(bpmnModel.getStartEvent()); - entity.setT(mst); - entity.setForm_type(deployment.getForm_type()); - entity.setForm_id(mst.getString("id")); + entity.setT(dto.getT()); + entity.setCallback(callback); + entity.setForm_type(dto.getForm_type()); + entity.setForm_id(dto.getForm_id()); entity.setStartActivityId(entity.getActivityId()); entity.setDeploymentId(deployment.getDeployment_id()); commandExecutor.execute(new StartInstanceCmd(),entity); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java index 870ad974..2dfc1e2a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java @@ -4,14 +4,17 @@ package org.nl.wms.md_manage.group_dick.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater; import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService; import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick; import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery; +import org.nl.wms.md_manage.group_dick.service.dto.MdGruopDtlDto; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -46,10 +49,13 @@ public class MdGruopDickController { public ResponseEntity queryBygroup(GroupDickQuery query, PageQuery page) { return new ResponseEntity<>(iMdGruopDickService.queryAll(query,page), HttpStatus.OK); } - + @GetMapping("getVehicleMater/{code}") + public ResponseEntity vehicleInfo(@PathVariable String code) { + return new ResponseEntity<>(TableDataInfo.build(iMdGruopDickService.getGroupDtl(code)), HttpStatus.OK); + } @PutMapping("/updategroup") - @Log("修改桶记录表") + @Log("修改组盘信息") //("查询桶记录表") public ResponseEntity updategroup(@RequestBody JSONObject whereJson) { if (whereJson!=null){ @@ -85,5 +91,7 @@ public class MdGruopDickController { iMdGruopDickService.groupDick(dicks); return new ResponseEntity<>(HttpStatus.OK); } + + } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java index 828f5c7f..2ce82bb3 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java @@ -5,6 +5,7 @@ import org.nl.common.domain.entity.PageQuery; import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery; +import org.nl.wms.md_manage.group_dick.service.dto.MdGruopDtlVo; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -34,4 +35,11 @@ public interface IMdGruopDickService extends IService { */ void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response); + /** + * 查询组盘明细 + * @param dick_id + * @return + */ + List getGroupDtl(String dick_id); + } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDtlService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDtlService.java new file mode 100644 index 00000000..6226ab47 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDtlService.java @@ -0,0 +1,24 @@ +package org.nl.wms.md_manage.group_dick.service; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick; +import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDtl; +import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + *

+ * 载具物料组盘表 服务类 + *

+ * + * @author generator + * @since 2024-04-24 + */ +public interface IMdGruopDtlService extends IService { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java index 23321d6e..eef4862b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java @@ -22,7 +22,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName(value = "md_gruop_dick",autoResultMap = true) +@TableName(value = "md_group_dick",autoResultMap = true) public class MdGruopDick implements Serializable { private static final long serialVersionUID = 1L; @@ -80,5 +80,10 @@ public class MdGruopDick implements Serializable { @TableField(typeHandler = FastjsonTypeHandler.class) private JSONObject form_data; + /** + * 流程实例id + */ + private String proc_inst_id; + } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDtl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDtl.java new file mode 100644 index 00000000..ddfa56b3 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDtl.java @@ -0,0 +1,65 @@ +package org.nl.wms.md_manage.group_dick.service.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + *

+ * 载具物料组盘表 + *

+ * + * @author generator + * @since 2024-04-24 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName(value = "md_group_dtl") +public class MdGruopDtl implements Serializable { + + /** + * 主键 + */ + @TableId + private String id; + /** + * 主表id + */ + private String dick_id; + /** + * 实例id + */ + private String proc_inst_id; + + /** + * 载具 + */ + private String vehicle_code; + /** + * 载具 + */ + private String remark; + + /** + * 组盘状态 + */ + private String status; + + /** + * 源单 + */ + private String source_form_type; + /** + * 源单id + */ + private String source_form_id; + + /** + * 修改时间 + */ + private String update_time; + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDickMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDickMapper.java index 8e78faa4..b936e055 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDickMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDickMapper.java @@ -1,9 +1,11 @@ package org.nl.wms.md_manage.group_dick.service.dao.mapper; +import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery; +import org.nl.wms.md_manage.group_dick.service.dto.MdGruopDtlDto; import java.util.List; import java.util.Map; @@ -19,4 +21,6 @@ import java.util.Map; public interface MdGruopDickMapper extends BaseMapper { List query(@Param("query") GroupDickQuery query); + + List getGroupDtl(String dickId); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDtlMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDtlMapper.java new file mode 100644 index 00000000..369bd58f --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDtlMapper.java @@ -0,0 +1,21 @@ +package org.nl.wms.md_manage.group_dick.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick; +import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDtl; +import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery; + +import java.util.List; + +/** + *

+ * 载具物料组盘表 Mapper 接口 + *

+ * + * @author generator + * @since 2024-04-24 + */ +public interface MdGruopDtlMapper extends BaseMapper { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml index 27ea1340..9f9671c1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml @@ -4,22 +4,16 @@ - - + - - - - - - - - + + + + - @@ -27,7 +21,7 @@ SELECT * FROM - md_gruop_dick + md_group_dick and material_code = #{query.material_code} @@ -38,6 +32,10 @@ and pcsn = #{query.pcsn} + + + and status = #{query.status} + @@ -47,4 +45,16 @@ + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java index 0b0fde1c..b60d41bf 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java @@ -19,5 +19,6 @@ public class GroupDickQuery extends BaseQuery { private String vehicle_code; private String material_code; private String pcsn; + private String status; private Map form_query; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java new file mode 100644 index 00000000..944f13eb --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java @@ -0,0 +1,60 @@ +package org.nl.wms.md_manage.group_dick.service.dto; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater; +import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDtl; + +import java.io.Serializable; + +/** + *

+ * 载具物料组盘表 + *

+ * + * @author generator + * @since 2024-04-24 + */ +@Data +public class MdGruopDtlDto extends MdPbVehicleMater { + + /** + * 主键 + */ + private String id; + /** + * 主表id + */ + private String dick_id; + /** + * 实例id + */ + private String proc_inst_id; + + /** + * 载具 + */ + private String vehicle_code; + + /** + * 组盘状态 + */ + private String status; + + /** + * 源单 + */ + private String source_form_type; + /** + * 源单id + */ + private String source_form_id; + + /** + * 修改时间 + */ + private String update_time; + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java new file mode 100644 index 00000000..6738203d --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java @@ -0,0 +1,21 @@ +package org.nl.wms.md_manage.group_dick.service.dto; + +import lombok.Data; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater; + +/** + *

+ * 载具物料组盘表 + *

+ * + * @author generator + * @since 2024-04-24 + */ +@Data +public class MdGruopDtlVo extends MdGruopDtlDto { + + private String material_name; + private String material_spec; + private String material_code; + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java index 9ce69356..f689c017 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java @@ -1,26 +1,34 @@ package org.nl.wms.md_manage.group_dick.service.impl; import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; import org.nl.common.domain.entity.PageQuery; +import org.nl.common.publish.BussEventMulticaster; +import org.nl.common.utils.CodeUtil; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; -import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService; -import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; -import org.nl.wms.flow_manage.flow.service.execution.IFlowOperationService; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.IMdPbVehicleMaterService; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater; +import org.nl.wms.flow_manage.event.FlowStartEvent; +import org.nl.wms.md_manage.group_dick.service.IMdGruopDtlService; import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick; +import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDtl; import org.nl.wms.md_manage.group_dick.service.dao.mapper.MdGruopDickMapper; import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery; -import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto; +import org.nl.wms.md_manage.group_dick.service.dto.MdGruopDtlDto; +import org.nl.wms.md_manage.group_dick.service.dto.MdGruopDtlVo; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; @@ -28,6 +36,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.function.Consumer; +import java.util.stream.Collectors; /** *

@@ -41,12 +52,15 @@ import java.util.List; public class MdGruopDickServiceImpl extends ServiceImpl implements IMdGruopDickService { @Autowired - private IFlowOperationService iFlowOperationService; - + @Lazy + private IMdGruopDickService self; + @Autowired + private IMdGruopDtlService iMdGruopDtlService; + @Autowired + private IMdPbVehicleMaterService iMdPbVehicleMaterService; @Override public Object queryAll(GroupDickQuery query, PageQuery pageQuery) { - Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); page.setOrderBy("create_time DESC"); List mstDetail = this.baseMapper.query(query); @@ -57,32 +71,62 @@ public class MdGruopDickServiceImpl extends ServiceImpl tableData = (ArrayList)forms.remove("tableData"); - forms.put("update_name",SecurityUtils.getCurrentNickName()); - forms.put("update_time",DateUtil.now()); - forms.put("id",IdUtil.getStringId()); + List tableData = (ArrayList)forms.remove("item"); + String now = DateUtil.now(); + forms.put("update_name",SecurityUtils.getCurrentNickName()); + forms.put("update_time", now); + forms.put("id",IdUtil.getStringId()); + forms.put("id",IdUtil.getStringId()); + forms.put("code", CodeUtil.getNewCode("md_group_dick")); MdGruopDick mdGroupMst = forms.toJavaObject(MdGruopDick.class); + + List items = new ArrayList<>(); + List vehicleMaters = new ArrayList<>(); + List dtlJson = new ArrayList<>(); if (!CollectionUtils.isEmpty(forms)){ - List items = new ArrayList<>(); for (int i = 0; i < tableData.size(); i++) { - JSONObject item = new JSONObject(tableData.get(i)); + Map item = tableData.get(i); item.put("update_name",SecurityUtils.getCurrentNickName()); - item.put("update_time",DateUtil.now()); + item.put("update_time", now); item.put("id",IdUtil.getStringId()); - item.put("mst_id",mdGroupMst.getId()); -// MdGruopDick dick = item.toJavaObject(MdGruopDick.class); -// this.save(dick); - items.add(item); + item.put("dick_id",mdGroupMst.getId()); + JSONObject item_json = new JSONObject(item); + MdGruopDtl mdGruopDtl = item_json.toJavaObject(MdGruopDtl.class); + MdPbVehicleMater vehicleMater = item_json.toJavaObject(MdPbVehicleMater.class); + items.add(mdGruopDtl); + vehicleMaters.add(vehicleMater); + dtlJson.add(item_json); } -// iMdGroupMstService.save(mdGroupMst); - iFlowOperationService.startUp("service_source_apply",forms,items); } + this.save(mdGroupMst); + iMdGruopDtlService.saveBatch(items); + iMdPbVehicleMaterService.saveBatch(vehicleMaters); + + BussEventMulticaster.Publish(new FlowStartEvent("md_group_dick", (Consumer) proc_inst_id -> { + self.update(new UpdateWrapper() + .set("proc_inst_id",proc_inst_id).eq("id",mdGroupMst.getId())); }) + .build("md_group_dick",mdGroupMst.getId(),forms) + .build("md_group_dtl",items.stream().map(MdGruopDtl::getId).collect(Collectors.toList()), dtlJson) + ,true); } @Override public void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response) { } + + @Override + public List getGroupDtl(String dick_id) { + List result = new ArrayList<>(); + if (StringUtils.isEmpty(dick_id)){ + return new ArrayList<>(); + } + List groupDtl = this.baseMapper.getGroupDtl(dick_id); + for (JSONObject json : groupDtl) { + result.add(json.toJavaObject(MdGruopDtlVo.class)); + } + return result; + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDtlServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDtlServiceImpl.java new file mode 100644 index 00000000..f466af58 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDtlServiceImpl.java @@ -0,0 +1,21 @@ +package org.nl.wms.md_manage.group_dick.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.md_manage.group_dick.service.IMdGruopDtlService; +import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDtl; +import org.nl.wms.md_manage.group_dick.service.dao.mapper.MdGruopDtlMapper; +import org.springframework.stereotype.Service; + +/** + *

+ * 载具物料组盘表 服务实现类 + *

+ * + * @author generator + * @since 2024-04-24 + */ +@Service +public class MdGruopDtlServiceImpl extends ServiceImpl implements IMdGruopDtlService { + +} 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 d2dde30f..8e67c4ac 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 @@ -36,7 +36,7 @@ public class PmFormDataController { @GetMapping() public ResponseEntity queryAll(FormDataQuery query, PageQuery page) { - return new ResponseEntity<>(formDataService.queryAll(query,page), HttpStatus.CREATED); + return new ResponseEntity<>(TableDataInfo.build(formDataService.queryTree(query,page)), HttpStatus.CREATED); } @GetMapping("/getSonFormData/{id}") diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java index d4af142f..326d324f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java @@ -1,9 +1,11 @@ package org.nl.wms.pm_manage.form_data.service; +import com.github.pagehelper.Page; import org.nl.common.domain.entity.PageQuery; import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery; +import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto; import org.nl.wms.sync_manage.service.form_mapping.dao.SyncFormMapping; import java.util.List; @@ -22,7 +24,12 @@ public interface IPmFormDataService extends IService { List syncAnalyse(SyncFormMapping mapping, String dataString); + List getByType(String from_type); + Object queryAll(FormDataQuery query, PageQuery page); + List queryTree(FormDataQuery query, PageQuery page); + + Object getSonDtlFormData(String id); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java index d94c3d77..80c65acc 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java @@ -91,7 +91,7 @@ public class PmFormData implements Serializable { private BigDecimal assign_qty; /** - * 数量 + * 单位 */ private String unit_id; @@ -116,8 +116,6 @@ public class PmFormData implements Serializable { */ private String parent_id; - @TableField(exist = false) - private Boolean hasChildren = false; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java index 55142dcf..8c084d09 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java @@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Param; import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery; +import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto; import java.util.List; @@ -19,5 +20,5 @@ public interface PmFormDataMapper extends BaseMapper { List query(@Param("query") FormDataQuery query); -// List query(@Param("id") String id); + List queryTree(@Param("query")FormDataQuery query); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml index ba7e1df1..1f5dea12 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml @@ -22,6 +22,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java index 9bfeb60b..2ade943f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java @@ -3,12 +3,16 @@ package org.nl.wms.pm_manage.form_data.service.dto; import java.math.BigDecimal; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.List; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; +import org.nl.common.enums.StatusEnum; +import org.springframework.util.CollectionUtils; /** *

@@ -26,17 +30,29 @@ public class PmFormDataDto implements Serializable { /** * 业务单据单据id */ - private String bus_id; + private String id; + /** + * 单据编码 + */ + private String code; + /** + * 对应流程实例id + */ + private String proc_inst_id; /** * 业务单据编号 */ - private String bus_code; + private String biz_id; + /** + * 业务单据编号 + */ + private String biz_code; /** * 业务单据日期 */ - private String bus_date; + private String biz_date; /** * 单据类型 @@ -56,22 +72,48 @@ public class PmFormDataDto implements Serializable { /** * 创建id */ - private String create_id; + private String create_name; /** * 物料id */ private String material_id; + /** + * 物料name + */ + private String material_name; + /** + * 物料code + */ + private String material_code; + /** + * 物料spec + */ + private String material_spec; /** * 数量 */ private BigDecimal qty; + /** + * 分配数量 + */ + private BigDecimal assign_qty; + + /** + * 数量 + */ + private String unit_id; /** * 批次号 */ private String pcsn; + /** + * 载具 + */ + private String vehicle_code; + /** * 自定义表单字段 @@ -83,9 +125,14 @@ public class PmFormDataDto implements Serializable { */ private String parent_id; + private Boolean HasChildren=Boolean.FALSE; - private List dtl; - - + private List children; + public void setChildren(List children) { + if (!CollectionUtils.isEmpty(children)){ + this.HasChildren=Boolean.TRUE; + } + this.children = children; + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java index df89874f..28bdfb90 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java @@ -1,6 +1,5 @@ package org.nl.wms.pm_manage.form_data.service.impl; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -15,20 +14,22 @@ import org.nl.common.domain.exception.BadRequestException; import org.nl.common.utils.*; import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService; import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; -import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick; import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import org.nl.wms.pm_manage.form_data.service.dao.mapper.PmFormDataMapper; import org.nl.wms.pm_manage.form_data.service.IPmFormDataService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery; +import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto; import org.nl.wms.sync_manage.service.form_mapping.ISyncFormMappingService; import org.nl.wms.sync_manage.service.form_mapping.dao.SyncFormMapping; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import java.util.*; +import java.util.stream.Collectors; /** *

@@ -108,41 +109,46 @@ public class PmFormDataServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); - page.setOrderBy("create_time DESC"); - List pmFormData = this.baseMapper.query(query); - TableDataInfo build = TableDataInfo.build(pmFormData); - List content = build.getContent(); - for (PmFormData formData : content) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(PmFormData::getParent_id, formData.getId()); - List list = this.baseMapper.selectList(lqw); - if (CollectionUtil.isNotEmpty(list)) { - formData.setHasChildren(true); + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + page.setOrderBy("id DESC"); + this.baseMapper.query(query); + List content = page.getResult(); + List ids = content.stream().map(PmFormData::getId).collect(Collectors.toList()); + Map> childMap = new HashMap<>(); + if (!CollectionUtils.isEmpty(ids)){ + List childs = this.list(new QueryWrapper().in("parent_id", ids)); + childMap = childs.stream().collect(Collectors.groupingBy(PmFormData::getParent_id)); + } + List list = new ArrayList<>(); + for (PmFormData record : content) { + PmFormDataDto strucDto = new PmFormDataDto(); + BeanUtils.copyProperties(record, strucDto); + list.add(strucDto); + List dtl = childMap.get(record.getId()); + if (!CollectionUtils.isEmpty(dtl)){ + strucDto.setHasChildren(true); + strucDto.setChildren(CopyUtil.copyList(dtl,PmFormDataDto.class)); } } - build.setTotalElements(page.getTotal()); + TableDataInfo build = TableDataInfo.build(page); + build.setContent(list); return build; } + @Override + public Page queryTree(FormDataQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + page.setOrderBy("id DESC"); + this.baseMapper.queryTree(query); + return page; + } + + @Override public Object getSonDtlFormData(String id) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(PmFormData::getParent_id, id); return this.list(lqw); -// List pmFormData = this.baseMapper.query(id); -// TableDataInfo build = TableDataInfo.build(pmFormData); -// List content = build.getContent(); -// for (PmFormData formData : content) { -// LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); -// lqw.eq(PmFormData::getParent_id, formData.getId()); -// List list = this.baseMapper.selectList(lqw); -// if (CollectionUtil.isNotEmpty(list)) { -// formData.setHasChildren(true); -// } -// } -// build.setTotalElements(page.getTotal()); -// return build; } @@ -202,5 +208,11 @@ public class PmFormDataServiceImpl extends ServiceImpl getByType(String from_type) { + Assert.notNull(from_type,"表单类型参数不能为空"); + return this.list(new QueryWrapper().eq("form_type",from_type)); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml index 2505ba08..4bc0e9e0 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml @@ -85,3 +85,9 @@ feishu: https://open.feishu.cn/open-apis/bot/v2/hook/cfe495f7-9bcd-40bb-ab66-038 lucene: index: path: E:\lms\lucene\index +pageheiper: + helperDialect: mysql + reasonable: true + supportMethodsArguments: true + pageSizeZero: false #pageSize=0 返回所有 + params: count=countSgl diff --git a/wms_pro/qd/src/views/wms/base_manage/measure/index.vue b/wms_pro/qd/src/views/wms/base_manage/measure/index.vue index 46fb87af..4f4f3dc6 100644 --- a/wms_pro/qd/src/views/wms/base_manage/measure/index.vue +++ b/wms_pro/qd/src/views/wms/base_manage/measure/index.vue @@ -110,7 +110,7 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' const defaultForm = { - measure_unit_id: null, + unit_id: null, unit_code: null, unit_name: null, qty_precision: null, @@ -138,8 +138,8 @@ export default { add: true, reset: true }, - idField: 'measure_unit_id', - sort: 'measure_unit_id,desc', + idField: 'unit_id', + sort: 'unit_id,desc', crudMethod: { ...crudMdPbMeasureunit } }) }, @@ -147,7 +147,7 @@ export default { return { permission: {}, rules: { - measure_unit_id: [ + unit_id: [ { required: true, message: '不能为空', trigger: 'blur' } ], unit_code: [ 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 792c54e3..b8ee3332 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 @@ -64,7 +64,7 @@ - + @@ -133,13 +133,18 @@ + + + + + - + @@ -163,7 +168,7 @@ - + @@ -174,7 +179,8 @@ - + + import formstruc from './formstruc' -import CRUD, {crud, form, header, presenter} from '@crud/crud' -import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect' +import CRUD, { crud, form, header, presenter } from '@crud/crud' +import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' @@ -233,15 +239,15 @@ const defaultForm = { export default { name: 'FormStruc', dicts: ['base_data'], - components: {UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect}, - mixins: [presenter(), header(), form(defaultForm), crud()], + components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect }, + mixins: [ presenter(), header(), form(defaultForm), crud() ], cruds() { return CRUD({ title: '基础类别', url: 'api/bmFormStruc', idField: 'id', sort: 'id,desc', - crudMethod: {...formstruc}, + crudMethod: { ...formstruc }, optShow: { add: true, reset: true diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue index 9c763036..b7415e9d 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue @@ -64,14 +64,14 @@ style="width: 100%;" > - + - + - + label="流程模型"/> + + label="当前节点"/> @@ -190,6 +184,7 @@ import CRUD, { crud, form } from '@crud/crud' import MaterDialog from '@/views/wms/base_manage/material/MaterDialog' import FormDialog from '@/views/wms/pm_manage/form_data/FormDialog' import formstruc from '@/views/wms/config_manage/formStruc/formstruc' +import measureunit from '@/views/wms/base_manage/measure/measureunit' const defaultForm = { @@ -206,9 +201,9 @@ const defaultForm = { export default { name: 'AddDialog', - components: { formstruc, MaterDialog, FormDialog }, - mixins: [crud(), form(defaultForm)], - dicts: ['IO_BILL_STATUS', 'ST_INV_CP_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area', 'PCS_SAL_TYPE'], + components: { formstruc, MaterDialog, FormDialog, measureunit }, + mixins: [ crud(), form(defaultForm) ], + dicts: [ 'FORM_STATUS' ], props: { dialogShow: { type: Boolean, @@ -220,17 +215,16 @@ export default { }, data() { return { - cols:[], - dtlCols:[], - tableData:[], dialogVisible: false, materShow: false, formShow: false, dtlShow: false, - opendtlParam: null, + cols:[], + dtlCols:[], + tableData:[], + unitDict: [], + materType: '03', // 关键成品 - storlist: [], - billtypelist: [], rules: { } @@ -245,16 +239,19 @@ export default { }, methods: { open() { - formstruc.getHeader('GROUP_MST').then(res => { + this.tableData = [] + formstruc.getHeader('md_group_dick').then(res => { this.cols = res res.forEach(a => { this.form.form_data[a.value,''] }) }), - formstruc.getHeader('GROUP_DICK').then(res => { + formstruc.getHeader('md_pb_vehicleivt').then(res => { this.dtlCols = res }) - + measureunit.getSelect().then(res => { + this.unitDict = res.content + }) }, close() { this.$emit('AddChanged') @@ -266,7 +263,8 @@ export default { this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO) return true } - this.form.tableData = this.tableData + debugger + this.form.item = this.tableData }, deleteRow(index, rows) { rows.splice(index, 1) @@ -286,6 +284,29 @@ export default { }) this.form.child_qty = this.tableData.length }, + tableDtlMaterial2(rows) { + rows.forEach((row) => { + const data = {} + data.material_name = row.material_name + data.material_code = row.material_code + data.material_id = row.material_id + data.material_spec = row.material_spec + data.source_form_type = row.form_type + data.source_form_id = row.id + data.unit_id = row.unit_id + data.form_data = {} + let row_form_data = row.form_data; + this.dtlCols.forEach(a=>{ + let item = null + if (a.value in row_form_data) { + item = row_form_data[a.value]; + } + this.$set(data.form_data,a.value,item) + }) + this.tableData.splice(-1, 0, data) + }) + this.form.child_qty = this.tableData.length + }, insertEvent(row) { this.materShow = true }, @@ -304,8 +325,18 @@ export default { } this.tableData.push({ edit: false, qty: '0' }) }, - formatBaseType(row) { - return this.dict.label.PCS_SAL_TYPE[row.base_bill_type] + + unitFormatter(row) { + debugger + if (row.unit_id!=null){ + for (let i = 0; i < this.unitDict.length; i++) { + let item = this.unitDict[i]; + if (item.value == row.unit_id){ + return key.label + } + } + } + return "" } } } diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/ViewDialog.vue b/wms_pro/qd/src/views/wms/md_manage/group_dick/ViewDialog.vue new file mode 100644 index 00000000..5a7de9f8 --- /dev/null +++ b/wms_pro/qd/src/views/wms/md_manage/group_dick/ViewDialog.vue @@ -0,0 +1,177 @@ + + + + + + diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/group_config/index.vue b/wms_pro/qd/src/views/wms/md_manage/group_dick/group_config/index.vue index 3b2ef999..b10f7958 100644 --- a/wms_pro/qd/src/views/wms/md_manage/group_dick/group_config/index.vue +++ b/wms_pro/qd/src/views/wms/md_manage/group_dick/group_config/index.vue @@ -2,133 +2,26 @@

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 是 - 否 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 取消 - 确认 -
- - -
- 组盘表配置信息 +
+ + 组盘配置信息
+ + - + - + @@ -139,72 +32,47 @@ - - - - - - - - - - - - - - - - - - - + -
diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/viewDialog.vue b/wms_pro/qd/src/views/wms/md_manage/group_dick/viewDialog.vue deleted file mode 100644 index a7e826eb..00000000 --- a/wms_pro/qd/src/views/wms/md_manage/group_dick/viewDialog.vue +++ /dev/null @@ -1,224 +0,0 @@ - - - - - diff --git a/wms_pro/qd/src/views/wms/md_manage/vehicleMater/vehicleMater.js b/wms_pro/qd/src/views/wms/md_manage/vehicleMater/vehicleMater.js index 918b0f1e..efcd02fd 100644 --- a/wms_pro/qd/src/views/wms/md_manage/vehicleMater/vehicleMater.js +++ b/wms_pro/qd/src/views/wms/md_manage/vehicleMater/vehicleMater.js @@ -1,16 +1,24 @@ import request from '@/utils/request' + export function add(data) { return request({ - url: '/api/mdGruopDick', + url: '/api/MdPbVehicleMater', method: 'post', data }) } +export function getgroupDtl(code) { + return request({ + url: 'api/mdGruopDick/getVehicleMater/' + code, + method: 'get', + }) +} + export function del(ids) { return request({ - url: '/api/mdGruopDick/', + url: '/api/MdPbVehicleMater/', method: 'delete', data: ids }) @@ -18,65 +26,10 @@ export function del(ids) { export function edit(data) { return request({ - url: '/api/mdGruopDick', - method: 'put', - data - }) -} -export function updategroup(data) { - return request({ - url: '/api/mdGruopDick/updategroup', + url: '/api/MdPbVehicleMater', method: 'put', data }) } -export function addPersons(data) { - return request({ - url: '/api/mdGruopDick/addPersons', - method: 'post', - data - }) -} - -export function getHeader(data) { - return request({ - url: '/api/mdGruopDick/getHeader', - method: 'post', - data - }) -} - -export function getDeviceIdByUserId(data) { - return request({ - url: '/api/mdGruopDick/getDeviceIdByUserId', - method: 'post', - data - }) -} - -export function addDevices(data) { - return request({ - url: '/api/mdGruopDick/addDevices', - method: 'post', - data - }) -} - -export function deleteRow(data) { - return request({ - url: '/api/mdGruopDick/deleteRow', - method: 'delete', - data - }) -} - -export function excelImport(data) { - return request({ - url: '/api/mdGruopDick/excelImport', - method: 'post', - data - }) -} - -export default { add, edit, del, addPersons, getHeader, deleteRow, addDevices,excelImport,updategroup } +export default { add, getgroupDtl, edit, del } diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/FormDialog.vue b/wms_pro/qd/src/views/wms/pm_manage/form_data/FormDialog.vue index d75769c7..838dfbcd 100644 --- a/wms_pro/qd/src/views/wms/pm_manage/form_data/FormDialog.vue +++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/FormDialog.vue @@ -48,8 +48,6 @@ - + @@ -77,7 +75,6 @@ 取 消 确 定 + + + + + + + + + + + + + + + + + + + + + + 取 消 + + +