|
|
|
@ -5,18 +5,26 @@ import jnpf.mapper.YysMaterialRequirementPlanMapper;
|
|
|
|
|
import jnpf.service.*;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
import jnpf.model.yysmaterialrequirementplan.*;
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import jnpf.permission.model.authorize.AuthorizeConditionModel;
|
|
|
|
|
import jnpf.util.GeneraterSwapUtil;
|
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryJsonModel;
|
|
|
|
|
import jnpf.database.model.superQuery.ConditionJsonModel;
|
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryConditionModel;
|
|
|
|
|
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
|
|
|
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
|
|
import jnpf.model.QueryModel;
|
|
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
|
import jnpf.permission.entity.UserEntity;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
*
|
|
|
|
|
* YysMaterialRequirementPlan
|
|
|
|
|
* 版本: V3.5
|
|
|
|
|
* 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
|
|
|
|
@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity;
|
|
|
|
|
* 日期: 2024-08-07
|
|
|
|
|
*/
|
|
|
|
|
@Service
|
|
|
|
|
public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMaterialRequirementPlanMapper, YysMaterialRequirementPlanEntity> implements YysMaterialRequirementPlanService{
|
|
|
|
|
public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMaterialRequirementPlanMapper, YysMaterialRequirementPlanEntity> implements YysMaterialRequirementPlanService {
|
|
|
|
|
@Autowired
|
|
|
|
|
private GeneraterSwapUtil generaterSwapUtil;
|
|
|
|
|
|
|
|
|
@ -48,383 +60,405 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private YysMaterialRequirementItemService yysMaterialRequirementItemService;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<YysMaterialRequirementPlanEntity> getList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination){
|
|
|
|
|
return getTypeList(yysMaterialRequirementPlanPagination,yysMaterialRequirementPlanPagination.getDataType());
|
|
|
|
|
public List<YysMaterialRequirementPlanEntity> getList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) {
|
|
|
|
|
return getTypeList(yysMaterialRequirementPlanPagination, yysMaterialRequirementPlanPagination.getDataType());
|
|
|
|
|
}
|
|
|
|
|
/** 列表查询 */
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 列表查询
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public List<YysMaterialRequirementPlanEntity> getTypeList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination,String dataType){
|
|
|
|
|
String userId=userProvider.get().getUserId();
|
|
|
|
|
List<String> AllIdList =new ArrayList();
|
|
|
|
|
List<List<String>> intersectionList =new ArrayList<>();
|
|
|
|
|
public List<YysMaterialRequirementPlanEntity> getTypeList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination, String dataType) {
|
|
|
|
|
String userId = userProvider.get().getUserId();
|
|
|
|
|
List<String> AllIdList = new ArrayList();
|
|
|
|
|
List<List<String>> intersectionList = new ArrayList<>();
|
|
|
|
|
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
|
|
|
|
|
String columnData = !isPc ? YysMaterialRequirementPlanConstant.getAppColumnData() : YysMaterialRequirementPlanConstant.getColumnData();
|
|
|
|
|
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
|
|
|
|
|
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
|
|
|
|
|
|
|
|
|
|
int total=0;
|
|
|
|
|
int yysMaterialRequirementPlanNum =0;
|
|
|
|
|
QueryWrapper<YysMaterialRequirementPlanEntity> yysMaterialRequirementPlanQueryWrapper=new QueryWrapper<>();
|
|
|
|
|
int yysMaterialRequirementItemNum =0;
|
|
|
|
|
QueryWrapper<YysMaterialRequirementItemEntity> yysMaterialRequirementItemQueryWrapper=new QueryWrapper<>();
|
|
|
|
|
int total = 0;
|
|
|
|
|
int yysMaterialRequirementPlanNum = 0;
|
|
|
|
|
QueryWrapper<YysMaterialRequirementPlanEntity> yysMaterialRequirementPlanQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
int yysMaterialRequirementItemNum = 0;
|
|
|
|
|
QueryWrapper<YysMaterialRequirementItemEntity> yysMaterialRequirementItemQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
long yysMaterialRequirementItemcount = yysMaterialRequirementItemService.count();
|
|
|
|
|
List<String> allSuperIDlist = new ArrayList<>();
|
|
|
|
|
String superOp ="";
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getSuperQueryJson())){
|
|
|
|
|
String superOp = "";
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getSuperQueryJson())) {
|
|
|
|
|
List<String> allSuperList = new ArrayList<>();
|
|
|
|
|
List<List<String>> intersectionSuperList = new ArrayList<>();
|
|
|
|
|
List<List<String>> intersectionSuperList = new ArrayList<>();
|
|
|
|
|
String queryJson = yysMaterialRequirementPlanPagination.getSuperQueryJson();
|
|
|
|
|
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
|
|
|
|
|
int superNum = 0;
|
|
|
|
|
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();
|
|
|
|
|
if (yysMaterialRequirementPlanNum1>0){
|
|
|
|
|
List<String> yysMaterialRequirementPlanList =this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList());
|
|
|
|
|
if (yysMaterialRequirementPlanNum1 > 0) {
|
|
|
|
|
List<String> yysMaterialRequirementPlanList = this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList());
|
|
|
|
|
allSuperList.addAll(yysMaterialRequirementPlanList);
|
|
|
|
|
intersectionSuperList.add(yysMaterialRequirementPlanList);
|
|
|
|
|
superNum++;
|
|
|
|
|
}
|
|
|
|
|
String YysMaterialRequirementItemTable = "yys_material_requirement_item";
|
|
|
|
|
boolean YysMaterialRequirementItemHasSql = queryJson.contains(YysMaterialRequirementItemTable);
|
|
|
|
|
List<String> yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable , queryJson, null);
|
|
|
|
|
if (YysMaterialRequirementItemHasSql){
|
|
|
|
|
List<String> yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable, queryJson, null);
|
|
|
|
|
if (YysMaterialRequirementItemHasSql) {
|
|
|
|
|
allSuperList.addAll(yysMaterialRequirementItemList);
|
|
|
|
|
intersectionSuperList.add(yysMaterialRequirementItemList);
|
|
|
|
|
superNum++;
|
|
|
|
|
}
|
|
|
|
|
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
|
|
|
|
|
//and or
|
|
|
|
|
if(superOp.equalsIgnoreCase("and")){
|
|
|
|
|
if (superOp.equalsIgnoreCase("and")) {
|
|
|
|
|
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
allSuperIDlist = allSuperList;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
List<String> allRuleIDlist = new ArrayList<>();
|
|
|
|
|
String ruleOp ="";
|
|
|
|
|
if (ObjectUtil.isNotEmpty(ruleJson)){
|
|
|
|
|
String ruleOp = "";
|
|
|
|
|
if (ObjectUtil.isNotEmpty(ruleJson)) {
|
|
|
|
|
List<String> allRuleList = new ArrayList<>();
|
|
|
|
|
List<List<String>> intersectionRuleList = new ArrayList<>();
|
|
|
|
|
List<List<String>> intersectionRuleList = new ArrayList<>();
|
|
|
|
|
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
|
|
|
|
|
int ruleNum = 0;
|
|
|
|
|
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();
|
|
|
|
|
if (yysMaterialRequirementPlanNum1>0){
|
|
|
|
|
List<String> yysMaterialRequirementPlanList =this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList());
|
|
|
|
|
if (yysMaterialRequirementPlanNum1 > 0) {
|
|
|
|
|
List<String> yysMaterialRequirementPlanList = this.list(yysMaterialRequirementPlanSuperWrapper).stream().map(YysMaterialRequirementPlanEntity::getId).collect(Collectors.toList());
|
|
|
|
|
allRuleList.addAll(yysMaterialRequirementPlanList);
|
|
|
|
|
intersectionRuleList.add(yysMaterialRequirementPlanList);
|
|
|
|
|
ruleNum++;
|
|
|
|
|
}
|
|
|
|
|
String YysMaterialRequirementItemTable = "yys_material_requirement_item";
|
|
|
|
|
boolean YysMaterialRequirementItemHasSql = ruleJson.contains(YysMaterialRequirementItemTable);
|
|
|
|
|
List<String> yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable , ruleJson, null);
|
|
|
|
|
if (YysMaterialRequirementItemHasSql){
|
|
|
|
|
List<String> yysMaterialRequirementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialRequirementPlanConstant.getTableList(), YysMaterialRequirementItemTable, ruleJson, null);
|
|
|
|
|
if (YysMaterialRequirementItemHasSql) {
|
|
|
|
|
allRuleList.addAll(yysMaterialRequirementItemList);
|
|
|
|
|
intersectionRuleList.add(yysMaterialRequirementItemList);
|
|
|
|
|
ruleNum++;
|
|
|
|
|
}
|
|
|
|
|
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
|
|
|
|
|
//and or
|
|
|
|
|
if(ruleOp.equalsIgnoreCase("and")){
|
|
|
|
|
if (ruleOp.equalsIgnoreCase("and")) {
|
|
|
|
|
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
allRuleIDlist = allRuleList;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
boolean pcPermission = true;
|
|
|
|
|
boolean appPermission = false;
|
|
|
|
|
if(isPc && pcPermission){
|
|
|
|
|
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"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
yysMaterialRequirementItemQueryWrapper = (QueryWrapper<YysMaterialRequirementItemEntity>)yysMaterialRequirementItemObj;
|
|
|
|
|
if( yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
|
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++;
|
|
|
|
|
}
|
|
|
|
|
boolean pcPermission = true;
|
|
|
|
|
boolean appPermission = false;
|
|
|
|
|
if (isPc && pcPermission) {
|
|
|
|
|
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"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)) {
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
yysMaterialRequirementItemQueryWrapper = (QueryWrapper<YysMaterialRequirementItemEntity>) yysMaterialRequirementItemObj;
|
|
|
|
|
if (yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size() > 0) {
|
|
|
|
|
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++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Object yysMaterialRequirementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementItemQueryWrapper,YysMaterialRequirementItemEntity.class,yysMaterialRequirementPlanPagination.getMenuId(),"0"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
yysMaterialRequirementItemQueryWrapper = (QueryWrapper<YysMaterialRequirementItemEntity>)yysMaterialRequirementItemObj;
|
|
|
|
|
if( yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
|
yysMaterialRequirementItemNum++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Object yysMaterialRequirementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialRequirementItemQueryWrapper, YysMaterialRequirementItemEntity.class, yysMaterialRequirementPlanPagination.getMenuId(), "0"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysMaterialRequirementItemObj)) {
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
yysMaterialRequirementItemQueryWrapper = (QueryWrapper<YysMaterialRequirementItemEntity>) yysMaterialRequirementItemObj;
|
|
|
|
|
if (yysMaterialRequirementItemQueryWrapper.getExpression().getNormal().size() > 0) {
|
|
|
|
|
yysMaterialRequirementItemNum++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(isPc){
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanNumber())){
|
|
|
|
|
yysMaterialRequirementPlanNum++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (isPc) {
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanNumber())) {
|
|
|
|
|
yysMaterialRequirementPlanNum++;
|
|
|
|
|
|
|
|
|
|
String value = yysMaterialRequirementPlanPagination.getPlanNumber() instanceof List ?
|
|
|
|
|
JsonUtil.getObjectToString(yysMaterialRequirementPlanPagination.getPlanNumber()) :
|
|
|
|
|
String.valueOf(yysMaterialRequirementPlanPagination.getPlanNumber());
|
|
|
|
|
yysMaterialRequirementPlanQueryWrapper.lambda().like(YysMaterialRequirementPlanEntity::getPlanNumber,value);
|
|
|
|
|
JsonUtil.getObjectToString(yysMaterialRequirementPlanPagination.getPlanNumber()) :
|
|
|
|
|
String.valueOf(yysMaterialRequirementPlanPagination.getPlanNumber());
|
|
|
|
|
yysMaterialRequirementPlanQueryWrapper.lambda().like(YysMaterialRequirementPlanEntity::getPlanNumber, value);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanYearMonth())){
|
|
|
|
|
yysMaterialRequirementPlanNum++;
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getPlanYearMonth())) {
|
|
|
|
|
yysMaterialRequirementPlanNum++;
|
|
|
|
|
|
|
|
|
|
List PlanYearMonthList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getPlanYearMonth(),String.class);
|
|
|
|
|
Long fir = Long.valueOf(String.valueOf(PlanYearMonthList.get(0)));
|
|
|
|
|
Long sec = Long.valueOf(String.valueOf(PlanYearMonthList.get(1)));
|
|
|
|
|
List PlanYearMonthList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getPlanYearMonth(), String.class);
|
|
|
|
|
Long fir = Long.valueOf(String.valueOf(PlanYearMonthList.get(0)));
|
|
|
|
|
Long sec = Long.valueOf(String.valueOf(PlanYearMonthList.get(1)));
|
|
|
|
|
|
|
|
|
|
yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getPlanYearMonth, new Date(fir))
|
|
|
|
|
.le(YysMaterialRequirementPlanEntity::getPlanYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
|
|
|
|
|
yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getPlanYearMonth, new Date(fir))
|
|
|
|
|
.le(YysMaterialRequirementPlanEntity::getPlanYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getOrderDate())){
|
|
|
|
|
yysMaterialRequirementPlanNum++;
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getOrderDate())) {
|
|
|
|
|
yysMaterialRequirementPlanNum++;
|
|
|
|
|
|
|
|
|
|
List OrderDateList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getOrderDate(),String.class);
|
|
|
|
|
Long fir = Long.valueOf(String.valueOf(OrderDateList.get(0)));
|
|
|
|
|
Long sec = Long.valueOf(String.valueOf(OrderDateList.get(1)));
|
|
|
|
|
List OrderDateList = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getOrderDate(), String.class);
|
|
|
|
|
Long fir = Long.valueOf(String.valueOf(OrderDateList.get(0)));
|
|
|
|
|
Long sec = Long.valueOf(String.valueOf(OrderDateList.get(1)));
|
|
|
|
|
|
|
|
|
|
yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getOrderDate, new Date(fir))
|
|
|
|
|
.le(YysMaterialRequirementPlanEntity::getOrderDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
|
|
|
|
|
yysMaterialRequirementPlanQueryWrapper.lambda().ge(YysMaterialRequirementPlanEntity::getOrderDate, new Date(fir))
|
|
|
|
|
.le(YysMaterialRequirementPlanEntity::getOrderDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getIsCreatePlan())){
|
|
|
|
|
yysMaterialRequirementPlanNum++;
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysMaterialRequirementPlanPagination.getIsCreatePlan())) {
|
|
|
|
|
yysMaterialRequirementPlanNum++;
|
|
|
|
|
|
|
|
|
|
List<String> idList = new ArrayList<>();
|
|
|
|
|
try {
|
|
|
|
|
String[][] isCreatePlan = JsonUtil.getJsonToBean(yysMaterialRequirementPlanPagination.getIsCreatePlan(),String[][].class);
|
|
|
|
|
for(int i=0;i<isCreatePlan.length;i++){
|
|
|
|
|
if(isCreatePlan[i].length>0){
|
|
|
|
|
idList.add(JsonUtil.getObjectToString(Arrays.asList(isCreatePlan[i])));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}catch (Exception e1){
|
|
|
|
|
try {
|
|
|
|
|
List<String> isCreatePlan = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getIsCreatePlan(),String.class);
|
|
|
|
|
if(isCreatePlan.size()>0){
|
|
|
|
|
idList.addAll(isCreatePlan);
|
|
|
|
|
}
|
|
|
|
|
}catch (Exception e2){
|
|
|
|
|
idList.add(String.valueOf(yysMaterialRequirementPlanPagination.getIsCreatePlan()));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
yysMaterialRequirementPlanQueryWrapper.lambda().and(t->{
|
|
|
|
|
idList.forEach(tt->{
|
|
|
|
|
t.like(YysMaterialRequirementPlanEntity::getIsCreatePlan, tt).or();
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
List<String> idList = new ArrayList<>();
|
|
|
|
|
try {
|
|
|
|
|
String[][] isCreatePlan = JsonUtil.getJsonToBean(yysMaterialRequirementPlanPagination.getIsCreatePlan(), String[][].class);
|
|
|
|
|
for (int i = 0; i < isCreatePlan.length; i++) {
|
|
|
|
|
if (isCreatePlan[i].length > 0) {
|
|
|
|
|
idList.add(JsonUtil.getObjectToString(Arrays.asList(isCreatePlan[i])));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception e1) {
|
|
|
|
|
try {
|
|
|
|
|
List<String> isCreatePlan = JsonUtil.getJsonToList(yysMaterialRequirementPlanPagination.getIsCreatePlan(), String.class);
|
|
|
|
|
if (isCreatePlan.size() > 0) {
|
|
|
|
|
idList.addAll(isCreatePlan);
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception e2) {
|
|
|
|
|
idList.add(String.valueOf(yysMaterialRequirementPlanPagination.getIsCreatePlan()));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
yysMaterialRequirementPlanQueryWrapper.lambda().and(t -> {
|
|
|
|
|
idList.forEach(tt -> {
|
|
|
|
|
t.like(YysMaterialRequirementPlanEntity::getIsCreatePlan, tt).or();
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
if(yysMaterialRequirementItemNum>0){
|
|
|
|
|
List<String> yysMaterialRequirementItemIdList = yysMaterialRequirementItemService.list(yysMaterialRequirementItemQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getMaterialRequirementPlanId())).map(t->t.getMaterialRequirementPlanId()).collect(Collectors.toList());
|
|
|
|
|
if (yysMaterialRequirementItemNum > 0) {
|
|
|
|
|
List<String> yysMaterialRequirementItemIdList = yysMaterialRequirementItemService.list(yysMaterialRequirementItemQueryWrapper).stream().filter(t -> StringUtil.isNotEmpty(t.getMaterialRequirementPlanId())).map(t -> t.getMaterialRequirementPlanId()).collect(Collectors.toList());
|
|
|
|
|
long count = yysMaterialRequirementItemService.count();
|
|
|
|
|
if (count>0){
|
|
|
|
|
intersectionList.add(yysMaterialRequirementItemIdList);
|
|
|
|
|
if (count > 0) {
|
|
|
|
|
intersectionList.add(yysMaterialRequirementItemIdList);
|
|
|
|
|
}
|
|
|
|
|
AllIdList.addAll(yysMaterialRequirementItemIdList);
|
|
|
|
|
}
|
|
|
|
|
total+=yysMaterialRequirementItemNum;
|
|
|
|
|
}
|
|
|
|
|
total += yysMaterialRequirementItemNum;
|
|
|
|
|
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
|
|
|
|
|
if (total>0){
|
|
|
|
|
if (intersection.size()==0){
|
|
|
|
|
if (total > 0) {
|
|
|
|
|
if (intersection.size() == 0) {
|
|
|
|
|
intersection.add("jnpfNullList");
|
|
|
|
|
}
|
|
|
|
|
yysMaterialRequirementPlanQueryWrapper.lambda().in(YysMaterialRequirementPlanEntity::getId, intersection);
|
|
|
|
|
}
|
|
|
|
|
//是否有高级查询
|
|
|
|
|
if (StringUtil.isNotEmpty(superOp)){
|
|
|
|
|
if (allSuperIDlist.size()==0){
|
|
|
|
|
//是否有高级查询
|
|
|
|
|
if (StringUtil.isNotEmpty(superOp)) {
|
|
|
|
|
if (allSuperIDlist.size() == 0) {
|
|
|
|
|
allSuperIDlist.add("jnpfNullList");
|
|
|
|
|
}
|
|
|
|
|
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 (allRuleIDlist.size()==0){
|
|
|
|
|
//是否有数据过滤查询
|
|
|
|
|
if (StringUtil.isNotEmpty(ruleOp)) {
|
|
|
|
|
if (allRuleIDlist.size() == 0) {
|
|
|
|
|
allRuleIDlist.add("jnpfNullList");
|
|
|
|
|
}
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
|
|
//排序
|
|
|
|
|
if(StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSidx())){
|
|
|
|
|
if (StringUtil.isEmpty(yysMaterialRequirementPlanPagination.getSidx())) {
|
|
|
|
|
yysMaterialRequirementPlanQueryWrapper.lambda().orderByDesc(YysMaterialRequirementPlanEntity::getOrderDate);
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
try {
|
|
|
|
|
String sidx = yysMaterialRequirementPlanPagination.getSidx();
|
|
|
|
|
String[] strs= sidx.split("_name");
|
|
|
|
|
String[] strs = sidx.split("_name");
|
|
|
|
|
YysMaterialRequirementPlanEntity yysMaterialRequirementPlanEntity = new YysMaterialRequirementPlanEntity();
|
|
|
|
|
Field declaredField = yysMaterialRequirementPlanEntity.getClass().getDeclaredField(strs[0]);
|
|
|
|
|
declaredField.setAccessible(true);
|
|
|
|
|
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) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if("0".equals(dataType)){
|
|
|
|
|
if((total>0 && AllIdList.size()>0) || total==0){
|
|
|
|
|
Page<YysMaterialRequirementPlanEntity> page=new Page<>(yysMaterialRequirementPlanPagination.getCurrentPage(), yysMaterialRequirementPlanPagination.getPageSize());
|
|
|
|
|
IPage<YysMaterialRequirementPlanEntity> userIPage=this.page(page, yysMaterialRequirementPlanQueryWrapper);
|
|
|
|
|
return yysMaterialRequirementPlanPagination.setData(userIPage.getRecords(),userIPage.getTotal());
|
|
|
|
|
}else{
|
|
|
|
|
if ("0".equals(dataType)) {
|
|
|
|
|
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
|
|
|
|
|
Page<YysMaterialRequirementPlanEntity> page = new Page<>(yysMaterialRequirementPlanPagination.getCurrentPage(), yysMaterialRequirementPlanPagination.getPageSize());
|
|
|
|
|
IPage<YysMaterialRequirementPlanEntity> userIPage = this.page(page, yysMaterialRequirementPlanQueryWrapper);
|
|
|
|
|
return yysMaterialRequirementPlanPagination.setData(userIPage.getRecords(), userIPage.getTotal());
|
|
|
|
|
} else {
|
|
|
|
|
List<YysMaterialRequirementPlanEntity> list = new ArrayList();
|
|
|
|
|
return yysMaterialRequirementPlanPagination.setData(list, list.size());
|
|
|
|
|
}
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
return this.list(yysMaterialRequirementPlanQueryWrapper);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public YysMaterialRequirementPlanEntity getInfo(String id){
|
|
|
|
|
QueryWrapper<YysMaterialRequirementPlanEntity> queryWrapper=new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(YysMaterialRequirementPlanEntity::getId,id);
|
|
|
|
|
public YysMaterialRequirementPlanEntity getInfo(String id) {
|
|
|
|
|
QueryWrapper<YysMaterialRequirementPlanEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(YysMaterialRequirementPlanEntity::getId, id);
|
|
|
|
|
return this.getOne(queryWrapper);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void create(YysMaterialRequirementPlanEntity entity){
|
|
|
|
|
public void create(YysMaterialRequirementPlanEntity entity) {
|
|
|
|
|
this.save(entity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public boolean update(String id, YysMaterialRequirementPlanEntity entity){
|
|
|
|
|
public boolean update(String id, YysMaterialRequirementPlanEntity entity) {
|
|
|
|
|
return this.updateById(entity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void delete(YysMaterialRequirementPlanEntity entity){
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
public void delete(YysMaterialRequirementPlanEntity entity) {
|
|
|
|
|
if (entity != null) {
|
|
|
|
|
this.removeById(entity.getId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/** YysMaterialRequirementItem子表方法 */
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* YysMaterialRequirementItem子表方法
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id,YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination){
|
|
|
|
|
Map<String, Object> newtabMap=YysMaterialRequirementPlanConstant.TABLEFIELDKEY.entrySet()
|
|
|
|
|
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
|
|
|
|
|
String tableName="yysMaterialRequirementItem";
|
|
|
|
|
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
|
|
|
|
|
public List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id, YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) {
|
|
|
|
|
Map<String, Object> newtabMap = YysMaterialRequirementPlanConstant.TABLEFIELDKEY.entrySet()
|
|
|
|
|
.stream().collect(Collectors.toMap(e -> e.getValue(), e -> e.getKey()));
|
|
|
|
|
String tableName = "yysMaterialRequirementItem";
|
|
|
|
|
tableName = newtabMap.get(tableName) == null ? tableName : newtabMap.get(tableName).toString();
|
|
|
|
|
QueryWrapper<YysMaterialRequirementItemEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper = yysMaterialRequirementItemService.getChild(yysMaterialRequirementPlanPagination,queryWrapper);
|
|
|
|
|
queryWrapper = yysMaterialRequirementItemService.getChild(yysMaterialRequirementPlanPagination, queryWrapper);
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** YysMaterialRequirementItem子表方法 */
|
|
|
|
|
/**
|
|
|
|
|
* YysMaterialRequirementItem子表方法
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id){
|
|
|
|
|
public List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id) {
|
|
|
|
|
QueryWrapper<YysMaterialRequirementItemEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, id);
|
|
|
|
|
return yysMaterialRequirementItemService.list(queryWrapper);
|
|
|
|
|
}
|
|
|
|
|
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 验证表单唯一字段,正则,非空 i-0新增-1修改
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public String checkForm(YysMaterialRequirementPlanForm form,int i) {
|
|
|
|
|
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
|
|
|
|
|
String id="";
|
|
|
|
|
public String checkForm(YysMaterialRequirementPlanForm form, int i) {
|
|
|
|
|
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
|
|
|
|
|
String id = "";
|
|
|
|
|
String countRecover = "";
|
|
|
|
|
if (isUp){
|
|
|
|
|
if (isUp) {
|
|
|
|
|
id = form.getId();
|
|
|
|
|
}
|
|
|
|
|
//主表字段验证
|
|
|
|
|
//子表字段验证
|
|
|
|
|
if (form.getYysMaterialRequirementItemList()!=null){
|
|
|
|
|
for(YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()){
|
|
|
|
|
if(StringUtil.isNotEmpty(t.getMaterialCode())){
|
|
|
|
|
t.setMaterialCode(t.getMaterialCode().trim());
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
return "设计子表-物料编码不能为空";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for(YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()){
|
|
|
|
|
if(StringUtil.isNotEmpty(t.getMaterialName())){
|
|
|
|
|
t.setMaterialName(t.getMaterialName().trim());
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
return "设计子表-物料名称不能为空";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (form.getYysMaterialRequirementItemList() != null) {
|
|
|
|
|
for (YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()) {
|
|
|
|
|
if (StringUtil.isNotEmpty(t.getMaterialCode())) {
|
|
|
|
|
t.setMaterialCode(t.getMaterialCode().trim());
|
|
|
|
|
} else {
|
|
|
|
|
return "设计子表-物料编码不能为空";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for (YysMaterialRequirementItemModel t : form.getYysMaterialRequirementItemList()) {
|
|
|
|
|
if (StringUtil.isNotEmpty(t.getMaterialName())) {
|
|
|
|
|
t.setMaterialName(t.getMaterialName().trim());
|
|
|
|
|
} else {
|
|
|
|
|
return "设计子表-物料名称不能为空";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return countRecover;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 新增修改数据(事务回滚)
|
|
|
|
|
* @param id
|
|
|
|
|
* @param yysMaterialRequirementPlanForm
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
* 新增修改数据(事务回滚)
|
|
|
|
|
*
|
|
|
|
|
* @param id
|
|
|
|
|
* @param yysMaterialRequirementPlanForm
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional
|
|
|
|
|
public void saveOrUpdate(YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm,String id, boolean isSave) throws Exception{
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
public void saveOrUpdate(YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm, String id, boolean isSave) throws Exception {
|
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
|
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
|
|
|
|
|
yysMaterialRequirementPlanForm = JsonUtil.getJsonToBean(
|
|
|
|
|
generaterSwapUtil.swapDatetime(YysMaterialRequirementPlanConstant.getFormData(),yysMaterialRequirementPlanForm),YysMaterialRequirementPlanForm.class);
|
|
|
|
|
generaterSwapUtil.swapDatetime(YysMaterialRequirementPlanConstant.getFormData(), yysMaterialRequirementPlanForm), YysMaterialRequirementPlanForm.class);
|
|
|
|
|
YysMaterialRequirementPlanEntity entity = JsonUtil.getJsonToBean(yysMaterialRequirementPlanForm, YysMaterialRequirementPlanEntity.class);
|
|
|
|
|
|
|
|
|
|
if(isSave){
|
|
|
|
|
String mainId = RandomUtil.uuId() ;
|
|
|
|
|
entity.setPlanNumber(generaterSwapUtil.getBillNumber("plannumber", false));
|
|
|
|
|
if (isSave) {
|
|
|
|
|
String mainId = RandomUtil.uuId();
|
|
|
|
|
entity.setPlanNumber(generaterSwapUtil.getBillNumber("plannumber", false));
|
|
|
|
|
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));
|
|
|
|
|
}
|
|
|
|
|
this.saveOrUpdate(entity);
|
|
|
|
|
|
|
|
|
|
//YysMaterialRequirementItem子表数据新增修改
|
|
|
|
|
if(!isSave){
|
|
|
|
|
if (!isSave) {
|
|
|
|
|
QueryWrapper<YysMaterialRequirementItemEntity> YysMaterialRequirementItemqueryWrapper = new QueryWrapper<>();
|
|
|
|
|
YysMaterialRequirementItemqueryWrapper.lambda().eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, entity.getId());
|
|
|
|
|
yysMaterialRequirementItemService.remove(YysMaterialRequirementItemqueryWrapper);
|
|
|
|
|
}
|
|
|
|
|
if (yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList()!=null){
|
|
|
|
|
List<YysMaterialRequirementItemEntity> tableField119 = JsonUtil.getJsonToList(yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList(),YysMaterialRequirementItemEntity.class);
|
|
|
|
|
for(YysMaterialRequirementItemEntity entitys : tableField119){
|
|
|
|
|
if (yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList() != null) {
|
|
|
|
|
List<YysMaterialRequirementItemEntity> tableField119 = JsonUtil.getJsonToList(yysMaterialRequirementPlanForm.getYysMaterialRequirementItemList(), YysMaterialRequirementItemEntity.class);
|
|
|
|
|
for (YysMaterialRequirementItemEntity entitys : tableField119) {
|
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
|
entitys.setMaterialRequirementPlanId(entity.getId());
|
|
|
|
|
if(isSave){
|
|
|
|
|
}else{
|
|
|
|
|
if (isSave) {
|
|
|
|
|
entitys.setCreatorTime(DateUtil.getNowDate());
|
|
|
|
|
entitys.setCreatorUserId(userInfo.getUserId());
|
|
|
|
|
} else {
|
|
|
|
|
}
|
|
|
|
|
yysMaterialRequirementItemService.saveOrUpdate(entitys);
|
|
|
|
|
}
|
|
|
|
|