|
|
@ -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)
|
|
|
@ -48,11 +60,15 @@ 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();
|
|
|
@ -316,27 +332,34 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
|
|
|
|
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()
|
|
|
@ -350,14 +373,19 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
|
|
|
|
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");
|
|
|
@ -372,24 +400,24 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
|
|
|
|
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 {
|
|
|
|
else{
|
|
|
|
|
|
|
|
return "设计子表-物料名称不能为空";
|
|
|
|
return "设计子表-物料名称不能为空";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return countRecover;
|
|
|
|
return countRecover;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 新增修改数据(事务回滚)
|
|
|
|
* 新增修改数据(事务回滚)
|
|
|
|
|
|
|
|
*
|
|
|
|
* @param id
|
|
|
|
* @param id
|
|
|
|
* @param yysMaterialRequirementPlanForm
|
|
|
|
* @param yysMaterialRequirementPlanForm
|
|
|
|
* @return
|
|
|
|
* @return
|
|
|
@ -407,7 +435,11 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
|
|
|
|
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);
|
|
|
|
|
|
|
|
entity.setCreatorTime(DateUtil.getNowDate());
|
|
|
|
|
|
|
|
entity.setCreatorUserId(userInfo.getUserId());
|
|
|
|
} else {
|
|
|
|
} 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);
|
|
|
@ -424,6 +456,8 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
entitys.setMaterialRequirementPlanId(entity.getId());
|
|
|
|
entitys.setMaterialRequirementPlanId(entity.getId());
|
|
|
|
if (isSave) {
|
|
|
|
if (isSave) {
|
|
|
|
|
|
|
|
entitys.setCreatorTime(DateUtil.getNowDate());
|
|
|
|
|
|
|
|
entitys.setCreatorUserId(userInfo.getUserId());
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
yysMaterialRequirementItemService.saveOrUpdate(entitys);
|
|
|
|
yysMaterialRequirementItemService.saveOrUpdate(entitys);
|
|
|
|