hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、新增凭证界面，动态列展示。

This commit is contained in:
zhengyf 2025-08-05 09:38:00 +08:00
parent 41f3aecf89
commit edb450daad
4 changed files with 261 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/controller/CoreController.java
View File

@ -11,8 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* Created by zydd on 2025-07-09 10:10
@ -41,13 +40,19 @@ public class CoreController extends DefaultController {
}
/**
* 存在重复单号，需要将单号去重
*/
@RequestMapping(value = "/generate", method = RequestMethod.POST)
public JsonResultEntity generateVoucher(@RequestBody CreateVoucherVO createVoucherVO) {
try {
String billCodes = createVoucherVO.getBillCode();
String[] split = billCodes.split(",");
for (String s : split) {
Set<String> set = new LinkedHashSet<>(Arrays.asList(split));
String[] uniqueArray = set.toArray(new String[0]);
for (String s : uniqueArray) {
createVoucherVO.setBillCode(s);
coreService.generateVoucher(createVoucherVO);
}

30
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/controller/PushLogController.java
View File

@ -2,6 +2,7 @@ package com.hzya.frame.voucher.ae.push.controller;
import cn.hutool.core.lang.Assert;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.mdm.entity.MdmViewVo;
import com.hzya.frame.voucher.ae.generate.core.service.ICoreService;
import com.hzya.frame.voucher.ae.generate.core.vo.CreateVoucherVO;
import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity;
@ -31,17 +32,16 @@ public class PushLogController extends DefaultController {
private IAePushVoucherLogService aePushVoucherLogService;
/**
* 查询单据，根据状态
* 以mdm为准，查询所有单据，过滤日志表
*/
@RequestMapping(value = "/queryBill", method = RequestMethod.POST)
public JsonResultEntity queryBill(@RequestBody AePushVoucherLogEntity entity){
public JsonResultEntity queryBill(@RequestBody AePushVoucherLogEntity entity) {
try {
List<AePushVoucherLogEntity> voucherLogEntityList = aePushVoucherLogService.queryBill(entity);
return getSuccessMessageEntity("请求成功",voucherLogEntityList);
}catch (Exception e){
return getSuccessMessageEntity("请求成功", voucherLogEntityList);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
@ -51,11 +51,11 @@ public class PushLogController extends DefaultController {
* 查询明细
*/
@RequestMapping(value = "/queryDetailsByBillCode", method = RequestMethod.POST)
public JsonResultEntity queryDetailsByBillCode(@RequestBody AePushVoucherLogEntity entity){
public JsonResultEntity queryDetailsByBillCode(@RequestBody AePushVoucherLogEntity entity) {
try {
List<AePushVoucherLogDetailsEntity> voucherLogDetails = aePushVoucherLogService.queryDetailsByBillCode(entity);
return getSuccessMessageEntity("请求成功",voucherLogDetails);
}catch (Exception e){
return getSuccessMessageEntity("请求成功", voucherLogDetails);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
@ -66,8 +66,20 @@ public class PushLogController extends DefaultController {
public JsonResultEntity queryBillPaged(@RequestBody CreateVoucherVO vo) {
try {
PageInfo pageInfo = aePushVoucherLogService.queryBillPaged(vo);
return getSuccessMessageEntity("请求成功",pageInfo);
}catch (Exception e){
return getSuccessMessageEntity("请求成功", pageInfo);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
}
//查需字段以及规则
@RequestMapping(value = "/queryBillFileds", method = RequestMethod.POST)
public JsonResultEntity queryBillFileds(@RequestBody CreateVoucherVO vo) {
try {
MdmViewVo mdmViewVo = aePushVoucherLogService.queryBillFileds(vo);
return getSuccessMessageEntity("请求成功", mdmViewVo);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}

3
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/IAePushVoucherLogService.java
View File

@ -1,6 +1,7 @@
package com.hzya.frame.voucher.ae.push.service;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.mdm.entity.MdmViewVo;
import com.hzya.frame.voucher.ae.generate.core.vo.CreateVoucherVO;
import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity;
import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity;
@ -23,4 +24,6 @@ public interface IAePushVoucherLogService extends IBaseService<AePushVoucherLogE
AePushVoucherLogEntity saveOrUpdateBymdmIdAndBillCodeAndTypeId(AePushVoucherLogEntity aePushVoucherLogEntity);
PageInfo queryBillPaged(CreateVoucherVO vo);
MdmViewVo queryBillFileds(CreateVoucherVO vo);
}

233
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java
View File

@ -3,11 +3,21 @@ package com.hzya.frame.voucher.ae.push.service.impl;
import cn.hutool.core.lang.Assert;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.mdm.entity.MdmViewFiledVo;
import com.hzya.frame.mdm.entity.MdmViewVo;
import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao;
import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao;
import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity;
import com.hzya.frame.mdm.mdmModuleDbFileds.dao.IMdmModuleDbFiledsDao;
import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity;
import com.hzya.frame.mdm.mdmModuleDbFiledsRule.dao.IMdmModuleDbFiledsRuleDao;
import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity;
import com.hzya.frame.mdm.mdmModuleView.dao.IMdmModuleViewDao;
import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity;
import com.hzya.frame.mdm.mdmModuleViewDetail.dao.IMdmModuleViewDetailDao;
import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity;
import com.hzya.frame.mdm.service.IMdmServiceCache;
import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDBQueryVODAO;
import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDbFiledVODAO;
import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO;
@ -19,6 +29,7 @@ import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity;
import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity;
import com.hzya.frame.voucher.ae.push.dao.IAePushVoucherLogDao;
import com.hzya.frame.voucher.ae.push.service.IAePushVoucherLogService;
import com.hzya.frame.web.entity.BaseResult;
import groovy.lang.Lazy;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -65,6 +76,12 @@ public class AePushVoucherLogServiceImpl extends BaseService<AePushVoucherLogEnt
private IMdmModuleDbFiledsDao mdmModuleDbFiledsDao;
@Autowired
private IMdmModuleDbFiledsRuleDao mdmModuleDbFiledsRuleDao;
@Resource
private IMdmModuleViewDao mdmModuleViewDao;
@Resource
private IMdmServiceCache mdmServiceCache;
@Resource
private IMdmModuleViewDetailDao mdmModuleViewDetailDao;
// @Override
@ -305,14 +322,19 @@ public class AePushVoucherLogServiceImpl extends BaseService<AePushVoucherLogEnt
String timeStart = vo.getTimeStart();
String timeEnd = vo.getTimeEnd();
MdmDBQueryVO mdmDBQueryVO = new MdmDBQueryVO();
mdmDBQueryVO.setTablename(mdmModuleDb.getDbName());
mdmDBQueryVO.setPageNum(vo.getPageNum());
mdmDBQueryVO.setPageSize(vo.getPageSize());
mdmDBQueryVO.setProp3(datefieldname);
mdmDBQueryVO.setPropValue3(timeStart+" 00:00:00");
mdmDBQueryVO.setProp4(datefieldname);
mdmDBQueryVO.setPropValue4(timeEnd+" 00:00:00");
if(timeStart!=null&&timeEnd!=null){
mdmDBQueryVO.setProp3(datefieldname);
mdmDBQueryVO.setPropValue3(timeStart+" 00:00:00");
mdmDBQueryVO.setProp4(datefieldname);
mdmDBQueryVO.setPropValue4(timeEnd+" 00:00:00");
}
mdmDBQueryVO.setProp5(codefieldname);
mdmDBQueryVO.setPropValue5(vo.getBillCode());
@ -327,6 +349,74 @@ public class AePushVoucherLogServiceImpl extends BaseService<AePushVoucherLogEnt
}
@Override
public MdmViewVo queryBillFileds(CreateVoucherVO vo) {
MdmViewVo mdmViewVo = new MdmViewVo();
try{
String mdmId = vo.getMdmId();
MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
mdmModuleEntity.setId(mdmId);
List<MdmModuleEntity> mdmModuleEntityList = mdmModuleDao.query(mdmModuleEntity);
if(mdmModuleEntityList.size()==0){
Assert.state(false,"根据mdmId:{},查询模板失败。",mdmId);
}
//设置模版
mdmViewVo.setMdmModuleEntity(mdmModuleEntityList.get(0));
//查询展示类型
MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId());
mdmModuleViewEntity.setSts("Y");
List<MdmModuleViewEntity> moduleViewEntityList = mdmModuleViewDao.queryBase(mdmModuleViewEntity);
if (moduleViewEntityList == null || moduleViewEntityList.size() != 1) {
Assert.state(false,"根据mdmId:{},查询展示类型失败。",mdmId);
}
mdmModuleViewEntity = moduleViewEntityList.get(0);
mdmViewVo.setMdmModuleViewEntity(mdmModuleViewEntity);
//查询数据源主表
MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
mdmModuleDbEntity.setSts("Y");
List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
Assert.state(false,"根据mdmId:{},查询数据源主表失败。",mdmId);
}
//查询数据源表下面的字段
MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId());
mdmModuleDbFiledsEntity.setSts("Y");
List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
if (mdmModuleDbFiledsEntityList == null || mdmModuleDbFiledsEntityList.size() == 0) {
Assert.state(false,"根据mdmId:{},查询数据源表下面的字段失败。",mdmId);
}
//查询字段下的规则
MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity();
mdmModuleDbFiledsRuleEntity.setMdmId(mdmModuleEntity.getId());
mdmModuleDbFiledsRuleEntity.setSts("Y");
List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList = mdmModuleDbFiledsRuleDao.queryBase(mdmModuleDbFiledsRuleEntity);
if (mdmModuleDbFiledsRuleEntityList == null || mdmModuleDbFiledsRuleEntityList.size() == 0) {
Assert.state(false,"查询字段下的规则失败");
}
//查询设置的查询字段
MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity();
mdmModuleViewDetailEntity.setMdmId(mdmModuleEntity.getId());
mdmModuleViewDetailEntity.setSts("Y");
List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntities = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity);
if (mdmModuleViewDetailEntities == null || mdmModuleViewDetailEntities.size() == 0) {
Assert.state(false,"查询设置的查询字段失败");
}
List<MdmViewFiledVo> queryList = getFiledByType("1", mdmModuleViewDetailEntities, mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList);
mdmViewVo.setQueryList(queryList);
List<MdmViewFiledVo> listList = getFiledByType("2", mdmModuleViewDetailEntities, mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList);
mdmViewVo.setListList(listList);
}catch (Exception e){
e.printStackTrace();
Assert.state(false,"查询字段失败。");
}
return mdmViewVo;
}
@Override
public List<AePushVoucherLogDetailsEntity> queryDetailsByBillCode(AePushVoucherLogEntity entity) {
@ -412,6 +502,141 @@ public class AePushVoucherLogServiceImpl extends BaseService<AePushVoucherLogEnt
return aePushVoucherLogEntity;
}
}
private List<MdmViewFiledVo> getFiledByType(String viewType, List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntities, List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList, List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList) {
List<MdmViewFiledVo> mdmViewFiledVos = new ArrayList<>();
for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
MdmViewFiledVo rule = new MdmViewFiledVo();
rule.setDbName(mdmModuleDbEntityList.get(i).getDbName());
rule.setDbType("1");
rule.setMdmId(mdmModuleDbEntityList.get(i).getMdmId());
rule.setDbId(mdmModuleDbEntityList.get(i).getId());
rule.setChName("单据规则");
rule.setEnName("document_rule");
mdmViewFiledVos.add(rule);
List<MdmModuleDbFiledsRuleEntity> msgRule = new ArrayList<>();
MdmModuleDbFiledsRuleEntity msgRuleTitie = new MdmModuleDbFiledsRuleEntity();
msgRuleTitie.setFormName("optionRuleForm");
msgRuleTitie.setRuleCode("title");
msgRuleTitie.setRuleName("显示名");
msgRuleTitie.setRuleType("2");
msgRuleTitie.setRuleValue("单据编码");
MdmModuleDbFiledsRuleEntity msgRulerow = new MdmModuleDbFiledsRuleEntity();
msgRulerow.setFormName("optionRuleForm");
msgRulerow.setRuleCode("row");
msgRulerow.setRuleName("宽度");
msgRulerow.setRuleType("2");
msgRulerow.setRuleValue("12");
MdmModuleDbFiledsRuleEntity msgRuletype = new MdmModuleDbFiledsRuleEntity();
msgRuletype.setFormName("optionRuleForm");
msgRuletype.setRuleCode("type");
msgRuletype.setRuleName("数据类型");
msgRuletype.setRuleType("2");
msgRuletype.setRuleValue("input");
MdmModuleDbFiledsRuleEntity msgRulerequired = new MdmModuleDbFiledsRuleEntity();
msgRulerequired.setFormName("optionRuleForm");
msgRulerequired.setRuleCode("required");
msgRulerequired.setRuleName("必填");
msgRulerequired.setRuleType("2");
MdmModuleDbFiledsRuleEntity withs = new MdmModuleDbFiledsRuleEntity();
withs.setFormName("optionRuleForm");
withs.setRuleCode("width");
withs.setRuleName("宽度");
withs.setRuleType("2");
withs.setRuleValue("200");
msgRule.add(withs);
msgRule.add(msgRulerequired);
msgRule.add(msgRuletype);
msgRule.add(msgRulerow);
msgRule.add(msgRuleTitie);
rule.setRuleList(msgRule);
}
}
if (mdmModuleViewDetailEntities != null && mdmModuleViewDetailEntities.size() > 0) {
for (int i = 0; i < mdmModuleViewDetailEntities.size(); i++) {
if (viewType.equals(mdmModuleViewDetailEntities.get(i).getViewType())) {
//类型一致
MdmViewFiledVo mdmViewFiledVo = new MdmViewFiledVo();
mdmViewFiledVo.setId(mdmModuleViewDetailEntities.get(i).getViewFiled());
for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
if (mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleViewDetailEntities.get(i).getViewFiled())) {
for (int i2 = 0; i2 < mdmModuleDbEntityList.size(); i2++) {
if (mdmModuleDbEntityList.get(i2).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
mdmViewFiledVo.setDbName(mdmModuleDbEntityList.get(i2).getDbName());
mdmViewFiledVo.setDbType(mdmModuleDbEntityList.get(i2).getDbType());
mdmViewFiledVo.setMdmId(mdmModuleDbEntityList.get(i2).getMdmId());
mdmViewFiledVo.setDbId(mdmModuleDbEntityList.get(i2).getId());
break;
}
}
mdmViewFiledVo.setChName(mdmModuleDbFiledsEntityList.get(i1).getChName());
mdmViewFiledVo.setEnName(mdmModuleDbFiledsEntityList.get(i1).getEnName());
mdmViewFiledVo.setFiledType(mdmModuleDbFiledsEntityList.get(i1).getFiledType());
//字段规则
if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) {
List<MdmModuleDbFiledsRuleEntity> ruleList = new ArrayList<>();
for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) {
if (mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())) {
ruleList.add(mdmModuleDbFiledsRuleEntityList.get(i2));
}
}
mdmViewFiledVo.setRuleList(ruleList);
if ("data_status".equals(mdmModuleDbFiledsEntityList.get(i1).getEnName())) {
List<MdmModuleDbFiledsRuleEntity> a = new ArrayList<>();
MdmModuleDbFiledsRuleEntity msgRuleTitie = new MdmModuleDbFiledsRuleEntity();
msgRuleTitie.setFormName("optionRuleForm");
msgRuleTitie.setRuleCode("title");
msgRuleTitie.setRuleName("显示名");
msgRuleTitie.setRuleType("2");
msgRuleTitie.setRuleValue("数据状态");
MdmModuleDbFiledsRuleEntity msgRulerow = new MdmModuleDbFiledsRuleEntity();
msgRulerow.setFormName("optionRuleForm");
msgRulerow.setRuleCode("row");
msgRulerow.setRuleName("宽度");
msgRulerow.setRuleType("2");
msgRulerow.setRuleValue("12");
MdmModuleDbFiledsRuleEntity msgRuletype = new MdmModuleDbFiledsRuleEntity();
msgRuletype.setFormName("optionRuleForm");
msgRuletype.setRuleCode("type");
msgRuletype.setRuleName("数据类型");
msgRuletype.setRuleType("2");
msgRuletype.setRuleValue("input");
MdmModuleDbFiledsRuleEntity msgRulerequired = new MdmModuleDbFiledsRuleEntity();
msgRulerequired.setFormName("optionRuleForm");
msgRulerequired.setRuleCode("required");
msgRulerequired.setRuleName("必填");
msgRulerequired.setRuleType("2");
MdmModuleDbFiledsRuleEntity withs = new MdmModuleDbFiledsRuleEntity();
withs.setFormName("optionRuleForm");
withs.setRuleCode("width");
withs.setRuleName("宽度");
withs.setRuleType("2");
withs.setRuleValue("200");
a.add(withs);
a.add(msgRulerequired);
a.add(msgRuletype);
a.add(msgRulerow);
a.add(msgRuleTitie);
mdmViewFiledVo.setRuleList(a);
}
}
break;
}
}
mdmViewFiledVos.add(mdmViewFiledVo);
}
}
}
if (mdmViewFiledVos != null && mdmViewFiledVos.size() > 0) {
for (int i = 0; i < mdmViewFiledVos.size(); i++) {
mdmViewFiledVos.get(i).setSorts(i);
}
}
return mdmViewFiledVos;
}