|
|
|
@ -28,7 +28,6 @@ import java.util.concurrent.CompletableFuture;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
*
|
|
|
|
|
* yysDayWork
|
|
|
|
|
* 版本: V3.5
|
|
|
|
|
* 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
|
|
|
|
@ -36,7 +35,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
* 日期: 2024-08-19
|
|
|
|
|
*/
|
|
|
|
|
@Service
|
|
|
|
|
public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayWorkEntity> implements YysDayWorkService{
|
|
|
|
|
public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayWorkEntity> implements YysDayWorkService {
|
|
|
|
|
@Autowired
|
|
|
|
|
private GeneraterSwapUtil generaterSwapUtil;
|
|
|
|
|
|
|
|
|
@ -62,95 +61,98 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
|
private YysRequisitionReportService yysRequisitionReportService;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<YysDayWorkEntity> getList(YysDayWorkPagination yysDayWorkPagination){
|
|
|
|
|
return getTypeList(yysDayWorkPagination,yysDayWorkPagination.getDataType());
|
|
|
|
|
public List<YysDayWorkEntity> getList(YysDayWorkPagination yysDayWorkPagination) {
|
|
|
|
|
return getTypeList(yysDayWorkPagination, yysDayWorkPagination.getDataType());
|
|
|
|
|
}
|
|
|
|
|
/** 列表查询 */
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 列表查询
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public List<YysDayWorkEntity> getTypeList(YysDayWorkPagination yysDayWorkPagination,String dataType){
|
|
|
|
|
String userId=userProvider.get().getUserId();
|
|
|
|
|
List<String> AllIdList =new ArrayList();
|
|
|
|
|
List<List<String>> intersectionList =new ArrayList<>();
|
|
|
|
|
public List<YysDayWorkEntity> getTypeList(YysDayWorkPagination yysDayWorkPagination, 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 ? YysDayWorkConstant.getAppColumnData() : YysDayWorkConstant.getColumnData();
|
|
|
|
|
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
|
|
|
|
|
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
|
|
|
|
|
|
|
|
|
|
int total=0;
|
|
|
|
|
int yysDayWorkNum =0;
|
|
|
|
|
QueryWrapper<YysDayWorkEntity> yysDayWorkQueryWrapper=new QueryWrapper<>();
|
|
|
|
|
int total = 0;
|
|
|
|
|
int yysDayWorkNum = 0;
|
|
|
|
|
QueryWrapper<YysDayWorkEntity> yysDayWorkQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
List<String> allSuperIDlist = new ArrayList<>();
|
|
|
|
|
String superOp ="";
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysDayWorkPagination.getSuperQueryJson())){
|
|
|
|
|
String superOp = "";
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysDayWorkPagination.getSuperQueryJson())) {
|
|
|
|
|
List<String> allSuperList = new ArrayList<>();
|
|
|
|
|
List<List<String>> intersectionSuperList = new ArrayList<>();
|
|
|
|
|
String queryJson = yysDayWorkPagination.getSuperQueryJson();
|
|
|
|
|
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
|
|
|
|
|
int superNum = 0;
|
|
|
|
|
QueryWrapper<YysDayWorkEntity> yysDayWorkSuperWrapper = new QueryWrapper<>();
|
|
|
|
|
yysDayWorkSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayWorkSuperWrapper,YysDayWorkEntity.class,queryJson,"0"));
|
|
|
|
|
yysDayWorkSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayWorkSuperWrapper, YysDayWorkEntity.class, queryJson, "0"));
|
|
|
|
|
int yysDayWorkNum1 = yysDayWorkSuperWrapper.getExpression().getNormal().size();
|
|
|
|
|
if (yysDayWorkNum1>0){
|
|
|
|
|
List<String> yysDayWorkList =this.list(yysDayWorkSuperWrapper).stream().map(YysDayWorkEntity::getId).collect(Collectors.toList());
|
|
|
|
|
if (yysDayWorkNum1 > 0) {
|
|
|
|
|
List<String> yysDayWorkList = this.list(yysDayWorkSuperWrapper).stream().map(YysDayWorkEntity::getId).collect(Collectors.toList());
|
|
|
|
|
allSuperList.addAll(yysDayWorkList);
|
|
|
|
|
intersectionSuperList.add(yysDayWorkList);
|
|
|
|
|
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<>();
|
|
|
|
|
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
|
|
|
|
|
int ruleNum = 0;
|
|
|
|
|
QueryWrapper<YysDayWorkEntity> yysDayWorkSuperWrapper = new QueryWrapper<>();
|
|
|
|
|
yysDayWorkSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayWorkSuperWrapper,YysDayWorkEntity.class,ruleJson,"0"));
|
|
|
|
|
yysDayWorkSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayWorkSuperWrapper, YysDayWorkEntity.class, ruleJson, "0"));
|
|
|
|
|
int yysDayWorkNum1 = yysDayWorkSuperWrapper.getExpression().getNormal().size();
|
|
|
|
|
if (yysDayWorkNum1>0){
|
|
|
|
|
List<String> yysDayWorkList =this.list(yysDayWorkSuperWrapper).stream().map(YysDayWorkEntity::getId).collect(Collectors.toList());
|
|
|
|
|
if (yysDayWorkNum1 > 0) {
|
|
|
|
|
List<String> yysDayWorkList = this.list(yysDayWorkSuperWrapper).stream().map(YysDayWorkEntity::getId).collect(Collectors.toList());
|
|
|
|
|
allRuleList.addAll(yysDayWorkList);
|
|
|
|
|
intersectionRuleList.add(yysDayWorkList);
|
|
|
|
|
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 = false;
|
|
|
|
|
boolean appPermission = false;
|
|
|
|
|
if(isPc && pcPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object yysDayWorkObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayWorkQueryWrapper,YysDayWorkEntity.class,yysDayWorkPagination.getMenuId(),"0"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysDayWorkObj)){
|
|
|
|
|
if (isPc && pcPermission) {
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()) {
|
|
|
|
|
Object yysDayWorkObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayWorkQueryWrapper, YysDayWorkEntity.class, yysDayWorkPagination.getMenuId(), "0"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysDayWorkObj)) {
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
yysDayWorkQueryWrapper = (QueryWrapper<YysDayWorkEntity>)yysDayWorkObj;
|
|
|
|
|
if( yysDayWorkQueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
|
yysDayWorkQueryWrapper = (QueryWrapper<YysDayWorkEntity>) yysDayWorkObj;
|
|
|
|
|
if (yysDayWorkQueryWrapper.getExpression().getNormal().size() > 0) {
|
|
|
|
|
yysDayWorkNum++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(!isPc && appPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object yysDayWorkObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayWorkQueryWrapper,YysDayWorkEntity.class,yysDayWorkPagination.getMenuId(),"0"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysDayWorkObj)){
|
|
|
|
|
if (!isPc && appPermission) {
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()) {
|
|
|
|
|
Object yysDayWorkObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayWorkQueryWrapper, YysDayWorkEntity.class, yysDayWorkPagination.getMenuId(), "0"));
|
|
|
|
|
if (ObjectUtil.isEmpty(yysDayWorkObj)) {
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
yysDayWorkQueryWrapper = (QueryWrapper<YysDayWorkEntity>)yysDayWorkObj;
|
|
|
|
|
if( yysDayWorkQueryWrapper.getExpression().getNormal().size()>0){
|
|
|
|
|
yysDayWorkQueryWrapper = (QueryWrapper<YysDayWorkEntity>) yysDayWorkObj;
|
|
|
|
|
if (yysDayWorkQueryWrapper.getExpression().getNormal().size() > 0) {
|
|
|
|
|
yysDayWorkNum++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -158,11 +160,11 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(isPc){
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysDayWorkPagination.getManufactureTime())){
|
|
|
|
|
if (isPc) {
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysDayWorkPagination.getManufactureTime())) {
|
|
|
|
|
yysDayWorkNum++;
|
|
|
|
|
|
|
|
|
|
List ManufactureTimeList = JsonUtil.getJsonToList(yysDayWorkPagination.getManufactureTime(),String.class);
|
|
|
|
|
List ManufactureTimeList = JsonUtil.getJsonToList(yysDayWorkPagination.getManufactureTime(), String.class);
|
|
|
|
|
Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0)));
|
|
|
|
|
Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1)));
|
|
|
|
|
|
|
|
|
@ -188,43 +190,43 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
|
String value = yysDayWorkPagination.getProductName() instanceof List ?
|
|
|
|
|
JsonUtil.getObjectToString(yysDayWorkPagination.getProductName()) :
|
|
|
|
|
String.valueOf(yysDayWorkPagination.getProductName());
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().like(YysDayWorkEntity::getProductName,value);
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().like(YysDayWorkEntity::getProductName, value);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysDayWorkPagination.getDeviceName())){
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysDayWorkPagination.getDeviceName())) {
|
|
|
|
|
yysDayWorkNum++;
|
|
|
|
|
|
|
|
|
|
String value = yysDayWorkPagination.getDeviceName() instanceof List ?
|
|
|
|
|
JsonUtil.getObjectToString(yysDayWorkPagination.getDeviceName()) :
|
|
|
|
|
String.valueOf(yysDayWorkPagination.getDeviceName());
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().like(YysDayWorkEntity::getDeviceName,value);
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().like(YysDayWorkEntity::getDeviceName, value);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(yysDayWorkPagination.getProductionStatus())){
|
|
|
|
|
if (ObjectUtil.isNotEmpty(yysDayWorkPagination.getProductionStatus())) {
|
|
|
|
|
yysDayWorkNum++;
|
|
|
|
|
|
|
|
|
|
List<String> idList = new ArrayList<>();
|
|
|
|
|
try {
|
|
|
|
|
String[][] productionStatus = JsonUtil.getJsonToBean(yysDayWorkPagination.getProductionStatus(),String[][].class);
|
|
|
|
|
for(int i=0;i<productionStatus.length;i++){
|
|
|
|
|
if(productionStatus[i].length>0){
|
|
|
|
|
String[][] productionStatus = JsonUtil.getJsonToBean(yysDayWorkPagination.getProductionStatus(), String[][].class);
|
|
|
|
|
for (int i = 0; i < productionStatus.length; i++) {
|
|
|
|
|
if (productionStatus[i].length > 0) {
|
|
|
|
|
idList.add(JsonUtil.getObjectToString(Arrays.asList(productionStatus[i])));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}catch (Exception e1){
|
|
|
|
|
} catch (Exception e1) {
|
|
|
|
|
try {
|
|
|
|
|
List<String> productionStatus = JsonUtil.getJsonToList(yysDayWorkPagination.getProductionStatus(),String.class);
|
|
|
|
|
if(productionStatus.size()>0){
|
|
|
|
|
List<String> productionStatus = JsonUtil.getJsonToList(yysDayWorkPagination.getProductionStatus(), String.class);
|
|
|
|
|
if (productionStatus.size() > 0) {
|
|
|
|
|
idList.addAll(productionStatus);
|
|
|
|
|
}
|
|
|
|
|
}catch (Exception e2){
|
|
|
|
|
} catch (Exception e2) {
|
|
|
|
|
idList.add(String.valueOf(yysDayWorkPagination.getProductionStatus()));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().and(t->{
|
|
|
|
|
idList.forEach(tt->{
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().and(t -> {
|
|
|
|
|
idList.forEach(tt -> {
|
|
|
|
|
t.like(YysDayWorkEntity::getProductionStatus, tt).or();
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
@ -233,27 +235,27 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
|
|
|
|
|
if (total>0){
|
|
|
|
|
if (intersection.size()==0){
|
|
|
|
|
if (total > 0) {
|
|
|
|
|
if (intersection.size() == 0) {
|
|
|
|
|
intersection.add("jnpfNullList");
|
|
|
|
|
}
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().in(YysDayWorkEntity::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;
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().and(t->t.in(YysDayWorkEntity::getId, finalAllSuperIDlist));
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().and(t -> t.in(YysDayWorkEntity::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;
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().and(t->t.in(YysDayWorkEntity::getId, finalAllRuleIDlist));
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().and(t -> t.in(YysDayWorkEntity::getId, finalAllRuleIDlist));
|
|
|
|
|
}
|
|
|
|
|
//假删除标志
|
|
|
|
|
yysDayWorkQueryWrapper.lambda().isNull(YysDayWorkEntity::getDeleteMark);
|
|
|
|
@ -276,75 +278,84 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
if("0".equals(dataType)){
|
|
|
|
|
if((total>0 && AllIdList.size()>0) || total==0){
|
|
|
|
|
Page<YysDayWorkEntity> page=new Page<>(yysDayWorkPagination.getCurrentPage(), yysDayWorkPagination.getPageSize());
|
|
|
|
|
IPage<YysDayWorkEntity> userIPage=this.page(page, yysDayWorkQueryWrapper);
|
|
|
|
|
return yysDayWorkPagination.setData(userIPage.getRecords(),userIPage.getTotal());
|
|
|
|
|
}else{
|
|
|
|
|
if ("0".equals(dataType)) {
|
|
|
|
|
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
|
|
|
|
|
Page<YysDayWorkEntity> page = new Page<>(yysDayWorkPagination.getCurrentPage(), yysDayWorkPagination.getPageSize());
|
|
|
|
|
IPage<YysDayWorkEntity> userIPage = this.page(page, yysDayWorkQueryWrapper);
|
|
|
|
|
return yysDayWorkPagination.setData(userIPage.getRecords(), userIPage.getTotal());
|
|
|
|
|
} else {
|
|
|
|
|
List<YysDayWorkEntity> list = new ArrayList();
|
|
|
|
|
return yysDayWorkPagination.setData(list, list.size());
|
|
|
|
|
}
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
return this.list(yysDayWorkQueryWrapper);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public YysDayWorkEntity getInfo(String id){
|
|
|
|
|
QueryWrapper<YysDayWorkEntity> queryWrapper=new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(YysDayWorkEntity::getId,id);
|
|
|
|
|
public YysDayWorkEntity getInfo(String id) {
|
|
|
|
|
QueryWrapper<YysDayWorkEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(YysDayWorkEntity::getId, id);
|
|
|
|
|
return this.getOne(queryWrapper);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void create(YysDayWorkEntity entity){
|
|
|
|
|
public void create(YysDayWorkEntity entity) {
|
|
|
|
|
this.save(entity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public boolean update(String id, YysDayWorkEntity entity){
|
|
|
|
|
public boolean update(String id, YysDayWorkEntity entity) {
|
|
|
|
|
return this.updateById(entity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void delete(YysDayWorkEntity entity){
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
public void delete(YysDayWorkEntity entity) {
|
|
|
|
|
if (entity != null) {
|
|
|
|
|
this.removeById(entity.getId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 验证表单唯一字段,正则,非空 i-0新增-1修改
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public String checkForm(YysDayWorkForm form,int i) {
|
|
|
|
|
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
|
|
|
|
|
String id="";
|
|
|
|
|
public String checkForm(YysDayWorkForm 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(StringUtil.isEmpty(form.getProductName())){
|
|
|
|
|
if (StringUtil.isEmpty(form.getProductName())) {
|
|
|
|
|
return "产品名称不能为空";
|
|
|
|
|
}
|
|
|
|
|
if(StringUtil.isNotEmpty(form.getProductName())){
|
|
|
|
|
if (StringUtil.isNotEmpty(form.getProductName())) {
|
|
|
|
|
form.setProductName(form.getProductName().trim());
|
|
|
|
|
QueryWrapper<YysDayWorkEntity> productNameWrapper=new QueryWrapper<>();
|
|
|
|
|
productNameWrapper.lambda().eq(YysDayWorkEntity::getProductName,form.getProductName());
|
|
|
|
|
QueryWrapper<YysDayWorkEntity> productNameWrapper = new QueryWrapper<>();
|
|
|
|
|
productNameWrapper.lambda().eq(YysDayWorkEntity::getProductName, form.getProductName());
|
|
|
|
|
//假删除标志
|
|
|
|
|
productNameWrapper.lambda().isNull(YysDayWorkEntity::getDeleteMark);
|
|
|
|
|
if (isUp){
|
|
|
|
|
if (isUp) {
|
|
|
|
|
productNameWrapper.lambda().ne(YysDayWorkEntity::getId, id);
|
|
|
|
|
}
|
|
|
|
|
if((int) this.count(productNameWrapper)>0){
|
|
|
|
|
if ((int) this.count(productNameWrapper) > 0) {
|
|
|
|
|
countRecover = "产品名称不能重复";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(StringUtil.isEmpty(form.getModels())){
|
|
|
|
|
if (StringUtil.isEmpty(form.getModels())) {
|
|
|
|
|
return "规格型号不能为空";
|
|
|
|
|
}
|
|
|
|
|
if(StringUtil.isEmpty(form.getMeasurementUnit())){
|
|
|
|
|
if (StringUtil.isEmpty(form.getMeasurementUnit())) {
|
|
|
|
|
return "计量单位不能为空";
|
|
|
|
|
}
|
|
|
|
|
return countRecover;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 新增修改数据(事务回滚)
|
|
|
|
|
*
|
|
|
|
|
* @param id
|
|
|
|
|
* @param yysDayWorkForm
|
|
|
|
|
* @return
|
|
|
|
@ -365,6 +376,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
|
entity.setVersion(0);
|
|
|
|
|
entity.setDeliveryTime(entity.getManufactureTime());
|
|
|
|
|
entity.setIsFrozen("否");
|
|
|
|
|
} else {
|
|
|
|
|
entity.setLastModifyTime(DateUtil.getNowDate());
|
|
|
|
|
entity.setLastModifyUserId(userInfo.getUserId());
|
|
|
|
@ -389,6 +401,8 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
|
//查询所有待确认的数据
|
|
|
|
|
LambdaQueryWrapper<YysDayWorkEntity> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
wrapper.eq(YysDayWorkEntity::getIsConfirm, request.getFlag());
|
|
|
|
|
wrapper.eq(YysDayWorkEntity::getIsFrozen, "否");
|
|
|
|
|
wrapper.isNull(YysDayWorkEntity::getDeleteMark);
|
|
|
|
|
List<YysDayWorkEntity> root = this.list(wrapper);
|
|
|
|
|
if (CollectionUtils.isEmpty(root)) {
|
|
|
|
|
return Collections.emptyList();
|
|
|
|
@ -479,7 +493,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
|
}
|
|
|
|
|
if ((prodResult && requisitionResult) || (packResult && requisitionResult)) {
|
|
|
|
|
//修改是否完工状态
|
|
|
|
|
CompletableFuture.runAsync(()->{
|
|
|
|
|
CompletableFuture.runAsync(() -> {
|
|
|
|
|
YysDayWorkEntity entity = this.getById(request.getId());
|
|
|
|
|
entity.setIsConfirm("2");
|
|
|
|
|
entity.setProductionStatus("2");
|
|
|
|
@ -489,4 +503,29 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
|
}
|
|
|
|
|
return "确认失败";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void syncIsForzen(String id) {
|
|
|
|
|
LambdaQueryWrapper<YysDayWorkEntity> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
wrapper.eq(YysDayWorkEntity::getMonthId, id);
|
|
|
|
|
List<YysDayWorkEntity> list = this.list(wrapper);
|
|
|
|
|
list.forEach(obj -> obj.setIsFrozen("是"));
|
|
|
|
|
this.updateBatchById(list);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public String isFrozen(String id) {
|
|
|
|
|
YysDayWorkEntity entity = this.getById(id);
|
|
|
|
|
entity.setIsFrozen("是");
|
|
|
|
|
this.updateById(entity);
|
|
|
|
|
return "冻结成功";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public String cancelFrozen(String id) {
|
|
|
|
|
YysDayWorkEntity entity = this.getById(id);
|
|
|
|
|
entity.setIsFrozen("否");
|
|
|
|
|
this.updateById(entity);
|
|
|
|
|
return "取消冻结成功";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|