yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat():前端样式调整，后端接口完善;

Browse Source
master
jiyufei 2 months ago
parent 51d7a11f61
commit ce1a4df30e
11 changed files with 2570 additions and 2468 deletions
Show Stats Download Patch File Download Diff File

372
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java
Unescape View File

@ -5,18 +5,26 @@ import jnpf.mapper.YysMaterialProcurementPlanMapper;
import jnpf.service.*; import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.yysmaterialprocurementplan.*; import jnpf.model.yysmaterialprocurementplan.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel; import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil; import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel; import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel; import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel; import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import jnpf.model.QueryModel; import jnpf.model.QueryModel;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel; import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -25,13 +33,17 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import jnpf.util.*; import jnpf.util.*;
import java.util.*; import java.util.*;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
/** /**
*
* YysMaterialProcurementPlan * YysMaterialProcurementPlan
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity;
* 日期： 2024-08-08 * 日期： 2024-08-08
*/ */
@Service @Service
public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMaterialProcurementPlanMapper, YysMaterialProcurementPlanEntity> implements YysMaterialProcurementPlanService{ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMaterialProcurementPlanMapper, YysMaterialProcurementPlanEntity> implements YysMaterialProcurementPlanService {
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -48,341 +60,363 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
@Autowired @Autowired
private YysMaterialProcurementItemService yysMaterialProcurementItemService; private YysMaterialProcurementItemService yysMaterialProcurementItemService;
@Override @Override
public List<YysMaterialProcurementPlanEntity> getList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination){ public List<YysMaterialProcurementPlanEntity> getList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) {
return getTypeList(yysMaterialProcurementPlanPagination,yysMaterialProcurementPlanPagination.getDataType()); return getTypeList(yysMaterialProcurementPlanPagination, yysMaterialProcurementPlanPagination.getDataType());
} }
/** 列表查询 */
/**
* 列表查询
*/
@Override @Override
public List<YysMaterialProcurementPlanEntity> getTypeList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination,String dataType){ public List<YysMaterialProcurementPlanEntity> getTypeList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination, String dataType) {
String userId=userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList = new ArrayList();
List<List<String>> intersectionList =new ArrayList<>(); List<List<String>> intersectionList = new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? YysMaterialProcurementPlanConstant.getAppColumnData() : YysMaterialProcurementPlanConstant.getColumnData(); String columnData = !isPc ? YysMaterialProcurementPlanConstant.getAppColumnData() : YysMaterialProcurementPlanConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0; int total = 0;
int yysMaterialProcurementPlanNum =0; int yysMaterialProcurementPlanNum = 0;
QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanQueryWrapper=new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanQueryWrapper = new QueryWrapper<>();
int yysMaterialProcurementItemNum =0; int yysMaterialProcurementItemNum = 0;
QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper=new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper = new QueryWrapper<>();
long yysMaterialProcurementItemcount = yysMaterialProcurementItemService.count(); long yysMaterialProcurementItemcount = yysMaterialProcurementItemService.count();
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp =""; String superOp = "";
if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getSuperQueryJson())){ if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>(); List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>(); List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = yysMaterialProcurementPlanPagination.getSuperQueryJson(); String queryJson = yysMaterialProcurementPlanPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>();
yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper,YysMaterialProcurementPlanEntity.class,queryJson,"0")); yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper, YysMaterialProcurementPlanEntity.class, queryJson, "0"));
int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size(); int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size();
if (yysMaterialProcurementPlanNum1>0){ if (yysMaterialProcurementPlanNum1 > 0) {
List<String> yysMaterialProcurementPlanList =this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList()); List<String> yysMaterialProcurementPlanList = this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysMaterialProcurementPlanList); allSuperList.addAll(yysMaterialProcurementPlanList);
intersectionSuperList.add(yysMaterialProcurementPlanList); intersectionSuperList.add(yysMaterialProcurementPlanList);
superNum++; superNum++;
} }
String YysMaterialProcurementItemTable = "yys_material_procurement_item"; String YysMaterialProcurementItemTable = "yys_material_procurement_item";
boolean YysMaterialProcurementItemHasSql = queryJson.contains(YysMaterialProcurementItemTable); boolean YysMaterialProcurementItemHasSql = queryJson.contains(YysMaterialProcurementItemTable);
List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable , queryJson, null); List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable, queryJson, null);
if (YysMaterialProcurementItemHasSql){ if (YysMaterialProcurementItemHasSql) {
allSuperList.addAll(yysMaterialProcurementItemList); allSuperList.addAll(yysMaterialProcurementItemList);
intersectionSuperList.add(yysMaterialProcurementItemList); intersectionSuperList.add(yysMaterialProcurementItemList);
superNum++; superNum++;
} }
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or //and or
if(superOp.equalsIgnoreCase("and")){ if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{ } else {
allSuperIDlist = allSuperList; allSuperIDlist = allSuperList;
} }
} }
List<String> allRuleIDlist = new ArrayList<>(); List<String> allRuleIDlist = new ArrayList<>();
String ruleOp =""; String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)){ if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>(); List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>(); List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0; int ruleNum = 0;
QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>();
yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper,YysMaterialProcurementPlanEntity.class,ruleJson,"0")); yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper, YysMaterialProcurementPlanEntity.class, ruleJson, "0"));
int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size(); int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size();
if (yysMaterialProcurementPlanNum1>0){ if (yysMaterialProcurementPlanNum1 > 0) {
List<String> yysMaterialProcurementPlanList =this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList()); List<String> yysMaterialProcurementPlanList = this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysMaterialProcurementPlanList); allRuleList.addAll(yysMaterialProcurementPlanList);
intersectionRuleList.add(yysMaterialProcurementPlanList); intersectionRuleList.add(yysMaterialProcurementPlanList);
ruleNum++; ruleNum++;
} }
String YysMaterialProcurementItemTable = "yys_material_procurement_item"; String YysMaterialProcurementItemTable = "yys_material_procurement_item";
boolean YysMaterialProcurementItemHasSql = ruleJson.contains(YysMaterialProcurementItemTable); boolean YysMaterialProcurementItemHasSql = ruleJson.contains(YysMaterialProcurementItemTable);
List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable , ruleJson, null); List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable, ruleJson, null);
if (YysMaterialProcurementItemHasSql){ if (YysMaterialProcurementItemHasSql) {
allRuleList.addAll(yysMaterialProcurementItemList); allRuleList.addAll(yysMaterialProcurementItemList);
intersectionRuleList.add(yysMaterialProcurementItemList); intersectionRuleList.add(yysMaterialProcurementItemList);
ruleNum++; ruleNum++;
} }
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or //and or
if(ruleOp.equalsIgnoreCase("and")){ if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{ } else {
allRuleIDlist = allRuleList; allRuleIDlist = allRuleList;
} }
} }
boolean pcPermission = true; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = false;
if(isPc && pcPermission){ if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object yysMaterialProcurementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper,YysMaterialProcurementPlanEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0")); Object yysMaterialProcurementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper, YysMaterialProcurementPlanEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)){ if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>)yysMaterialProcurementPlanObj; yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>) yysMaterialProcurementPlanObj;
if( yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size()>0){ if (yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementPlanNum++; yysMaterialProcurementPlanNum++;
} }
} }
Object yysMaterialProcurementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper,YysMaterialProcurementItemEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0")); Object yysMaterialProcurementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper, YysMaterialProcurementItemEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)){ if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>)yysMaterialProcurementItemObj; yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>) yysMaterialProcurementItemObj;
if( yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size()>0){ if (yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementItemNum++; yysMaterialProcurementItemNum++;
} }
} }
} }
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysMaterialProcurementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper,YysMaterialProcurementPlanEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)){
return new ArrayList<>();
} else {
yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>)yysMaterialProcurementPlanObj;
if( yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size()>0){
yysMaterialProcurementPlanNum++;
}
} }
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysMaterialProcurementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper, YysMaterialProcurementPlanEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)) {
return new ArrayList<>();
} else {
yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>) yysMaterialProcurementPlanObj;
if (yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementPlanNum++;
}
}
Object yysMaterialProcurementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper,YysMaterialProcurementItemEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0")); Object yysMaterialProcurementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper, YysMaterialProcurementItemEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)){ if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>)yysMaterialProcurementItemObj; yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>) yysMaterialProcurementItemObj;
if( yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size()>0){ if (yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementItemNum++; yysMaterialProcurementItemNum++;
} }
} }
} }
} }
if(isPc){ if (isPc) {
if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementNumber())){ if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementNumber())) {
yysMaterialProcurementPlanNum++; yysMaterialProcurementPlanNum++;
String value = yysMaterialProcurementPlanPagination.getProcurementNumber() instanceof List ? String value = yysMaterialProcurementPlanPagination.getProcurementNumber() instanceof List ?
JsonUtil.getObjectToString(yysMaterialProcurementPlanPagination.getProcurementNumber()) : JsonUtil.getObjectToString(yysMaterialProcurementPlanPagination.getProcurementNumber()) :
String.valueOf(yysMaterialProcurementPlanPagination.getProcurementNumber()); String.valueOf(yysMaterialProcurementPlanPagination.getProcurementNumber());
yysMaterialProcurementPlanQueryWrapper.lambda().like(YysMaterialProcurementPlanEntity::getProcurementNumber,value); yysMaterialProcurementPlanQueryWrapper.lambda().like(YysMaterialProcurementPlanEntity::getProcurementNumber, value);
} }
if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementYearMonth())){ if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementYearMonth())) {
yysMaterialProcurementPlanNum++; yysMaterialProcurementPlanNum++;
List ProcurementYearMonthList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementYearMonth(),String.class); List ProcurementYearMonthList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementYearMonth(), String.class);
Long fir = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(0))); Long fir = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(0)));
Long sec = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(1))); Long sec = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(1)));
yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementYearMonth, new Date(fir)) yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementYearMonth, new Date(fir))
.le(YysMaterialProcurementPlanEntity::getProcurementYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); .le(YysMaterialProcurementPlanEntity::getProcurementYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
} }
if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementDate())){ if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementDate())) {
yysMaterialProcurementPlanNum++; yysMaterialProcurementPlanNum++;
List ProcurementDateList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementDate(),String.class); List ProcurementDateList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementDate(), String.class);
Long fir = Long.valueOf(String.valueOf(ProcurementDateList.get(0))); Long fir = Long.valueOf(String.valueOf(ProcurementDateList.get(0)));
Long sec = Long.valueOf(String.valueOf(ProcurementDateList.get(1))); Long sec = Long.valueOf(String.valueOf(ProcurementDateList.get(1)));
yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementDate, new Date(fir)) yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementDate, new Date(fir))
.le(YysMaterialProcurementPlanEntity::getProcurementDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); .le(YysMaterialProcurementPlanEntity::getProcurementDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
} }
} }
if(yysMaterialProcurementItemNum>0){ if (yysMaterialProcurementItemNum > 0) {
List<String> yysMaterialProcurementItemIdList = yysMaterialProcurementItemService.list(yysMaterialProcurementItemQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getMaterialProcurementPlanId())).map(t->t.getMaterialProcurementPlanId()).collect(Collectors.toList()); List<String> yysMaterialProcurementItemIdList = yysMaterialProcurementItemService.list(yysMaterialProcurementItemQueryWrapper).stream().filter(t -> StringUtil.isNotEmpty(t.getMaterialProcurementPlanId())).map(t -> t.getMaterialProcurementPlanId()).collect(Collectors.toList());
long count = yysMaterialProcurementItemService.count(); long count = yysMaterialProcurementItemService.count();
if (count>0){ if (count > 0) {
intersectionList.add(yysMaterialProcurementItemIdList); intersectionList.add(yysMaterialProcurementItemIdList);
} }
AllIdList.addAll(yysMaterialProcurementItemIdList); AllIdList.addAll(yysMaterialProcurementItemIdList);
} }
total+=yysMaterialProcurementItemNum; total += yysMaterialProcurementItemNum;
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList); List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){ if (total > 0) {
if (intersection.size()==0){ if (intersection.size() == 0) {
intersection.add("jnpfNullList"); intersection.add("jnpfNullList");
} }
yysMaterialProcurementPlanQueryWrapper.lambda().in(YysMaterialProcurementPlanEntity::getId, intersection); yysMaterialProcurementPlanQueryWrapper.lambda().in(YysMaterialProcurementPlanEntity::getId, intersection);
} }
//是否有高级查询 //是否有高级查询
if (StringUtil.isNotEmpty(superOp)){ if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size()==0){ if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList"); allSuperIDlist.add("jnpfNullList");
} }
List<String> finalAllSuperIDlist = allSuperIDlist; List<String> finalAllSuperIDlist = allSuperIDlist;
yysMaterialProcurementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialProcurementPlanEntity::getId, finalAllSuperIDlist)); yysMaterialProcurementPlanQueryWrapper.lambda().and(t -> t.in(YysMaterialProcurementPlanEntity::getId, finalAllSuperIDlist));
} }
//是否有数据过滤查询 //是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){ if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size()==0){ if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList"); allRuleIDlist.add("jnpfNullList");
} }
List<String> finalAllRuleIDlist = allRuleIDlist; List<String> finalAllRuleIDlist = allRuleIDlist;
yysMaterialProcurementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialProcurementPlanEntity::getId, finalAllRuleIDlist)); yysMaterialProcurementPlanQueryWrapper.lambda().and(t -> t.in(YysMaterialProcurementPlanEntity::getId, finalAllRuleIDlist));
} }
//假删除标志 //假删除标志
yysMaterialProcurementPlanQueryWrapper.lambda().isNull(YysMaterialProcurementPlanEntity::getDeleteMark); yysMaterialProcurementPlanQueryWrapper.lambda().isNull(YysMaterialProcurementPlanEntity::getDeleteMark);
//排序 //排序
if(StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSidx())){ if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSidx())) {
yysMaterialProcurementPlanQueryWrapper.lambda().orderByDesc(YysMaterialProcurementPlanEntity::getProcurementDate); yysMaterialProcurementPlanQueryWrapper.lambda().orderByDesc(YysMaterialProcurementPlanEntity::getProcurementDate);
}else{ } else {
try { try {
String sidx = yysMaterialProcurementPlanPagination.getSidx(); String sidx = yysMaterialProcurementPlanPagination.getSidx();
String[] strs= sidx.split("_name"); String[] strs = sidx.split("_name");
YysMaterialProcurementPlanEntity yysMaterialProcurementPlanEntity = new YysMaterialProcurementPlanEntity(); YysMaterialProcurementPlanEntity yysMaterialProcurementPlanEntity = new YysMaterialProcurementPlanEntity();
Field declaredField = yysMaterialProcurementPlanEntity.getClass().getDeclaredField(strs[0]); Field declaredField = yysMaterialProcurementPlanEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
yysMaterialProcurementPlanQueryWrapper="asc".equals(yysMaterialProcurementPlanPagination.getSort().toLowerCase())?yysMaterialProcurementPlanQueryWrapper.orderByAsc(value):yysMaterialProcurementPlanQueryWrapper.orderByDesc(value); yysMaterialProcurementPlanQueryWrapper = "asc".equals(yysMaterialProcurementPlanPagination.getSort().toLowerCase()) ? yysMaterialProcurementPlanQueryWrapper.orderByAsc(value) : yysMaterialProcurementPlanQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
if("0".equals(dataType)){ if ("0".equals(dataType)) {
if((total>0 && AllIdList.size()>0) || total==0){ if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<YysMaterialProcurementPlanEntity> page=new Page<>(yysMaterialProcurementPlanPagination.getCurrentPage(), yysMaterialProcurementPlanPagination.getPageSize()); Page<YysMaterialProcurementPlanEntity> page = new Page<>(yysMaterialProcurementPlanPagination.getCurrentPage(), yysMaterialProcurementPlanPagination.getPageSize());
IPage<YysMaterialProcurementPlanEntity> userIPage=this.page(page, yysMaterialProcurementPlanQueryWrapper); IPage<YysMaterialProcurementPlanEntity> userIPage = this.page(page, yysMaterialProcurementPlanQueryWrapper);
return yysMaterialProcurementPlanPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return yysMaterialProcurementPlanPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<YysMaterialProcurementPlanEntity> list = new ArrayList(); List<YysMaterialProcurementPlanEntity> list = new ArrayList();
return yysMaterialProcurementPlanPagination.setData(list, list.size()); return yysMaterialProcurementPlanPagination.setData(list, list.size());
} }
}else{ } else {
return this.list(yysMaterialProcurementPlanQueryWrapper); return this.list(yysMaterialProcurementPlanQueryWrapper);
} }
} }
@Override @Override
public YysMaterialProcurementPlanEntity getInfo(String id){ public YysMaterialProcurementPlanEntity getInfo(String id) {
QueryWrapper<YysMaterialProcurementPlanEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementPlanEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialProcurementPlanEntity::getId,id); queryWrapper.lambda().eq(YysMaterialProcurementPlanEntity::getId, id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(YysMaterialProcurementPlanEntity entity){ public void create(YysMaterialProcurementPlanEntity entity) {
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, YysMaterialProcurementPlanEntity entity){ public boolean update(String id, YysMaterialProcurementPlanEntity entity) {
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(YysMaterialProcurementPlanEntity entity){ public void delete(YysMaterialProcurementPlanEntity entity) {
if(entity!=null){ if (entity != null) {
this.removeById(entity.getId()); this.removeById(entity.getId());
} }
} }
/** YysMaterialProcurementItem子表方法 */
/**
* YysMaterialProcurementItem子表方法
*/
@Override @Override
public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id,YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination){ public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id, YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) {
Map<String, Object> newtabMap=YysMaterialProcurementPlanConstant.TABLEFIELDKEY.entrySet() Map<String, Object> newtabMap = YysMaterialProcurementPlanConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey())); .stream().collect(Collectors.toMap(e -> e.getValue(), e -> e.getKey()));
String tableName="yysMaterialProcurementItem"; String tableName = "yysMaterialProcurementItem";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString(); tableName = newtabMap.get(tableName) == null ? tableName : newtabMap.get(tableName).toString();
QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = yysMaterialProcurementItemService.getChild(yysMaterialProcurementPlanPagination,queryWrapper); queryWrapper = yysMaterialProcurementItemService.getChild(yysMaterialProcurementPlanPagination, queryWrapper);
queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id); queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id);
generaterSwapUtil.wrapperHandle(YysMaterialProcurementPlanConstant.getColumnData(), YysMaterialProcurementPlanConstant.getAppColumnData(), queryWrapper,YysMaterialProcurementItemEntity.class,"sub",tableName); generaterSwapUtil.wrapperHandle(YysMaterialProcurementPlanConstant.getColumnData(), YysMaterialProcurementPlanConstant.getAppColumnData(), queryWrapper, YysMaterialProcurementItemEntity.class, "sub", tableName);
return yysMaterialProcurementItemService.list(queryWrapper); return yysMaterialProcurementItemService.list(queryWrapper);
} }
/** YysMaterialProcurementItem子表方法 */ /**
* YysMaterialProcurementItem子表方法
*/
@Override @Override
public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id){ public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id) {
QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id); queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id);
return yysMaterialProcurementItemService.list(queryWrapper); return yysMaterialProcurementItemService.list(queryWrapper);
} }
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
@Override @Override
public String checkForm(YysMaterialProcurementPlanForm form,int i) { public String checkForm(YysMaterialProcurementPlanForm form, int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id=""; String id = "";
String countRecover = ""; String countRecover = "";
if (isUp){ if (isUp) {
id = form.getId(); id = form.getId();
} }
//主表字段验证 //主表字段验证
//子表字段验证 //子表字段验证
if (form.getYysMaterialProcurementItemList()!=null){ if (form.getYysMaterialProcurementItemList() != null) {
} }
return countRecover; return countRecover;
} }
/** /**
* 新增修改数据(事务回滚) * 新增修改数据(事务回滚)
* @param id *
* @param yysMaterialProcurementPlanForm * @param id
* @return * @param yysMaterialProcurementPlanForm
*/ * @return
*/
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,String id, boolean isSave) throws Exception{ public void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm, String id, boolean isSave) throws Exception {
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
yysMaterialProcurementPlanForm = JsonUtil.getJsonToBean( yysMaterialProcurementPlanForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(YysMaterialProcurementPlanConstant.getFormData(),yysMaterialProcurementPlanForm),YysMaterialProcurementPlanForm.class); generaterSwapUtil.swapDatetime(YysMaterialProcurementPlanConstant.getFormData(), yysMaterialProcurementPlanForm), YysMaterialProcurementPlanForm.class);
YysMaterialProcurementPlanEntity entity = JsonUtil.getJsonToBean(yysMaterialProcurementPlanForm, YysMaterialProcurementPlanEntity.class); YysMaterialProcurementPlanEntity entity = JsonUtil.getJsonToBean(yysMaterialProcurementPlanForm, YysMaterialProcurementPlanEntity.class);
if(isSave){ if (isSave) {
String mainId = RandomUtil.uuId() ; String mainId = RandomUtil.uuId();
entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false)); entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
entity.setId(mainId); entity.setId(mainId);
}else{ } else {
//entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false)); //entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
} }
this.saveOrUpdate(entity); this.saveOrUpdate(entity);
//YysMaterialProcurementItem子表数据新增修改 //YysMaterialProcurementItem子表数据新增修改
if(!isSave){ if (!isSave) {
QueryWrapper<YysMaterialProcurementItemEntity> YysMaterialProcurementItemqueryWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementItemEntity> YysMaterialProcurementItemqueryWrapper = new QueryWrapper<>();
YysMaterialProcurementItemqueryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, entity.getId()); YysMaterialProcurementItemqueryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, entity.getId());
yysMaterialProcurementItemService.remove(YysMaterialProcurementItemqueryWrapper); yysMaterialProcurementItemService.remove(YysMaterialProcurementItemqueryWrapper);
} }
if (yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList()!=null){ if (yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList() != null) {
List<YysMaterialProcurementItemEntity> tableField107 = JsonUtil.getJsonToList(yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList(),YysMaterialProcurementItemEntity.class); List<YysMaterialProcurementItemEntity> tableField107 = JsonUtil.getJsonToList(yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList(), YysMaterialProcurementItemEntity.class);
for(YysMaterialProcurementItemEntity entitys : tableField107){ for (YysMaterialProcurementItemEntity entitys : tableField107) {
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setMaterialProcurementPlanId(entity.getId()); entitys.setMaterialProcurementPlanId(entity.getId());
if(isSave){ if (isSave) {
}else{ } else {
} }
yysMaterialProcurementItemService.saveOrUpdate(entitys); yysMaterialProcurementItemService.saveOrUpdate(entitys);
} }
//每次修改的时候去修改下 采购表的修改时间和创建用户 其次统计数量
entity.setLastModifyTime(DateUtil.getNowDate());
entity.setLastModifyUserId(userInfo.getUserId());
this.saveOrUpdate(entity);
} }
} }
} }

8
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceUpkeepController.java
Unescape View File

@ -183,6 +183,10 @@ public class YysDeviceUpkeepController {
} }
Map<String, Object> yysDeviceUpkeepMap = JsonUtil.entityToMap(entity); Map<String, Object> yysDeviceUpkeepMap = JsonUtil.entityToMap(entity);
yysDeviceUpkeepMap.put("id", yysDeviceUpkeepMap.get("id")); yysDeviceUpkeepMap.put("id", yysDeviceUpkeepMap.get("id"));
yysDeviceUpkeepMap.put("creatorUserId", userService.getInfo(yysDeviceUpkeepMap.get("creatorUserId").toString()).getRealName());
if (yysDeviceUpkeepMap.containsKey("lastModifyUserId")){
yysDeviceUpkeepMap.put("lastModifyUserId", userService.getInfo(yysDeviceUpkeepMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据 //副表数据
//子表数据 //子表数据
List<YysdeviceunkeeplogsEntity> yysdeviceunkeeplogsList = yysDeviceUpkeepService.getYysdeviceunkeeplogsList(entity.getId()); List<YysdeviceunkeeplogsEntity> yysdeviceunkeeplogsList = yysDeviceUpkeepService.getYysdeviceunkeeplogsList(entity.getId());
@ -208,7 +212,9 @@ public class YysDeviceUpkeepController {
Map<String, Object> yysDeviceUpkeepMap = JsonUtil.entityToMap(entity); Map<String, Object> yysDeviceUpkeepMap = JsonUtil.entityToMap(entity);
yysDeviceUpkeepMap.put("id", yysDeviceUpkeepMap.get("id")); yysDeviceUpkeepMap.put("id", yysDeviceUpkeepMap.get("id"));
yysDeviceUpkeepMap.put("creatorUserId", userService.getInfo(yysDeviceUpkeepMap.get("creatorUserId").toString()).getRealName()); yysDeviceUpkeepMap.put("creatorUserId", userService.getInfo(yysDeviceUpkeepMap.get("creatorUserId").toString()).getRealName());
yysDeviceUpkeepMap.put("lastModifyUserId", userService.getInfo(yysDeviceUpkeepMap.get("lastModifyUserId").toString()).getRealName()); if (yysDeviceUpkeepMap.containsKey("lastModifyUserId")){
yysDeviceUpkeepMap.put("lastModifyUserId", userService.getInfo(yysDeviceUpkeepMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据 //副表数据
//子表数据 //子表数据
List<YysdeviceunkeeplogsEntity> yysdeviceunkeeplogsList = yysDeviceUpkeepService.getYysdeviceunkeeplogsList(entity.getId()); List<YysdeviceunkeeplogsEntity> yysdeviceunkeeplogsList = yysDeviceUpkeepService.getYysdeviceunkeeplogsList(entity.getId());

306
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementPlanController.java
Unescape View File

@ -8,23 +8,30 @@ import jnpf.base.ActionResult;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
import jnpf.permission.service.UserService;
import jnpf.service.*; import jnpf.service.*;
import jnpf.entity.*; import jnpf.entity.*;
import jnpf.util.*; import jnpf.util.*;
import jnpf.model.yysmaterialprocurementplan.*; import jnpf.model.yysmaterialprocurementplan.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.*; import java.util.*;
import jnpf.annotation.JnpfField; import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO; import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO; import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity; import jnpf.base.entity.ProvinceEntity;
import java.io.IOException; import java.io.IOException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity; import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException; import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -36,7 +43,9 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import java.io.File; import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel; import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel; import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel; import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
@ -51,6 +60,7 @@ import org.springframework.transaction.annotation.Transactional;
/** /**
* YysMaterialProcurementPlan * YysMaterialProcurementPlan
*
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
@ -58,7 +68,7 @@ import org.springframework.transaction.annotation.Transactional;
*/ */
@Slf4j @Slf4j
@RestController @RestController
@Tag(name = "YysMaterialProcurementPlan" , description = "example") @Tag(name = "YysMaterialProcurementPlan", description = "example")
@RequestMapping("/api/example/YysMaterialProcurementPlan") @RequestMapping("/api/example/YysMaterialProcurementPlan")
public class YysMaterialProcurementPlanController { public class YysMaterialProcurementPlanController {
@ -78,28 +88,34 @@ public class YysMaterialProcurementPlanController {
@Autowired @Autowired
private ConfigValueUtil configValueUtil; private ConfigValueUtil configValueUtil;
@Resource
private UserService userService;
/** /**
* 列表 * 列表
* *
* @param yysMaterialProcurementPlanPagination * @param yysMaterialProcurementPlanPagination
* @return * @return
*/ */
@Operation(summary = "获取列表") @Operation(summary = "获取列表")
@PostMapping("/getList") @PostMapping("/getList")
public ActionResult list(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination)throws IOException{ public ActionResult list(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) throws IOException {
List<YysMaterialProcurementPlanEntity> list= yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination); List<YysMaterialProcurementPlanEntity> list = yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination);
List<Map<String, Object>> realList=new ArrayList<>(); List<Map<String, Object>> realList = new ArrayList<>();
for (YysMaterialProcurementPlanEntity entity : list) { for (YysMaterialProcurementPlanEntity entity : list) {
Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity); Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
//副表数据 if (StringUtils.isNoneBlank(yysMaterialProcurementPlanMap.get("creatorUserId").toString())) {
//子表数据 yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName());
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(),yysMaterialProcurementPlanPagination); }
yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); //副表数据
//子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(), yysMaterialProcurementPlanPagination);
yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
realList.add(yysMaterialProcurementPlanMap); realList.add(yysMaterialProcurementPlanMap);
} }
//数据转换 //数据转换
realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(),false); realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(), false);
//返回对象 //返回对象
PageListVO vo = new PageListVO(); PageListVO vo = new PageListVO();
@ -108,108 +124,110 @@ public class YysMaterialProcurementPlanController {
vo.setPagination(page); vo.setPagination(page);
return ActionResult.success(vo); return ActionResult.success(vo);
} }
/** /**
* 创建 * 创建
* *
* @param yysMaterialProcurementPlanForm * @param yysMaterialProcurementPlanForm
* @return * @return
*/ */
@PostMapping() @PostMapping()
@Operation(summary = "创建") @Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm) { public ActionResult create(@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm) {
String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm,0); String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm, 0);
if (StringUtil.isNotEmpty(b)){ if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b ); return ActionResult.fail(b);
} }
try{ try {
yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, null ,true); yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, null, true);
}catch(Exception e){ } catch (Exception e) {
return ActionResult.fail("新增数据失败"); return ActionResult.fail("新增数据失败");
} }
return ActionResult.success("创建成功"); return ActionResult.success("创建成功");
} }
/** /**
* 导出Excel * 导出Excel
* *
* @return * @return
*/ */
@Operation(summary = "导出Excel") @Operation(summary = "导出Excel")
@PostMapping("/Actions/Export") @PostMapping("/Actions/Export")
public ActionResult Export(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) throws IOException { public ActionResult Export(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) throws IOException {
if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())){ if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())) {
return ActionResult.fail("请选择导出字段"); return ActionResult.fail("请选择导出字段");
} }
List<YysMaterialProcurementPlanEntity> list= yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination); List<YysMaterialProcurementPlanEntity> list = yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination);
List<Map<String, Object>> realList=new ArrayList<>(); List<Map<String, Object>> realList = new ArrayList<>();
for (YysMaterialProcurementPlanEntity entity : list) { for (YysMaterialProcurementPlanEntity entity : list) {
Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity); Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(),yysMaterialProcurementPlanPagination); List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(), yysMaterialProcurementPlanPagination);
yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
realList.add(yysMaterialProcurementPlanMap); realList.add(yysMaterialProcurementPlanMap);
} }
//数据转换 //数据转换
realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(),false); realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(), false);
String[]keys=!StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())?yysMaterialProcurementPlanPagination.getSelectKey():new String[0]; String[] keys = !StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey()) ? yysMaterialProcurementPlanPagination.getSelectKey() : new String[0];
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo); DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), realList, keys, userInfo);
return ActionResult.success(vo); return ActionResult.success(vo);
} }
/** /**
* 导出表格方法 * 导出表格方法
*/ */
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){ public DownloadVO creatModelExcel(String path, List<Map<String, Object>> list, String[] keys, UserInfo userInfo) {
DownloadVO vo=DownloadVO.builder().build(); DownloadVO vo = DownloadVO.builder().build();
List<ExcelExportEntity> entitys=new ArrayList<>(); List<ExcelExportEntity> entitys = new ArrayList<>();
if(keys.length>0){ if (keys.length > 0) {
ExcelExportEntity tableField107ExcelEntity = new ExcelExportEntity("物料明细","tableField107"); ExcelExportEntity tableField107ExcelEntity = new ExcelExportEntity("物料明细", "tableField107");
List<ExcelExportEntity> tableField107List = new ArrayList<>(); List<ExcelExportEntity> tableField107List = new ArrayList<>();
for(String key:keys){ for (String key : keys) {
switch(key){ switch (key) {
case "procurementNumber" : case "procurementNumber":
entitys.add(new ExcelExportEntity("采购计划单号" ,"procurementNumber")); entitys.add(new ExcelExportEntity("采购计划单号", "procurementNumber"));
break; break;
case "procurementDate" : case "procurementDate":
entitys.add(new ExcelExportEntity("单据日期" ,"procurementDate")); entitys.add(new ExcelExportEntity("单据日期", "procurementDate"));
break; break;
case "procurementYearMonth" : case "procurementYearMonth":
entitys.add(new ExcelExportEntity("年月" ,"procurementYearMonth")); entitys.add(new ExcelExportEntity("年月", "procurementYearMonth"));
break; break;
case "planNumber" : case "planNumber":
entitys.add(new ExcelExportEntity("物料需求计划单号" ,"planNumber")); entitys.add(new ExcelExportEntity("物料需求计划单号", "planNumber"));
break; break;
case "reamrk" : case "reamrk":
entitys.add(new ExcelExportEntity("备注" ,"reamrk")); entitys.add(new ExcelExportEntity("备注", "reamrk"));
break; break;
case "tableField107-materialCode": case "tableField107-materialCode":
tableField107List.add(new ExcelExportEntity("物料编码" ,"materialCode")); tableField107List.add(new ExcelExportEntity("物料编码", "materialCode"));
break; break;
case "tableField107-materialName": case "tableField107-materialName":
tableField107List.add(new ExcelExportEntity("物料名称" ,"materialName")); tableField107List.add(new ExcelExportEntity("物料名称", "materialName"));
break; break;
case "tableField107-materialType": case "tableField107-materialType":
tableField107List.add(new ExcelExportEntity("物料类型" ,"materialType")); tableField107List.add(new ExcelExportEntity("物料类型", "materialType"));
break; break;
case "tableField107-specification": case "tableField107-specification":
tableField107List.add(new ExcelExportEntity("规格型号" ,"specification")); tableField107List.add(new ExcelExportEntity("规格型号", "specification"));
break; break;
case "tableField107-lackNumber": case "tableField107-lackNumber":
tableField107List.add(new ExcelExportEntity("欠缺量" ,"lackNumber")); tableField107List.add(new ExcelExportEntity("欠缺量", "lackNumber"));
break; break;
case "tableField107-procurementPlanNumber": case "tableField107-procurementPlanNumber":
tableField107List.add(new ExcelExportEntity("拟采购量" ,"procurementPlanNumber")); tableField107List.add(new ExcelExportEntity("拟采购量", "procurementPlanNumber"));
break; break;
case "tableField107-unit": case "tableField107-unit":
tableField107List.add(new ExcelExportEntity("计量单位" ,"unit")); tableField107List.add(new ExcelExportEntity("计量单位", "unit"));
break; break;
default: default:
break; break;
} }
} }
if(tableField107List.size() > 0){ if (tableField107List.size() > 0) {
tableField107ExcelEntity.setList(tableField107List); tableField107ExcelEntity.setList(tableField107List);
entitys.add(tableField107ExcelEntity); entitys.add(tableField107ExcelEntity);
} }
@ -217,10 +235,10 @@ public class YysMaterialProcurementPlanController {
ExportParams exportParams = new ExportParams(null, "表单信息"); ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF); exportParams.setType(ExcelType.XSSF);
try{ try {
@Cleanup Workbook workbook = new HSSFWorkbook(); @Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){ if (entitys.size() > 0) {
if (list.size()==0){ if (list.size() == 0) {
list.add(new HashMap<>()); list.add(new HashMap<>());
} }
//去除空数据 //去除空数据
@ -230,8 +248,8 @@ public class YysMaterialProcurementPlanController {
for (String key : keys) { for (String key : keys) {
//子表 //子表
if (key.toLowerCase().startsWith("tablefield")) { if (key.toLowerCase().startsWith("tablefield")) {
String tableField = key.substring(0, key.indexOf("-" )); String tableField = key.substring(0, key.indexOf("-"));
String field = key.substring(key.indexOf("-" ) + 1); String field = key.substring(key.indexOf("-") + 1);
Object o = map.get(tableField); Object o = map.get(tableField);
if (o != null) { if (o != null) {
List<Map<String, Object>> childList = (List<Map<String, Object>>) o; List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
@ -257,7 +275,7 @@ public class YysMaterialProcurementPlanController {
List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList(); List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) { if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList); entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList); dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
} }
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList); workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
@ -274,94 +292,110 @@ public class YysMaterialProcurementPlanController {
} }
return vo; return vo;
} }
/** /**
* 编辑 * 编辑
* @param id *
* @param yysMaterialProcurementPlanForm * @param id
* @return * @param yysMaterialProcurementPlanForm
*/ * @return
*/
@PutMapping("/{id}") @PutMapping("/{id}")
@Operation(summary = "更新") @Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm, public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,
@RequestParam(value = "isImport", required = false) boolean isImport){ @RequestParam(value = "isImport", required = false) boolean isImport) {
yysMaterialProcurementPlanForm.setId(id); yysMaterialProcurementPlanForm.setId(id);
if (!isImport) { if (!isImport) {
String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm,1); String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm, 1);
if (StringUtil.isNotEmpty(b)){ if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b ); return ActionResult.fail(b);
} }
} }
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if(entity!=null){ if (entity != null) {
try{ try {
yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm,id,false); yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, id, false);
}catch(Exception e){ } catch (Exception e) {
return ActionResult.fail("修改数据失败"); return ActionResult.fail("修改数据失败");
} }
return ActionResult.success("更新成功"); return ActionResult.success("更新成功");
}else{ } else {
return ActionResult.fail("更新失败，数据不存在"); return ActionResult.fail("更新失败，数据不存在");
} }
} }
/** /**
* 删除 * 删除
* @param id *
* @return * @param id
*/ * @return
*/
@Operation(summary = "删除") @Operation(summary = "删除")
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@Transactional @Transactional
public ActionResult delete(@PathVariable("id") String id){ public ActionResult delete(@PathVariable("id") String id) {
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if(entity!=null){ if (entity != null) {
//假删除 //假删除
entity.setDeleteMark(1); entity.setDeleteMark(1);
yysMaterialProcurementPlanService.update(id,entity); yysMaterialProcurementPlanService.update(id, entity);
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");
} }
/** /**
* 表单信息(详情页) * 表单信息(详情页)
* 详情页面使用-转换数据 * 详情页面使用-转换数据
* @param id *
* @return * @param id
*/ * @return
*/
@Operation(summary = "表单信息(详情页)") @Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}") @GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){ public ActionResult detailInfo(@PathVariable("id") String id) {
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if(entity==null){ if (entity == null) {
return ActionResult.fail("表单数据不存在！"); return ActionResult.fail("表单数据不存在！");
} }
Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity); Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName());
if (yysMaterialProcurementPlanMap.containsKey("lastModifyUserId")) {
yysMaterialProcurementPlanMap.put("lastModifyUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据 //副表数据
//子表数据 //子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId()); List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId());
yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialProcurementPlanMap,YysMaterialProcurementPlanConstant.getFormData(),"590930391657874309",false); yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialProcurementPlanMap, YysMaterialProcurementPlanConstant.getFormData(), "590930391657874309", false);
return ActionResult.success(yysMaterialProcurementPlanMap); return ActionResult.success(yysMaterialProcurementPlanMap);
} }
/** /**
* 获取详情(编辑页) * 获取详情(编辑页)
* 编辑页面使用-不转换数据 * 编辑页面使用-不转换数据
* @param id *
* @return * @param id
*/ * @return
*/
@Operation(summary = "信息") @Operation(summary = "信息")
@GetMapping("/{id}") @GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){ public ActionResult info(@PathVariable("id") String id) {
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if(entity==null){ if (entity == null) {
return ActionResult.fail("表单数据不存在！"); return ActionResult.fail("表单数据不存在！");
} }
Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity); Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName());
if (yysMaterialProcurementPlanMap.containsKey("lastModifyUserId")) {
yysMaterialProcurementPlanMap.put("lastModifyUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据 //副表数据
//子表数据 //子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId()); List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId());
yysMaterialProcurementPlanMap.put("yysMaterialProcurementItemList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); yysMaterialProcurementPlanMap.put("yysMaterialProcurementItemList", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialProcurementPlanMap,YysMaterialProcurementPlanConstant.getFormData(),YysMaterialProcurementPlanConstant.TABLEFIELDKEY,YysMaterialProcurementPlanConstant.TABLERENAMES); yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialProcurementPlanMap, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.TABLEFIELDKEY, YysMaterialProcurementPlanConstant.TABLERENAMES);
return ActionResult.success(yysMaterialProcurementPlanMap); return ActionResult.success(yysMaterialProcurementPlanMap);
} }

2
jnpf-java-boot/jnpf-web/src/views/yys/yysdayplan/index.vue
Unescape View File

@ -51,6 +51,8 @@
</el-form> </el-form>
</el-row> </el-row>
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border> :span-method="arraySpanMethod" border>
<el-table-column prop="manufactureTime" label="生产日期" align="center"> <el-table-column prop="manufactureTime" label="生产日期" align="center">

466
jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue
Unescape View File

@ -1,260 +1,242 @@
<template> <template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" <el-page-header @back="goBack" content="详情" />
content="详情"/> <div class="options">
<div class="options"> <el-button @click="goBack">取 消</el-button>
<el-button @click="goBack">取 消</el-button> </div>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
<jnpf-form-tip-item label="设备编码"
prop="deviceCode" >
<p>{{dataForm.deviceCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备名称"
prop="deviceName" >
<p>{{dataForm.deviceName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="购入日期"
prop="buyTime" >
<p>{{dataForm.buyTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="所属部门"
prop="deviceDept" >
<p>{{dataForm.deviceDept}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="维修次数"
prop="repairsNum" >
<JnpfNumber v-model="dataForm.repairsNum"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="保养次数"
prop="unkeepNum" >
<JnpfNumber v-model="dataForm.unkeepNum"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>检修记录</h2>
</div> </div>
<el-table :data="dataForm.tableField108" size='mini' > <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-table-column type="index" width="50" label="序号" align="center" /> <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<el-table-column prop="unkeepType" label="维保类型" > <template v-if="!loading">
<template slot-scope="scope"> <el-col :span="8">
<p>{{ scope.row.unkeepType}}</p> <jnpf-form-tip-item label="设备编码" prop="deviceCode">
</template> <p>{{ dataForm.deviceCode }}</p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="startTime" label="维保开始时间" > </el-col>
<template slot-scope="scope"> <el-col :span="8">
<p>{{scope.row.startTime}}</p> <jnpf-form-tip-item label="设备名称" prop="deviceName">
</template> <p>{{ dataForm.deviceName }}</p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="endTime" label="维保结束时间" > </el-col>
<template slot-scope="scope"> <el-col :span="8">
<p>{{scope.row.endTime}}</p> <jnpf-form-tip-item label="购入日期" prop="buyTime">
</template> <p>{{ dataForm.buyTime }}</p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="hours" label="总耗时" > </el-col>
<template slot-scope="scope"> <el-col :span="8">
<JnpfNumber v-model="scope.row.hours" <jnpf-form-tip-item label="所属部门" prop="deviceDept">
placeholder="总耗时" disabled <p>{{ dataForm.deviceDept }}</p>
:step="1" > </jnpf-form-tip-item>
</JnpfNumber> </el-col>
</template> <el-col :span="8">
</el-table-column> <jnpf-form-tip-item label="维修次数" prop="repairsNum">
<el-table-column prop="unkeepDetails" label="维保详细内容" > <JnpfNumber v-model="dataForm.repairsNum" placeholder="数字文本" disabled :step="1">
<template slot-scope="scope"> </JnpfNumber>
<p>{{scope.row.unkeepDetails}}</p> </jnpf-form-tip-item>
</template> </el-col>
</el-table-column> <el-col :span="8">
<el-table-column prop="solution" label="解决办法" > <jnpf-form-tip-item label="保养次数" prop="unkeepNum">
<template slot-scope="scope"> <JnpfNumber v-model="dataForm.unkeepNum" placeholder="数字文本" disabled :step="1">
<p>{{scope.row.solution}}</p> </JnpfNumber>
</template> </jnpf-form-tip-item>
</el-table-column> </el-col>
<el-table-column prop="unkeepMember" label="维保人员" > <el-col :span="24">
<template slot-scope="scope"> <jnpf-form-tip-item label-width="0">
<p>{{scope.row.unkeepMember}}</p> <div class="JNPF-common-title">
</template> <h2>检修记录</h2>
</el-table-column> </div>
<el-table-column prop="changePartName" label="更换零配件名称" > <el-table :data="dataForm.tableField108" size='mini'>
<template slot-scope="scope"> <el-table-column type="index" width="50" label="序号" align="center" />
<p>{{scope.row.changePartName}}</p> <el-table-column prop="unkeepType" label="维保类型">
</template> <template slot-scope="scope">
</el-table-column> <p>{{ scope.row.unkeepType }}</p>
<el-table-column prop="models" label="规格型号" > </template>
<template slot-scope="scope"> </el-table-column>
<p>{{scope.row.models}}</p> <el-table-column prop="startTime" label="维保开始时间">
</template> <template slot-scope="scope">
</el-table-column> <p>{{ scope.row.startTime }}</p>
<el-table-column prop="changNum" label="更换数量" > </template>
<template slot-scope="scope"> </el-table-column>
<JnpfNumber v-model="scope.row.changNum" <el-table-column prop="endTime" label="维保结束时间">
placeholder="更换数量" disabled <template slot-scope="scope">
:step="1" > <p>{{ scope.row.endTime }}</p>
</JnpfNumber> </template>
</template> </el-table-column>
</el-table-column> <el-table-column prop="hours" label="总耗时">
<el-table-column prop="unkeepDeviceStatus" label="维保后设备状态" > <template slot-scope="scope">
<template slot-scope="scope"> <JnpfNumber v-model="scope.row.hours" placeholder="总耗时" disabled :step="1">
<p>{{ scope.row.unkeepDeviceStatus}}</p> </JnpfNumber>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="leader" label="操作组长" > <el-table-column prop="unkeepDetails" label="维保详细内容">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.leader}}</p> <p>{{ scope.row.unkeepDetails }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="estimatedTime" label="预估下次维保时间" > <el-table-column prop="solution" label="解决办法">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.estimatedTime}}</p> <p>{{ scope.row.solution }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remarks" label="备注" > <el-table-column prop="unkeepMember" label="维保人员">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.remarks}}</p> <p>{{ scope.row.unkeepMember }}</p>
</template> </template>
</el-table-column> </el-table-column>
</el-table> <el-table-column prop="changePartName" label="更换零配件名称">
</jnpf-form-tip-item> <template slot-scope="scope">
</el-col> <p>{{ scope.row.changePartName }}</p>
<el-col :span="12" > </template>
<jnpf-form-tip-item label="创建人" </el-table-column>
prop="creatorUserId" > <el-table-column prop="models" label="规格型号">
<p>{{dataForm.creatorUserId}}</p> <template slot-scope="scope">
</jnpf-form-tip-item> <p>{{ scope.row.models }}</p>
</el-col> </template>
<el-col :span="12" > </el-table-column>
<jnpf-form-tip-item label="创建时间" <el-table-column prop="changNum" label="更换数量">
prop="creatorTime" > <template slot-scope="scope">
<p>{{dataForm.creatorTime}}</p> <JnpfNumber v-model="scope.row.changNum" placeholder="更换数量" disabled
</jnpf-form-tip-item> :step="1">
</el-col> </JnpfNumber>
<el-col :span="12" > </template>
<jnpf-form-tip-item label="修改人" </el-table-column>
prop="lastModifyUserId" > <el-table-column prop="unkeepDeviceStatus" label="维保后设备状态">
<p>{{dataForm.lastModifyUserId}}</p> <template slot-scope="scope">
</jnpf-form-tip-item> <p>{{ scope.row.unkeepDeviceStatus }}</p>
</el-col> </template>
<el-col :span="12" > </el-table-column>
<jnpf-form-tip-item label="修改时间" <el-table-column prop="leader" label="操作组长">
prop="lastModifyTime" > <template slot-scope="scope">
<p>{{dataForm.lastModifyTime}}</p> <p>{{ scope.row.leader }}</p>
</jnpf-form-tip-item> </template>
</el-col> </el-table-column>
</template> <el-table-column prop="estimatedTime" label="预估下次维保时间">
</el-form> <template slot-scope="scope">
</el-row> <p>{{ scope.row.estimatedTime }}</p>
</div> </template>
</transition> </el-table-column>
<el-table-column prop="remarks" label="备注">
<template slot-scope="scope">
<p>{{ scope.row.remarks }}</p>
</template>
</el-table-column>
</el-table>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建人" prop="creatorUserId">
<p>{{ dataForm.creatorUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<p>{{ dataForm.creatorTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改人" prop="lastModifyUserId">
<p>{{ dataForm.lastModifyUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<p>{{ dataForm.lastModifyTime }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
deviceCode : '', deviceCode: '',
deviceName : '', deviceName: '',
buyTime : '', buyTime: '',
deviceDept : '', deviceDept: '',
repairsNum : 0, repairsNum: 0,
unkeepNum : 0, unkeepNum: 0,
creatorUserId : '', creatorUserId: '',
creatorTime : '', creatorTime: '',
lastModifyUserId : '', lastModifyUserId: '',
lastModifyTime : '', lastModifyTime: '',
enabledStatus : "", enabledStatus: "",
yysdeviceunkeeplogsList:[], yysdeviceunkeeplogsList: [],
}, },
enabledStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"未启用","id":"2"}], enabledStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "未启用", "id": "2" }],
enabledStatusProps:{"label":"fullName","value":"id" }, enabledStatusProps: { "label": "fullName", "value": "id" },
unkeepTypeOptions:[{"fullName":"维修","id":"1"},{"fullName":"保养","id":"2"}], unkeepTypeOptions: [{ "fullName": "维修", "id": "1" }, { "fullName": "保养", "id": "2" }],
unkeepTypeProps:{"label":"fullName","value":"id" }, unkeepTypeProps: { "label": "fullName", "value": "id" },
unkeepDeviceStatusOptions:[{"fullName":"运行正常","id":"1"},{"fullName":"运行异常","id":"2"}], unkeepDeviceStatusOptions: [{ "fullName": "运行正常", "id": "1" }, { "fullName": "运行异常", "id": "2" }],
unkeepDeviceStatusProps:{"label":"fullName","value":"id" }, unkeepDeviceStatusProps: { "label": "fullName", "value": "id" },
} }
},
computed: {},
watch: {},
created() {
},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
}, },
computed: {},
watch: {},
created() {
goBack() {
this.$emit('refresh')
}, },
mounted() {}, init(id) {
methods: { this.dataForm.id = id || 0;
toDetail(defaultValue, modelId) { this.visible = true;
if (!defaultValue) return this.$nextTick(() => {
getConfigData(modelId).then(res => { if (this.dataForm.id) {
if (!res.data || !res.data.formData) return this.loading = true
let formData = JSON.parse(res.data.formData) request({
formData.popupType = 'general' url: '/api/example/YysDeviceUpkeep/detail/' + this.dataForm.id,
this.detailVisible = true method: 'get'
this.$nextTick(() => { }).then(res => {
this.$refs.Detail.init(formData, modelId, defaultValue) this.dataInfo(res.data)
this.loading = false
}) })
}) }
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysDeviceUpkeep/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
}) })
},
}, },
} },
}
</script> </script>

339
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue
Unescape View File

@ -1,177 +1,198 @@
<template> <template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" <el-page-header @back="goBack" content="详情" />
content="详情"/> <div class="options">
<div class="options"> <el-button @click="goBack">取 消</el-button>
<el-button @click="goBack">取 消</el-button> </div>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
<jnpf-form-tip-item label="采购计划单号"
prop="procurementNumber" >
<p>{{dataForm.procurementNumber}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="单据日期"
prop="procurementDate" >
<p>{{dataForm.procurementDate}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="年月"
prop="procurementYearMonth" >
<p>{{dataForm.procurementYearMonth}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="物料需求计划单号"
prop="planNumber" >
<p>{{dataForm.planNumber}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="备注"
prop="reamrk" >
<p>{{dataForm.reamrk}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>物料明细</h2>
</div> </div>
<el-table :data="dataForm.tableField107" size='mini' > <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-table-column type="index" width="50" label="序号" align="center" /> <el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right">
<el-table-column prop="materialCode" label="物料编码" > <template v-if="!loading">
<template slot-scope="scope"> <el-col :span="8">
<p>{{scope.row.materialCode}}</p> <jnpf-form-tip-item label="采购计划单号" prop="procurementNumber">
</template> <p>{{ dataForm.procurementNumber }}</p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="materialName" label="物料名称" > </el-col>
<template slot-scope="scope"> <el-col :span="8">
<p>{{scope.row.materialName}}</p> <jnpf-form-tip-item label="单据日期" prop="procurementDate">
</template> <p>{{ dataForm.procurementDate }}</p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="materialType" label="物料类型" > </el-col>
<template slot-scope="scope"> <el-col :span="8">
<p>{{scope.row.materialType}}</p> <jnpf-form-tip-item label="年月" prop="procurementYearMonth">
</template> <p>{{ dataForm.procurementYearMonth }}</p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="specification" label="规格型号" > </el-col>
<template slot-scope="scope"> <el-col :span="8">
<p>{{scope.row.specification}}</p> <jnpf-form-tip-item label="物料需求计划单号" prop="planNumber">
</template> <p>{{ dataForm.planNumber }}</p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="lackNumber" label="欠缺量" > </el-col>
<template slot-scope="scope"> <el-col :span="24">
<JnpfNumber v-model="scope.row.lackNumber" <jnpf-form-tip-item label="备注" prop="reamrk">
placeholder="数字文本" disabled <p>{{ dataForm.reamrk }}</p>
:step="1" > </jnpf-form-tip-item>
</JnpfNumber> </el-col>
</template> <el-col :span="24">
</el-table-column> <jnpf-form-tip-item label-width="0">
<el-table-column prop="procurementPlanNumber" label="拟采购量" > <div class="JNPF-common-title">
<template slot-scope="scope"> <h2>物料明细</h2>
<JnpfNumber v-model="scope.row.procurementPlanNumber" </div>
placeholder="数字文本" disabled <el-table :data="dataForm.tableField107" size='mini'>
:step="1" > <el-table-column type="index" width="50" label="序号" align="center" />
</JnpfNumber> <el-table-column prop="materialCode" label="物料编码">
</template> <template slot-scope="scope">
</el-table-column> <p>{{ scope.row.materialCode }}</p>
<el-table-column prop="unit" label="计量单位" > </template>
<template slot-scope="scope"> </el-table-column>
<p>{{scope.row.unit}}</p> <el-table-column prop="materialName" label="物料名称">
</template> <template slot-scope="scope">
</el-table-column> <p>{{ scope.row.materialName }}</p>
</el-table> </template>
</jnpf-form-tip-item> </el-table-column>
</el-col> <el-table-column prop="materialType" label="物料类型">
</template> <template slot-scope="scope">
</el-form> <p>{{ scope.row.materialType }}</p>
</el-row> </template>
</div> </el-table-column>
</transition> <el-table-column prop="specification" label="规格型号">
<template slot-scope="scope">
<p>{{ scope.row.specification }}</p>
</template>
</el-table-column>
<el-table-column prop="lackNumber" label="欠缺量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.lackNumber" placeholder="数字文本" disabled
:step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="procurementPlanNumber" label="拟采购量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.procurementPlanNumber" placeholder="数字文本"
disabled :step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="unit" label="计量单位">
<template slot-scope="scope">
<p>{{ scope.row.unit }}</p>
</template>
</el-table-column>
</el-table>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建人" prop="creatorUserId">
<p>{{ dataForm.creatorUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<p>{{ formatDeliveryTime(dataForm.creatorTime) }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改人" prop="lastModifyUserId">
<p>{{ dataForm.lastModifyUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<p>{{ formatDeliveryTime(dataForm.lastModifyTime) }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
procurementNumber : '', procurementNumber: '',
procurementDate : '', procurementDate: '',
procurementYearMonth : '', procurementYearMonth: '',
planNumber : "", planNumber: "",
reamrk : '', reamrk: '',
yysmaterialprocurementitemList:[], yysmaterialprocurementitemList: [],
}, },
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {
},
mounted() { },
methods: {
formatDeliveryTime(creatorTime) {
if (creatorTime != null) {
const date = new Date(creatorTime);
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
}
}, },
mounted() {}, toDetail(defaultValue, modelId) {
methods: { if (!defaultValue) return
toDetail(defaultValue, modelId) { getConfigData(modelId).then(res => {
if (!defaultValue) return if (!res.data || !res.data.formData) return
getConfigData(modelId).then(res => { let formData = JSON.parse(res.data.formData)
if (!res.data || !res.data.formData) return formData.popupType = 'general'
let formData = JSON.parse(res.data.formData) this.detailVisible = true
formData.popupType = 'general' this.$nextTick(() => {
this.detailVisible = true this.$refs.Detail.init(formData, modelId, defaultValue)
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
}) })
}, })
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
}, this.dataForm = _dataAll
},
goBack() { goBack() {
this.$emit('refresh') this.$emit('refresh')
}, },
init(id) { init(id) {
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
url: '/api/example/YysMaterialProcurementPlan/detail/'+this.dataForm.id, url: '/api/example/YysMaterialProcurementPlan/detail/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}) })
} }
}) })
},
}, },
} },
}
</script> </script>

1125
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
View File

File diff suppressed because it is too large Load Diff

810
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/index.vue
Unescape View File

@ -1,36 +1,27 @@
<template> <template>
<div class="JNPF-common-layout"> <div class="JNPF-common-layout">
<div class="JNPF-common-layout-center"> <div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16"> <el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="采购计划单号"> <el-form-item label="采购计划单号">
<el-input v-model="query.procurementNumber" placeholder="请输入" clearable> </el-input> <el-input v-model="query.procurementNumber" placeholder="请输入" clearable> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="年月"> <el-form-item label="年月">
<JnpfDateRangePicker v-model="query.procurementYearMonth" <JnpfDateRangePicker v-model="query.procurementYearMonth" format="yyyy-MM"
format="yyyy-MM" startPlaceholder="开始日期" startPlaceholder="开始日期" endPlaceholder="结束日期">
endPlaceholder="结束日期" > </JnpfDateRangePicker>
</JnpfDateRangePicker> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="6">
<el-col :span="6"> <el-form-item label="单据日期">
<el-form-item label="单据日期"> <JnpfDateRangePicker v-model="query.procurementDate" format="yyyy-MM-dd"
<JnpfDateRangePicker v-model="query.procurementDate" startPlaceholder="开始日期" endPlaceholder="结束日期">
format="yyyy-MM-dd" startPlaceholder="开始日期" </JnpfDateRangePicker>
endPlaceholder="结束日期" > </el-form-item>
</JnpfDateRangePicker> </el-col>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@ -42,438 +33,439 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增 <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
</el-button> @click="addOrUpdateHandle()">新增
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'" >导出 </el-button>
</el-button> <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
</div> v-has="'btn_download'">导出
<div class="JNPF-common-head-right"> </el-button>
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div> </div>
<!-- <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div> -->
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" :span-method="arraySpanMethod" border>
<el-table-column prop="procurementYearMonth" label="年月" align="center">
> </el-table-column>
<el-table-column <el-table-column prop="procurementNumber" label="采购计划单号" align="center">
prop="procurementNumber" </el-table-column>
label="采购计划单号" align="left" <el-table-column prop="planNumber" label="物料需求计划单号" align="center">
> </el-table-column>
</el-table-column> <el-table-column prop="procurementDate" label="单据日期" align="center">
<el-table-column </el-table-column>
prop="procurementDate" <el-table-column prop="creatorUserId" label="创建人" align="center">
label="单据日期" align="left" </el-table-column>
> <el-table-column prop="creatorTime" label="创建日期" align="center" :formatter="formatDeliveryTime">
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="单据状态" prop="procurementStatus" align="center">
prop="procurementYearMonth" <template slot-scope="scope">
label="年月" align="left" <el-tag v-if="scope.row.procurementStatus == '1'">已保存</el-tag>
> <el-tag type="success" v-else-if="scope.row.procurementStatus == '2'">已提交</el-tag>
</el-table-column> </template>
<el-table-column </el-table-column>
prop="planNumber" <el-table-column label="操作" fixed="right" width="150">
label="物料需求计划单号" align="left" <template slot-scope="scope">
> <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-table-column> </el-button>
<el-table-column <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
prop="reamrk" @click="handleDel(scope.row.id)">删除
label="备注" align="left" </el-button>
> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-table-column> </el-button>
<el-table-column label="操作" </template>
fixed="right" width="150" > </el-table-column>
<template slot-scope="scope" >
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'" >编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" v-has="'btn_detail'"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
</div> @pagination="initData" />
</div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" /> @superQuery="superQuery" />
</div> </div>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form' import JNPFForm from './form'
import Detail from './Detail' import Detail from './Detail'
import ExportBox from '@/components/ExportBox' import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail' import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user' import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList' import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery' import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson' import superQueryJson from './superQueryJson'
export default { export default {
components: { components: {
JNPFForm, JNPFForm,
Detail, Detail,
ExportBox,ToFormDetail , SuperQuery ExportBox, ToFormDetail, SuperQuery
}, },
data() { data() {
return { return {
keyword:'', keyword: '',
expandsTree: true, expandsTree: true,
refreshTree: true, refreshTree: true,
toFormDetailVisible:false, toFormDetailVisible: false,
expandObj:{}, expandObj: {},
columnOptions: [], columnOptions: [],
mergeList: [], mergeList: [],
exportList:[], exportList: [],
columnList, columnList,
superQueryVisible: false, superQueryVisible: false,
superQueryJson, superQueryJson,
uploadBoxVisible: false, uploadBoxVisible: false,
detailVisible: false, detailVisible: false,
query: { query: {
procurementNumber:undefined, procurementNumber: undefined,
procurementYearMonth:undefined, procurementYearMonth: undefined,
procurementDate:undefined, procurementDate: undefined,
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
label: 'fullName', label: 'fullName',
value: 'id', value: 'id',
isLeaf: 'isLeaf' isLeaf: 'isLeaf'
}, },
list: [], list: [],
listLoading: true, listLoading: true,
total: 0, total: 0,
queryData: {}, queryData: {},
listQuery: { listQuery: {
superQueryJson: '', superQueryJson: '',
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
sort: "desc", sort: "desc",
sidx: "procurementDate", sidx: "procurementDate",
}, },
formVisible: false, formVisible: false,
flowVisible: false, flowVisible: false,
flowListVisible: false, flowListVisible: false,
flowList: [], flowList: [],
exportBoxVisible: false, exportBoxVisible: false,
interfaceRes: { interfaceRes: {
planNumber:[] , planNumber: [],
}, },
} }
}, },
computed: { computed: {
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),
menuId() { menuId() {
return this.$route.meta.modelId || '' return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
formatDeliveryTime(row, column) {
if (row.creatorTime != null) {
const date = new Date(row.creatorTime);
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
} }
}, },
created() { toDetail(defaultValue, modelId) {
this.getColumnList(), if (!defaultValue) return
this.initSearchDataAndListData() getConfigData(modelId).then(res => {
this.queryData = JSON.parse(JSON.stringify(this.query)) if (!res.data || !res.data.formData) return
}, let formData = JSON.parse(res.data.formData)
methods: { formData.popupType = 'general'
toDetail(defaultValue, modelId) { this.toFormDetailVisible = true
if (!defaultValue) return this.$nextTick(() => {
getConfigData(modelId).then(res => { this.$refs.toFormDetail.init(formData, modelId, defaultValue)
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
}) })
}, })
toggleTreeExpand(expands) { },
this.refreshTree = false toggleTreeExpand(expands) {
this.expandsTree = expands this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => { this.$nextTick(() => {
this.refreshTree = true this.$refs.treeBox.setCurrentKey(null)
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
}) })
}, })
filterNode(value, data) { },
if (!value) return true; filterNode(value, data) {
return data[this.treeProps.label].indexOf(value) !== -1; if (!value) return true;
}, return data[this.treeProps.label].indexOf(value) !== -1;
loadNode(node, resolve) { },
const nodeData = node.data loadNode(node, resolve) {
const config ={ const nodeData = node.data
treeInterfaceId:"", const config = {
treeTemplateJson:[] treeInterfaceId: "",
} treeTemplateJson: []
if (config.treeInterfaceId) { }
//这里是为了拿到参数中关联的字段的值，后端自行拿 if (config.treeInterfaceId) {
if (config.treeTemplateJson && config.treeTemplateJson.length) { //这里是为了拿到参数中关联的字段的值，后端自行拿
for (let i = 0; i < config.treeTemplateJson.length; i++) { if (config.treeTemplateJson && config.treeTemplateJson.length) {
const element = config.treeTemplateJson[i]; for (let i = 0; i < config.treeTemplateJson.length; i++) {
element.defaultValue = nodeData[element.relationField] || '' const element = config.treeTemplateJson[i];
} element.defaultValue = nodeData[element.relationField] || ''
}
//参数
let query = {
paramList: config.treeTemplateJson || [],
}
//接口
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
},
getColumnList() {
// 没有开启权限
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
} }
} }
this.getMergeList(list) //参数
this.getExportList(list) let query = {
return list paramList: config.treeTemplateJson || [],
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
} }
}, //接口
getMergeList(list) { getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let newList = JSON.parse(JSON.stringify(list)) let data = res.data
newList.forEach(item => { if (Array.isArray(data)) {
if (item.children && item.children.length) { resolve(data);
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length ) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else { } else {
this.mergeList.push({ resolve([]);
prop: item.prop,
rowspan: 1,
colspan: 1
})
} }
}) })
}, }
getExportList(list) { },
let exportList = [] getColumnList() {
for (let i = 0; i < list.length; i++) { // 没有开启权限
if (list[i].jnpfKey === 'table') { this.columnOptions = this.transformColumnList(this.columnList)
for (let j = 0; j < list[i].children.length; j++) { },
exportList.push(list[i].children[j]) transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
} }
} else {
exportList.push(list[i])
} }
} }
this.exportList = exportList }
}, this.getMergeList(list)
goDetail(id){ this.getExportList(list)
this.detailVisible = true return list
this.$nextTick(() => { },
this.$refs.Detail.init(id) arraySpanMethod({ column }) {
}) for (let i = 0; i < this.mergeList.length; i++) {
}, if (column.property == this.mergeList[i].prop) {
sortChange({column, prop, order}) { return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' }
this.listQuery.sidx = !order ? '' : prop }
this.initData() },
}, getMergeList(list) {
async initSearchDataAndListData() { let newList = JSON.parse(JSON.stringify(list))
await this.initSearchData() newList.forEach(item => {
this.initData() if (item.children && item.children.length) {
}, let child = {
//初始化查询的默认数据 prop: item.prop + '-child-first'
async initSearchData() { }
}, item.children.unshift(child)
initData() { }
this.listLoading = true; })
let _query = { newList.forEach(item => {
...this.listQuery, if (item.children && item.children.length) {
...this.query, item.children.forEach((child, index) => {
keyword: this.keyword, if (index == 0) {
dataType: 0, this.mergeList.push({
menuId:this.menuId, prop: child.prop,
moduleId:'590930391657874309', rowspan: 1,
type:1, colspan: item.children.length
}; })
request({ } else {
url: `/api/example/YysMaterialProcurementPlan/getList`, this.mergeList.push({
method: 'post', prop: child.prop,
data: _query rowspan: 0,
}).then(res => { colspan: 0
var _list =res.data.list; })
this.list = _list.map(o => ({ }
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysMaterialProcurementPlan/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
}) })
}).catch(() => { } else {
}); this.mergeList.push({
}, prop: item.prop,
handelUpload(){ rowspan: 1,
this.uploadBoxVisible = true colspan: 1
this.$nextTick(() => {
this.$refs.UploadBox.init("","example/YysMaterialProcurementPlan")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
}) })
}, }
superQuery(queryJson) { })
this.listQuery.superQueryJson = queryJson },
this.listQuery.currentPage = 1 getExportList(list) {
this.initData() let exportList = []
}, for (let i = 0; i < list.length; i++) {
addOrUpdateHandle(row, isDetail) { if (list[i].jnpfKey === 'table') {
let id = row?row.id:"" for (let j = 0; j < list[i].children.length; j++) {
this.formVisible = true exportList.push(list[i].children[j])
this.$nextTick(() => { }
this.$refs.JNPFForm.init(id, isDetail,this.list) } else {
}) exportList.push(list[i])
}, }
exportData() { }
this.exportBoxVisible = true this.exportList = exportList
this.$nextTick(() => { },
this.$refs.ExportBox.init(this.exportList) goDetail(id) {
}) this.detailVisible = true
}, this.$nextTick(() => {
download(data) { this.$refs.Detail.init(id)
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} })
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//初始化查询的默认数据
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '590930391657874309',
type: 1,
};
request({
url: `/api/example/YysMaterialProcurementPlan/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({ request({
url: `/api/example/YysMaterialProcurementPlan/Actions/Export`, url: `/api/example/YysMaterialProcurementPlan/${id}`,
method: 'post', method: 'DELETE'
data: query
}).then(res => { }).then(res => {
if (!res.data.url) return this.$message({
this.jnpf.downloadFile(res.data.url) type: 'success',
this.$refs.ExportBox.visible = false message: res.msg,
this.exportBoxVisible = false onClose: () => {
this.initData()
}
});
}) })
}, }).catch(() => {
search() { });
this.listQuery.currentPage=1 },
this.listQuery.pageSize=20 handelUpload() {
this.listQuery.sort="desc" this.uploadBoxVisible = true
this.listQuery.sidx="procurementDate" this.$nextTick(() => {
this.initData() this.$refs.UploadBox.init("", "example/YysMaterialProcurementPlan")
}, })
refresh(isrRefresh) { },
this.formVisible = false openSuperQuery() {
if (isrRefresh) this.reset() this.superQueryVisible = true
}, this.$nextTick(() => {
reset() { this.$refs.SuperQuery.init()
this.query = JSON.parse(JSON.stringify(this.queryData)) })
this.search() },
}, superQuery(queryJson) {
colseFlow(isrRefresh) { this.listQuery.superQueryJson = queryJson
this.flowVisible = false this.listQuery.currentPage = 1
if (isrRefresh) this.reset() this.initData()
}, },
} addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/example/YysMaterialProcurementPlan/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = "procurementDate"
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
} }
}
</script> </script>

359
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/Detail.vue
Unescape View File

@ -1,203 +1,192 @@
<template> <template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" <el-page-header @back="goBack" content="详情" />
content="详情"/> <div class="options">
<div class="options"> <el-button @click="goBack">取 消</el-button>
<el-button @click="goBack">取 消</el-button> </div>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right" >
<template v-if="!loading">
<el-col :span="12" >
<jnpf-form-tip-item label="物料需求计划单号"
prop="planNumber" >
<p>{{dataForm.planNumber}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" >
<jnpf-form-tip-item label="年月"
prop="planYearMonth" >
<p>{{dataForm.planYearMonth}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" >
<jnpf-form-tip-item label="单据日期"
prop="orderDate" >
<p>{{dataForm.orderDate}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" >
<jnpf-form-tip-item label="是否生成采购计划"
prop="isCreatePlan" >
<p>{{ dataForm.isCreatePlan }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="备注"
prop="reamrk" >
<p>{{dataForm.reamrk}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>设计子表</h2>
</div> </div>
<el-table :data="dataForm.tableField119" size='mini' > <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-table-column type="index" width="50" label="序号" align="center" /> <el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right">
<el-table-column prop="materialCode" label="物料编码" > <template v-if="!loading">
<template slot-scope="scope"> <el-col :span="12">
<p>{{scope.row.materialCode}}</p> <jnpf-form-tip-item label="物料需求计划单号" prop="planNumber">
</template> <p>{{ dataForm.planNumber }}</p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="materialName" label="物料名称" > </el-col>
<template slot-scope="scope"> <el-col :span="12">
<p>{{scope.row.materialName}}</p> <jnpf-form-tip-item label="年月" prop="planYearMonth">
</template> <p>{{ dataForm.planYearMonth }}</p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="materialType" label="物料类型" > </el-col>
<template slot-scope="scope"> <el-col :span="12">
<p>{{scope.row.materialType}}</p> <jnpf-form-tip-item label="单据日期" prop="orderDate">
</template> <p>{{ dataForm.orderDate }}</p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="specification" label="规格型号" > </el-col>
<template slot-scope="scope"> <el-col :span="12">
<p>{{scope.row.specification}}</p> <jnpf-form-tip-item label="是否生成采购计划" prop="isCreatePlan">
</template> <p>{{ dataForm.isCreatePlan }} </p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="unit" label="计量单位" > </el-col>
<template slot-scope="scope"> <el-col :span="24">
<p>{{scope.row.unit}}</p> <jnpf-form-tip-item label="备注" prop="reamrk">
</template> <p>{{ dataForm.reamrk }}</p>
</el-table-column> </jnpf-form-tip-item>
<el-table-column prop="requirementNumber" label="需求数量" > </el-col>
<template slot-scope="scope"> <el-col :span="24">
<JnpfNumber v-model="scope.row.requirementNumber" <jnpf-form-tip-item label-width="0">
placeholder="数字文本" disabled <div class="JNPF-common-title">
:step="1" > <h2>物料明细</h2>
</JnpfNumber> </div>
</template> <el-table :data="dataForm.tableField119" size='mini'>
</el-table-column> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="inventoryNumber" label="库存" > <el-table-column prop="materialCode" label="物料编码">
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfNumber v-model="scope.row.inventoryNumber" <p>{{ scope.row.materialCode }}</p>
placeholder="数字文本" disabled </template>
:step="1" > </el-table-column>
</JnpfNumber> <el-table-column prop="materialName" label="物料名称">
</template> <template slot-scope="scope">
</el-table-column> <p>{{ scope.row.materialName }}</p>
<el-table-column prop="inventorySafetyNumber" label="库存安全" > </template>
<template slot-scope="scope"> </el-table-column>
<JnpfNumber v-model="scope.row.inventorySafetyNumber" <el-table-column prop="materialType" label="物料类型">
placeholder="数字文本" disabled <template slot-scope="scope">
:step="1" > <p>{{ scope.row.materialType }}</p>
</JnpfNumber> </template>
</template> </el-table-column>
</el-table-column> <el-table-column prop="specification" label="规格型号">
<el-table-column prop="notIntoNumber" label="采购未入库" > <template slot-scope="scope">
<template slot-scope="scope"> <p>{{ scope.row.specification }}</p>
<JnpfNumber v-model="scope.row.notIntoNumber" </template>
placeholder="数字文本" disabled </el-table-column>
:step="1" > <el-table-column prop="unit" label="计量单位">
</JnpfNumber> <template slot-scope="scope">
</template> <p>{{ scope.row.unit }}</p>
</el-table-column> </template>
<el-table-column prop="lackNumber" label="欠缺量" > </el-table-column>
<template slot-scope="scope"> <el-table-column prop="requirementNumber" label="需求数量">
<JnpfNumber v-model="scope.row.lackNumber" <template slot-scope="scope">
placeholder="数字文本" disabled <JnpfNumber v-model="scope.row.requirementNumber" placeholder="数字文本"
:step="1" > disabled :step="1">
</JnpfNumber> </JnpfNumber>
</template> </template>
</el-table-column> </el-table-column>
</el-table> <el-table-column prop="inventoryNumber" label="库存">
</jnpf-form-tip-item> <template slot-scope="scope">
</el-col> <JnpfNumber v-model="scope.row.inventoryNumber" placeholder="数字文本" disabled
</template> :step="1">
</el-form> </JnpfNumber>
</el-row> </template>
</div> </el-table-column>
</transition> <el-table-column prop="inventorySafetyNumber" label="库存安全">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.inventorySafetyNumber" placeholder="数字文本"
disabled :step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="notIntoNumber" label="采购未入库">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.notIntoNumber" placeholder="数字文本" disabled
:step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="lackNumber" label="欠缺量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.lackNumber" placeholder="数字文本" disabled
:step="1">
</JnpfNumber>
</template>
</el-table-column>
</el-table>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
planNumber : '', planNumber: '',
planYearMonth : "", planYearMonth: "",
orderDate : '', orderDate: '',
isCreatePlan : "", isCreatePlan: "",
reamrk : '', reamrk: '',
yysmaterialrequirementitemList:[], yysmaterialrequirementitemList: [],
}, },
isCreatePlanOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"2"}], isCreatePlanOptions: [{ "fullName": "是", "id": "1" }, { "fullName": "否", "id": "2" }],
isCreatePlanProps:{"label":"fullName","value":"id" }, isCreatePlanProps: { "label": "fullName", "value": "id" },
} }
},
computed: {},
watch: {},
created() {
},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
}, },
computed: {},
watch: {},
created() {
goBack() {
this.$emit('refresh')
}, },
mounted() {}, init(id) {
methods: { this.dataForm.id = id || 0;
toDetail(defaultValue, modelId) { this.visible = true;
if (!defaultValue) return this.$nextTick(() => {
getConfigData(modelId).then(res => { if (this.dataForm.id) {
if (!res.data || !res.data.formData) return this.loading = true
let formData = JSON.parse(res.data.formData) request({
formData.popupType = 'general' url: '/api/example/YysMaterialRequirementPlan/detail/' + this.dataForm.id,
this.detailVisible = true method: 'get'
this.$nextTick(() => { }).then(res => {
this.$refs.Detail.init(formData, modelId, defaultValue) this.dataInfo(res.data)
this.loading = false
}) })
}) }
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysMaterialRequirementPlan/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
}) })
},
}, },
} },
}
</script> </script>

1226
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/form.vue
View File

File diff suppressed because it is too large Load Diff

23
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue
Unescape View File

@ -55,16 +55,6 @@
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border> :span-method="arraySpanMethod" border>
@ -76,7 +66,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="creatorUserId" label="创建人" align="center"> <el-table-column prop="creatorUserId" label="创建人" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="creatorTime" label="创建日期" align="center"> <el-table-column prop="creatorTime" label="创建日期" align="center" :formatter="formatDeliveryTime">
</el-table-column> </el-table-column>
<el-table-column label="是否生成采购计划" prop="isCreatePlan" align="center"> <el-table-column label="是否生成采购计划" prop="isCreatePlan" align="center">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
@ -96,6 +86,8 @@
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情 <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">生成采购计划
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
@ -205,6 +197,15 @@ export default {
this.queryData = JSON.parse(JSON.stringify(this.query)) this.queryData = JSON.parse(JSON.stringify(this.query))
}, },
methods: { methods: {
formatDeliveryTime(row, column) {
if (row.creatorTime != null) {
const date = new Date(row.creatorTime);
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
}
},
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {

Write Preview
Loading…
Cancel
Save