|
|
@ -23,15 +23,12 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
|
|
|
import java.time.LocalDate;
|
|
|
|
import java.time.LocalDate;
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
|
|
|
|
import java.time.LocalTime;
|
|
|
|
import java.time.LocalTime;
|
|
|
|
import java.time.ZoneId;
|
|
|
|
import java.time.ZoneId;
|
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
import java.util.logging.SimpleFormatter;
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
@ -505,7 +502,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
}
|
|
|
|
}
|
|
|
|
requisitionResult = yysRequisitionReportService.saveBatch(request.getRequisitionReportList());
|
|
|
|
requisitionResult = yysRequisitionReportService.saveBatch(request.getRequisitionReportList());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ((prodResult && requisitionResult) || (packResult && requisitionResult)) {
|
|
|
|
if ((prodResult && requisitionResult)) {
|
|
|
|
//修改是否完工状态
|
|
|
|
//修改是否完工状态
|
|
|
|
CompletableFuture.runAsync(() -> {
|
|
|
|
CompletableFuture.runAsync(() -> {
|
|
|
|
YysDayWorkEntity entity = this.getById(request.getId());
|
|
|
|
YysDayWorkEntity entity = this.getById(request.getId());
|
|
|
@ -515,6 +512,15 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return "确认成功";
|
|
|
|
return "确认成功";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((packResult && requisitionResult)) {
|
|
|
|
|
|
|
|
//修改是否完工状态
|
|
|
|
|
|
|
|
CompletableFuture.runAsync(() -> {
|
|
|
|
|
|
|
|
YysDayPackageEntity entity = yysDayPackageService.getById(request.getId());
|
|
|
|
|
|
|
|
entity.setIsConfirm("2");
|
|
|
|
|
|
|
|
yysDayPackageService.updateById(entity);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
return "确认成功";
|
|
|
|
|
|
|
|
}
|
|
|
|
return "确认失败";
|
|
|
|
return "确认失败";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|