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

feat():前端样式调整;

Browse Source
master
jiyufei 2 months ago
parent 33f534173f
commit 2d0267c80d
4 changed files with 418 additions and 356 deletions
Show Stats Download Patch File Download Diff File

450
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementPlanServiceImpl.java
Unescape View File

@ -5,18 +5,26 @@ import jnpf.mapper.YysMaterialRequirementPlanMapper;
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.yysmaterialrequirementplan.*; import jnpf.model.yysmaterialrequirementplan.*;
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;
/** /**
*
* YysMaterialRequirementPlan * YysMaterialRequirementPlan
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity;
* 日期： 2024-08-07 * 日期： 2024-08-07
*/ */
@Service @Service
public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMaterialRequirementPlanMapper, YysMaterialRequirementPlanEntity> implements YysMaterialRequirementPlanService{ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMaterialRequirementPlanMapper, YysMaterialRequirementPlanEntity> implements YysMaterialRequirementPlanService {
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -48,383 +60,405 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
@Autowired @Autowired
private YysMaterialRequirementItemService yysMaterialRequirementItemService; private YysMaterialRequirementItemService yysMaterialRequirementItemService;
@Override @Override
public List<YysMaterialRequirementPlanEntity> getList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination){ public List<YysMaterialRequirementPlanEntity> getList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) {
return getTypeList(yysMaterialRequirementPlanPagination,yysMaterialRequirementPlanPagination.getDataType()); return getTypeList(yysMaterialRequirementPlanPagination, yysMaterialRequirementPlanPagination.getDataType());
} }
/** 列表查询 */
/**
* 列表查询
*/
@Override @Override
public List<YysMaterialRequirementPlanEntity> getTypeList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination,String dataType){ public List<YysMaterialRequirementPlanEntity> getTypeList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination, 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 ? YysMaterialRequirementPlanConstant.getAppColumnData() : YysMaterialRequirementPlanConstant.getColumnData(); String columnData = !isPc ? YysMaterialRequirementPlanConstant.getAppColumnData() : YysMaterialRequirementPlanConstant.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 yysMaterialRequirementPlanNum =0; int yysMaterialRequirementPlanNum = 0;
QueryWrapper<YysMaterialRequirementPlanEntity> yysMaterialRequirementPlanQueryWrapper=new QueryWrapper<>(); QueryWrapper<YysMaterialRequirementPlanEntity> yysMaterialRequirementPlanQueryWrapper = new QueryWrapper<>();
int yysMaterialRequirementItemNum =0; int yysMaterialRequirementItemNum = 0;
QueryWrapper<YysMaterialRequirementItemEntity> yysMaterialRequirementItemQueryWrapper=new QueryWrapper<>(); QueryWrapper<YysMaterialRequirementItemEntity> yysMaterialRequirementItemQueryWrapper = new QueryWrapper<>();
long yysMaterialRequirementItemcount = yysMaterialRequirementItemService.count(); long yysMaterialRequirementItemcount = yysMaterialRequirementItemService.count();
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp =""; String superOp = "";
if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getSuperQueryJson())){ if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.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 = yysMaterialRequirementPlanPagination.getSuperQueryJson(); String queryJson = yysMaterialRequirementPlanPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<YysMaterialRequirementPlanEntity> yysMaterialRequirementPlanSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialRequirementPlanEntity> yysMaterialRequirementPlanSuperWrapper = new QueryWrapper<>();
yysMaterialRequirementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialRequirementPlanSuperWrapper,YysMaterialRequirementPlanEntity.class,queryJson,"0")); yysMaterialRequirementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialRequirementPlanSuperWrapper, YysMaterialRequirementPlanEntity.class, queryJson, "0"));
int yysMaterialRequirementPlanNum1 = yysMaterialRequirementPlanSuperWrapper.getExpression().getNormal().size(); int yysMaterialRequirementPlanNum1 = yysMaterialRequirementPlanSuperWrapper.getExpression().getNormal().size();
if (yysMaterialRequirementPlanNum1>0){ if (yysMaterialRequirementPlanNum1 > 0) {
List<String> yysMaterialRequirementPlanList =this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList()); List<String> yysMaterialRequirementPlanList = this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysMaterialRequirementPlanList); allSuperList.addAll(yysMaterialRequirementPlanList);
intersectionSuperList.add(yysMaterialRequirementPlanList); intersectionSuperList.add(yysMaterialRequirementPlanList);
superNum++; superNum++;
} }
String YysMaterialRequirementItemTable = "yys_material_requirement_item"; String YysMaterialRequirementItemTable = "yys_material_requirement_item";
boolean YysMaterialRequirementItemHasSql = queryJson.contains(YysMaterialRequirementItemTable); boolean YysMaterialRequirementItemHasSql = queryJson.contains(YysMaterialRequirementItemTable);
List<String> yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable , queryJson, null); List<String> yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable, queryJson, null);
if (YysMaterialRequirementItemHasSql){ if (YysMaterialRequirementItemHasSql) {
allSuperList.addAll(yysMaterialRequirementItemList); allSuperList.addAll(yysMaterialRequirementItemList);
intersectionSuperList.add(yysMaterialRequirementItemList); intersectionSuperList.add(yysMaterialRequirementItemList);
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<YysMaterialRequirementPlanEntity> yysMaterialRequirementPlanSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialRequirementPlanEntity> yysMaterialRequirementPlanSuperWrapper = new QueryWrapper<>();
yysMaterialRequirementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialRequirementPlanSuperWrapper,YysMaterialRequirementPlanEntity.class,ruleJson,"0")); yysMaterialRequirementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialRequirementPlanSuperWrapper, YysMaterialRequirementPlanEntity.class, ruleJson, "0"));
int yysMaterialRequirementPlanNum1 = yysMaterialRequirementPlanSuperWrapper.getExpression().getNormal().size(); int yysMaterialRequirementPlanNum1 = yysMaterialRequirementPlanSuperWrapper.getExpression().getNormal().size();
if (yysMaterialRequirementPlanNum1>0){ if (yysMaterialRequirementPlanNum1 > 0) {
List<String> yysMaterialRequirementPlanList =this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList()); List<String> yysMaterialRequirementPlanList = this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysMaterialRequirementPlanList); allRuleList.addAll(yysMaterialRequirementPlanList);
intersectionRuleList.add(yysMaterialRequirementPlanList); intersectionRuleList.add(yysMaterialRequirementPlanList);
ruleNum++; ruleNum++;
} }
String YysMaterialRequirementItemTable = "yys_material_requirement_item"; String YysMaterialRequirementItemTable = "yys_material_requirement_item";
boolean YysMaterialRequirementItemHasSql = ruleJson.contains(YysMaterialRequirementItemTable); boolean YysMaterialRequirementItemHasSql = ruleJson.contains(YysMaterialRequirementItemTable);
List<String> yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable , ruleJson, null); List<String> yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable, ruleJson, null);
if (YysMaterialRequirementItemHasSql){ if (YysMaterialRequirementItemHasSql) {
allRuleList.addAll(yysMaterialRequirementItemList); allRuleList.addAll(yysMaterialRequirementItemList);
intersectionRuleList.add(yysMaterialRequirementItemList); intersectionRuleList.add(yysMaterialRequirementItemList);
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 yysMaterialRequirementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementPlanQueryWrapper,YysMaterialRequirementPlanEntity.class,yysMaterialRequirementPlanPagination.getMenuId(),"0")); Object yysMaterialRequirementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementPlanQueryWrapper, YysMaterialRequirementPlanEntity.class, yysMaterialRequirementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialRequirementPlanObj)){ if (ObjectUtil.isEmpty(yysMaterialRequirementPlanObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysMaterialRequirementPlanQueryWrapper = (QueryWrapper<YysMaterialRequirementPlanEntity>)yysMaterialRequirementPlanObj; yysMaterialRequirementPlanQueryWrapper = (QueryWrapper<YysMaterialRequirementPlanEntity>) yysMaterialRequirementPlanObj;
if( yysMaterialRequirementPlanQueryWrapper.getExpression().getNormal().size()>0){ if (yysMaterialRequirementPlanQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialRequirementPlanNum++; yysMaterialRequirementPlanNum++;
} }
} }
Object yysMaterialRequirementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementItemQueryWrapper,YysMaterialRequirementItemEntity.class,yysMaterialRequirementPlanPagination.getMenuId(),"0")); Object yysMaterialRequirementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementItemQueryWrapper, YysMaterialRequirementItemEntity.class, yysMaterialRequirementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)){ if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysMaterialRequirementItemQueryWrapper = (QueryWrapper<YysMaterialRequirementItemEntity>)yysMaterialRequirementItemObj; yysMaterialRequirementItemQueryWrapper = (QueryWrapper<YysMaterialRequirementItemEntity>) yysMaterialRequirementItemObj;
if( yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size()>0){ if (yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialRequirementItemNum++; yysMaterialRequirementItemNum++;
} }
} }
} }
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysMaterialRequirementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementPlanQueryWrapper,YysMaterialRequirementPlanEntity.class,yysMaterialRequirementPlanPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysMaterialRequirementPlanObj)){
return new ArrayList<>();
} else {
yysMaterialRequirementPlanQueryWrapper = (QueryWrapper<YysMaterialRequirementPlanEntity>)yysMaterialRequirementPlanObj;
if( yysMaterialRequirementPlanQueryWrapper.getExpression().getNormal().size()>0){
yysMaterialRequirementPlanNum++;
}
} }
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysMaterialRequirementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementPlanQueryWrapper, YysMaterialRequirementPlanEntity.class, yysMaterialRequirementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialRequirementPlanObj)) {
return new ArrayList<>();
} else {
yysMaterialRequirementPlanQueryWrapper = (QueryWrapper<YysMaterialRequirementPlanEntity>) yysMaterialRequirementPlanObj;
if (yysMaterialRequirementPlanQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialRequirementPlanNum++;
}
}
Object yysMaterialRequirementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementItemQueryWrapper,YysMaterialRequirementItemEntity.class,yysMaterialRequirementPlanPagination.getMenuId(),"0")); Object yysMaterialRequirementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementItemQueryWrapper, YysMaterialRequirementItemEntity.class, yysMaterialRequirementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)){ if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysMaterialRequirementItemQueryWrapper = (QueryWrapper<YysMaterialRequirementItemEntity>)yysMaterialRequirementItemObj; yysMaterialRequirementItemQueryWrapper = (QueryWrapper<YysMaterialRequirementItemEntity>) yysMaterialRequirementItemObj;
if( yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size()>0){ if (yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialRequirementItemNum++; yysMaterialRequirementItemNum++;
} }
} }
} }
} }
if(isPc){ if (isPc) {
if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanNumber())){ if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanNumber())) {
yysMaterialRequirementPlanNum++; yysMaterialRequirementPlanNum++;
String value = yysMaterialRequirementPlanPagination.getPlanNumber() instanceof List ? String value = yysMaterialRequirementPlanPagination.getPlanNumber() instanceof List ?
JsonUtil.getObjectToString(yysMaterialRequirementPlanPagination.getPlanNumber()) : JsonUtil.getObjectToString(yysMaterialRequirementPlanPagination.getPlanNumber()) :
String.valueOf(yysMaterialRequirementPlanPagination.getPlanNumber()); String.valueOf(yysMaterialRequirementPlanPagination.getPlanNumber());
yysMaterialRequirementPlanQueryWrapper.lambda().like(YysMaterialRequirementPlanEntity::getPlanNumber,value); yysMaterialRequirementPlanQueryWrapper.lambda().like(YysMaterialRequirementPlanEntity::getPlanNumber, value);
} }
if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanYearMonth())){ if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanYearMonth())) {
yysMaterialRequirementPlanNum++; yysMaterialRequirementPlanNum++;
List PlanYearMonthList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getPlanYearMonth(),String.class); List PlanYearMonthList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getPlanYearMonth(), String.class);
Long fir = Long.valueOf(String.valueOf(PlanYearMonthList.get(0))); Long fir = Long.valueOf(String.valueOf(PlanYearMonthList.get(0)));
Long sec = Long.valueOf(String.valueOf(PlanYearMonthList.get(1))); Long sec = Long.valueOf(String.valueOf(PlanYearMonthList.get(1)));
yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getPlanYearMonth, new Date(fir)) yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getPlanYearMonth, new Date(fir))
.le(YysMaterialRequirementPlanEntity::getPlanYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); .le(YysMaterialRequirementPlanEntity::getPlanYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
} }
if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getOrderDate())){ if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getOrderDate())) {
yysMaterialRequirementPlanNum++; yysMaterialRequirementPlanNum++;
List OrderDateList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getOrderDate(),String.class); List OrderDateList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getOrderDate(), String.class);
Long fir = Long.valueOf(String.valueOf(OrderDateList.get(0))); Long fir = Long.valueOf(String.valueOf(OrderDateList.get(0)));
Long sec = Long.valueOf(String.valueOf(OrderDateList.get(1))); Long sec = Long.valueOf(String.valueOf(OrderDateList.get(1)));
yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getOrderDate, new Date(fir)) yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getOrderDate, new Date(fir))
.le(YysMaterialRequirementPlanEntity::getOrderDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); .le(YysMaterialRequirementPlanEntity::getOrderDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
} }
if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getIsCreatePlan())){ if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getIsCreatePlan())) {
yysMaterialRequirementPlanNum++; yysMaterialRequirementPlanNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] isCreatePlan = JsonUtil.getJsonToBean(yysMaterialRequirementPlanPagination.getIsCreatePlan(),String[][].class); String[][] isCreatePlan = JsonUtil.getJsonToBean(yysMaterialRequirementPlanPagination.getIsCreatePlan(), String[][].class);
for(int i=0;i<isCreatePlan.length;i++){ for (int i = 0; i < isCreatePlan.length; i++) {
if(isCreatePlan[i].length>0){ if (isCreatePlan[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(isCreatePlan[i]))); idList.add(JsonUtil.getObjectToString(Arrays.asList(isCreatePlan[i])));
} }
} }
}catch (Exception e1){ } catch (Exception e1) {
try { try {
List<String> isCreatePlan = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getIsCreatePlan(),String.class); List<String> isCreatePlan = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getIsCreatePlan(), String.class);
if(isCreatePlan.size()>0){ if (isCreatePlan.size() > 0) {
idList.addAll(isCreatePlan); idList.addAll(isCreatePlan);
} }
}catch (Exception e2){ } catch (Exception e2) {
idList.add(String.valueOf(yysMaterialRequirementPlanPagination.getIsCreatePlan())); idList.add(String.valueOf(yysMaterialRequirementPlanPagination.getIsCreatePlan()));
} }
} }
yysMaterialRequirementPlanQueryWrapper.lambda().and(t->{ yysMaterialRequirementPlanQueryWrapper.lambda().and(t -> {
idList.forEach(tt->{ idList.forEach(tt -> {
t.like(YysMaterialRequirementPlanEntity::getIsCreatePlan, tt).or(); t.like(YysMaterialRequirementPlanEntity::getIsCreatePlan, tt).or();
}); });
}); });
} }
} }
if(yysMaterialRequirementItemNum>0){ if (yysMaterialRequirementItemNum > 0) {
List<String> yysMaterialRequirementItemIdList = yysMaterialRequirementItemService.list(yysMaterialRequirementItemQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getMaterialRequirementPlanId())).map(t->t.getMaterialRequirementPlanId()).collect(Collectors.toList()); List<String> yysMaterialRequirementItemIdList = yysMaterialRequirementItemService.list(yysMaterialRequirementItemQueryWrapper).stream().filter(t -> StringUtil.isNotEmpty(t.getMaterialRequirementPlanId())).map(t -> t.getMaterialRequirementPlanId()).collect(Collectors.toList());
long count = yysMaterialRequirementItemService.count(); long count = yysMaterialRequirementItemService.count();
if (count>0){ if (count > 0) {
intersectionList.add(yysMaterialRequirementItemIdList); intersectionList.add(yysMaterialRequirementItemIdList);
} }
AllIdList.addAll(yysMaterialRequirementItemIdList); AllIdList.addAll(yysMaterialRequirementItemIdList);
} }
total+=yysMaterialRequirementItemNum; total += yysMaterialRequirementItemNum;
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");
} }
yysMaterialRequirementPlanQueryWrapper.lambda().in(YysMaterialRequirementPlanEntity::getId, intersection); yysMaterialRequirementPlanQueryWrapper.lambda().in(YysMaterialRequirementPlanEntity::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;
yysMaterialRequirementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialRequirementPlanEntity::getId, finalAllSuperIDlist)); yysMaterialRequirementPlanQueryWrapper.lambda().and(t -> t.in(YysMaterialRequirementPlanEntity::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;
yysMaterialRequirementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialRequirementPlanEntity::getId, finalAllRuleIDlist)); yysMaterialRequirementPlanQueryWrapper.lambda().and(t -> t.in(YysMaterialRequirementPlanEntity::getId, finalAllRuleIDlist));
} }
//假删除标志 //假删除标志
yysMaterialRequirementPlanQueryWrapper.lambda().isNull(YysMaterialRequirementPlanEntity::getDeleteMark); yysMaterialRequirementPlanQueryWrapper.lambda().isNull(YysMaterialRequirementPlanEntity::getDeleteMark);
//排序 //排序
if(StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSidx())){ if (StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSidx())) {
yysMaterialRequirementPlanQueryWrapper.lambda().orderByDesc(YysMaterialRequirementPlanEntity::getOrderDate); yysMaterialRequirementPlanQueryWrapper.lambda().orderByDesc(YysMaterialRequirementPlanEntity::getOrderDate);
}else{ } else {
try { try {
String sidx = yysMaterialRequirementPlanPagination.getSidx(); String sidx = yysMaterialRequirementPlanPagination.getSidx();
String[] strs= sidx.split("_name"); String[] strs = sidx.split("_name");
YysMaterialRequirementPlanEntity yysMaterialRequirementPlanEntity = new YysMaterialRequirementPlanEntity(); YysMaterialRequirementPlanEntity yysMaterialRequirementPlanEntity = new YysMaterialRequirementPlanEntity();
Field declaredField = yysMaterialRequirementPlanEntity.getClass().getDeclaredField(strs[0]); Field declaredField = yysMaterialRequirementPlanEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
yysMaterialRequirementPlanQueryWrapper="asc".equals(yysMaterialRequirementPlanPagination.getSort().toLowerCase())?yysMaterialRequirementPlanQueryWrapper.orderByAsc(value):yysMaterialRequirementPlanQueryWrapper.orderByDesc(value); yysMaterialRequirementPlanQueryWrapper = "asc".equals(yysMaterialRequirementPlanPagination.getSort().toLowerCase()) ? yysMaterialRequirementPlanQueryWrapper.orderByAsc(value) : yysMaterialRequirementPlanQueryWrapper.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<YysMaterialRequirementPlanEntity> page=new Page<>(yysMaterialRequirementPlanPagination.getCurrentPage(), yysMaterialRequirementPlanPagination.getPageSize()); Page<YysMaterialRequirementPlanEntity> page = new Page<>(yysMaterialRequirementPlanPagination.getCurrentPage(), yysMaterialRequirementPlanPagination.getPageSize());
IPage<YysMaterialRequirementPlanEntity> userIPage=this.page(page, yysMaterialRequirementPlanQueryWrapper); IPage<YysMaterialRequirementPlanEntity> userIPage = this.page(page, yysMaterialRequirementPlanQueryWrapper);
return yysMaterialRequirementPlanPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return yysMaterialRequirementPlanPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<YysMaterialRequirementPlanEntity> list = new ArrayList(); List<YysMaterialRequirementPlanEntity> list = new ArrayList();
return yysMaterialRequirementPlanPagination.setData(list, list.size()); return yysMaterialRequirementPlanPagination.setData(list, list.size());
} }
}else{ } else {
return this.list(yysMaterialRequirementPlanQueryWrapper); return this.list(yysMaterialRequirementPlanQueryWrapper);
} }
} }
@Override @Override
public YysMaterialRequirementPlanEntity getInfo(String id){ public YysMaterialRequirementPlanEntity getInfo(String id) {
QueryWrapper<YysMaterialRequirementPlanEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<YysMaterialRequirementPlanEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialRequirementPlanEntity::getId,id); queryWrapper.lambda().eq(YysMaterialRequirementPlanEntity::getId, id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(YysMaterialRequirementPlanEntity entity){ public void create(YysMaterialRequirementPlanEntity entity) {
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, YysMaterialRequirementPlanEntity entity){ public boolean update(String id, YysMaterialRequirementPlanEntity entity) {
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(YysMaterialRequirementPlanEntity entity){ public void delete(YysMaterialRequirementPlanEntity entity) {
if(entity!=null){ if (entity != null) {
this.removeById(entity.getId()); this.removeById(entity.getId());
} }
} }
/** YysMaterialRequirementItem子表方法 */
/**
* YysMaterialRequirementItem子表方法
*/
@Override @Override
public List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id,YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination){ public List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id, YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) {
Map<String, Object> newtabMap=YysMaterialRequirementPlanConstant.TABLEFIELDKEY.entrySet() Map<String, Object> newtabMap = YysMaterialRequirementPlanConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey())); .stream().collect(Collectors.toMap(e -> e.getValue(), e -> e.getKey()));
String tableName="yysMaterialRequirementItem"; String tableName = "yysMaterialRequirementItem";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString(); tableName = newtabMap.get(tableName) == null ? tableName : newtabMap.get(tableName).toString();
QueryWrapper<YysMaterialRequirementItemEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialRequirementItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = yysMaterialRequirementItemService.getChild(yysMaterialRequirementPlanPagination,queryWrapper); queryWrapper = yysMaterialRequirementItemService.getChild(yysMaterialRequirementPlanPagination, queryWrapper);
queryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, id); queryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, id);
generaterSwapUtil.wrapperHandle(YysMaterialRequirementPlanConstant.getColumnData(), YysMaterialRequirementPlanConstant.getAppColumnData(), queryWrapper,YysMaterialRequirementItemEntity.class,"sub",tableName); generaterSwapUtil.wrapperHandle(YysMaterialRequirementPlanConstant.getColumnData(), YysMaterialRequirementPlanConstant.getAppColumnData(), queryWrapper, YysMaterialRequirementItemEntity.class, "sub", tableName);
return yysMaterialRequirementItemService.list(queryWrapper); return yysMaterialRequirementItemService.list(queryWrapper);
} }
/** YysMaterialRequirementItem子表方法 */ /**
* YysMaterialRequirementItem子表方法
*/
@Override @Override
public List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id){ public List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id) {
QueryWrapper<YysMaterialRequirementItemEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialRequirementItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, id); queryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, id);
return yysMaterialRequirementItemService.list(queryWrapper); return yysMaterialRequirementItemService.list(queryWrapper);
} }
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
@Override @Override
public String checkForm(YysMaterialRequirementPlanForm form,int i) { public String checkForm(YysMaterialRequirementPlanForm 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.getYysMaterialRequirementItemList()!=null){ if (form.getYysMaterialRequirementItemList() != null) {
for(YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()){ for (YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()) {
if(StringUtil.isNotEmpty(t.getMaterialCode())){ if (StringUtil.isNotEmpty(t.getMaterialCode())) {
t.setMaterialCode(t.getMaterialCode().trim()); t.setMaterialCode(t.getMaterialCode().trim());
} } else {
else{ return "设计子表-物料编码不能为空";
return "设计子表-物料编码不能为空"; }
} }
} for (YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()) {
for(YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()){ if (StringUtil.isNotEmpty(t.getMaterialName())) {
if(StringUtil.isNotEmpty(t.getMaterialName())){ t.setMaterialName(t.getMaterialName().trim());
t.setMaterialName(t.getMaterialName().trim()); } else {
} return "设计子表-物料名称不能为空";
else{ }
return "设计子表-物料名称不能为空";
}
}
} }
}
return countRecover; return countRecover;
} }
/** /**
* 新增修改数据(事务回滚) * 新增修改数据(事务回滚)
* @param id *
* @param yysMaterialRequirementPlanForm * @param id
* @return * @param yysMaterialRequirementPlanForm
*/ * @return
*/
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm,String id, boolean isSave) throws Exception{ public void saveOrUpdate(YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm, 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());
yysMaterialRequirementPlanForm = JsonUtil.getJsonToBean( yysMaterialRequirementPlanForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(YysMaterialRequirementPlanConstant.getFormData(),yysMaterialRequirementPlanForm),YysMaterialRequirementPlanForm.class); generaterSwapUtil.swapDatetime(YysMaterialRequirementPlanConstant.getFormData(), yysMaterialRequirementPlanForm), YysMaterialRequirementPlanForm.class);
YysMaterialRequirementPlanEntity entity = JsonUtil.getJsonToBean(yysMaterialRequirementPlanForm, YysMaterialRequirementPlanEntity.class); YysMaterialRequirementPlanEntity entity = JsonUtil.getJsonToBean(yysMaterialRequirementPlanForm, YysMaterialRequirementPlanEntity.class);
if(isSave){ if (isSave) {
String mainId = RandomUtil.uuId() ; String mainId = RandomUtil.uuId();
entity.setPlanNumber(generaterSwapUtil.getBillNumber("plannumber", false)); entity.setPlanNumber(generaterSwapUtil.getBillNumber("plannumber", false));
entity.setId(mainId); entity.setId(mainId);
}else{ entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
} else {
entity.setLastModifyTime(DateUtil.getNowDate());
entity.setLastModifyUserId(userInfo.getUserId());
// entity.setPlanNumber(generaterSwapUtil.getBillNumber("plannumber", false)); // entity.setPlanNumber(generaterSwapUtil.getBillNumber("plannumber", false));
} }
this.saveOrUpdate(entity); this.saveOrUpdate(entity);
//YysMaterialRequirementItem子表数据新增修改 //YysMaterialRequirementItem子表数据新增修改
if(!isSave){ if (!isSave) {
QueryWrapper<YysMaterialRequirementItemEntity> YysMaterialRequirementItemqueryWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialRequirementItemEntity> YysMaterialRequirementItemqueryWrapper = new QueryWrapper<>();
YysMaterialRequirementItemqueryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, entity.getId()); YysMaterialRequirementItemqueryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, entity.getId());
yysMaterialRequirementItemService.remove(YysMaterialRequirementItemqueryWrapper); yysMaterialRequirementItemService.remove(YysMaterialRequirementItemqueryWrapper);
} }
if (yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList()!=null){ if (yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList() != null) {
List<YysMaterialRequirementItemEntity> tableField119 = JsonUtil.getJsonToList(yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList(),YysMaterialRequirementItemEntity.class); List<YysMaterialRequirementItemEntity> tableField119 = JsonUtil.getJsonToList(yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList(), YysMaterialRequirementItemEntity.class);
for(YysMaterialRequirementItemEntity entitys : tableField119){ for (YysMaterialRequirementItemEntity entitys : tableField119) {
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setMaterialRequirementPlanId(entity.getId()); entitys.setMaterialRequirementPlanId(entity.getId());
if(isSave){ if (isSave) {
}else{ entitys.setCreatorTime(DateUtil.getNowDate());
entitys.setCreatorUserId(userInfo.getUserId());
} else {
} }
yysMaterialRequirementItemService.saveOrUpdate(entitys); yysMaterialRequirementItemService.saveOrUpdate(entitys);
} }

310
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialRequirementPlanController.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.yysmaterialrequirementplan.*; import jnpf.model.yysmaterialrequirementplan.*;
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;
/** /**
* YysMaterialRequirementPlan * YysMaterialRequirementPlan
*
* @版本： 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 = "YysMaterialRequirementPlan" , description = "example") @Tag(name = "YysMaterialRequirementPlan", description = "example")
@RequestMapping("/api/example/YysMaterialRequirementPlan") @RequestMapping("/api/example/YysMaterialRequirementPlan")
public class YysMaterialRequirementPlanController { public class YysMaterialRequirementPlanController {
@ -78,28 +88,34 @@ public class YysMaterialRequirementPlanController {
@Autowired @Autowired
private ConfigValueUtil configValueUtil; private ConfigValueUtil configValueUtil;
@Resource
private UserService userService;
/** /**
* 列表 * 列表
* *
* @param yysMaterialRequirementPlanPagination * @param yysMaterialRequirementPlanPagination
* @return * @return
*/ */
@Operation(summary = "获取列表") @Operation(summary = "获取列表")
@PostMapping("/getList") @PostMapping("/getList")
public ActionResult list(@RequestBody YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination)throws IOException{ public ActionResult list(@RequestBody YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) throws IOException {
List<YysMaterialRequirementPlanEntity> list= yysMaterialRequirementPlanService.getList(yysMaterialRequirementPlanPagination); List<YysMaterialRequirementPlanEntity> list = yysMaterialRequirementPlanService.getList(yysMaterialRequirementPlanPagination);
List<Map<String, Object>> realList=new ArrayList<>(); List<Map<String, Object>> realList = new ArrayList<>();
for (YysMaterialRequirementPlanEntity entity : list) { for (YysMaterialRequirementPlanEntity entity : list) {
Map<String, Object> yysMaterialRequirementPlanMap=JsonUtil.entityToMap(entity); Map<String, Object> yysMaterialRequirementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id")); yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id"));
//副表数据 if (StringUtils.isNoneBlank(yysMaterialRequirementPlanMap.get("creatorUserId").toString())) {
//子表数据 yysMaterialRequirementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialRequirementPlanMap.get("creatorUserId").toString()).getRealName());
List<YysMaterialRequirementItemEntity> yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId(),yysMaterialRequirementPlanPagination); }
yysMaterialRequirementPlanMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); //副表数据
//子表数据
List<YysMaterialRequirementItemEntity> yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId(), yysMaterialRequirementPlanPagination);
yysMaterialRequirementPlanMap.put("tableField119", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList)));
realList.add(yysMaterialRequirementPlanMap); realList.add(yysMaterialRequirementPlanMap);
} }
//数据转换 //数据转换
realList = generaterSwapUtil.swapDataList(realList, YysMaterialRequirementPlanConstant.getFormData(), YysMaterialRequirementPlanConstant.getColumnData(), yysMaterialRequirementPlanPagination.getModuleId(),false); realList = generaterSwapUtil.swapDataList(realList, YysMaterialRequirementPlanConstant.getFormData(), YysMaterialRequirementPlanConstant.getColumnData(), yysMaterialRequirementPlanPagination.getModuleId(), false);
//返回对象 //返回对象
PageListVO vo = new PageListVO(); PageListVO vo = new PageListVO();
@ -108,117 +124,119 @@ public class YysMaterialRequirementPlanController {
vo.setPagination(page); vo.setPagination(page);
return ActionResult.success(vo); return ActionResult.success(vo);
} }
/** /**
* 创建 * 创建
* *
* @param yysMaterialRequirementPlanForm * @param yysMaterialRequirementPlanForm
* @return * @return
*/ */
@PostMapping() @PostMapping()
@Operation(summary = "创建") @Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm) { public ActionResult create(@RequestBody @Valid YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm) {
String b = yysMaterialRequirementPlanService.checkForm(yysMaterialRequirementPlanForm,0); String b = yysMaterialRequirementPlanService.checkForm(yysMaterialRequirementPlanForm, 0);
if (StringUtil.isNotEmpty(b)){ if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b ); return ActionResult.fail(b);
} }
try{ try {
yysMaterialRequirementPlanService.saveOrUpdate(yysMaterialRequirementPlanForm, null ,true); yysMaterialRequirementPlanService.saveOrUpdate(yysMaterialRequirementPlanForm, 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 YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) throws IOException { public ActionResult Export(@RequestBody YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) throws IOException {
if (StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSelectKey())){ if (StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSelectKey())) {
return ActionResult.fail("请选择导出字段"); return ActionResult.fail("请选择导出字段");
} }
List<YysMaterialRequirementPlanEntity> list= yysMaterialRequirementPlanService.getList(yysMaterialRequirementPlanPagination); List<YysMaterialRequirementPlanEntity> list = yysMaterialRequirementPlanService.getList(yysMaterialRequirementPlanPagination);
List<Map<String, Object>> realList=new ArrayList<>(); List<Map<String, Object>> realList = new ArrayList<>();
for (YysMaterialRequirementPlanEntity entity : list) { for (YysMaterialRequirementPlanEntity entity : list) {
Map<String, Object> yysMaterialRequirementPlanMap=JsonUtil.entityToMap(entity); Map<String, Object> yysMaterialRequirementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id")); yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
List<YysMaterialRequirementItemEntity> yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId(),yysMaterialRequirementPlanPagination); List<YysMaterialRequirementItemEntity> yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId(), yysMaterialRequirementPlanPagination);
yysMaterialRequirementPlanMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); yysMaterialRequirementPlanMap.put("tableField119", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList)));
realList.add(yysMaterialRequirementPlanMap); realList.add(yysMaterialRequirementPlanMap);
} }
//数据转换 //数据转换
realList = generaterSwapUtil.swapDataList(realList, YysMaterialRequirementPlanConstant.getFormData(), YysMaterialRequirementPlanConstant.getColumnData(), yysMaterialRequirementPlanPagination.getModuleId(),false); realList = generaterSwapUtil.swapDataList(realList, YysMaterialRequirementPlanConstant.getFormData(), YysMaterialRequirementPlanConstant.getColumnData(), yysMaterialRequirementPlanPagination.getModuleId(), false);
String[]keys=!StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSelectKey())?yysMaterialRequirementPlanPagination.getSelectKey():new String[0]; String[] keys = !StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSelectKey()) ? yysMaterialRequirementPlanPagination.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 tableField119ExcelEntity = new ExcelExportEntity("设计子表","tableField119"); ExcelExportEntity tableField119ExcelEntity = new ExcelExportEntity("设计子表", "tableField119");
List<ExcelExportEntity> tableField119List = new ArrayList<>(); List<ExcelExportEntity> tableField119List = new ArrayList<>();
for(String key:keys){ for (String key : keys) {
switch(key){ switch (key) {
case "planNumber" : case "planNumber":
entitys.add(new ExcelExportEntity("物料需求计划单号" ,"planNumber")); entitys.add(new ExcelExportEntity("物料需求计划单号", "planNumber"));
break; break;
case "planYearMonth" : case "planYearMonth":
entitys.add(new ExcelExportEntity("年月" ,"planYearMonth")); entitys.add(new ExcelExportEntity("年月", "planYearMonth"));
break; break;
case "orderDate" : case "orderDate":
entitys.add(new ExcelExportEntity("单据日期" ,"orderDate")); entitys.add(new ExcelExportEntity("单据日期", "orderDate"));
break; break;
case "isCreatePlan" : case "isCreatePlan":
entitys.add(new ExcelExportEntity("是否生成采购计划" ,"isCreatePlan")); entitys.add(new ExcelExportEntity("是否生成采购计划", "isCreatePlan"));
break; break;
case "reamrk" : case "reamrk":
entitys.add(new ExcelExportEntity("备注" ,"reamrk")); entitys.add(new ExcelExportEntity("备注", "reamrk"));
break; break;
case "tableField119-materialCode": case "tableField119-materialCode":
tableField119List.add(new ExcelExportEntity("物料编码" ,"materialCode")); tableField119List.add(new ExcelExportEntity("物料编码", "materialCode"));
break; break;
case "tableField119-materialName": case "tableField119-materialName":
tableField119List.add(new ExcelExportEntity("物料名称" ,"materialName")); tableField119List.add(new ExcelExportEntity("物料名称", "materialName"));
break; break;
case "tableField119-materialType": case "tableField119-materialType":
tableField119List.add(new ExcelExportEntity("物料类型" ,"materialType")); tableField119List.add(new ExcelExportEntity("物料类型", "materialType"));
break; break;
case "tableField119-specification": case "tableField119-specification":
tableField119List.add(new ExcelExportEntity("规格型号" ,"specification")); tableField119List.add(new ExcelExportEntity("规格型号", "specification"));
break; break;
case "tableField119-unit": case "tableField119-unit":
tableField119List.add(new ExcelExportEntity("计量单位" ,"unit")); tableField119List.add(new ExcelExportEntity("计量单位", "unit"));
break; break;
case "tableField119-requirementNumber": case "tableField119-requirementNumber":
tableField119List.add(new ExcelExportEntity("需求数量" ,"requirementNumber")); tableField119List.add(new ExcelExportEntity("需求数量", "requirementNumber"));
break; break;
case "tableField119-inventoryNumber": case "tableField119-inventoryNumber":
tableField119List.add(new ExcelExportEntity("库存" ,"inventoryNumber")); tableField119List.add(new ExcelExportEntity("库存", "inventoryNumber"));
break; break;
case "tableField119-inventorySafetyNumber": case "tableField119-inventorySafetyNumber":
tableField119List.add(new ExcelExportEntity("库存安全" ,"inventorySafetyNumber")); tableField119List.add(new ExcelExportEntity("库存安全", "inventorySafetyNumber"));
break; break;
case "tableField119-notIntoNumber": case "tableField119-notIntoNumber":
tableField119List.add(new ExcelExportEntity("采购未入库" ,"notIntoNumber")); tableField119List.add(new ExcelExportEntity("采购未入库", "notIntoNumber"));
break; break;
case "tableField119-lackNumber": case "tableField119-lackNumber":
tableField119List.add(new ExcelExportEntity("欠缺量" ,"lackNumber")); tableField119List.add(new ExcelExportEntity("欠缺量", "lackNumber"));
break; break;
default: default:
break; break;
} }
} }
if(tableField119List.size() > 0){ if (tableField119List.size() > 0) {
tableField119ExcelEntity.setList(tableField119List); tableField119ExcelEntity.setList(tableField119List);
entitys.add(tableField119ExcelEntity); entitys.add(tableField119ExcelEntity);
} }
@ -226,10 +244,10 @@ public class YysMaterialRequirementPlanController {
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<>());
} }
//去除空数据 //去除空数据
@ -239,8 +257,8 @@ public class YysMaterialRequirementPlanController {
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;
@ -266,7 +284,7 @@ public class YysMaterialRequirementPlanController {
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);
@ -283,94 +301,102 @@ public class YysMaterialRequirementPlanController {
} }
return vo; return vo;
} }
/** /**
* 编辑 * 编辑
* @param id *
* @param yysMaterialRequirementPlanForm * @param id
* @return * @param yysMaterialRequirementPlanForm
*/ * @return
*/
@PutMapping("/{id}") @PutMapping("/{id}")
@Operation(summary = "更新") @Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm, public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm,
@RequestParam(value = "isImport", required = false) boolean isImport){ @RequestParam(value = "isImport", required = false) boolean isImport) {
yysMaterialRequirementPlanForm.setId(id); yysMaterialRequirementPlanForm.setId(id);
if (!isImport) { if (!isImport) {
String b = yysMaterialRequirementPlanService.checkForm(yysMaterialRequirementPlanForm,1); String b = yysMaterialRequirementPlanService.checkForm(yysMaterialRequirementPlanForm, 1);
if (StringUtil.isNotEmpty(b)){ if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b ); return ActionResult.fail(b);
} }
} }
YysMaterialRequirementPlanEntity entity= yysMaterialRequirementPlanService.getInfo(id); YysMaterialRequirementPlanEntity entity = yysMaterialRequirementPlanService.getInfo(id);
if(entity!=null){ if (entity != null) {
try{ try {
yysMaterialRequirementPlanService.saveOrUpdate(yysMaterialRequirementPlanForm,id,false); yysMaterialRequirementPlanService.saveOrUpdate(yysMaterialRequirementPlanForm, 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) {
YysMaterialRequirementPlanEntity entity= yysMaterialRequirementPlanService.getInfo(id); YysMaterialRequirementPlanEntity entity = yysMaterialRequirementPlanService.getInfo(id);
if(entity!=null){ if (entity != null) {
//假删除 //假删除
entity.setDeleteMark(1); entity.setDeleteMark(1);
yysMaterialRequirementPlanService.update(id,entity); yysMaterialRequirementPlanService.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) {
YysMaterialRequirementPlanEntity entity= yysMaterialRequirementPlanService.getInfo(id); YysMaterialRequirementPlanEntity entity = yysMaterialRequirementPlanService.getInfo(id);
if(entity==null){ if (entity == null) {
return ActionResult.fail("表单数据不存在！"); return ActionResult.fail("表单数据不存在！");
} }
Map<String, Object> yysMaterialRequirementPlanMap=JsonUtil.entityToMap(entity); Map<String, Object> yysMaterialRequirementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id")); yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
List<YysMaterialRequirementItemEntity> yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId()); List<YysMaterialRequirementItemEntity> yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId());
yysMaterialRequirementPlanMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); yysMaterialRequirementPlanMap.put("tableField119", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList)));
yysMaterialRequirementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialRequirementPlanMap,YysMaterialRequirementPlanConstant.getFormData(),"590812661621456901",false); yysMaterialRequirementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialRequirementPlanMap, YysMaterialRequirementPlanConstant.getFormData(), "590812661621456901", false);
return ActionResult.success(yysMaterialRequirementPlanMap); return ActionResult.success(yysMaterialRequirementPlanMap);
} }
/** /**
* 获取详情(编辑页) * 获取详情(编辑页)
* 编辑页面使用-不转换数据 * 编辑页面使用-不转换数据
* @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) {
YysMaterialRequirementPlanEntity entity= yysMaterialRequirementPlanService.getInfo(id); YysMaterialRequirementPlanEntity entity = yysMaterialRequirementPlanService.getInfo(id);
if(entity==null){ if (entity == null) {
return ActionResult.fail("表单数据不存在！"); return ActionResult.fail("表单数据不存在！");
} }
Map<String, Object> yysMaterialRequirementPlanMap=JsonUtil.entityToMap(entity); Map<String, Object> yysMaterialRequirementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id")); yysMaterialRequirementPlanMap.put("id", yysMaterialRequirementPlanMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
List<YysMaterialRequirementItemEntity> yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId()); List<YysMaterialRequirementItemEntity> yysMaterialRequirementItemList = yysMaterialRequirementPlanService.getYysMaterialRequirementItemList(entity.getId());
yysMaterialRequirementPlanMap.put("yysMaterialRequirementItemList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList))); yysMaterialRequirementPlanMap.put("yysMaterialRequirementItemList", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialRequirementItemList)));
yysMaterialRequirementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialRequirementPlanMap,YysMaterialRequirementPlanConstant.getFormData(),YysMaterialRequirementPlanConstant.TABLEFIELDKEY,YysMaterialRequirementPlanConstant.TABLERENAMES); yysMaterialRequirementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialRequirementPlanMap, YysMaterialRequirementPlanConstant.getFormData(), YysMaterialRequirementPlanConstant.TABLEFIELDKEY, YysMaterialRequirementPlanConstant.TABLERENAMES);
return ActionResult.success(yysMaterialRequirementPlanMap); return ActionResult.success(yysMaterialRequirementPlanMap);
} }

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

@ -82,7 +82,7 @@
<JnpfNumber v-model="scope.row.sort" :thousands="false" /> <JnpfNumber v-model="scope.row.sort" :thousands="false" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班次" prop="post" algin="center"> <el-table-column label="班次" prop="post" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.post }} {{ scope.row.post }}
</template> </template>

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

@ -68,9 +68,15 @@
</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>
<el-table-column prop="planYearMonth" label="年月" align="center">
</el-table-column>
<el-table-column prop="planNumber" label="物料需求计划单号" align="center"> <el-table-column prop="planNumber" label="物料需求计划单号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="reamrk" label="备注" align="center"> <el-table-column prop="orderDate" label="单据日期" align="center">
</el-table-column>
<el-table-column prop="creatorUserId" label="创建人" align="center">
</el-table-column>
<el-table-column prop="creatorTime" label="创建日期" align="center">
</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">
@ -81,10 +87,6 @@
<el-tag type="success" v-else-if="scope.row.isCreatePlan == '否'">否</el-tag> <el-tag type="success" v-else-if="scope.row.isCreatePlan == '否'">否</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="planYearMonth" label="年月" align="center">
</el-table-column>
<el-table-column prop="orderDate" label="单据日期" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑 <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑

Write Preview
Loading…
Cancel
Save