root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:组盘->流程实例关系

Browse Source
This commit is contained in:
zhangzq
2024-05-17 16:22:23 +08:00
parent c8439abd23
commit c5c93d73ee
49 changed files with 1174 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java
View File

@@ -22,7 +22,7 @@ public class BussEventMulticaster implements BeanPostProcessor {
public static Set<AbstraceListener<?>> 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<AbstraceListener<?>> getListenerByEvent(PublishEvent event){
List<AbstraceListener<?>> list = new ArrayList<>();
try {

8
wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
View File

@@ -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();

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/controller/BmMeasureunitController.java
View File

@@ -46,7 +46,7 @@ public class BmMeasureunitController {
List<BmMeasureUnit> list = measureUnitService.list();
List<Map> 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);
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/dao/BmMeasureUnit.java
View File

@@ -27,7 +27,7 @@ public class BmMeasureUnit implements Serializable {
* 计量单位标识
*/
@TableId
private String measure_unit_id;
private String unit_id;
/**
* 编码

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/measure/service/impl/BmMeasureUnitServiceImpl.java
View File

@@ -42,7 +42,7 @@ public class BmMeasureUnitServiceImpl extends ServiceImpl<BmMeasureUnitMapper, B
BigDecimal qty_precision = jo.getBigDecimal("qty_precision");
boolean is_used = jo.getBoolean("is_used");
BmMeasureUnit unit = new BmMeasureUnit();
unit.setMeasure_unit_id(IdUtil.getStringId());
unit.setUnit_id(IdUtil.getStringId());
unit.setUnit_code(unit_code);
unit.setUnit_name(unit_name);
unit.setQty_precision(qty_precision);

11
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/controller/MdPbVehicleMaterController.java
View File

@@ -2,12 +2,14 @@ package org.nl.wms.base_manage.vehicle.vehicleMater.controller;
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.wms.base_manage.vehicle.vehicleInfo.service.IBmVehicleInfoService;
import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dto.VehicleQuery;
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.base_manage.vehicle.vehicleMater.service.dto.VehicleMaterQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -15,6 +17,8 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* <p>
* 载具信息表 前端控制器
@@ -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<Object> vehicleInfo(@PathVariable String code) {
List<MdPbVehicleMater> dick_code = iMdPbVehicleMaterService.list(new QueryWrapper<MdPbVehicleMater>()
.eq("dick_code", code));
return new ResponseEntity<>(TableDataInfo.build(dick_code), HttpStatus.OK);
}
}

26
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java
View File

@@ -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;
}

19
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java
View File

@@ -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<Object> 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<Object> update(@RequestBody JSONObject param){
//逻辑判断：如果有数据了则不允许修改
BmFormStruc formStruc = param.toJavaObject(BmFormStruc.class);
List<PmFormData> 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<Object> delete(@RequestBody Long[] ids){
//参数判读，参数解析，调用参数入库

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java
View File

@@ -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

27
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/event/FlowEventListener.java Normal file
View File

@@ -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<FlowStartEvent> {
@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());
}
}

56
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/event/FlowStartEvent.java Normal file
View File

@@ -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<String> ids, List<JSONObject> datas){
if (dto == null){
throw new BadRequestException("主数据参数未构建");
}
List<ExecutionDto> 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;
}
}

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java
View File

@@ -25,11 +25,11 @@ public class ServerTaskActivityBehavior extends FlowNodeActivityBehavior<JSONObj
FlowElement element = entity.getCurrentFlowElement();
ServerTask currentNode = (ServerTask) element;
if (!CollectionUtils.isEmpty(currentNode.getSkipExpression())) {
TypeHandler<ExecutionDto<JSONObject>, ExecutionEntity<JSONObject>> typeHandler = TypeHandler.HANDLER_MAP.get(currentNode.getCategory());
TypeHandler<ExecutionDto, ExecutionEntity<JSONObject>> typeHandler = TypeHandler.HANDLER_MAP.get(currentNode.getCategory());
if (typeHandler == null) {
throw new BadRequestException("【flow】当前节点处理类型未定义");
}
ExecutionDto<JSONObject> 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());

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StartEventActivityBehavior.java
View File

@@ -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());
}

57
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionDto.java
View File

@@ -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<T> {
public class ExecutionDto {
/**
* 表单id
*/
private String form_id;
private T t;
/**
* 单据类型
*/
private String form_type;
/**
* 主数据
*/
private JSONObject t;
/**
* 明细数据
*/
private List<ExecutionDto> item;
/**
* 获取数据时：合并主表明细表
* @return
*/
public JSONObject getT() {
t.put("item",item);
return t;
}
public void setT(JSONObject t) {
this.t = t;
}
public void setItem(List<ExecutionDto> 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;
}
}

9
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionEntity.java
View File

@@ -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<T> 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<T> implements Cloneable{
public void setParent_id(String parent_id) {
this.parent_id = parent_id;
}
public void setCallback(Consumer callback) {
this.callback = callback;
}
}

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IFlowOperationService.java
View File

@@ -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<JSONObject> items);
String startUp(String model_key, Consumer callback,ExecutionDto dto);
Boolean startFormFlow(StartProcessInstanceVo params);

14
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java
View File

@@ -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<JSONObject> 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);

12
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java
View File

@@ -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<Object> queryBygroup(GroupDickQuery query, PageQuery page) {
return new ResponseEntity<>(iMdGruopDickService.queryAll(query,page), HttpStatus.OK);
}
@GetMapping("getVehicleMater/{code}")
public ResponseEntity<Object> vehicleInfo(@PathVariable String code) {
return new ResponseEntity<>(TableDataInfo.build(iMdGruopDickService.getGroupDtl(code)), HttpStatus.OK);
}
@PutMapping("/updategroup")
@Log("修改桶记录表")
@Log("修改组盘信息")
//("查询桶记录表")
public ResponseEntity<Object> updategroup(@RequestBody JSONObject whereJson) {
if (whereJson!=null){
@@ -85,5 +91,7 @@ public class MdGruopDickController {
iMdGruopDickService.groupDick(dicks);
return new ResponseEntity<>(HttpStatus.OK);
}
}

8
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java
View File

@@ -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<MdGruopDick> {
*/
void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response);
/**
* 查询组盘明细
* @param dick_id
* @return
*/
List<MdGruopDtlVo> getGroupDtl(String dick_id);
}

24
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDtlService.java Normal file
View File

@@ -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;
/**
* <p>
* 载具物料组盘表 服务类
* </p>
*
* @author generator
* @since 2024-04-24
*/
public interface IMdGruopDtlService extends IService<MdGruopDtl> {
}

7
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java
View File

@@ -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;
}

65
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDtl.java Normal file
View File

@@ -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;
/**
* <p>
* 载具物料组盘表
* </p>
*
* @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;
}

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDickMapper.java
View File

@@ -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<MdGruopDick> {
List<MdGruopDick> query(@Param("query") GroupDickQuery query);
List<JSONObject> getGroupDtl(String dickId);
}

21
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDtlMapper.java Normal file
View File

@@ -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;
/**
* <p>
* 载具物料组盘表 Mapper 接口
* </p>
*
* @author generator
* @since 2024-04-24
*/
public interface MdGruopDtlMapper extends BaseMapper<MdGruopDtl> {
}

34
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml
View File

@@ -4,22 +4,16 @@
<resultMap id="BaseResultMap" type="org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick">
<result property="id" column="id"/>
<result property="vehicle_code" column="vehicle_code"/>
<result property="has_child" column="has_child"/>
<result property="code" column="code"/>
<result property="parent_vehicle_code" column="parent_vehicle_code"/>
<result property="material_id" column="material_id"/>
<result property="material_code" column="material_code"/>
<result property="material_name" column="material_name"/>
<result property="material_pcsn" column="material_pcsn"/>
<result property="pcsn" column="pcsn"/>
<result property="qty_unit_id" column="qty_unit_id"/>
<result property="qty_unit_name" column="qty_unit_name"/>
<result property="qty" column="qty"/>
<result property="status" column="status"/>
<result property="remark" column="remark"/>
<result property="source_form_type" column="source_form_type"/>
<result property="source_form_id" column="source_form_id"/>
<result property="update_name" column="update_name"/>
<result property="update_time" column="update_time"/>
<result property="create_time" column="create_time"/>
<result property="form_data" column="form_data" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="status" column="status"/>
</resultMap>
@@ -27,7 +21,7 @@
SELECT
*
FROM
md_gruop_dick
md_group_dick
<where>
<if test="query.material_code != null and query.material_code != ''">
and material_code = #{query.material_code}
@@ -38,6 +32,10 @@
<if test="query.pcsn != null and query.pcsn != ''">
and pcsn = #{query.pcsn}
</if>
<if test="query.status != null and query.status != ''">
and status = #{query.status}
</if>
<if test="query.form_query != null and query.form_query.size() > 0">
<foreach collection="query.form_query" item="value" index="key" >
<if test="value != null and value != ''">
@@ -47,4 +45,16 @@
</if>
</where>
</select>
<select id="getGroupDtl" resultType="com.alibaba.fastjson.JSONObject">
SELECT
*,
md_me_materialbase.material_code,
md_me_materialbase.material_name,
md_me_materialbase.material_spec
FROM
md_group_dtl
LEFT JOIN md_pb_vehicleMater ON md_group_dtl.vehicle_code = md_pb_vehicleMater.vehicle_code
LEFT JOIN md_me_materialbase on md_pb_vehicleMater.material_id = md_me_materialbase.material_id
where md_group_dtl.dick_id = #{dickId}
</select>
</mapper>

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java
View File

@@ -19,5 +19,6 @@ public class GroupDickQuery extends BaseQuery<MdGruopDick> {
private String vehicle_code;
private String material_code;
private String pcsn;
private String status;
private Map<String,String> form_query;
}

60
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java Normal file
View File

@@ -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;
/**
* <p>
* 载具物料组盘表
* </p>
*
* @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;
}

21
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java Normal file
View File

@@ -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;
/**
* <p>
* 载具物料组盘表
* </p>
*
* @author generator
* @since 2024-04-24
*/
@Data
public class MdGruopDtlVo extends MdGruopDtlDto {
private String material_name;
private String material_spec;
private String material_code;
}

90
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
View File

@@ -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;
/**
* <p>
@@ -41,12 +52,15 @@ import java.util.List;
public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGruopDick> 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<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
page.setOrderBy("create_time DESC");
List<MdGruopDick> mstDetail = this.baseMapper.query(query);
@@ -57,32 +71,62 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
}
@Override
@Transactional
public void groupDick(JSONObject forms) {
//TEST:iFlowOperationService.startUp("GROUP_DICK",forms.get(0),forms);
List<JSONObject> tableData = (ArrayList)forms.remove("tableData");
forms.put("update_name",SecurityUtils.getCurrentNickName());
forms.put("update_time",DateUtil.now());
forms.put("id",IdUtil.getStringId());
List<JSONObject> 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<MdGruopDtl> items = new ArrayList<>();
List<MdPbVehicleMater> vehicleMaters = new ArrayList<>();
List<JSONObject> dtlJson = new ArrayList<>();
if (!CollectionUtils.isEmpty(forms)){
List<JSONObject> 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<String>) proc_inst_id -> {
self.update(new UpdateWrapper<MdGruopDick>()
.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<MdGruopDtlVo> getGroupDtl(String dick_id) {
List<MdGruopDtlVo> result = new ArrayList<>();
if (StringUtils.isEmpty(dick_id)){
return new ArrayList<>();
}
List<JSONObject> groupDtl = this.baseMapper.getGroupDtl(dick_id);
for (JSONObject json : groupDtl) {
result.add(json.toJavaObject(MdGruopDtlVo.class));
}
return result;
}
}

21
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDtlServiceImpl.java Normal file
View File

@@ -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;
/**
* <p>
* 载具物料组盘表 服务实现类
* </p>
*
* @author generator
* @since 2024-04-24
*/
@Service
public class MdGruopDtlServiceImpl extends ServiceImpl<MdGruopDtlMapper, MdGruopDtl> implements IMdGruopDtlService {
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
View File

@@ -36,7 +36,7 @@ public class PmFormDataController {
@GetMapping()
public ResponseEntity<Object> 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}")

7
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java
View File

@@ -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<PmFormData> {
List<PmFormData> syncAnalyse(SyncFormMapping mapping, String dataString);
List<PmFormData> getByType(String from_type);
Object queryAll(FormDataQuery query, PageQuery page);
List<PmFormDataDto> queryTree(FormDataQuery query, PageQuery page);
Object getSonDtlFormData(String id);
}

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
View File

@@ -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;
}

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java
View File

@@ -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<PmFormData> {
List<PmFormData> query(@Param("query") FormDataQuery query);
// List<PmFormData> query(@Param("id") String id);
List<PmFormDataDto> queryTree(@Param("query")FormDataQuery query);
}

54
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
View File

@@ -22,6 +22,28 @@
<result property="unit_id" column="unit_id"/>
</resultMap>
<resultMap id="dataDetail" type="org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto" >
<result property="id" column="id"/>
<result property="code" column="code"/>
<result property="proc_inst_id" column="proc_inst_id"/>
<result property="biz_code" column="biz_code"/>
<result property="biz_id" column="biz_id"/>
<result property="biz_date" column="biz_date"/>
<result property="form_type" column="form_type"/>
<result property="status" column="status"/>
<result property="create_name" column="create_name"/>
<result property="create_time" column="create_time"/>
<result property="material_id" column="material_id"/>
<result property="qty" column="qty"/>
<result property="pcsn" column="pcsn"/>
<result property="vehicle_code" column="vehicle_code"/>
<result property="parent_id" column="parent_id"/>
<result property="form_data" column="form_data" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="unit_id" column="unit_id"/>
<!-- <result property="HasChildren" column="HasChildren"/>-->
<collection property="children" ofType="org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto" column="id" select="selectChild"></collection>
</resultMap>
<select id="query" resultMap="BaseResultMap">
SELECT
child.*
@@ -40,4 +62,36 @@
</if>
</where>
</select>
<select id="queryTree" resultMap="dataDetail">
SELECT
pm_form_data.*,
md_me_materialbase.material_code,
md_me_materialbase.material_name,
md_me_materialbase.material_spec
FROM
pm_form_data
left join md_me_materialbase on pm_form_data.material_id = md_me_materialbase.material_id
<where>
<if test="query.form_type != null and query.form_type != ''">
and form_type = #{query.form_type}
</if>
<if test="query.form_query != null and query.form_query.size() > 0">
<foreach collection="query.form_query" item="value" index="key" >
<if test="value != null and value != ''">
and JSON_CONTAINS(form_data, '{"${key}":"${value}"}')
</if>
</foreach>
</if>
</where>
</select>
<select id="selectChild" resultMap="dataDetail">
select
pm_form_data.*,
md_me_materialbase.material_code,
md_me_materialbase.material_name,
md_me_materialbase.material_spec
from pm_form_data left join md_me_materialbase on pm_form_data.material_id = md_me_materialbase.material_id
where parent_id = #{id}
</select>
</mapper>

61
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java
View File

@@ -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;
/**
* <p>
@@ -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<PmFormDataDto> dtl;
private List<PmFormDataDto> children;
public void setChildren(List<PmFormDataDto> children) {
if (!CollectionUtils.isEmpty(children)){
this.HasChildren=Boolean.TRUE;
}
this.children = children;
}
}

66
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
View File

@@ -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;
/**
* <p>
@@ -108,41 +109,46 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
@Override
public Object queryAll(FormDataQuery query, PageQuery pageQuery) {
Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
page.setOrderBy("create_time DESC");
List<PmFormData> pmFormData = this.baseMapper.query(query);
TableDataInfo<PmFormData> build = TableDataInfo.build(pmFormData);
List<PmFormData> content = build.getContent();
for (PmFormData formData : content) {
LambdaQueryWrapper<PmFormData> lqw = new LambdaQueryWrapper<>();
lqw.eq(PmFormData::getParent_id, formData.getId());
List<PmFormData> 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<PmFormData> content = page.getResult();
List<String> ids = content.stream().map(PmFormData::getId).collect(Collectors.toList());
Map<String, List<PmFormData>> childMap = new HashMap<>();
if (!CollectionUtils.isEmpty(ids)){
List<PmFormData> childs = this.list(new QueryWrapper<PmFormData>().in("parent_id", ids));
childMap = childs.stream().collect(Collectors.groupingBy(PmFormData::getParent_id));
}
List<PmFormDataDto> list = new ArrayList<>();
for (PmFormData record : content) {
PmFormDataDto strucDto = new PmFormDataDto();
BeanUtils.copyProperties(record, strucDto);
list.add(strucDto);
List<PmFormData> 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<PmFormData> lqw = new LambdaQueryWrapper<>();
lqw.eq(PmFormData::getParent_id, id);
return this.list(lqw);
// List<PmFormData> pmFormData = this.baseMapper.query(id);
// TableDataInfo<PmFormData> build = TableDataInfo.build(pmFormData);
// List<PmFormData> content = build.getContent();
// for (PmFormData formData : content) {
// LambdaQueryWrapper<PmFormData> lqw = new LambdaQueryWrapper<>();
// lqw.eq(PmFormData::getParent_id, formData.getId());
// List<PmFormData> 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<PmFormDataMapper, PmFormD
}
return data;
}
@Override
public List<PmFormData> getByType(String from_type) {
Assert.notNull(from_type,"表单类型参数不能为空");
return this.list(new QueryWrapper<PmFormData>().eq("form_type",from_type));
}
}

6
wms_pro/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -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